From 504a4e8e66fe61d7c50f83aa8e3730635f75ebfc Mon Sep 17 00:00:00 2001
From: pigwantacat <zhuhebin0928@163.com>
Date: Thu, 16 Mar 2023 23:48:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84ruoyi-file=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E7=9A=84upload=E6=8E=A5=E5=8F=A3=E5=9C=A8=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=BF=87=E5=A4=A7=E5=92=8C=E6=96=87=E4=BB=B6=E5=90=8D=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E7=9A=84=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=80=BC=E4=B8=AD=E7=9A=84msg=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/core/exception/file/FileException.java  | 4 ++--
 .../exception/file/FileNameLengthLimitExceededException.java | 2 +-
 .../core/exception/file/FileSizeLimitExceededException.java  | 2 +-
 .../src/main/java/com/ruoyi/file/utils/FileUploadUtils.java  | 5 +++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java
index ae6154320..b19f2d826 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java
+++ b/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
 {
     private static final long serialVersionUID = 1L;
 
-    public FileException(String code, Object[] args)
+    public FileException(String code, Object[] args, String msg)
     {
-        super("file", code, args, null);
+        super("file", code, args, msg);
     }
 
 }
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java
index c425acdf9..0962ca5ac 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java
+++ b/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
 
     public FileNameLengthLimitExceededException(int defaultFileNameLength)
     {
-        super("upload.filename.exceed.length", new Object[] { defaultFileNameLength });
+        super("upload.filename.exceed.length", new Object[] { defaultFileNameLength }, "the filename is too long");
     }
 }
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java
index 0426067a9..f9a66b78c 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java
+++ b/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
 
     public FileSizeLimitExceededException(long defaultMaxSize)
     {
-        super("upload.exceed.maxSize", new Object[] { defaultMaxSize });
+        super("upload.exceed.maxSize", new Object[] { defaultMaxSize }, "the filesize is too large");
     }
 }
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
index a0d1d4a84..c7a248401 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
@@ -4,6 +4,8 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.Objects;
+
+import com.ruoyi.common.core.exception.file.FileException;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.core.exception.file.FileNameLengthLimitExceededException;
@@ -46,6 +48,9 @@ public class FileUploadUtils
         {
             return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
         }
+        catch (FileException fe){
+            throw new IOException(fe.getDefaultMessage(), fe);
+        }
         catch (Exception e)
         {
             throw new IOException(e.getMessage(), e);