From bcf4b054771d64503da2a9835d4ae30a133ffa0f Mon Sep 17 00:00:00 2001
From: sgjj <admin@loverot.cn>
Date: Mon, 30 Sep 2019 01:38:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml | 126 ++++++++++++++++-------------
 1 file changed, 69 insertions(+), 57 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8fb97ea9..3c86d733 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,58 +1,70 @@
-server:
-  port: 8080
-  servlet.context-path: /ms-mcms
-  servlet.session.timeout: 60M
-  
-logging:
- level:
-  net.mingsoft: trace
-ms:
- manager: 
-  path: /ms
-  view-path: /WEB-INF/manager
-  
- upload: 
-   path: /upload
-   mapping: /upload/**
-   denied: .exe,.jsp
-
-spring:
-  profiles:
-    active: dev
-  mvc:
-    pathmatch: 
-     use-suffix-pattern: true
-  devtools:
-    restart:
-      enabled: true
-      additional-paths: src/main/java
-      exclude: static/**,WEB-INF/**
-  servlet:
-    multipart:
-      max-request-size: 100MB
-      enabled: false
-  freemarker:
-    suffix: .ftl
-    charset: UTF-8
-    content-type: text/html
-    allow-request-override: true
-    allow-session-override: true
-    expose-request-attributes: true
-    expose-session-attributes: true
-    expose-spring-macro-helpers: true
-    prefer-file-system-access: false
-    template-loader-path: classpath:/WEB-INF/manager,classpath:/WEB-INF
-    settings: 
-      template_update_delay: 1
-      default_encoding: UTF-8
-      classic_compatible: true
-      date_format: yyyy-MM-dd
-      time_format: HH:mm:ss
-      datetime_format: yyyy-MM-dd HH:mm:ss
-      auto_import: /include/macro.ftl as ms
-      number_format: 0.##
-      
-mybatis:
-  mapper-locations: classpath*:**/dao/*.xml
-  configuration: 
+server:
+  port: 8080
+  servlet.context-path: /ms-mcms
+  servlet.session.timeout: 60M
+  
+logging:
+ level:
+  net.mingsoft: trace
+ms:
+ manager: 
+  path: /ms
+  view-path: /WEB-INF/manager
+  
+ upload: 
+   path: /upload
+   mapping: /upload/**
+   denied: .exe,.jsp
+   multipart:
+     #最大上传文件大小 单位：KB
+     max-file-size: 10240
+     #文件暂存临时目录
+     upload-temp-dir: temp
+     #临时文件大小
+     max-in-memory-size: 10240
+     #总上传最大大小 单位：KB -1禁用
+     max-request-size: -1
+
+
+
+
+spring:
+  profiles:
+    active: dev
+  mvc:
+    pathmatch: 
+     use-suffix-pattern: true
+  devtools:
+    restart:
+      enabled: true
+      additional-paths: src/main/java
+      exclude: static/**,WEB-INF/**
+  servlet:
+    multipart:
+      max-request-size: 100MB
+      enabled: false
+  freemarker:
+    suffix: .ftl
+    charset: UTF-8
+    content-type: text/html
+    allow-request-override: true
+    allow-session-override: true
+    expose-request-attributes: true
+    expose-session-attributes: true
+    expose-spring-macro-helpers: true
+    prefer-file-system-access: false
+    template-loader-path: classpath:/WEB-INF/manager,classpath:/WEB-INF
+    settings: 
+      template_update_delay: 1
+      default_encoding: UTF-8
+      classic_compatible: true
+      date_format: yyyy-MM-dd
+      time_format: HH:mm:ss
+      datetime_format: yyyy-MM-dd HH:mm:ss
+      auto_import: /include/macro.ftl as ms
+      number_format: 0.##
+      
+mybatis:
+  mapper-locations: classpath*:**/dao/*.xml
+  configuration: 
    database-id: mysql
\ No newline at end of file

From e705e844178ac1030869e97bc61e93dd729dff02 Mon Sep 17 00:00:00 2001
From: sgjj <995959152@qq.com>
Date: Mon, 30 Sep 2019 10:02:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=9B=B8=E5=AF=B9=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3c86d733..ebf77c77 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,7 +12,7 @@ ms:
   view-path: /WEB-INF/manager
   
  upload: 
-   path: /upload
+   path: upload
    mapping: /upload/**
    denied: .exe,.jsp
    multipart: