Skip to content

Commit

Permalink
fix: 临时修复更新会导致原加密失效的问题(待 starter 升级)
Browse files Browse the repository at this point in the history
  • Loading branch information
Charles7c committed Sep 4, 2024
1 parent 6324a5a commit 8903195
Showing 1 changed file with 11 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -366,10 +366,12 @@ public void delete(List<Long> ids) {

@Override
public void resetPassword(UserPasswordResetReq req, Long id) {
UserDO user = super.getById(id);
user.setPassword(req.getNewPassword());
user.setPwdResetTime(LocalDateTime.now());
baseMapper.updateById(user);
super.getById(id);
baseMapper.lambdaUpdate()
.set(UserDO::getPassword, req.getNewPassword())
.set(UserDO::getPwdResetTime, LocalDateTime.now())
.eq(UserDO::getId, id)
.update();
}

@Override
Expand Down Expand Up @@ -414,9 +416,11 @@ public void updatePassword(String oldPassword, String newPassword, Long id) {
// 校验密码合法性
int passwordRepetitionTimes = this.checkPassword(newPassword, user);
// 更新密码和密码重置时间
user.setPassword(newPassword);
user.setPwdResetTime(LocalDateTime.now());
baseMapper.updateById(user);
baseMapper.lambdaUpdate()
.set(UserDO::getPassword, newPassword)
.set(UserDO::getPwdResetTime, LocalDateTime.now())
.eq(UserDO::getId, id)
.update();
// 保存历史密码
userPasswordHistoryService.add(id, password, passwordRepetitionTimes);
// 修改后登出
Expand Down

0 comments on commit 8903195

Please sign in to comment.