From c7a1a16c8d22b64f9025e800ebaf89b19b530228 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/resources/application.properties |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/flower_city/src/main/resources/application.properties b/flower_city/src/main/resources/application.properties
index cebf6e4..9cf2488 100644
--- a/flower_city/src/main/resources/application.properties
+++ b/flower_city/src/main/resources/application.properties
@@ -1,8 +1,6 @@
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.username=root
 spring.datasource.password=nahanMysqlPwd&&RemoteRemote2019nahan
-#spring.datasource.url=jdbc:mysql://10.8.0.74:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
-#spring.datasource.url=jdbc:mysql://localhost:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
 #spring.datasource.url=jdbc:mysql://10.8.0.74:3306/huacheng_smart_life?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
 spring.datasource.url=jdbc:mysql://182.151.2.19:3306/huacheng_smart_life?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
 
@@ -22,8 +20,8 @@
 spring.mvc.pathmatch.matching-strategy=ant_path_matcher
 
 
-spring.servlet.multipart.max-file-size=20MB
-spring.servlet.multipart.max-request-size=50MB
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=150MB
 
 
 

--
Gitblit v1.7.1