From 2479dc444595f8771b44f7d720abd366b8e4aa64 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期一, 14 十一月 2022 14:54:22 +0800
Subject: [PATCH] 补充提交
---
sandu-common/src/main/java/com/sandu/common/file/FileToThumbnail.java | 2 +-
sandu-common/src/main/java/com/sandu/common/file/impl/LocalFileUploadImpl.java | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/sandu-common/src/main/java/com/sandu/common/file/FileToThumbnail.java b/sandu-common/src/main/java/com/sandu/common/file/FileToThumbnail.java
index 555512d..c4be2de 100644
--- a/sandu-common/src/main/java/com/sandu/common/file/FileToThumbnail.java
+++ b/sandu-common/src/main/java/com/sandu/common/file/FileToThumbnail.java
@@ -127,7 +127,7 @@
ImageIO.write(bi, "png", targetFile);
// 鏌ョ湅stop婧愮爜浼氳嚜鍔ㄥ叧娴�
ff.stop();
- return targetFile.getPath().replace(SpringContextHolder.getBean(NovaFileConfig.class).getUploadRootPath(), "").replaceAll("\\\\", "/");
+ return targetFile.getPath().replace(SpringContextHolder.getBean(NovaFileConfig.class).getUploadRootPath(), "").replace(File.separator,"/");
}
diff --git a/sandu-common/src/main/java/com/sandu/common/file/impl/LocalFileUploadImpl.java b/sandu-common/src/main/java/com/sandu/common/file/impl/LocalFileUploadImpl.java
index ec79628..4abbe70 100644
--- a/sandu-common/src/main/java/com/sandu/common/file/impl/LocalFileUploadImpl.java
+++ b/sandu-common/src/main/java/com/sandu/common/file/impl/LocalFileUploadImpl.java
@@ -5,6 +5,7 @@
import cn.hutool.core.io.FileTypeUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.UUID;
+import com.alibaba.fastjson.JSON;
import com.sandu.common.enums.FileStorageEnums;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.file.*;
@@ -12,6 +13,7 @@
import com.sandu.common.util.SpringContextHolder;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringEscapeUtils;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -23,7 +25,9 @@
import java.math.BigInteger;
import java.security.MessageDigest;
import java.time.LocalDate;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Optional;
/**
@@ -65,10 +69,8 @@
FileUploadDto uploadDto = new FileUploadDto();
uploadDto.setOriginName(originalFilename);
uploadDto.setFileName(fileName);
- System.out.println(File.separator);
- uploadDto.setRealUrl(dest.getPath().replaceAll("\\\\", "/"));
- System.out.println(dest.getPath());
- uploadDto.setFileUrl(dest.getPath().replace(fileProperties.getUploadRootPath(), "").replaceAll("\\\\", "/"));
+ uploadDto.setRealUrl(dest.getPath().replace(File.separator,"/"));
+ uploadDto.setFileUrl(dest.getPath().replace(fileProperties.getUploadRootPath(), "").replace(File.separator,"/"));
uploadDto.setFileType(FileUtil.getType(dest));
uploadDto.setStorageType(FileStorageEnums.LOCAL.getCode());
uploadDto.setFileSize(size);
--
Gitblit v1.9.3