diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UploadFileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UploadFileController.java
index 0b5ffb9d2..c49936f35 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UploadFileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UploadFileController.java
@@ -57,7 +57,7 @@ public class UploadFileController extends BaseController {
                 if (null != module) {
                     filePath=module+ File.separator+ DateUtil.today()+ File.separator;
                 }
-                String fileName = FileUploadUtils.upload( Global.getAvatarPath()+filePath, file,originalFileName);
+                String fileName = FileUploadUtils.upload( Global.getAvatarPath()+filePath, file,false,originalFileName);
                 AjaxResult ajaxResult = new AjaxResult();
                 ajaxResult.put( "fileName", filePath+fileName );
                 ajaxResult.put( "code", "200" );
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/FileUploadUtils.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/FileUploadUtils.java
index b7d690058..7652204af 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/FileUploadUtils.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/FileUploadUtils.java
@@ -54,7 +54,7 @@ public class FileUploadUtils {
      */
     public static final String upload(MultipartFile file) throws IOException {
         try {
-            return upload( getDefaultBaseDir(), file, FileUploadUtils.IMAGE_JPG_EXTENSION );
+            return upload( getDefaultBaseDir(), file,true, FileUploadUtils.IMAGE_JPG_EXTENSION );
         } catch (Exception e) {
             throw new IOException( e );
         }
@@ -70,7 +70,7 @@ public class FileUploadUtils {
      */
     public static final String upload(String baseDir, MultipartFile file) throws IOException {
         try {
-            return upload( baseDir, file, FileUploadUtils.IMAGE_JPG_EXTENSION );
+            return upload( baseDir, file,true, FileUploadUtils.IMAGE_JPG_EXTENSION );
         } catch (Exception e) {
             throw new IOException( e );
         }
@@ -88,7 +88,7 @@ public class FileUploadUtils {
      * @throws FileNameLengthLimitExceededException 文件名太长
      * @throws IOException                          比如读写文件出错时
      */
-    public static final String upload(String baseDir, MultipartFile file, String extension)
+    public static final String upload(String baseDir, MultipartFile file,boolean needDatePathAndRandomName, String extension)
             throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException {
 
         int fileNamelength = file.getOriginalFilename().length();
@@ -99,7 +99,10 @@ public class FileUploadUtils {
 
         assertAllowed( file );
 
-        String fileName = encodingFilename( file.getOriginalFilename(), extension );
+        String fileName = extension;
+        if(needDatePathAndRandomName){
+            fileName =encodingFilename( file.getOriginalFilename(), extension );
+        }
 
         File desc = getAbsoluteFile( baseDir, baseDir + fileName );
         file.transferTo( desc );
@@ -127,7 +130,7 @@ public class FileUploadUtils {
         return filename;
     }
 
-    /**
+    /**`    、。，
      * 文件大小校验
      *
      * @param file 上传的文件