合并分支 'yjzx_dev' 到 'yjzx_test'

Yjzx dev

查看合并请求 !4

pom.xml

@@ -132,7 +132,11 @@
             <version>3.18.1</version>
         </dependency>
 
-
+        <dependency>
+            <groupId>com.github.ulisesbocchio</groupId>
+            <artifactId>jasypt-spring-boot-starter</artifactId>
+            <version>3.0.5</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/resources/application.yml

@@ -38,18 +38,18 @@ spring:
       datasource:
         master:
           url: jdbc:mysql://1.95.14.228:3306/clb_project?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&useSSL=false&allowMultiQueries=true
-          username: ciglobal
-          password: _PSuWVQ4CLpX
+          username: ZZSN(FbEHhqzrUVSuInnt5QsXNDK7k5qR5sTIuSs7Q5766kyOpc+cmoen+H440dp8OtGB)
+          password: ZZSN(w+QcMJsUKP++LPd1TZV4gGCBIu63q3/sV/tPiPnU5pNz7K490noBgohAtHOSFJS3)
           driver-class-name: com.mysql.jdbc.Driver
         slave:
           url: jdbc:mysql://1.95.14.228:3306/clb_system?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&useSSL=false
-          username: ciglobal
-          password: _PSuWVQ4CLpX
+          username: ZZSN(FbEHhqzrUVSuInnt5QsXNDK7k5qR5sTIuSs7Q5766kyOpc+cmoen+H440dp8OtGB)
+          password: ZZSN(w+QcMJsUKP++LPd1TZV4gGCBIu63q3/sV/tPiPnU5pNz7K490noBgohAtHOSFJS3)
           driver-class-name: com.mysql.jdbc.Driver
   redis:
     database: 0
     host: 1.95.69.2
-    password: RPHZgkDQ4zGJ
+    password: ZZSN(cUb0CIVzKp86PFpQXCoC0tSxQL34jLeMTTUS2j04hZoz7hp0kSpoZAUfzOIAzzXd)
     port: 6380
   kafka:
     bootstrap-servers: 1.95.78.131:9092
@@ -73,8 +73,8 @@ es1:
   endpoint2port: 9200
   endpoint3: 1.95.87.177
   endpoint3port: 9700
-  username: elastic
-  password: zzsn9988
+  username: ZZSN(2+idGBfetdfz0WDsVCeIqgauTL+BRJQl7HhgBGnpHA0I/cWg0Ztg75pxEB4CpBVb)
+  password: ZZSN(BbWBiYf7Yl4QINlRP7YXxJJdhZE4+0pNlwsWTThaiVh5StDaBIqVsVN9KjcUt6Q2)
 
 sys_base_label_type_id: 1783029731298439170
 sys_base_label_type: 1792195735429595138
@@ -85,4 +85,9 @@ dict:
 
 files:
   #storage: D:\\thinktank\\
-  storage: /zzsn/clb/thinktank/
\ No newline at end of file
+  storage: /zzsn/clb/thinktank/
+jasypt:
+  encryptor:
+    property:
+      prefix: ZZSN(
+      suffix: )
\ No newline at end of file