diff --git a/xiaoyi-auth/src/main/resources/config/application-dev.yml b/xiaoyi-auth/src/main/resources/config/application-dev.yml index 86dd4f3..048ddb5 100644 --- a/xiaoyi-auth/src/main/resources/config/application-dev.yml +++ b/xiaoyi-auth/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver # 数据库连接信息 - url: jdbc:mysql://127.0.0.1:3306/xiaoyishu?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true - username: ENC(q6eB0z65vHf2Fsm/DGFZpOea+GFigZNdnInAw2YvW1vMLWGAANwp+AcGiZB8lT5c) - password: ENC(ZUUg0fBx9YSK4c4hOtIpkBpNSXMbhsRCM0CBRYHYvSzJCXTu9dK4gMgODcKgyooo67Osmm2ccgBeHbJheSMTCQ==) + url: ENC(+rm/FjvaL/fDxkZu/G9zxQnSO2M60VFodOuZzxqlxzUyNN2ooNjH9mtVVZiqlqMm8EHDCBKYD/rI4e1VdaDlYtwL+WxdW2K6rujuUm1R0Mkjl1kphthDaiAK5tnPvtfffL4aVpBbA7oOUdsX0tCURzWvpjSFhDHlxtb4b+Ezx6JeHJoZDEJ0bErjDETLdjbIGDNdCsTCvz2wp1S5+AdW39S5C8kj4PNLIXkbckzKdhHm9ATLrixdveyBLmuBkDwLsE9XBmCFm0ipST5/SVg8WA==) + username: ENC(B/DozYPqx155j/Gdh3QkCX/wGmuzLf1jumsbb1kF4GY6EjrlRdAatc8BlhrrR2J6) + password: ENC(JwQdlswsrwmGE6eplp6Jk9Vp5s6zlFgra6jLN5fKBt8qOyqQHUHCJM6JcKp5g0t8B/or2wTH18ohR/d41oyV9w==) druid: # Druid 连接池 initial-size: 5 # 初始化连接池大小 min-idle: 5 # 最小连接池数量 @@ -43,9 +43,9 @@ spring: data: redis: database: 0 # Redis 数据库索引（默认为 0） - host: 127.0.0.1 # Redis 服务器地址 + host: ENC(W8nbSo0vMjCenHHLHyhvdhW2wH3oI54/FW+LQp8H9lx6xQH2Tm56nGSgNom6xsK7) # Redis 服务器地址 port: 6379 # Redis 服务器连接端口 - password: 12345678 # Redis 服务器连接密码（默认为空） + password: ENC(iK/k0IGPflACqYMUwX4N/sGvCVuysYywLcAO+Ikeqk326V8hCr8dgEGzkiEIwWOo) # Redis 服务器连接密码（默认为空） timeout: 5s # 读超时时间 connect-timeout: 5s # 链接超时时间 lettuce: @@ -73,8 +73,8 @@ logging: top.crushtj.xiaoyishu.auth.domain.mappers: debug aliyun: - accessKeyId: ENC(h8yRFpNaFNA3NduXrnm8Z4D1jZr1UNapbYVdBxaSKsZMSn1RqJQ29RmqsZscxsea5vKuLdywVE+CYP3+Q+ZQ/A==) - accessKeySecret: ENC(/Ovw0XK2/fFIGXKxOdmdUHvFPI0pNSHBDkLyjAXdbQytlCCNnBW8hFBseN4t4juumjJ5AJ9KBgvgDYCV+/gWGg==) + accessKeyId: ENC(0GWRL+sq6nY4HvFY8tGqAJz/21NQm4Ga3Qbek+yiR3dwgk4TZXLpcoflD1pyXI/nrkzgcbZsiXXBd6FXW00GJA==) + accessKeySecret: ENC(VUngnZ/ERJDRHmimA0CB7tla6LKIXB7K6jzRJjOg2kqc3KwtXwin+E3cnpJSe92daR5yLCcMa2kPYwy9h6lPqg==) jasypt: encryptor: password: diff --git a/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/EncryptTest.java b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/EncryptTest.java index 8cba947..a969c76 100644 --- a/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/EncryptTest.java +++ b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/EncryptTest.java @@ -20,13 +20,14 @@ import org.springframework.test.context.TestPropertySource; @SpringBootTest @Slf4j -@TestPropertySource(properties = {"jasypt.encryptor.password=GhaU7VjZd2b3M4Hbx4SelEXZc"}) +@TestPropertySource(properties = {"jasypt.encryptor.password="}) public class EncryptTest { //@Autowired //private StringEncryptor defaultLazyEncryptor; //private StringEncryptor pooledPbeStringEncryptor; @Value("${jasypt.encryptor.password}") private String encryptorPassword; + /** * Druid 密码加密 */ @@ -34,7 +35,7 @@ public class EncryptTest { @SneakyThrows void testEncodePassword() { // 你的密码 - String password = "HhpxE2HWE4bGTyB5"; + String password = "";//密码 String[] arr = ConfigTools.genKeyPair(512); // 私钥 @@ -52,7 +53,8 @@ public class EncryptTest { StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor(); // JDK 17适配的核心配置（关键参数必须完整） - encryptor.setPassword(encryptorPassword); // AES-256要求密钥至少32位 + String password = ""; // 加密密码 + encryptor.setPassword(password); // AES-256要求密钥至少32位 encryptor.setAlgorithm("PBEWithHMACSHA512AndAES_256"); // JDK17原生支持的算法 encryptor.setKeyObtentionIterations(1000); // 迭代次数（固定值） encryptor.setStringOutputType("base64"); // 输出格式（固定） @@ -60,21 +62,21 @@ public class EncryptTest { encryptor.setIvGenerator(new RandomIvGenerator()); // AES必须的IV生成器 // 待加密的原始值 - String accessKeyId = "ayi"; - String accessKeySecret = "HhpxE2HWE4bGTyB5"; + String encry1 = ""; // 待加密的原始值1 + String encry2 = ""; // 待加密的原始值2 try { - String cipherAccessKeyId = encryptor.encrypt(accessKeyId); - System.out.println("accessKeyId加密成功，密文：" + cipherAccessKeyId); + String cipherAccessKeyId = encryptor.encrypt(encry1); + System.out.println("字段1加密成功，密文：" + cipherAccessKeyId); String decryptAccessKeyId = encryptor.decrypt(cipherAccessKeyId); - System.out.println("accessKeyId解密成功，明文：" + decryptAccessKeyId); + System.out.println("字段1解密成功，明文：" + decryptAccessKeyId); - String cipherAccessKeySecret = encryptor.encrypt(accessKeySecret); - System.out.println("accessKeySecret加密成功，密文：" + cipherAccessKeySecret); + String cipherAccessKeySecret = encryptor.encrypt(encry2); + System.out.println("字段2加密成功，密文：" + cipherAccessKeySecret); String decryptAccessKeySecret = encryptor.decrypt(cipherAccessKeySecret); - System.out.println("accessKeySecret解密成功，明文：" + decryptAccessKeySecret); + System.out.println("字段2解密成功，明文：" + decryptAccessKeySecret); } catch (Exception e) { e.printStackTrace(); System.out.println("加密失败原因：" + e.getMessage()); diff --git a/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/ThreadPoolTaskExecutorTests.java b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/ThreadPoolTaskExecutorTests.java index 308bf97..9693c8c 100644 --- a/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/ThreadPoolTaskExecutorTests.java +++ b/xiaoyi-auth/src/test/java/top/crushtj/xiaoyishu/auth/ThreadPoolTaskExecutorTests.java @@ -17,7 +17,7 @@ import org.springframework.test.context.TestPropertySource; @Slf4j @SpringBootTest -@TestPropertySource(properties = {"jasypt.encryptor.password=GhaU7VjZd2b3M4Hbx4SelEXZc"}) +@TestPropertySource(properties = {"jasypt.encryptor.password="}) public class ThreadPoolTaskExecutorTests { @Resource(name = "taskExecutor") private ThreadPoolTaskExecutor taskExecutor;