From 60cdf33b7bede041b03c76f5b395780dd51505cb Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sat, 3 Aug 2024 17:35:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/ysk/cashier/system/rest/UserController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/UserController.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/UserController.java index bc462c86..208f1418 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/UserController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/rest/UserController.java @@ -156,11 +156,11 @@ public class UserController { String currentUsername = SecurityUtils.getCurrentUsername(); UserDto user = userService.findByName(currentUsername); String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, passVo.getOldPass()); - String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, passVo.getNewPass()); if (!passwordEncoder.matches(oldPass, user.getPassword())) { throw new BadRequestException("修改失败，旧密码错误"); } - if (passwordEncoder.matches(newPass, user.getPassword())) { + System.out.println(oldPass); + if (passwordEncoder.matches(passVo.getNewPass(), user.getPassword())) { throw new BadRequestException("新密码不能与旧密码相同"); } String encPass = MD5Utils.encrypt( passVo.getNewPass()); @@ -170,7 +170,7 @@ public class UserController { }else { shopStaffRepository.updatePass(currentUsername,encPass,System.currentTimeMillis()); } - userService.updatePass(user.getUsername(),passwordEncoder.encode(newPass)); + userService.updatePass(user.getUsername(),passwordEncoder.encode(passVo.getNewPass())); onlineUserService.logout(tokenProvider.getToken(request)); return new ResponseEntity<>(HttpStatus.OK); }