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

common/src/main/java/com/lantone/common/config/BaseJasyptConfig.java

@@ -0,0 +1,36 @@
+package com.lantone.common.config;
+
+import com.lantone.common.util.StringUtil;
+import org.jasypt.encryption.StringEncryptor;
+import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
+import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * @Description: Jasypt基础配置
+ * @author: rengb
+ * @time: 2021/1/5 18:27
+ */
+public class BaseJasyptConfig {
+
+    @Value("${jasypt.encryptor.password:#{null}}")
+    private String password;
+
+    @Bean("jasyptStringEncryptor")
+    public StringEncryptor stringEncryptor() {
+        PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
+        SimpleStringPBEConfig config = new SimpleStringPBEConfig();
+        config.setPassword(StringUtil.isBlank(password) ? "jasypt" : password);
+        config.setAlgorithm("PBEWITHHMACSHA512ANDAES_256");
+        config.setKeyObtentionIterations("1000");
+        config.setPoolSize("1");
+        config.setProviderName("SunJCE");
+        config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator");
+        config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator");
+        config.setStringOutputType("base64");
+        encryptor.setConfig(config);
+        return encryptor;
+    }
+
+}

common/src/main/java/com/lantone/common/util/JasyptUtil.java

@@ -0,0 +1,69 @@
+package com.lantone.common.util;
+
+import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
+import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
+
+/**
+ * @Description: Jasypt安全框架加解密工具
+ * @author: rengb
+ * @time: 2022/3/21 15:26
+ */
+public class JasyptUtil {
+
+    /**
+     * 解密
+     *
+     * @param password 配置文件中设定的加密密码 jasypt.encryptor.password
+     * @param value    待解密密文
+     * @return
+     */
+    public static String decyptPwd(String password, String value) {
+        PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
+        encryptor.setConfig(cryptor(password));
+        String result = encryptor.decrypt(value);
+        return result;
+    }
+
+    /**
+     * 加密
+     *
+     * @param password 配置文件中设定的加密密码 jasypt.encryptor.password
+     * @param value    待加密值
+     * @return
+     */
+    public static String encyptPwd(String password, String value) {
+        PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
+        encryptor.setConfig(cryptor(password));
+        String result = encryptor.encrypt(value);
+        return result;
+    }
+
+    /**
+     * 生成通用配置
+     *
+     * @param password 配置文件中设定的加密密码 jasypt.encryptor.password
+     * @return
+     */
+    public static SimpleStringPBEConfig cryptor(String password) {
+        SimpleStringPBEConfig config = new SimpleStringPBEConfig();
+        config.setPassword(password);
+        config.setAlgorithm("PBEWITHHMACSHA512ANDAES_256");
+        config.setKeyObtentionIterations("1000");
+        config.setPoolSize("1");
+        config.setProviderName("SunJCE");
+        config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator");
+        config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator");
+        config.setStringOutputType("base64");
+        return config;
+    }
+
+    public static void main(String[] args) {
+        // 加密
+        String encPwd = encyptPwd("jasypt", "lantone");
+        // 解密
+        String decPwd = decyptPwd("jasypt", encPwd);
+        System.out.println(encPwd);
+        System.out.println(decPwd);
+    }
+
+}

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

@@ -2,12 +2,12 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(3G5NNq4jd+XnD/waOrs9rW50Hv9YPX7OisChDzM4xSveyLFYb6sn2cYVdN3XogyU) # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.237:3306/daqe?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
+      username: ENC(j00VNE8vjb8dg6WJJpmAapN0DyT/TO3qdiQoloOrDWmJdei2DnWylArt/g2QiwZo)
+      password: ENC(RZz4slfEuQ7z1tjMo1uEyKcIa0wtq9pNEIxFXWbd/LeCXia3r3xF08VvzpEdLnwr)
 
 swagger.show: true

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

@@ -2,12 +2,12 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(EOofvJuXt/500cwSLlbFucB1PjSIG4wOvchduGRpZ6JSjHoQVInGrlyECXhqDjRo) # Redis服务器连接密码（默认为空）
   datasource:
     druid:
