From 2211a75704860d9e6ae9dd02602746b14ad1e67f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 17 七月 2020 09:24:04 +0800
Subject: [PATCH] 编码文件名修改为uuid方式
---
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java | 1 -
ruoyi/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java | 2 +-
ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java | 16 ++--------------
3 files changed, 3 insertions(+), 16 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 6921fea..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;
}
@@ -150,16 +148,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;
}
/**
diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
similarity index 96%
rename from ruoyi/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java
rename to ruoyi/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
index 40e8030..df1e23f 100644
--- a/ruoyi/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java
+++ b/ruoyi/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.utils.security;
+package com.ruoyi.common.utils.sign;
import java.security.MessageDigest;
import org.slf4j.Logger;
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
index 28788e4..b6842e9 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
@@ -454,5 +454,4 @@
}
return successMsg.toString();
}
-
}
--
Gitblit v1.9.3