Merge branch 'dev' into pro

# Conflicts:
#	src/main/resources/application-test.yml

src/main/resources/application-dev.yml

@@ -1,5 +1,6 @@
 server:
-  port: 9993
+  port: 9994
+
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
@@ -8,8 +9,10 @@ spring:
     password: 123456
     hikari:
       connection-timeout: 60000
-      maximum-pool-size: 60
+      maximum-pool-size: 20
       minimum-idle: 10
+
+
   redis:
     database: 10
     host: 127.0.0.1
@@ -43,8 +46,8 @@ logging:
   level:
     com.glxp.api.dao: debug
 
-file_path: d:/udi/udiwms/udiwmsfile/
-back_file_path: d:/share/udisps/back/
+file_path: D:/udi/udiwms/udiwmsfile/
+back_file_path: D:/share/udisps/back/
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs

src/main/resources/application-pro.yml

@@ -3,7 +3,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_spms_ljy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_spms_px?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: Glxp@6066
     hikari:
@@ -13,7 +13,7 @@ spring:
   redis:
     database: 10
     host: 127.0.0.1
-    port: 6404
+    port: 6379
     #    password: 123456
     timeout: 300
     jedis:
@@ -43,8 +43,8 @@ logging:
   level:
     com.glxp.api.dao: debug
 
-file_path: /udi/udiwms/udiwmsfile/
-back_file_path: /share/udisps/back/
+file_path: D:/udi/udiwms/udiwmsfile/
+back_file_path: D:/share/udisps/back/
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs

src/main/resources/application-test.yml

@@ -1,9 +1,9 @@
 server:
-  port: 9991
+  port: 9993
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_spms_px?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_spms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: Glxp@6066
     hikari:
@@ -43,19 +43,13 @@ logging:
   level:
     com.glxp.api.dao: debug
 
-initSql: true
-
-# knife4j文档是否启用
-knife4j:
-  enable: true
-
-file_path: /udi/udiwms/udiwmsfile/
-back_file_path: /share/udisps/back/
+file_path: D:/udi/udiwms/udiwmsfile/
+back_file_path: D:/share/udisps/back/
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
 
-
 API_KEY: 1101
 API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L
+
 WEB_TITLE: 平潭协和医院