-      url: jdbc:mysql://192.168.2.237:3306/daqe?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
+      url: jdbc:mysql://192.168.2.125:3306/daqe?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: ENC(Az6Fp+AgkR0iiHP2l5HjH8UKmud+5w3bxv096AGiHVWgJxn4KnrgjgK4esoPwmxd)
+      password: ENC(iLkrdRLPM/5Y+1gAWdniZx/rDVbJILF7x3M8VuQ20219/p3Mck7hwfe7M8OntVTkDxqwpa4hLm8Q4n0qD5Lsog==)
 
 swagger.show: false

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

@@ -2,12 +2,12 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(LfJiGcjvB77hgiTZHrBzI4ccwrZ9jjrjmk9jLKLKOf8iOEeeTfzHOKyAkQrMIE0c) # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.237:3306/daqe?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
+      username: ENC(Y/ndna0Me4aL99A1+VtbuiZmj0+0jxqa7DCP0jOQo+Yc+r+igFT7oayrwj/vw4fy)
+      password: ENC(WD7m3iIAAPiHt8PTCG6Wqng/CY7MX16+hhrygtMFg10k81tiyTdBsRxKazg/dqsw)
 
 swagger.show: true

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

@@ -2,12 +2,12 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(4bAJxtxr2aFwEeYbouOhYk0b+NtDIrP35XWAhUxXZlllv82/1MiyhOEM56hhmhdV) # Redis服务器连接密码（默认为空）
   datasource:
     druid:
-      url: jdbc:mysql://192.168.2.237:3306/daqe?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
+      url: jdbc:mysql://192.168.2.129:3306/daqe?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: ENC(W8OCGadBpumA0shuwzaPU6kcjdXhajivb0+wKjZowCid7YVvsxi7s436hcThGn9q)
+      password: ENC(K3iC2nMnARmKclU/50vfBLs2oJC/MlfqRgo/qXO+6eOxQnDKdm1hDCHwveo3ZRUGXlA5v219748Dw7EZKn/siA==)
 
 swagger.show: false

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

@@ -2,12 +2,12 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(2mpOAdlOoqAWPpaZYwK50FVqS12jjdxj7m/SdtbqlNIexoWEb4ReBk3IXKx2MhI2) # Redis服务器连接密码（默认为空）
   datasource:
     druid:
-      url: jdbc:mysql://192.168.2.237:3306/daqe?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
+      url: jdbc:mysql://192.168.2.126:3306/daqe?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: ENC(jcBffg13qhhFZr8OQ6uFu7eLvtxNq5uwQqLLO6jyGdSUEFw0IO1Waesrz3DhqVMx)
+      password: ENC(TCiDVOvl/3KAZhVKEA/4+bVwgq2pcLx9VFf7zzDKJVvNpOkWX4Gm1nSw0bPcOycj)
 
 swagger.show: true

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

@@ -2,7 +2,7 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(+3QNcQazEQDeidXgbssRGSXb5N0vb96HsByTC+zUmjPnzlOuoZgd3BGLS27E3/wG) # Redis服务器连接密码（默认为空）
 
 swagger.show: true

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

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

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

@@ -2,7 +2,7 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(Ibu5vcLTqqaMwPgTtf/H2jeYwTmidL+Yk0CtNVBsQ3Alh/uVx1NpRrjjXfAFavy1) # Redis服务器连接密码（默认为空）
 
 swagger.show: true

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

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

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

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

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

@@ -2,13 +2,13 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(yRoG5bY7HWMt5GedSBemK4+2crMSBLCGYGYvbYpMJvIqEKOzPbAR/BfOWG0RS+w8) # Redis服务器连接密码（默认为空）
   rabbitmq:
     host: 192.168.2.237
     port: 5672
-    username: emrais
-    password: emrais
+    username: ENC(9gQ7zU0IG+yknvcwxcWHO6l8TvUxODcoWNF6LnrlMIXcUitDl2MIy2uIUsg53LdA)
+    password: ENC(rW44uZL01M3njrwpyyvk5SnArnsGQZJmeovqjqaSg9RFznlsmu4T4eJZrYqs2yk9)
     virtual-host: /emrais # 虚拟host
 
 rabbitmq:

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

@@ -2,19 +2,19 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(ZCCHM3HGeXELR9l6wD+Jb/WIypXUxULUZU9wausUahQsMLt/RcdLua1UXa7n+e5f) # Redis服务器连接密码（默认为空）
   rabbitmq:
-    host: 192.168.2.237
+    host: 192.168.2.125
     port: 5672
-    username: emrais
-    password: emrais
+    username: ENC(79XvRlB4BgWhhrbB0FPblnn+Rl7xOwJiX6YZkFeizY07L9BmR03dhd890MaO2BT/)
+    password: ENC(mBaNx+5I9mQf8tmAtKDIpiJ2lAc4hp6QHKDj+uNgeOH3YXhyCbqAqHCAvsqoBpo1)
     virtual-host: /emrais # 虚拟host
 
 rabbitmq:
   mqtt:
-    url: tcp://192.168.2.237:1883
-    front-url: ws://192.168.2.237:15675/ws
+    url: tcp://192.168.2.125:1883
+    front-url: ws://192.168.2.125:15675/ws
     defaultTopic: defaultSampleTopic
 
 swagger.show: false

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

@@ -2,13 +2,13 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(Uwufo1Fak0Cs5UZgNUpufficR3HUUYGc86SPyUW0CrLn3n2thMuFgzukUx95iBJU) # Redis服务器连接密码（默认为空）
   rabbitmq:
     host: 192.168.2.237
     port: 5672
-    username: emrais
-    password: emrais
+    username: ENC(c4T35OSMySYtaMnLIQznBeUKzcMmqi8khmE5RysqzYzIuLwWIg8mjQxhBlRQCZ0M)
+    password: ENC(uvbSuKGBONevV0hJzvoQVLLAMGlGTczbyLMGRcrFCl6+uY00Ds/rLKkgJfpv4qV0)
     virtual-host: /emrais # 虚拟host
 
 rabbitmq:

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

@@ -2,19 +2,19 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(VhzXO4Ad7v5tUT5ZFLvbx3Eh+Qk9/p92oKIEgzWHw+AxM4ES2gS5NIojEo3dmZLB) # Redis服务器连接密码（默认为空）
   rabbitmq:
-    host: 192.168.2.237
+    host: 192.168.2.129
     port: 5672
-    username: emrais
-    password: emrais
+    username: ENC(nzwGIstiOQaf1mhjlsVnoRmLH95DUOhzHBOyHS3Rz/4hxJ6ewFyBzqa4M2koAy71)
+    password: ENC(LWxtG8CPNjjW5R1HooBHjbZZVpT2HoPhnS3s1C6UHn5vRZ0cKtxniWmkX7TIcgdxJanQJ6XQKVunPMMbT8W+2Q==)
     virtual-host: /emrais # 虚拟host
 
 rabbitmq:
   mqtt:
-    url: tcp://192.168.2.237:1883
-    front-url: ws://192.168.2.237:15675/ws
+    url: tcp://192.168.2.129:1883
+    front-url: ws://192.168.2.129:15675/ws
     defaultTopic: defaultSampleTopic
 
 swagger.show: false

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

@@ -2,19 +2,19 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(ZXXJ4nNpwUD3iyn9rmb9bhQlUeoWDMZ02Fj7fWV2AprPLTR1uT7NwyybBZl3go3Z) # Redis服务器连接密码（默认为空）
   rabbitmq:
-    host: 192.168.2.237
+    host: 192.168.2.126
     port: 5672
-    username: emrais
-    password: emrais
+    username: ENC(w8kdx+MILgTw77/jqTfwJv68oXowOfbnC2hiaj7M1IrR8xdsDImmJAFwlG+bcjZS)
+    password: ENC(gYwMH/4WB7fVbB2k7MOTpkgT3pV6yE12XByjmHYgxgd6k91wtOH8XBXjUxC4hPBAAGJTyLXLs3edHuH945t7Yw==)
     virtual-host: /emrais # 虚拟host
 
 rabbitmq:
   mqtt:
-    url: tcp://192.168.2.237:1883
-    front-url: ws://192.168.2.237:15675/ws
+    url: tcp://192.168.2.126:1883
+    front-url: ws://192.168.2.126:15675/ws
     defaultTopic: defaultSampleTopic
 
 swagger.show: true

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

@@ -2,12 +2,12 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(Pfc4r7aTbxCpd0XAVZEpsoOTfvKlR+h3lK2RDwFntoeKt7RNo98hT8G2vznKCdg6) # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.237:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
+      username: ENC(iJ6mLZ4QEwAg5NNzgTw317tGlGqz1+UfKqrPKqopWih7bXrgsnknynFfDShkaVYv)
+      password: ENC(IlFDlxVjx+PfV2mYzBulkz5LfkiV54Syvzq/bky7Ij9+G5cZySPe2cFOHqKAdp2n)
 
 swagger.show: true

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

@@ -2,12 +2,12 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(YBV01kMHu6ufwSegbHcfaoQ20bbW1ho67SHAnKMsJX6K9O0ZXaF+/wHYlLOQjxqN) # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.125:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: LangT0ng@lt
+      username: ENC(YJB0kpEK7yuHA9BxwPYNQVcmlRcRjMqXfyHsr64UplJ0zpGooSdbBsQNd0L/c3lk)
+      password: ENC(Lse35eqXdyY9JtY6o+FTzlOdQcQE5gyt4YioxE3i75yamWM5sdF+NTpnGlxIoVtT)
 
 swagger.show: false

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

@@ -2,12 +2,12 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(j/i26SYVLx6wfhf3GQZHVSXezzyyl41W7wChMG+FIgzZzlk+BYi1yDXe36zwoVLZ) # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.237:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
+      username: ENC(gvpQNZ97vaoD8tZkfegBuE7tp/yavyYV7XrkTHNkQJrO2qTILluezSU3e47hKLzx)
+      password: ENC(byBymj6qCH+dViJJ5EM2Aca/k5HazyPMjaswD8aioi67JY+43dVkQH6a5tn7FC99)
 
 swagger.show: true

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

@@ -2,12 +2,12 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(mesC4twLS8qQ9BiZBnXO8+IniAF+ljJQBJHCI63Tb8ZJgrwJxZc4VTm6x4ed91hh) # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.129:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: LangT0ng@122lt
+      username: ENC(rMQ76oaGbiSXvkV11yOmhTGLsZpg7eQAg0DDEBlMlP77A88W2OmAWRM99EDJOKEM)
+      password: ENC(tZuUlohI/e4NkaWnB08PaUSmovn+IRfhC70A4oMuJDFJm1FJyzXycl0mBVtNEEpr)
 
 swagger.show: false

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

@@ -2,12 +2,12 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(4ueOtw8DSAJ5BcYg0kVIMwuhRhklV+vFjWFX3iLD9XDSVqw1ysb8w2ari1ch5Ro7) # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.126:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: Lat0ne@tesT
+      username: ENC(yh8BEagmXKGqJydg/j7ckKECbKNUczR8hDQ98xhh+vIgR83qg0HNqfDFtKZO2WW9)
+      password: ENC(BTLHRtCI4JhXSxbABxoyy3MiGJ4+0nffLdL9Mnq0M9xnJgonqJkopXhoQ7uaAcCu)
 
 swagger.show: true

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

@@ -2,12 +2,12 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(9gkJqEGZe2OrdEOZ0JrG5f4laCUvZJj5EAgRrTeUJVa2DLFcPwuPxuDAhuwa5hau) # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
+      username: ENC(Y5/U4Vq7FFBTpnxMgTR+9JdVkGpO3jTgWDv3MlfQpvkIa7fc3SCXdWzn/13hiamc)
+      password: ENC(GdcFB7Ju+WOMZ78t+cdzT2qRmcsMv3OzDQnSBa0FzXwLtz2MQ8CHAC5WXefomwSD)
 
 swagger.show: true

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

