Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/application.properties

out/production/resources/AccessInterface.yml

@@ -1,5 +1,5 @@
 interfaceList:
   - "/ws/register/register/face"
   - "/ws/register/login/face"
-  - "/ws/eventCenter/user/saveUser"
+  #- "/ws/eventCenter/user/saveUser"
-  - "/ws/eventCenter/user/deleteUser"
+  #- "/ws/eventCenter/user/deleteUser"

out/production/resources/application.properties

@@ -68,7 +68,6 @@ db.default.url=jdbc:mysql://117.78.10.170:3006/app_zhangqiyang_app_master_pre?us
 db.default.user=app_zhangqiyang
 db.default.password=Asdf123!@#
 
-
 #db.company1.name=Company 1
 #db.company1.driver=com.mysql.cj.jdbc.Driver
 #db.company1.url=jdbc:mysql://localhost:3306/hy_iot_paas2?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
@@ -318,9 +317,10 @@ logging.level.com.hypaas=INFO
 # Log connection pooling
 #logging.level.com.zaxxer.hikari = INFO
 
-auth.jwt.basic.auth.enabled=true
+#auth.jwt.basic.auth.enabled=true
-application.microcontext=/lowcode-portal-logmanage
+#application.microcontext=/lowcode-portal-logmanage
-application.gatewaycontext=/lowcode-portal-logmanage
+#application.gatewaycontext=/lowcode-portal-logmanage
+
 
 
 

src/main/resources/application.properties

@@ -62,13 +62,11 @@ auth.logout.local=true
 #db.default.password = hypaas
 
 # MySQL
-#db.default.driver = com.mysql.jdbc.Driver
+db.default.driver=com.mysql.cj.jdbc.Driver
-#db.default.visible=false
-db.default.driver=
 db.default.ddl=update
-db.default.url=jdbc:://?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true
+db.default.url=jdbc:mysql://117.78.10.170:3006/app_zhangqiyang_app_master_pre?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true
-db.default.user=
+db.default.user=app_zhangqiyang
-db.default.password=
+db.default.password=Asdf123!@#
 
 #db.company1.name=Company 1
 #db.company1.driver=com.mysql.cj.jdbc.Driver