|
@@ -490,14 +490,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
}
|
|
|
BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
|
|
|
boolean flag = bCryptPasswordEncoder.matches(SecurityConstants.BCRYPT + originalPassword, u.getPassword());
|
|
|
- if (!flag) {
|
|
|
- String sha1 = SecureUtil.sha1(originalPassword);
|
|
|
- log.info("sha1加密:{}", sha1);
|
|
|
- boolean matches = bCryptPasswordEncoder.matches(SecurityConstants.BCRYPT + sha1, u.getPassword());
|
|
|
- if (!matches) {
|
|
|
- return ResultRespone.failed("原始密码不正确");
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
String password = user2.getPassword();
|
|
|
if (StringUtil.isEmpty(password)) {
|