@@ -2,12 +2,12 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(FiJszzg2JxkBA1oS2QqF83D4rmBPHVbogAsrY8Hd4rRrijVPmjvdnvT/yG9ioq93) # Redis服务器连接密码（默认为空）
   datasource:
     druid:
-      url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
+      url: jdbc:mysql://192.168.2.125:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: ENC(mOhdbcO/tq5rpmVioHRTrLYtSBKhNE1vxlHaTMF+ffWkxvoC0aHww91Dwe8oSeKh)
+      password: ENC(j48SjDCv+7iYIsByq6hz5cNMWDWK4DR5nhbXUO5p8egqNe+5lXJb8XQ9AFbaOOcEjM6HR4ae/ko+YsAJz6EMfw==)
 
 swagger.show: false

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

@@ -2,12 +2,12 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(9elxU0rUdCuxKTMqrVZlSWTARWNOimFfEzCrCJY5sO0+0+Dcmqd75rVzZBRSOEut) # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
+      username: ENC(4uo3ZjSEkn5SX+w2fJLQ+9hc9dXcUhFIh3F0ElAuDr6pgcZVS04ENIHMitnYUcwE)
+      password: ENC(X+6h5MH2c7X/18c9QPC+ctNwRwlv66I5OBeiyVpKCO8my7jhTgj87kyNLD6uLtmf)
 
 swagger.show: true

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

@@ -2,12 +2,12 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(FR9/7gi6MjTqZndGV3JbgMYa9tW7ffos3/wfuZQP2CC+Yk5elYS5pKQ7SDUVPbsD) # Redis服务器连接密码（默认为空）
   datasource:
     druid:
-      url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
+      url: jdbc:mysql://192.168.2.129:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: ENC(Qs3DXZnOP4vT0wUJ/hvYF64wT8Gn8JaRbDQjwWlEpSP8X2OuxfilxJDPwiZmLeLp)
+      password: ENC(Kzq13ofPtHZfkXvC5A28C8+7+/BgOOli0T+DW5j9d9ed22x3qqGYc1gqjJf5Ewd93/QcmymCjhhVIVTxt4pDTA==)
 
 swagger.show: false

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

@@ -2,12 +2,12 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(yPq+iIBDk/h2N+AP1xdicK45btGXdKDHoV3niq2xxW5/lrUkR2+uVbjukWHdnDVS) # Redis服务器连接密码（默认为空）
   datasource:
     druid:
-      url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
+      url: jdbc:mysql://192.168.2.126:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: ENC(xNnlWjS3J+pLkO7q8GWVfG88sCKaDyuw3XuAP32f3ZUbM2AxF62yEDNWx65dhBlg)
+      password: ENC(ThDAoitAtd2K1ehZCLEdbxCZvLuvHNjw2o8+1fgg6TJjOcupdijwcJt4V+zQ+Tei)
 
 swagger.show: true

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

@@ -2,8 +2,8 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(LgNsL+qixdWlBQyO6i4a6cJZGyW14J3eF7WeiqtQi6kSFZzCN6sHAg0uWQRsU3BC) # Redis服务器连接密码（默认为空）
 
 swagger.show: true
 

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

@@ -2,8 +2,8 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(ROTGjn5VhZWfOiWGjLkMk0J+5b5IZkCWU3GW0yq4XCK+yT7cw8geJZ9asofRiYg2) # Redis服务器连接密码（默认为空）
 
 swagger.show: false
 

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

@@ -2,8 +2,8 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(7CunTnFrG8V3TstUO8EGQhSJ1Z+9fM3VaugXm2B9JxkYI4TPmoDcYbH3AzbLIp3+) # Redis服务器连接密码（默认为空）
 
 swagger.show: true
 

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

@@ -2,8 +2,8 @@ spring:
   redis:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
