配置文件修改

apply-net/src/main/resources/application-prod.yml

@@ -98,7 +98,7 @@ spring:
     host: localhost
     port: 5672
     username: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
-    password: root
+    password: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
   redis:
     clusterWhether: false
     cluster:

apply-net/src/main/resources/application-test.yml

@@ -108,7 +108,7 @@ spring:
     database: 0
     host: schoolcenterredis
     port: 6379
-    password:
+    password: ENC(dzBR0ihAkOs43UgnwmnQfFpmjbWvfqmtOIwwgra/+ik=)
     lettuce:
       pool:
         max-active: -1
@@ -120,6 +120,9 @@ spring:
       exprie: 600
       prohibition: 600
   datasource:
+    url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
+    username: ENC(CT4X/xOJCLwK1IJtuZZN/A==)
+    password: ENC(IQRisTAAktGkj1rrrEvpXpImI0FyRfda)
     dynamic:
       primary: master
       p6spy: true
@@ -128,9 +131,9 @@ spring:
         max-active: 30
       datasource:
         master:
-          url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
-          username: ENC(CT4X/xOJCLwK1IJtuZZN/A==)
-          password: ENC(IQRisTAAktGkj1rrrEvpXpImI0FyRfda)
+          url: ${spring.datasource.url}
+          username: ${spring.datasource.username}
+          password: ${spring.datasource.password}
           driver-class-name: com.mysql.cj.jdbc.Driver
   devtools:
     restart:

core-service/src/main/java/com/winsun/WinsunCoreServiceApplication.java

