Преглед на файлове

完善ruoyi-file模块的upload接口在文件过大和文件名过长的情况下的返回值中的msg提示信息

pigwantacat преди 3 години
родител
ревизия
504a4e8e66

+ 2 - 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java

@@ -11,9 +11,9 @@ public class FileException extends BaseException
11 11
 {
12 12
     private static final long serialVersionUID = 1L;
13 13
 
14
-    public FileException(String code, Object[] args)
14
+    public FileException(String code, Object[] args, String msg)
15 15
     {
16
-        super("file", code, args, null);
16
+        super("file", code, args, msg);
17 17
     }
18 18
 
19 19
 }

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java

@@ -11,6 +11,6 @@ public class FileNameLengthLimitExceededException extends FileException
11 11
 
12 12
     public FileNameLengthLimitExceededException(int defaultFileNameLength)
13 13
     {
14
-        super("upload.filename.exceed.length", new Object[] { defaultFileNameLength });
14
+        super("upload.filename.exceed.length", new Object[] { defaultFileNameLength }, "the filename is too long");
15 15
     }
16 16
 }

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java

@@ -11,6 +11,6 @@ public class FileSizeLimitExceededException extends FileException
11 11
 
12 12
     public FileSizeLimitExceededException(long defaultMaxSize)
13 13
     {
14
-        super("upload.exceed.maxSize", new Object[] { defaultMaxSize });
14
+        super("upload.exceed.maxSize", new Object[] { defaultMaxSize }, "the filesize is too large");
15 15
     }
16 16
 }

+ 5 - 0
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java

@@ -4,6 +4,8 @@ import java.io.File;
4 4
 import java.io.IOException;
5 5
 import java.nio.file.Paths;
6 6
 import java.util.Objects;
7
+
8
+import com.ruoyi.common.core.exception.file.FileException;
7 9
 import org.apache.commons.io.FilenameUtils;
8 10
 import org.springframework.web.multipart.MultipartFile;
9 11
 import com.ruoyi.common.core.exception.file.FileNameLengthLimitExceededException;
@@ -46,6 +48,9 @@ public class FileUploadUtils
46 48
         {
47 49
             return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
48 50
         }
51
+        catch (FileException fe){
52
+            throw new IOException(fe.getDefaultMessage(), fe);
53
+        }
49 54
         catch (Exception e)
50 55
         {
51 56
             throw new IOException(e.getMessage(), e);