diff --git a/mallinkAdmin/src/main/java/com/simple/UserApplication.java b/mallinkAdmin/src/main/java/com/simple/UserApplication.java
index a16a60136..3dfeddf2d 100644
--- a/mallinkAdmin/src/main/java/com/simple/UserApplication.java
+++ b/mallinkAdmin/src/main/java/com/simple/UserApplication.java
@@ -1,5 +1,6 @@
package com.simple;
+import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -13,6 +14,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@SpringBootApplication
@MapperScan(basePackages = {"com.simple.mapper"})
@EnableSwagger2
+@EnableEncryptableProperties
public class UserApplication {
public static void main(String[] args) {
diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml
index 86cf4f4c0..dad59fbfa 100644
--- a/mallinkAdmin/src/main/resources/application-dev.yml
+++ b/mallinkAdmin/src/main/resources/application-dev.yml
@@ -2,8 +2,8 @@ spring:
# JDBC
datasource:
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&useSSL=false
- username: mallone
- password: m@1l0ne123@#
+ username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
+ password: ENC(OZXsE6/Tj+V1Yu2wdjnIGbNOaBVQzi9W)
type: com.alibaba.druid.pool.DruidDataSource
driver_class: com.mysql.cj.jdbc.Driver
filters: stat
@@ -27,7 +27,7 @@ spring:
redis:
host: 202.165.179.86
port: 6789
- password: JGtest123
+ password: ENC(YOLO4buIPjiYfosG+Akk3XZ9HYrbCFco)
timeout: 0
expire: 1800 #30分钟
pool:
diff --git a/mallinkAdmin/src/main/resources/application.yml b/mallinkAdmin/src/main/resources/application.yml
index d0ab85172..1dd9ee252 100644
--- a/mallinkAdmin/src/main/resources/application.yml
+++ b/mallinkAdmin/src/main/resources/application.yml
@@ -39,4 +39,8 @@ mapper:
- com.simple.common.CommonMapper
pay:
- real: true
\ No newline at end of file
+ real: true
+
+jasypt:
+ encryptor:
+ password: oRqdnDbK5pj3eMmB
\ No newline at end of file
diff --git a/mallinkBApi/src/main/java/com/simple/BApplication.java b/mallinkBApi/src/main/java/com/simple/BApplication.java
index 0b399ffbd..cf5173e3c 100644
--- a/mallinkBApi/src/main/java/com/simple/BApplication.java
+++ b/mallinkBApi/src/main/java/com/simple/BApplication.java
@@ -1,5 +1,6 @@
package com.simple;
+import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -13,6 +14,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@SpringBootApplication
@MapperScan(basePackages = {"com.simple.mapper"})
@EnableSwagger2
+@EnableEncryptableProperties
public class BApplication {
public static void main(String[] args) {
diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml
index eb2ea3414..5ba19fccd 100644
--- a/mallinkBApi/src/main/resources/application-dev.yml
+++ b/mallinkBApi/src/main/resources/application-dev.yml
@@ -2,8 +2,8 @@ spring:
# JDBC
datasource:
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&useSSL=false
- username: mallone
- password: m@1l0ne123@#
+ username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
+ password: ENC(OZXsE6/Tj+V1Yu2wdjnIGbNOaBVQzi9W)
type: com.alibaba.druid.pool.DruidDataSource
driver_class: com.mysql.cj.jdbc.Driver
filters: stat
@@ -26,7 +26,7 @@ spring:
redis:
host: 202.165.179.86
port: 6789
- password: JGtest123
+ password: ENC(YOLO4buIPjiYfosG+Akk3XZ9HYrbCFco)
timeout: 0
expire: 1800 #30分钟
pool:
diff --git a/mallinkBApi/src/main/resources/application.yml b/mallinkBApi/src/main/resources/application.yml
index 663167d37..e4092a2d9 100644
--- a/mallinkBApi/src/main/resources/application.yml
+++ b/mallinkBApi/src/main/resources/application.yml
@@ -39,4 +39,8 @@ mapper:
- com.simple.common.CommonMapper
pay:
- real: true
\ No newline at end of file
+ real: true
+
+jasypt:
+ encryptor:
+ password: oRqdnDbK5pj3eMmB
\ No newline at end of file
diff --git a/mallinkCApi/src/main/java/com/simple/CApplication.java b/mallinkCApi/src/main/java/com/simple/CApplication.java
index c9e810cd4..cdb45268f 100644
--- a/mallinkCApi/src/main/java/com/simple/CApplication.java
+++ b/mallinkCApi/src/main/java/com/simple/CApplication.java
@@ -1,5 +1,6 @@
package com.simple;
+import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -12,7 +13,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
*/
@SpringBootApplication
@MapperScan(basePackages = {"com.simple.mapper"})
-
+@EnableEncryptableProperties
public class CApplication {
public static void main(String[] args) {
diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml
index eb2ea3414..5ba19fccd 100644
--- a/mallinkCApi/src/main/resources/application-dev.yml
+++ b/mallinkCApi/src/main/resources/application-dev.yml
@@ -2,8 +2,8 @@ spring:
# JDBC
datasource:
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&useSSL=false
- username: mallone
- password: m@1l0ne123@#
+ username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
+ password: ENC(OZXsE6/Tj+V1Yu2wdjnIGbNOaBVQzi9W)
type: com.alibaba.druid.pool.DruidDataSource
driver_class: com.mysql.cj.jdbc.Driver
filters: stat
@@ -26,7 +26,7 @@ spring:
redis:
host: 202.165.179.86
port: 6789
- password: JGtest123
+ password: ENC(YOLO4buIPjiYfosG+Akk3XZ9HYrbCFco)
timeout: 0
expire: 1800 #30分钟
pool:
diff --git a/mallinkCApi/src/main/resources/application.yml b/mallinkCApi/src/main/resources/application.yml
index 6f51968a0..c12fd23de 100644
--- a/mallinkCApi/src/main/resources/application.yml
+++ b/mallinkCApi/src/main/resources/application.yml
@@ -40,3 +40,7 @@ mapper:
pay:
real: true
+
+jasypt:
+ encryptor:
+ password: oRqdnDbK5pj3eMmB
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 519bede6a..c144744be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,6 +240,12 @@
${weixin-java-miniapp.version}
+
+ com.github.ulisesbocchio
+ jasypt-spring-boot
+ 2.0.0
+
+