@@ -29,7 +29,6 @@ public class WinsunCoreServiceApplication {
     private final static Logger logger = LoggerFactory.getLogger(WinsunCoreServiceApplication.class);
 
     public static void main(String[] args) {
-        System.setProperty("jasypt.encryptor.password", Const.JASYPT_ENCRYPTOR_PASSWORD);
         SpringApplication.run(WinsunCoreServiceApplication.class, args);
         logger.info("{} is success!", WinsunCoreServiceApplication.class.getName());
     }

core-service/src/main/resources/application-local.yml

@@ -71,8 +71,8 @@ spring:
   rabbitmq:
     host: localhost
     port: 5672
-    username: ENC(bejPzANsFWjq/OahirFIYg==)
-    password: ENC(bejPzANsFWjq/OahirFIYg==)
+    username: ENC(Jm+qlQikhtTS1xupsT/bLQ==)
+    password: ENC(Jm+qlQikhtTS1xupsT/bLQ==)
   redis:
     clusterWhether: false
     cluster:
@@ -82,7 +82,7 @@ spring:
     database: 0
     host: localhost
     port: 6379
-    password: ENC(7pxTOj/J2GJBbNFhIRTz4Q8Wjl9iGg+WAKwkmxddQJo=)
+    password: ENC(dzBR0ihAkOs43UgnwmnQfFpmjbWvfqmtOIwwgra/+ik=)
     lettuce:
       pool:
         max-active: -1
@@ -96,8 +96,8 @@ spring:
   datasource:
     # 由于父框架的问题，这里本来不应该这样写的
     url: jdbc:mysql://172.18.101.171:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
-    username: ENC(65KjcBzodj/mXcGa5YEAUg==)
-    password: ENC(fc4sYisgO1ToW+XX+UWP4ew9bMCT3tKn)
+    username: ENC(CT4X/xOJCLwK1IJtuZZN/A==)
+    password: ENC(IQRisTAAktGkj1rrrEvpXpImI0FyRfda)
     db-name: guns #用来搜集数据库的所有表
     filters: wall,mergeStat
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -179,3 +179,8 @@ messageconfig:
 weixin:
   appid: wx0641dc1dc4d34384
   appsecret: 3b43b46fc94d4e98588ee6ad992fa5c7
+#jasypt加密的盐值
+#jasypt.encryptor.password=erp
+jasypt:
+  encryptor:
+    password: schoolCenterErp

core-service/src/main/resources/application-prod.yml

@@ -72,8 +72,8 @@ spring:
   rabbitmq:
     host: localhost
     port: 5672
-    username: ENC(NzFqyqWumayIAvJvbmNy+g==)
-    password: ENC(NzFqyqWumayIAvJvbmNy+g==)
+    username: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
+    password: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
   redis:
     clusterWhether: false
     cluster:
@@ -83,7 +83,7 @@ spring:
     database: 0
     host: localhost
     port: 6379
-    password: ENC(7pxTOj/J2GJBbNFhIRTz4Q8Wjl9iGg+WAKwkmxddQJo=)
+    password: ENC(dzBR0ihAkOs43UgnwmnQfFpmjbWvfqmtOIwwgra/+ik=)
     lettuce:
       pool:
         max-active: -1
@@ -96,8 +96,8 @@ spring:
       prohibition: 600
   datasource:
     url: jdbc:mysql://localhost:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
-    username: ENC(NzFqyqWumayIAvJvbmNy+g==)
-    password: ENC(JxItnS1AAsYjV/dC7khZo8KRypHlPIfaucHkHsfYib8=)
+    username: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
+    password: ENC(r4U47DSf9LNRyoH/G6GxfA2w1JTZOwr7MREDyGA0PWM=)
     #用来搜集数据库的所有表
     db-name: guns
     filters: wall,mergeStat
@@ -149,3 +149,8 @@ messageconfig:
 weixin:
   appid: wx0641dc1dc4d34384
   appsecret: 3b43b46fc94d4e98588ee6ad992fa5c7
+#jasypt加密的盐值
+#jasypt.encryptor.password=erp
+jasypt:
+  encryptor:
+    password: schoolCenterErp

core-service/src/test/java/com/winsun/user/UserTestHelper.java

 package com.winsun.user;
 
-import com.winsun.auth.core.common.model.ResponseData;
-import com.winsun.auth.model.user.User;
 import com.winsun.base.AppApplicationBaseIT;
 import com.winsun.item.modular.system.dao.UserMapper;
-import com.winsun.item.util.LoginUtils;
-import com.winsun.utils.RandomUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;

migration/src/main/resources/application.yml

@@ -22,7 +22,7 @@ spring:
     db1:
       jdbc-url: jdbc:mysql://localhost:3306/school_center?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
       username: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
-      password: root
+      password: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
       driver-class-name: com.mysql.cj.jdbc.Driver
     db2:
       #jdbc-url: jdbc:mysql://172.18.101.171:3306/xyjl?useUnicode=true&characterEncoding=utf-8&serverTimezone=CTT&useSSL=false
@@ -30,7 +30,7 @@ spring:
       #password: ENC(IQRisTAAktGkj1rrrEvpXpImI0FyRfda)
       jdbc-url: jdbc:mysql://localhost:3306/xyjl?useUnicode=true&characterEncoding=utf-8&serverTimezone=CTT&useSSL=false
       username: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
-      password: root
+      password: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
       driver-class-name: com.mysql.cj.jdbc.Driver
     db3:
       #jdbc-url: jdbc:mysql://172.18.101.171:3306/dzqd?useUnicode=true&characterEncoding=utf-8&serverTimezone=CTT&useSSL=false
@@ -38,7 +38,7 @@ spring:
       #password: ENC(IQRisTAAktGkj1rrrEvpXpImI0FyRfda)
       jdbc-url: jdbc:mysql://localhost:3306/dzqd?useUnicode=true&characterEncoding=utf-8&serverTimezone=CTT&useSSL=false
       username: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
-      password: root
+      password: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
       driver-class-name: com.mysql.cj.jdbc.Driver
 
 

new-user/src/main/resources/application-prod.yml

@@ -100,7 +100,7 @@ spring:
     host: localhost
     port: 5672
     username: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
-    password: root
+    password: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
   redis:
     clusterWhether: false
     cluster:

old-user/src/main/resources/application-prod.yml

@@ -98,7 +98,7 @@ spring:
     host: localhost
     port: 5672
     username: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
-    password: root
+    password: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
   redis:
     clusterWhether: false
     cluster:

pom.xml

@@ -103,7 +103,6 @@
                 <groupId>com.alibaba</groupId>
                 <version>${druid.version}</version>
             </dependency>
-
         </dependencies>
     </dependencyManagement>
 

renewal-user/src/main/resources/application-prod.yml

@@ -98,7 +98,7 @@ spring:
     host: localhost
     port: 5672
     username: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
-    password: root
+    password: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
   redis:
     clusterWhether: false
     cluster:

service-manager/src/main/resources/application-prod.yml

@@ -98,7 +98,7 @@ spring:
     host: localhost
     port: 5672
     username: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
-    password: root
+    password: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
   redis:
     clusterWhether: false
     cluster:

task/src/main/resources/application-prod.yml

@@ -99,7 +99,7 @@ spring:
     host: localhost
     port: 5672
     username: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
-    password: root
+    password: ENC(z8WG0Zar99IzLr3L9Z3mOw==)
   redis:
     clusterWhether: false
     cluster: