diff --git a/ruoyi-common/pinn-common-extend/src/main/java/com/pinn/publicPackage/context/jasyptHandler.java b/ruoyi-common/pinn-common-extend/src/main/java/com/pinn/publicPackage/context/jasyptHandler.java index d7ac4b23..2066ee51 100644 --- a/ruoyi-common/pinn-common-extend/src/main/java/com/pinn/publicPackage/context/jasyptHandler.java +++ b/ruoyi-common/pinn-common-extend/src/main/java/com/pinn/publicPackage/context/jasyptHandler.java @@ -14,20 +14,20 @@ import org.springframework.stereotype.Component; @Component public class jasyptHandler { - @Bean("jasyptStringEncryptor") - public StringEncryptor stringEncryptor() { - PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor(); - SimpleStringPBEConfig config = new SimpleStringPBEConfig(); - // 配置解析的密码 - config.setPassword("password"); - config.setAlgorithm(StandardPBEByteEncryptor.DEFAULT_ALGORITHM); - config.setKeyObtentionIterations("1000"); - config.setPoolSize("1"); -// config.setProviderName("SunJCE"); - config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); -// config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator"); - config.setStringOutputType("base64"); - encryptor.setConfig(config); - return encryptor; - } +// @Bean("jasyptStringEncryptor") +// public StringEncryptor stringEncryptor() { +// PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor(); +// SimpleStringPBEConfig config = new SimpleStringPBEConfig(); +// // 配置解析的密码 +// config.setPassword("password"); +// config.setAlgorithm(StandardPBEByteEncryptor.DEFAULT_ALGORITHM); +// config.setKeyObtentionIterations("1000"); +// config.setPoolSize("1"); +//// config.setProviderName("SunJCE"); +// config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); +//// config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator"); +// config.setStringOutputType("base64"); +// encryptor.setConfig(config); +// return encryptor; +// } } diff --git a/ruoyi-common/pinn-common-extend/src/main/java/com/pinn/publicPackage/utils/jasyptEncryptUtils.java b/ruoyi-common/pinn-common-extend/src/main/java/com/pinn/publicPackage/utils/jasyptEncryptUtils.java index a630e015..764b30a3 100644 --- a/ruoyi-common/pinn-common-extend/src/main/java/com/pinn/publicPackage/utils/jasyptEncryptUtils.java +++ b/ruoyi-common/pinn-common-extend/src/main/java/com/pinn/publicPackage/utils/jasyptEncryptUtils.java @@ -5,6 +5,7 @@ import cn.hutool.core.map.MapUtil; import org.jasypt.encryption.StringEncryptor; import org.jasypt.encryption.pbe.PooledPBEStringEncryptor; import org.jasypt.encryption.pbe.StandardPBEByteEncryptor; +import org.jasypt.encryption.pbe.StandardPBEStringEncryptor; import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig; import java.io.File; @@ -23,7 +24,64 @@ public class jasyptEncryptUtils { final static String PREFIX = "PINN@["; final static String SUFFIX = "]"; - /** + public static void main(String[] args) { + HashMap dataSource = MapUtil.newHashMap(); + dataSource.put("url","jdbc:mysql://175.178.38.240:9033/ry_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"); + dataSource.put("username","nacos"); + dataSource.put("password","nacos2233"); + + encryptionDataSource(dataSource); + + +// HashMap dataSource2 = MapUtil.newHashMap(); +// dataSource2.put("url","xvrY1Lb+8pSI993YLonk0/Zc5UJJyrCEvobsCWPKzjhFyN5+6TxFksonriogCXk3ZZKdLZ2RuGlNZ/F4ezeZtDH/gYdGpYmRmGPHJfCGDXZIHUQAdqB5xIGYxdym4UkMhvxY0zH+LfECaL4Xh4SsbYnoEe0+YlRav24x/1cNW7ZxZ+5kXLc8wRTkSTUCmEOqwBrwVII5lhNBbBva/ItLqYSFdfdyLX2g3BYBUz2iSlqH2aMH2sjUnHaaeEqpSoLq"); +// dataSource2.put("username","RZvKwBufVgR5YDlJ2ncYeWgaFIZ92BpKnepqv6EuUMFz1FY7rIyJEJyhR/NYYN7F"); +// dataSource2.put("password","ixlE6Xon2PkZGz2YWT30XodveKEhidgo3m2QWrzT9Wf9Jh5tTs/MKxEXZJPBSvij"); +// +// decryptDataSource(dataSource2); + +// StandardPBEStringEncryptor standardPBEStringEncryptor = new StandardPBEStringEncryptor(); +// standardPBEStringEncryptor.setPassword("aa78fcbe21d77af8"); +// System.out.println(standardPBEStringEncryptor.decrypt("I41o92myZEH//IF94wRL63p1fYXvq+OaltRqSCk4OhzT3Ff5G4aj4Y8URNzarpiM")); + } + + + /** + * 打印密钥和加密串 + * @param dataSource 集合 + */ + public static void decryptDataSource(Map dataSource){ + String key = AESMybatisPlusUtils.genOrGetKey(); + String url = decryptPwd(key,dataSource.get("url")); + String username = decryptPwd(key,dataSource.get("username")); + String password = decryptPwd(key,dataSource.get("password")); + + //保存在目录下 + FileWriter writer = new FileWriter(new File(FILE_PATCH_DE), CHARSET_UTF8); + writer.write("key: "+ key + LINE,false); + writer.write("url: " +url + LINE,true); + writer.write("username: " +username + LINE,true); + writer.write("password: " +password + LINE,true); + } + + /** + * 打印密钥和加密串 + * @param dataSource 集合 + */ + public static void encryptionDataSource(Map dataSource){ + String key = AESMybatisPlusUtils.genOrGetKey(); + String url = encryptPwd(key,dataSource.get("url")); + String username = encryptPwd(key,dataSource.get("username")); + String password = encryptPwd(key,dataSource.get("password")); + //保存在目录下 + FileWriter writer = new FileWriter(new File(FILE_PATCH_ALL), CHARSET_UTF8); + writer.write("key: "+ key + LINE,false); + writer.write("url: " + PREFIX +url + SUFFIX + LINE,true); + writer.write("username: " + PREFIX +username + SUFFIX + LINE,true); + writer.write("password: " + PREFIX +password + SUFFIX + LINE,true); + } + + /** * Jasypt生成加密结果 * * @param password 配置文件中设定的加密密码 jasypt.encryptor.password @@ -58,68 +116,8 @@ public class jasyptEncryptUtils { public static SimpleStringPBEConfig cryptOr(String password) { SimpleStringPBEConfig config = new SimpleStringPBEConfig(); config.setPassword(password); -// config.setAlgorithm(StandardPBEByteEncryptor.DEFAULT_ALGORITHM); -// config.setKeyObtentionIterations("1000"); + config.setAlgorithm("PBEWithMD5AndDES"); config.setPoolSize("1"); -// config.setProviderName(null); -// config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); -// config.setStringOutputType("base64"); - return config; } - - /** - * 打印密钥和加密串 - * @param dataSource 集合 - */ - public static void decryptDataSource(Map dataSource){ - String key = AESMybatisPlusUtils.genOrGetKey(); - String url = decryptPwd(key,dataSource.get("url")); - String username = decryptPwd(key,dataSource.get("username")); - String password = decryptPwd(key,dataSource.get("password")); - - //保存在目录下 - FileWriter writer = new FileWriter(new File(FILE_PATCH_DE), CHARSET_UTF8); - writer.write("key: "+ key + LINE,false); - writer.write("url: " +url + LINE,true); - writer.write("username: " +username + LINE,true); - writer.write("password: " +password + LINE,true); - } - - /** - * 打印密钥和加密串 - * @param dataSource 集合 - */ - public static void encryptionDataSource(Map dataSource){ - String key = AESMybatisPlusUtils.genOrGetKey(); - String url = encryptPwd(key,dataSource.get("url")); - String username = encryptPwd(key,dataSource.get("username")); - String password = encryptPwd(key,dataSource.get("password")); - - //保存在目录下 - FileWriter writer = new FileWriter(new File(FILE_PATCH_ALL), CHARSET_UTF8); - writer.write("key: "+ key + LINE,false); - writer.write("url: " + PREFIX +url + SUFFIX + LINE,true); - writer.write("username: " + PREFIX +username + SUFFIX + LINE,true); - writer.write("password: " + PREFIX +password + SUFFIX + LINE,true); - } - - - public static void main(String[] args) { - HashMap dataSource = MapUtil.newHashMap(); - dataSource.put("url","jdbc:mysql://175.178.38.240:9033/ry_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"); - dataSource.put("username","nacos"); - dataSource.put("password","nacos2233"); - - encryptionDataSource(dataSource); - - -/* HashMap dataSource2 = MapUtil.newHashMap(); - dataSource2.put("url","tdAxOXA3+S2kSy2Rv8sfFujgdl46zQy+Cl7xVnC9pDhZrVwtHnCdOeco2zkvyZnMDfIl/uiBig3DYmU4HqGbQgwBeYdyqamHu9jGKxVI9RzlKVM4XiDae630G5hSwNzhndchz33PBUZ0IMdvB7pDcDs/Ug/5h8O47qQ0TQrTAOarKOFkZCoA7wNqaDhYJmZzTCAtvPadRx8qdNRKHsbswFtjqmCO+QrW"); - dataSource2.put("username","ghFv/J1tegsx6a/kVdzwVQ=="); - dataSource2.put("password","VNMRcA303/pklpGem3JQYP8T+GwZXwnC"); - - decryptDataSource(dataSource2);*/ - } - } \ No newline at end of file diff --git a/ruoyi-common/pinn-common-extend/src/main/resources/mybatisPlus/JasyptAll.yaml b/ruoyi-common/pinn-common-extend/src/main/resources/mybatisPlus/JasyptAll.yaml index b2a22bfb..1eb7f74e 100644 --- a/ruoyi-common/pinn-common-extend/src/main/resources/mybatisPlus/JasyptAll.yaml +++ b/ruoyi-common/pinn-common-extend/src/main/resources/mybatisPlus/JasyptAll.yaml @@ -1,4 +1,4 @@ key: aa78fcbe21d77af8 -url: PINN@[RDvIMG8MFQAINuVwgI59BimaqgkEOrcnY0vj8kYmZMmlRWwl+9rn7weZDNwon807LaYXZF+hme4/+Ye4d9LwHUS2IzOvz/nOqXoeqmPIMYNq2Cdt4AAIvtENj+Fnp4/XccSKfhAlA8pRarc/lk8F7l62ul5VsxKi8lUQatXDB1v1OCsNAzDowj2l7T0o/TzNrIHWl0b9yYcZZVGDnyYrkA==] -username: PINN@[9LFA4aI0xDSxwlsyyoJf1w==] -password: PINN@[AG6wLP/NWZx1UpBDYIHAcpQ62kjD7mfa] +url: PINN@[b43OeNppIVyLnbWEybBFR7ilgcIOkQz5Mkb2tWtOuugrQoTxjpf3hozwU8LRSpboCAOf4WSAB9eknmbS15qX42/e6g1XmmJCsSAwx3TswOjX9x6BgjcDiWrUcYx4ZiNS9wO79ieCkLdeWRW1AZ6msuFV0JGRQNMpsLaJjwra2BZ4Hldq88EDjyZntBvT2s58EXM/bjMKIQhynkUibEbAhw==] +username: PINN@[WEciwJ1eT6ZjAMncoppuow==] +password: PINN@[YZXfQ+pMtdFaMCxbKy5ey5BfxIG2RQnZ] diff --git a/ruoyi-common/pinn-common-extend/src/main/resources/mybatisPlus/JasyptDe.yaml b/ruoyi-common/pinn-common-extend/src/main/resources/mybatisPlus/JasyptDe.yaml index 99122f83..007273e3 100644 --- a/ruoyi-common/pinn-common-extend/src/main/resources/mybatisPlus/JasyptDe.yaml +++ b/ruoyi-common/pinn-common-extend/src/main/resources/mybatisPlus/JasyptDe.yaml @@ -1,4 +1,4 @@ key: aa78fcbe21d77af8 -url: 'jdbc:mysql://175.178.38.240:9033/ry_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8' -username: 'nacos' -password: 'nacos2233' +url: jdbc:mysql://175.178.38.240:9033/ry_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +username: nacos +password: nacos2233