Merge remote-tracking branch 'origin/master'

xuhy

2025-01-16 9fde9f917552f659d41fcfce5094f429a29b8ead

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java

@@ -117,8 +117,11 @@
    
    
    public static void main(String[] args) {
        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
        String encode = passwordEncoder.encode("123456");
        System.err.println(encode);
        String s = encryptPassword("ad23a8ac3c902145ffe05df05812b1f0");
        System.err.println(s);
//        System.err.println(s);

        System.err.println(matchesPassword("6ac9d3a5c7639060425fadd6db3d305e","$2a$10$M.L9orN4p8y6aLvBhOm9hevAmi0YXAPuWIHZrAyEAKGW3x8B4/0d."));
        System.err.println(matchesPassword("ad23a8ac3c902145ffe05df05812b1f0","$2a$10$Rw0A4NjcdqnNrImdOn4EI.z.Ib.XfpY01NPPs9kSsF42JxGrMrJBy"));
    }
}