lwhhszx 2 лет назад
Родитель
Сommit
88de84c18e

+ 19 - 1
RMS/src/main/resources/application-dev.yml

@@ -1,4 +1,22 @@
 spring:
+  #    # 使用 smtp 协议
+  #  mail.protocol: smtps
+  #  mail.host: smtp.exmail.qq.com
+  #  mail.port: 465
+  #  mail.username: shenyongyi@china-wispro.com
+  #    # 授权码
+  #  mail.password: c3hY5cgAexhhr9HL
+  #  mail.test-connection: false
+  #  mail.properties.mail.smtp.auth: true
+  #  mail.properties.mail.debug: false
+  #  mail.properties.mail.mime.splitlongparameters: false
+  #  mail.default-encoding: UTF-8
+  # rabbitmq
+  rabbitmq:
+    host: 192.168.1.24
+    port: 5672
+    username: admin
+    password: 123456
   redis:
     host: 192.168.1.24
     port: 6379
@@ -36,7 +54,7 @@ spring:
         login-password: 123456
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-queueName: mail.queue
+queueName: emailProd.queue
 RMSFile:  http://192.168.1.24:8011
 PASFile: http://192.168.1.24:8011
 PCSUrl: http://localhost:8871

+ 18 - 13
RMS/src/main/resources/application-prodNetIn.yml

@@ -1,4 +1,22 @@
 spring:
+  #    # 使用 smtp 协议
+  #  mail.protocol: smtps
+  #  mail.host: smtp.exmail.qq.com
+  #  mail.port: 465
+  #  mail.username: shenyongyi@china-wispro.com
+  #    # 授权码
+  #  mail.password: c3hY5cgAexhhr9HL
+  #  mail.test-connection: false
+  #  mail.properties.mail.smtp.auth: true
+  #  mail.properties.mail.debug: false
+  #  mail.properties.mail.mime.splitlongparameters: false
+  #  mail.default-encoding: UTF-8
+  # rabbitmq
+  rabbitmq:
+    host: 172.27.247.174
+    port: 5672
+    username: admin
+    password: 123456
   redis:
     host: 172.27.247.174
     port: 6379
@@ -16,19 +34,6 @@ spring:
     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:

+ 18 - 13
RMS/src/main/resources/application-prodNetOut.yml

@@ -1,4 +1,22 @@
 spring:
+  #    # 使用 smtp 协议
+  #  mail.protocol: smtps
+  #  mail.host: smtp.exmail.qq.com
+  #  mail.port: 465
+  #  mail.username: shenyongyi@china-wispro.com
+  #    # 授权码
+  #  mail.password: c3hY5cgAexhhr9HL
+  #  mail.test-connection: false
+  #  mail.properties.mail.smtp.auth: true
+  #  mail.properties.mail.debug: false
+  #  mail.properties.mail.mime.splitlongparameters: false
+  #  mail.default-encoding: UTF-8
+  # rabbitmq
+  rabbitmq:
+    host: 47.101.137.223
+    port: 5672
+    username: admin
+    password: 123456
   redis:
     host: 47.101.137.223
     port: 6379
@@ -16,19 +34,6 @@ spring:
     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:

+ 19 - 14
RMS/src/main/resources/application-testNetIn.yml

@@ -1,4 +1,22 @@
 spring:
+  #    # 使用 smtp 协议
+  #  mail.protocol: smtps
+  #  mail.host: smtp.exmail.qq.com
+  #  mail.port: 465
+  #  mail.username: shenyongyi@china-wispro.com
+  #    # 授权码
+  #  mail.password: c3hY5cgAexhhr9HL
+  #  mail.test-connection: false
+  #  mail.properties.mail.smtp.auth: true
+  #  mail.properties.mail.debug: false
+  #  mail.properties.mail.mime.splitlongparameters: false
+  #  mail.default-encoding: UTF-8
+  # rabbitmq
+  rabbitmq:
+    host: 172.27.247.174
+    port: 5672
+    username: admin
+    password: 123456
   redis:
     host: 172.27.247.174
     port: 6379
@@ -16,19 +34,6 @@ spring:
     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:
@@ -36,7 +41,7 @@ spring:
         login-password: 123456
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-queueName: mail.queue
+queueName: emailTest.queue
 RMSFile:  http://192.168.1.24:8011
 PASFile: http://192.168.1.24:8011
 PCSUrl: http://localhost:8871

+ 19 - 14
RMS/src/main/resources/application-testNetOut.yml

@@ -1,4 +1,22 @@
 spring:
+  #    # 使用 smtp 协议
+  #  mail.protocol: smtps
+  #  mail.host: smtp.exmail.qq.com
+  #  mail.port: 465
+  #  mail.username: shenyongyi@china-wispro.com
+  #    # 授权码
+  #  mail.password: c3hY5cgAexhhr9HL
+  #  mail.test-connection: false
+  #  mail.properties.mail.smtp.auth: true
+  #  mail.properties.mail.debug: false
+  #  mail.properties.mail.mime.splitlongparameters: false
+  #  mail.default-encoding: UTF-8
+  # rabbitmq
+  rabbitmq:
+    host: 47.101.137.223
+    port: 5672
+    username: admin
+    password: 123456
   redis:
     host: 47.101.137.223
     port: 6379
@@ -16,19 +34,6 @@ spring:
     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:
@@ -36,7 +41,7 @@ spring:
         login-password: 123456
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-queueName: mail.queue
+queueName: emailTest.queue
 RMSFile:  http://192.168.1.24:8011
 PASFile: http://192.168.1.24:8011
 PCSUrl: http://localhost:8871

+ 2 - 18
RMS/src/main/resources/application.yml

@@ -13,23 +13,7 @@ spring:
   thymeleaf:
     cache: false
     mode: HTML5
-    #    # 使用 smtp 协议
-    #  mail.protocol: smtps
-    #  mail.host: smtp.exmail.qq.com
-    #  mail.port: 465
-    #  mail.username: shenyongyi@china-wispro.com
-    #    # 授权码
-    #  mail.password: c3hY5cgAexhhr9HL
-    #  mail.test-connection: false
-    #  mail.properties.mail.smtp.auth: true
-    #  mail.properties.mail.debug: false
-    #  mail.properties.mail.mime.splitlongparameters: false
-    #  mail.default-encoding: UTF-8
-    # rabbitmq
-  rabbitmq.host: 47.101.137.223
-  rabbitmq.port: 5672
-  rabbitmq.username: admin
-  rabbitmq.password: 123456
+
   mvc:
     pathmatch:
       matching-strategy: ant_path_matcher
@@ -43,7 +27,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: local
+    active: dev
   jackson:
     default-property-inclusion: non_null
     serialization: