From a53a3b3119659d6ec28b458dcefd46f4ec49d55c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 17 七月 2020 16:43:47 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index dd96648..1c0d9fb 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -2,8 +2,6 @@
import java.io.File;
import java.io.IOException;
-
-import com.ruoyi.common.core.lang.UUID;
import org.apache.commons.io.FilenameUtils;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.constant.Constants;
@@ -11,8 +9,8 @@
import com.ruoyi.common.exception.file.FileSizeLimitExceededException;
import com.ruoyi.common.exception.file.InvalidExtensionException;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.IdUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.security.Md5Utils;
import com.ruoyi.framework.config.RuoYiConfig;
/**
@@ -36,8 +34,6 @@
* 榛樿涓婁紶鐨勫湴鍧�
*/
private static String defaultBaseDir = RuoYiConfig.getProfile();
-
- private static int counter = 0;
public static void setDefaultBaseDir(String defaultBaseDir)
{
@@ -127,7 +123,7 @@
{
String fileName = file.getOriginalFilename();
String extension = getExtension(file);
- fileName = DateUtils.datePath() + "/" + encodingFilename(fileName) + "." + extension;
+ fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
return fileName;
}
@@ -139,10 +135,11 @@
{
desc.getParentFile().mkdirs();
}
- if (!desc.exists())
- {
- desc.createNewFile();
- }
+ // 瑙ｅ喅undertow鏂囦欢涓婁紶bug,鍥犲簳灞傚疄鐜颁笉鍚�,鏃犻渶鍒涘缓鏂版枃浠�
+// if (!desc.exists())
+// {
+// desc.createNewFile();
+// }
return desc;
}
@@ -152,16 +149,6 @@
String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
return pathFileName;
- }
-
- /**
- * 缂栫爜鏂囦欢鍚�
- */
- private static final String encodingFilename(String fileName)
- {
- fileName = fileName.replace("_", " ");
- fileName = Md5Utils.hash(fileName + System.nanoTime() + counter++);
- return fileName;
}
/**
--
Gitblit v1.9.3