上传文件去掉日期

上传文件添加模块名称

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -18,6 +18,8 @@ import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.framework.config.ServerConfig;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
+import java.io.File;
+
 /**
  * 通用请求处理
  * 
@@ -68,11 +70,15 @@ public class CommonController {
      * 通用上传请求
      */
     @PostMapping("/common/upload")
-    public AjaxResult uploadFile(MultipartFile file) throws Exception {
+    public AjaxResult uploadFile(MultipartFile file,String modName) throws Exception {
         try
         {
             // 上传文件路径
             String filePath = RuoYiConfig.getUploadPath();
+            //@TODO 上传添加模块名称 luobo
+            if (StringUtils.isNotEmpty(modName) && !modName.equalsIgnoreCase("null") && !modName.equalsIgnoreCase("undefined")){
+                filePath += "/"+modName;
+            }
             // 上传并返回新文件名称
             String fileName = FileUploadUtils.upload(filePath, file);
             String url = serverConfig.getUrl() + fileName;
@@ -88,10 +94,14 @@ public class CommonController {
      * 图片上传请求
      */
     @PostMapping("/common/uploadImg")
-    public AjaxResult uploadFile(MultipartHttpServletRequest multiReq) throws Exception {
+    public AjaxResult uploadFile(MultipartHttpServletRequest multiReq,String modName) throws Exception {
         try {
             // 上传文件路径
             String filePath = RuoYiConfig.getUploadPath();
+            //@TODO 上传添加模块名称 luobo
+            if (StringUtils.isNotEmpty(modName) && !modName.equalsIgnoreCase("null") && !modName.equalsIgnoreCase("undefined")){
+                filePath += "/"+modName;
+            }
             // 上传并返回新文件名称
             String fileName = FileUploadUtils.upload(filePath, multiReq.getFile("img"));
             String url = serverConfig.getUrl() + fileName;

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

@@ -123,7 +123,9 @@ public class FileUploadUtils
     {
         String fileName = file.getOriginalFilename();
         String extension = getExtension(file);
-        fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
+//        fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
+        //@TODO 去掉上传文件路径里的日期 luobo
+        fileName = IdUtils.fastUUID() + "." + extension;
         return fileName;
     }