From 6038409c2e35aae9268e5c9d8e8020b904cfd383 Mon Sep 17 00:00:00 2001
From: "wei.zhang2" <wei.zhang2@baidao.com>
Date: Thu, 15 Mar 2018 11:40:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                          | 1 +
 src/main/resources/application.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 11d0e31..3cce203 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
 # boot-security
 ## 2018.03.05 spring boot 由1.5.10 升级到2.0.0
+## 2018.3.15上传文件的大小配置修改spring.http.multipart改为spring.servlet.multipart
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 87f9d00..59229ab 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -22,7 +22,7 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     joda-date-time-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
-  http:
+  servlet:
     multipart:
       max-file-size: 100MB
       max-request-size: 100MB