From 48c4f3e03ff5bd144dce05a2b6621268345dbb0f Mon Sep 17 00:00:00 2001
From: zhangqiyang <1066386929@qq.com>
Date: Mon, 1 Jan 2024 10:24:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/application.properties
---
 out/production/resources/AccessInterface.yml    |  4 ++--
 out/production/resources/application.properties |  8 ++++----
 src/main/resources/application.properties       | 10 ++++------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/out/production/resources/AccessInterface.yml b/out/production/resources/AccessInterface.yml
index 1ffd4d1..60dfcf1 100644
--- a/out/production/resources/AccessInterface.yml
+++ b/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/deleteUser"
+  #- "/ws/eventCenter/user/saveUser"
+  #- "/ws/eventCenter/user/deleteUser"
\ No newline at end of file
diff --git a/out/production/resources/application.properties b/out/production/resources/application.properties
index 0a1fab3..fde48ec 100644
--- a/out/production/resources/application.properties
+++ b/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
-application.microcontext=/lowcode-portal-logmanage
-application.gatewaycontext=/lowcode-portal-logmanage
+#auth.jwt.basic.auth.enabled=true
+#application.microcontext=/lowcode-portal-logmanage
+#application.gatewaycontext=/lowcode-portal-logmanage
+
 
 
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1e603ba..dc9dfb7 100644
--- a/src/main/resources/application.properties
+++ b/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.visible=false
-db.default.driver=
+db.default.driver=com.mysql.cj.jdbc.Driver
 db.default.ddl=update
-db.default.url=jdbc:://?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true
-db.default.user=
-db.default.password=
+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=app_zhangqiyang
+db.default.password=Asdf123!@#
 
 #db.company1.name=Company 1
 #db.company1.driver=com.mysql.cj.jdbc.Driver