Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/resources/application.properties
9 months ago · 6290f5c168
9 changed files with 5 additions and 4 deletions
--- a/.gradle/6.3/executionHistory/executionHistory.bin
+++ b/.gradle/6.3/executionHistory/executionHistory.bin
--- a/.gradle/6.3/executionHistory/executionHistory.lock
+++ b/.gradle/6.3/executionHistory/executionHistory.lock
--- a/.gradle/6.3/fileHashes/fileHashes.bin
+++ b/.gradle/6.3/fileHashes/fileHashes.bin
--- a/.gradle/6.3/fileHashes/fileHashes.lock
+++ b/.gradle/6.3/fileHashes/fileHashes.lock
--- a/.gradle/6.3/fileHashes/resourceHashesCache.bin
+++ b/.gradle/6.3/fileHashes/resourceHashesCache.bin
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- 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"
--- 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
@ -390,5 +389,6 @@ logging.level.com.hypaas=INFO



+


--- a/src/main/resources/AccessInterface.yml
+++ b/src/main/resources/AccessInterface.yml
@ -3,3 +3,4 @@ interfaceList:
  - "/ws/register/login/face"
  - "/ws/eventCenter/user/saveUser"
  - "/ws/eventCenter/user/deleteUser"
+  - "/webapps/**"