Merge branch 'dev/20220228_v3.0.1通用版_渠道管理第一期' into debug

config-center/src/main/resources/shared/daqe-center-inner.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.125 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(EOofvJuXt/500cwSLlbFucB1PjSIG4wOvchduGRpZ6JSjHoQVInGrlyECXhqDjRo) # Redis服务器连接密码（默认为空）
   datasource:

config-center/src/main/resources/shared/daqe-center-outer.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.129 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(4bAJxtxr2aFwEeYbouOhYk0b+NtDIrP35XWAhUxXZlllv82/1MiyhOEM56hhmhdV) # Redis服务器连接密码（默认为空）
   datasource:

config-center/src/main/resources/shared/daqe-center-test.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.126 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(2mpOAdlOoqAWPpaZYwK50FVqS12jjdxj7m/SdtbqlNIexoWEb4ReBk3IXKx2MhI2) # Redis服务器连接密码（默认为空）
   datasource:

config-center/src/main/resources/shared/gateway-service-inner.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.125 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(AZv6G8i84pAmUPbUP5CDDlO5vvX/1WbqZTERx/ecIW3CXFP0cCSRPv4MDOJxEvln) # Redis服务器连接密码（默认为空）
 

config-center/src/main/resources/shared/gateway-service-outer.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.129 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(JgDWqutkg2e8RZ77yIH5fUiQJ7sA5bROP8kOwutqt4+tHFRYrI5DH7899cyuZIIM) # Redis服务器连接密码（默认为空）
 

config-center/src/main/resources/shared/gateway-service-test.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.126 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(YMitYYfJ8WlrvbtKPNdEtyVqP7tPcbfegllqF2mnGtDJiq0pRZRoVpoa78dUfzyU) # Redis服务器连接密码（默认为空）
 

config-center/src/main/resources/shared/message-service-inner.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.125 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(ZCCHM3HGeXELR9l6wD+Jb/WIypXUxULUZU9wausUahQsMLt/RcdLua1UXa7n+e5f) # Redis服务器连接密码（默认为空）
   rabbitmq:

config-center/src/main/resources/shared/message-service-outer.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.129 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(VhzXO4Ad7v5tUT5ZFLvbx3Eh+Qk9/p92oKIEgzWHw+AxM4ES2gS5NIojEo3dmZLB) # Redis服务器连接密码（默认为空）
   rabbitmq:

config-center/src/main/resources/shared/message-service-test.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.126 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(ZXXJ4nNpwUD3iyn9rmb9bhQlUeoWDMZ02Fj7fWV2AprPLTR1uT7NwyybBZl3go3Z) # Redis服务器连接密码（默认为空）
   rabbitmq:

config-center/src/main/resources/shared/report-service-inner.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.125 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(YBV01kMHu6ufwSegbHcfaoQ20bbW1ho67SHAnKMsJX6K9O0ZXaF+/wHYlLOQjxqN) # Redis服务器连接密码（默认为空）
   datasource:

config-center/src/main/resources/shared/report-service-outer.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.129 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(mesC4twLS8qQ9BiZBnXO8+IniAF+ljJQBJHCI63Tb8ZJgrwJxZc4VTm6x4ed91hh) # Redis服务器连接密码（默认为空）
   datasource:

config-center/src/main/resources/shared/report-service-test.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.126 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(4ueOtw8DSAJ5BcYg0kVIMwuhRhklV+vFjWFX3iLD9XDSVqw1ysb8w2ari1ch5Ro7) # Redis服务器连接密码（默认为空）
   datasource:

config-center/src/main/resources/shared/security-center-inner.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.125 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(FiJszzg2JxkBA1oS2QqF83D4rmBPHVbogAsrY8Hd4rRrijVPmjvdnvT/yG9ioq93) # Redis服务器连接密码（默认为空）
   datasource:

config-center/src/main/resources/shared/security-center-outer.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.129 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(FR9/7gi6MjTqZndGV3JbgMYa9tW7ffos3/wfuZQP2CC+Yk5elYS5pKQ7SDUVPbsD) # Redis服务器连接密码（默认为空）
   datasource:

