From 1624debefe4c0f83722da3edf2419320c0ce75b1 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期六, 18 七月 2020 12:23:20 +0800
Subject: [PATCH] !41 禁止加密密文返回前端 Merge pull request !41 from 平凡/hmxmylove-master-patch-79033
---
ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java | 18 +++---------------
1 files changed, 3 insertions(+), 15 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 48d3ada..5b356e2 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
@@ -9,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;
/**
@@ -34,8 +34,6 @@
* 默认上传的地址
*/
private static String defaultBaseDir = RuoYiConfig.getProfile();
-
- private static int counter = 0;
public static void setDefaultBaseDir(String defaultBaseDir)
{
@@ -125,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;
}
@@ -146,20 +144,10 @@
private static final String getPathFileName(String uploadDir, String fileName) throws IOException
{
- int dirLastIndex = uploadDir.lastIndexOf("/") + 1;
+ int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
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.2