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

RMS/src/main/resources/application-prodNetOut.yml

@@ -0,0 +1,48 @@
+spring:
+  redis:
+    host: 47.101.137.223
+    port: 6379
+    database: 3
+    password: Xx0GWxdWQJxx6Swe
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
+    timeout: 2000ms
+  datasource:
+    url: jdbc:mysql://47.101.137.223:3306/RMS_PROD?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: TU5x6IeBi7rl
+    dynamic:
+      primary: rms
+      datasource:
+        pas:
+          url: jdbc:mysql://47.101.137.223:3306/pas-history?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          username: root
+          password: TU5x6IeBi7rl
+        rms:
+          url: jdbc:mysql://47.101.137.223:3306/RMS_PROD?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          username: root
+          password: TU5x6IeBi7rl
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      stat-view-servlet:
+        login-username: admin
+        login-password: 123456
+      web-stat-filter:
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+springdoc:
+  api-docs:
+    enabled: false
+queueName: emailProd.queue
+RMSFile:  http://139.224.24.90:8084
+PASFile: http://139.224.24.90:8011
+PCSUrl: http://localhost:8871
+PASUrl: http://localhost:8877
+PCS: http://139.224.24.90:81
+PAS: http://139.224.24.90:80

RMS/src/main/resources/application-test.yml

@@ -1,6 +1,6 @@
 spring:
   redis:
-    host: 192.168.1.24
+    host: 172.27.247.174
     port: 6379
     database: 3
     password: Xx0GWxdWQJxx6Swe
@@ -12,7 +12,7 @@ spring:
         max-wait: -1ms
     timeout: 2000ms
   datasource:
-    url: jdbc:mysql://192.168.1.24:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://172.27.247.174:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: rrzTwWAYX8Gxh5JH

RMS/src/main/resources/application-testNetOut.yml

@@ -0,0 +1,45 @@
+spring:
+  redis:
+    host: 47.101.137.223
+    port: 6379
+    database: 3
+    password: Xx0GWxdWQJxx6Swe
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
+    timeout: 2000ms
+  datasource:
+    url: jdbc:mysql://47.101.137.223:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: rrzTwWAYX8Gxh5JH
+    dynamic:
+      primary: rms
+      datasource:
+        pas:
+          url: jdbc:mysql://192.168.1.24:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          username: root
+          password: rrzTwWAYX8Gxh5JH
+        rms:
+          url: jdbc:mysql://192.168.1.24:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          username: root
+          password: rrzTwWAYX8Gxh5JH
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      stat-view-servlet:
+        login-username: admin
+        login-password: 123456
+      web-stat-filter:
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+queueName: mail.queue
+RMSFile:  http://192.168.1.24:8011
+PASFile: http://192.168.1.24:8011
+PCSUrl: http://localhost:8871
+PASUrl: http://localhost:8877
+PCS: http://192.168.1.24:81
+PAS: http://192.168.1.24:80