|
@@ -95,7 +95,6 @@ public class UserController {
|
|
|
}
|
|
|
|
|
|
@PutMapping("/password/modify")
|
|
|
- @SaCheckPermission("system:user:modify")
|
|
|
public CommonResult<String> passwordModify(@RequestBody @Valid ModifyPasswordBO passwordBO) {
|
|
|
|
|
|
if (StrUtils.isBlank(passwordBO.getPassword())) {
|
|
@@ -103,13 +102,12 @@ public class UserController {
|
|
|
}
|
|
|
UserVO userVO = userService.selectById(LoginHelper.getUserId());
|
|
|
if (!BCrypt.checkpw(passwordBO.getOldPassword(), userVO.getPassword())) {
|
|
|
- return fail("密码不能为空!");
|
|
|
+ return fail("旧密码不正确!");
|
|
|
}
|
|
|
|
|
|
if (BCrypt.checkpw(passwordBO.getPassword(), userVO.getPassword())) {
|
|
|
return fail("新密码不能与旧密码相同!");
|
|
|
}
|
|
|
- passwordBO.setPassword(BCrypt.hashpw(passwordBO.getPassword()));
|
|
|
UserBO userBO = new UserBO();
|
|
|
userBO.setUserId(userVO.getUserId());
|
|
|
userBO.setPassword(BCrypt.hashpw(passwordBO.getPassword()));
|