Merge branch 'fpg-master'

zgztBus/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -2,6 +2,9 @@ server:
   port: 8080
   tomcat:
     max-swallow-size: -1
+    connection-timeout: 60000
+    max-connections: 250
+    accept-count: 300
   error:
     include-exception: true
     include-stacktrace: ALWAYS

zgztBus/jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml

@@ -15,11 +15,11 @@ db:
   url:
 #    '0': jdbc:mysql://192.168.1.190:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
 #  研发环境
-    '0': jdbc:mysql://123.57.213.14:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+#    '0': jdbc:mysql://123.57.213.14:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
 #  本地环境
-#   '0': jdbc:mysql://127.0.0.1:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+   '0': jdbc:mysql://127.0.0.1:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
   user:
-    '0': root
+    '0': nacos
   password:
     '0': 1qaz2wsx@..
 management: