Merge remote-tracking branch 'origin/test' into test

src/main/resources/application-dev.yml

@@ -5,6 +5,9 @@ pay:
     orderNotifyUrl: https://video.hnsiyao.cn/czg/app/wuyou/notify
     extractNotifyUrl: https://video.hnsiyao.cn/czg/app/wuyou/extractNotify
 
+server:
+    port: 8100
+
 # 数据源的一些配置
 driver-class-name: com.mysql.cj.jdbc.Driver
 # 最小空闲连接，默认值10，小于0或大于maximum-pool-size，都会重置为maximum-pool-size
@@ -194,3 +197,4 @@ spring:
                 slaveDataSourceNames:
 #                    - duanju-4
                     - duanju-slave-4
+

src/main/resources/application-pay.yml

@@ -5,6 +5,10 @@ pay:
     orderNotifyUrl: https://pay.hnsiyao.cn/czg/app/wuyou/notify
     extractNotifyUrl: https://pay.hnsiyao.cn/czg/app/wuyou/extractNotify
 
+
+server:
+    port: 8200
+
 # 数据源的一些配置
 driver-class-name: com.mysql.cj.jdbc.Driver
 # 最小空闲连接，默认值10，小于0或大于maximum-pool-size，都会重置为maximum-pool-size

src/main/resources/application-prod.yml

@@ -5,6 +5,9 @@ pay:
   orderNotifyUrl: https://pay.hnsiyao.cn/czg/app/wuyou/notify
   extractNotifyUrl: https://pay.hnsiyao.cn/czg/app/wuyou/extractNotify
 
+server:
+  port: 8100
+
 # 数据源的一些配置
 driver-class-name: com.mysql.cj.jdbc.Driver
 # 最小空闲连接，默认值10，小于0或大于maximum-pool-size，都会重置为maximum-pool-size

src/main/resources/application.yml

@@ -6,7 +6,6 @@ server:
     threads:
       max: 1600
       min-spare: 50
-  port: 8100
   servlet:
     context-path: /czg