diff --git a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/SecurityUtils.java b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/SecurityUtils.java index 5be97b8..4876cc4 100644 --- a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/SecurityUtils.java +++ b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/SecurityUtils.java @@ -100,8 +100,9 @@ public class SecurityUtils */ public static String encryptPassword(String password) { - return Sm4Utils.encrypt(password); - + //return Sm4Utils.encrypt(password); + BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); + return passwordEncoder.encode(password); } /** @@ -113,29 +114,17 @@ public class SecurityUtils */ public static boolean matchesPassword(String rawPassword, String encodedPassword) { - return encodedPassword.equals(Sm4Utils.encrypt(rawPassword)); + //return encodedPassword.equals(Sm4Utils.encrypt(rawPassword)); + BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); + return passwordEncoder.matches(rawPassword, encodedPassword); } public static void main(String[] args) { - //老的加密方式要保留,偶尔调试要用 -// BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); -// String encodePass = passwordEncoder.encode("Bonus$2026"); -// System.out.println(encodePass); -// boolean result = passwordEncoder.matches("Bonus$2026", "$2a$10$0TaYZgPNd7eqpvsKx4KZnu0nPiSQlVn5SZZaJa2q6tLPuI9bWD0lW"); -// System.out.println("result: " + result); - -//$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2 - //$2a$10$zvlw3Mu8M.j.MhAChrYwluj88ziX6lVD3AoRrBQpwKMcdIZvKMoR2 -// String msg= encryptPassword("Admin@1234"); -// String msg= encryptPassword("15888888888"); -// boolean rest = matchesPassword("Bonus$2024","$2a$10$8JaKSUAU.K.mceU1.YQbd.wP4EJzbrsIscjAwPlfDR7wAWV6s/BGa"); - String msg = Sm4Utils.encrypt("18956025265"); - System.err.println(msg); - - String msg1 = Sm4Utils.encrypt("1895"); - System.err.println(msg1); -// String msg = Sm4Utils.decrypt("4eb762402e0ce5ef9d0028e2d622c53bc8ea1d7680ea4416975e4cc23b4ef7f0"); - -// System.err.println(rest); + //老的加密方式 (不可逆) + BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); + String encodePass = passwordEncoder.encode("Bonus$2026"); + System.out.println(encodePass); + boolean result = passwordEncoder.matches("Bonus$2026", "$2a$10$vrcmG0TyvgH5tS9g8ptaVOK2K3pYWVAa13SWEK7pQBGRtNAPlGV7O"); + System.out.println("result: " + result); } }