-    port: 63791 # Redis服务器连接端口
-    password: emrais # Redis服务器连接密码（默认为空）
+    port: 6351 # Redis服务器连接端口
+    password: ENC(NRv47uLh9uZVkRFjghaHV307gL8OoPXvnTrgV6yMMR4oGsB5RR7Kh8+BtiK92jez) # Redis服务器连接密码（默认为空）
 
 swagger.show: false
 

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

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

daqe-center/src/main/java/com/lantone/daqe/config/JasyptConfig.java

@@ -0,0 +1,14 @@
+package com.lantone.daqe.config;
+
+import com.lantone.common.config.BaseJasyptConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: Jasypt相关配置
+ * @author: rengb
+ * @time: 2021/7/21 11:15
+ */
+@Configuration
+public class JasyptConfig extends BaseJasyptConfig {
+
+}

document/docker/docker-compose-debug.yml

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

document/docker/docker-compose-inner.yml

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

document/docker/docker-compose-outer.yml

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

document/docker/docker-compose-test.yml

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

gateway-service/src/main/java/com/lantone/config/JasyptConfig.java

@@ -0,0 +1,14 @@
+package com.lantone.config;
+
+import com.lantone.common.config.BaseJasyptConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: Jasypt相关配置
+ * @author: rengb
+ * @time: 2021/7/21 11:15
+ */
+@Configuration
+public class JasyptConfig extends BaseJasyptConfig {
+
+}

message-service/src/main/java/com/lantone/message/config/JasyptConfig.java

@@ -0,0 +1,14 @@
+package com.lantone.message.config;
+
+import com.lantone.common.config.BaseJasyptConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: Jasypt相关配置
+ * @author: rengb
+ * @time: 2021/7/21 11:15
+ */
+@Configuration
+public class JasyptConfig extends BaseJasyptConfig {
+
+}

pom.xml

@@ -60,6 +60,7 @@
         <spring-data-commons.version>2.3.0.RELEASE</spring-data-commons.version>
         <jackson-databind.version>2.12.3</jackson-databind.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
+        <jasypt-spring-boot-starter.version>3.0.4</jasypt-spring-boot-starter.version>
         <common.version>0.0.1-SNAPSHOT</common.version>
         <bus-interceptor.version>0.0.1-SNAPSHOT</bus-interceptor.version>
         <dblayer-mbg.version>0.0.1-SNAPSHOT</dblayer-mbg.version>
@@ -303,6 +304,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.ulisesbocchio</groupId>
+            <artifactId>jasypt-spring-boot-starter</artifactId>
+            <version>${jasypt-spring-boot-starter.version}</version>
+        </dependency>
     </dependencies>
 
     <!-- 打包(跳过docker)：mvn clean package -DskipDocker -->

report-service/src/main/java/com/lantone/report/config/JasyptConfig.java

@@ -0,0 +1,14 @@
+package com.lantone.report.config;
+
+import com.lantone.common.config.BaseJasyptConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: Jasypt相关配置
+ * @author: rengb
+ * @time: 2021/7/21 11:15
+ */
+@Configuration
+public class JasyptConfig extends BaseJasyptConfig {
+
+}

security-center/src/main/java/com/lantone/security/config/JasyptConfig.java

@@ -0,0 +1,14 @@
+package com.lantone.security.config;
+
+import com.lantone.common.config.BaseJasyptConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: Jasypt相关配置
+ * @author: rengb
+ * @time: 2021/7/21 11:15
+ */
+@Configuration
+public class JasyptConfig extends BaseJasyptConfig {
+
+}

structure-center/src/main/java/com/lantone/structure/config/JasyptConfig.java

@@ -0,0 +1,14 @@
+package com.lantone.structure.config;
+
+import com.lantone.common.config.BaseJasyptConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: Jasypt相关配置
+ * @author: rengb
+ * @time: 2021/7/21 11:15
+ */
+@Configuration
+public class JasyptConfig extends BaseJasyptConfig {
+
+}