config-center/src/main/resources/shared/security-center-test.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.126 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(yPq+iIBDk/h2N+AP1xdicK45btGXdKDHoV3niq2xxW5/lrUkR2+uVbjukWHdnDVS) # Redis服务器连接密码（默认为空）
   datasource:

config-center/src/main/resources/shared/structure-center-inner.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.125 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(ROTGjn5VhZWfOiWGjLkMk0J+5b5IZkCWU3GW0yq4XCK+yT7cw8geJZ9asofRiYg2) # Redis服务器连接密码（默认为空）
 

config-center/src/main/resources/shared/structure-center-outer.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.129 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(NRv47uLh9uZVkRFjghaHV307gL8OoPXvnTrgV6yMMR4oGsB5RR7Kh8+BtiK92jez) # Redis服务器连接密码（默认为空）
 

config-center/src/main/resources/shared/structure-center-test.yml

@@ -1,7 +1,7 @@
 spring:
   redis:
     database: 12
-    host: 192.168.2.237 # Redis服务器地址
+    host: 192.168.2.126 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
     password: ENC(E2F32Sm/6nE/Kk8z2FKXOM5xVcihg2a+/y135r+XO2uHtWnfq/8sSIBiPiorARh5) # Redis服务器连接密码（默认为空）
 

document/docker/docker-compose-debug.yml

@@ -62,7 +62,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=debug
       - log-level=debug
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -99,7 +99,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=debug
       - log-level=debug
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -119,7 +119,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=debug
       - log-level=debug
-      - jasypt.encryptor.password=${JASYPT_PWD_REPORT_SERVICE}
+      - "jasypt.encryptor.password=${JASYPT_PWD_REPORT_SERVICE}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -139,7 +139,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=debug
       - log-level=debug
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -159,7 +159,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=debug
       - log-level=debug
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -181,7 +181,7 @@ services:
       - gateway-port=8871
       - spring.profiles.active=debug
       - log-level=debug
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime

document/docker/docker-compose-inner.yml

@@ -62,7 +62,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=inner
       - log-level=error
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -99,7 +99,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=inner
       - log-level=error
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -119,7 +119,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=inner
       - log-level=error
-      - jasypt.encryptor.password=${JASYPT_PWD_REPORT_SERVICE}
+      - "jasypt.encryptor.password=${JASYPT_PWD_REPORT_SERVICE}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -139,7 +139,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=inner
       - log-level=error
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -159,7 +159,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=inner
       - log-level=error
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -181,7 +181,7 @@ services:
       - gateway-port=8871
       - spring.profiles.active=inner
       - log-level=error
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime

document/docker/docker-compose-outer.yml

@@ -62,7 +62,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=outer
       - log-level=error
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -99,7 +99,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=outer
       - log-level=error
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -119,7 +119,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=outer
       - log-level=error
-      - jasypt.encryptor.password=${JASYPT_PWD_REPORT_SERVICE}
+      - "jasypt.encryptor.password=${JASYPT_PWD_REPORT_SERVICE}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -139,7 +139,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=outer
       - log-level=error
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -159,7 +159,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=outer
       - log-level=error
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -181,7 +181,7 @@ services:
       - gateway-port=8871
       - spring.profiles.active=outer
       - log-level=error
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime

document/docker/docker-compose-test.yml

@@ -62,7 +62,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=test
       - log-level=info
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -99,7 +99,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=test
       - log-level=info
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -119,7 +119,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=test
       - log-level=info
-      - jasypt.encryptor.password=${JASYPT_PWD_REPORT_SERVICE}
+      - "jasypt.encryptor.password=${JASYPT_PWD_REPORT_SERVICE}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -139,7 +139,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=test
       - log-level=info
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -159,7 +159,7 @@ services:
       - eureka-port=6751
       - spring.profiles.active=test
       - log-level=info
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
@@ -181,7 +181,7 @@ services:
       - gateway-port=8871
       - spring.profiles.active=test
       - log-level=info
-      - jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}
+      - "jasypt.encryptor.password=${JASYPT_PWD_PUBLIC}"
     volumes:
       - /logs:/logs
       - /etc/localtime:/etc/localtime