From aa360938f6086d3a4bb7eb70e0e4b20e3e2c10ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 2 Jul 2021 21:04:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SystemConfigController.java    | 31 +++++++++++++++++++
 .../src/main/resources/application.properties |  5 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java
index c5b82fe57..52a392a0f 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java
@@ -55,6 +55,12 @@ public class SystemConfigController {
     @Value(value="${file.path}")
     private String filePath;
 
+    @Value(value="${spring.servlet.multipart.max-file-size}")
+    private Long maxFileSize;
+
+    @Value(value="${spring.servlet.multipart.max-request-size}")
+    private Long maxRequestSize;
+
     @GetMapping(value = "/getDictItems/{dictCode}")
     public BaseResponseInfo getDictItems(@PathVariable String dictCode,
                                        HttpServletRequest request) {
@@ -120,6 +126,31 @@ public class SystemConfigController {
         return res;
     }
 
+    /**
+     * 获取文件大小限制
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @GetMapping(value = "/fileSizeLimit")
+    public BaseResponseInfo fileSizeLimit(HttpServletRequest request) throws Exception {
+        BaseResponseInfo res = new BaseResponseInfo();
+        try{
+            Long limit = 0L;
+            if(maxFileSize<maxRequestSize) {
+                limit = maxFileSize;
+            } else {
+                limit = maxRequestSize;
+            }
+            res.code = 200;
+            res.data = limit;
+        } catch(Exception e){
+            e.printStackTrace();
+            res.code = 500;
+            res.data = "获取数据失败";
+        }
+        return res;
+    }
 
     /**
      * 文件上传统一方法
diff --git a/jshERP-boot/src/main/resources/application.properties b/jshERP-boot/src/main/resources/application.properties
index 0ae3ba9f2..003112651 100644
--- a/jshERP-boot/src/main/resources/application.properties
+++ b/jshERP-boot/src/main/resources/application.properties
@@ -27,4 +27,7 @@ plugin.runMode=prod
 plugin.pluginPath=plugins
 plugin.pluginConfigFilePath=pluginConfig
 #文件上传根目录
-file.path=/opt/jshERP/upload
\ No newline at end of file
+file.path=/opt/jshERP/upload
+#文件上传限制(byte)
+spring.servlet.multipart.max-file-size=10485760
+spring.servlet.multipart.max-request-size=10485760
\ No newline at end of file