From c76f64a1f4d9a7f7283373be70b1dfd925286e4d Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 13 十月 2026 17:11:51 +0800
Subject: [PATCH] 上传命名规则调整

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index d361a51..005f510 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -3,10 +3,12 @@
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.framework.config.ServerConfig;
+import io.swagger.annotations.ApiOperation;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.coyote.AbstractProtocol;
@@ -82,19 +84,23 @@
             String filename = file.getOriginalFilename().trim();
             String felinamePath = FileUploadUtils.extractFilename(file);
 //            String pathFileName = FileUploadUtils.getPathFileName(filePath, s);
-            File file1 = new File(filePath + "/" + felinamePath);
-            boolean exists = file1.exists();
-            if (exists) {
-                int i = filename.lastIndexOf(".");
-                String startStr = filename.substring(0, i);
-                String endStr = filename.substring(i, filename.length());
+            for (int i=1;i<500;i++) {
+                File file1 = new File(filePath + "/" + felinamePath);
+                boolean exists = file1.exists();
+                if (exists) {
+                    int index = filename.lastIndexOf(".");
+                    String startStr = filename.substring(0, index);
+                    String endStr = filename.substring(index, filename.length());
 
-                String newFilename = startStr + System.currentTimeMillis() + endStr; // your new filename
-                String contentType = file.getContentType();
-                byte[] bytes = file.getBytes();
-                file = new MockMultipartFile(newFilename, newFilename, contentType, bytes);
+                    String newFilename = startStr + "-" + i + endStr; // your new filename
+                    felinamePath = DateUtils.datePath() + "/" + newFilename;
+                    String contentType = file.getContentType();
+                    byte[] bytes = file.getBytes();
+                    file = new MockMultipartFile(newFilename, newFilename, contentType, bytes);
+                }else{
+                    break;
+                }
             }
-
             // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
             String fileName = FileUploadUtils.upload(filePath, file);
             String url1 = serverConfig.getUrl();
@@ -177,4 +183,5 @@
         }
         return 0;
     }
+
 }
\ No newline at end of file

--
Gitblit v1.9.3