Browse Source

文件大小问题处理

wisewoods 3 years ago
parent
commit
f1d1830caa

+ 2 - 12
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java

@@ -8,7 +8,6 @@ import java.text.SimpleDateFormat;
 import java.time.*;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.TimeZone;
 
 /**
  * 时间工具类
@@ -74,23 +73,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 
     public static final String parseDateToStr(final String format, final Date date)
     {
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
-        simpleDateFormat.setTimeZone(TimeZone.getDefault());
-        System.out.println("当前时区"+TimeZone.getDefault().toString());
-        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat(format);
-        simpleDateFormat1.setTimeZone(TimeZone.getTimeZone("GMT+8:00"));
-        System.out.println("当前东八时间"+simpleDateFormat1.format(date));
-
-        return simpleDateFormat.format(date);
+        return new SimpleDateFormat(format).format(date);
     }
 
     public static final Date dateTime(final String format, final String ts)
     {
         try
         {
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
-            simpleDateFormat.setTimeZone(TimeZone.getDefault());
-            return simpleDateFormat.parse(ts);
+            return new SimpleDateFormat(format).parse(ts);
         }
         catch (ParseException e)
         {

+ 9 - 0
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java

@@ -18,6 +18,7 @@ import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.multipart.MultipartException;
 
 import javax.servlet.http.HttpServletRequest;
 import java.sql.SQLException;
@@ -32,6 +33,14 @@ public class GlobalExceptionHandler
 {
     private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
 
+    /**
+     * 文件上传大小异常
+     */
+    @ExceptionHandler(MultipartException.class)
+    public AjaxResult exception(MultipartException e) {
+        return AjaxResult.error(HttpStatus.ERROR, "上传文件最大不可超过15M");
+    }
+
     /**
      * 权限码异常
      */

+ 0 - 1
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java

@@ -144,7 +144,6 @@ public class SecurityUtils
     }
 
     public static <T extends BaseEntity> void insertBaseEntity(T entity) {
-        System.out.println("当前时间为"+DateUtils.dateTimeNow());
         entity.setCreateTimeStr(DateUtils.dateTimeNow());
         entity.setCreateUserId(String.valueOf(SecurityUtils.getUserId()));
         entity.setCreateBy(SecurityUtils.getUsername());

+ 9 - 8
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java

@@ -1,11 +1,5 @@
 package com.ruoyi.file.utils;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.util.Objects;
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.core.exception.file.FileNameLengthLimitExceededException;
 import com.ruoyi.common.core.exception.file.FileSizeLimitExceededException;
 import com.ruoyi.common.core.exception.file.InvalidExtensionException;
@@ -13,6 +7,13 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.file.MimeTypeUtils;
 import com.ruoyi.common.core.utils.uuid.Seq;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.Objects;
 
 /**
  * 文件上传工具类
@@ -22,9 +23,9 @@ import com.ruoyi.common.core.utils.uuid.Seq;
 public class FileUploadUtils
 {
     /**
-     * 默认大小 50M
+     * 默认大小 15M
      */
-    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+    public static final long DEFAULT_MAX_SIZE = 15 * 1024 * 1024;
 
     /**
      * 默认的文件名最大长度 100

+ 1 - 1
ruoyi-ui/nginx.conf

@@ -25,7 +25,7 @@ http {
     #tcp_nopush     on;
 
     keepalive_timeout  65;
-    client_max_body_size 50m;
+    client_max_body_size 15m;
 
 
     server{