From 90153fcfe6f749f29e8574d3ee416a0bc173b602 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 14 Jun 2024 14:44:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=AF=86=E7=A0=81=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/AuthUserController.java | 77 +++++++++++++++---- .../api/controller/auth/LoginController.java | 8 +- 2 files changed, 68 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index f8f080200..d2f89a9e5 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -166,7 +166,11 @@ public class AuthUserController extends BaseController { if (updateUserRequset.getNewPassword().equals(authAdmin.getPassWord())) { return ResultVOUtils.error(500, "新密码与旧密码重复！请重新修改！"); } - if (updateUserRequset.getNewPassword().equals(updateUserRequset.getConfirmPassword()) && updateUserRequset.getPassWord().equals(authAdmin.getPassWord())) { + if (updateUserRequset.getNewPassword().equals(updateUserRequset.getConfirmPassword()) && + PasswordUtils.authAdminPwd(updateUserRequset.getPassWord()).equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord())) + || updateUserRequset.getPassWord().equals(authAdmin.getPassWord()) + || updateUserRequset.getPassWord().equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord())) + ) { customerService.update(updateUserRequset); return ResultVOUtils.success("修改成功"); } else { @@ -175,34 +179,81 @@ public class AuthUserController extends BaseController { } - // @AuthRuleAnnotation("") +// @PostMapping("/admin/auth/admin/force/updateUser") +// public BaseResponse forceUpdateUser(@RequestBody @Valid UpdateUserRequset updateUserRequset, BindingResult bindingResult) { +// if (bindingResult.hasErrors()) { +// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); +// } +// AuthAdmin authAdmin = customerService.getUserBean(); +// if (StringUtils.isBlank(updateUserRequset.getNewPassword())) { +// return ResultVOUtils.error(500, "请输入新密码！"); +// } +// if (StringUtils.isBlank(updateUserRequset.getConfirmPassword())) { +// return ResultVOUtils.error(500, "请输入确认密码！"); +// } +// +// if (updateUserRequset.getNewPassword().equals(updateUserRequset.getOldPassword())) { +// return ResultVOUtils.error(500, "新密码与旧密码重复！请重新修改！"); +// } +// if (updateUserRequset.getNewPassword().equals(updateUserRequset.getConfirmPassword()) +// && +// ( +// PasswordUtils.authAdminPwd(updateUserRequset.getOldPassword()).equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord())) +// || updateUserRequset.getOldPassword().equals(authAdmin.getPassWord()) +// || updateUserRequset.getOldPassword().equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord())) +// )) { +// String newPwd = PasswordUtils.authAdminPwd(updateUserRequset.getNewPassword()); +// authAdmin.setPassWord(newPwd); +// authAdmin.setLastUpdatePwdTime(new Date()); +// authAdminService.updateAuthAdmin(authAdmin); +// return ResultVOUtils.success("修改成功"); +// } else { +// return ResultVOUtils.error(500, "新密码与确认密码不相同！请重新修改！"); +// } +// +// } + @AuthRuleAnnotation("") @PostMapping("/admin/auth/admin/force/updateUser") - public BaseResponse forceUpdateUser(@RequestBody @Valid UpdateUserRequset updateUserRequset, BindingResult bindingResult) { + public BaseResponse forceUpdateUser(@RequestBody @Valid UpdateUserRequset updateUserRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + AuthAdmin authAdmin = customerService.getUserBean(); - if (StringUtils.isBlank(updateUserRequset.getNewPassword())) { + + if (StringUtils.isBlank(updateUserRequest.getNewPassword())) { return ResultVOUtils.error(500, "请输入新密码！"); } - if (StringUtils.isBlank(updateUserRequset.getConfirmPassword())) { + if (StringUtils.isBlank(updateUserRequest.getConfirmPassword())) { return ResultVOUtils.error(500, "请输入确认密码！"); } - if (updateUserRequset.getNewPassword().equals(updateUserRequset.getOldPassword())) { + if (updateUserRequest.getNewPassword().equals(updateUserRequest.getOldPassword())) { return ResultVOUtils.error(500, "新密码与旧密码重复！请重新修改！"); } - if (updateUserRequset.getNewPassword().equals(updateUserRequset.getConfirmPassword()) && updateUserRequset.getOldPassword().equals(authAdmin.getPassWord())) { - String newPwd = PasswordUtils.authAdminPwd(updateUserRequset.getNewPassword()); - authAdmin.setPassWord(newPwd); - authAdmin.setLastUpdatePwdTime(new Date()); - authAdminService.updateAuthAdmin(authAdmin); - return ResultVOUtils.success("修改成功"); + + if (updateUserRequest.getNewPassword().equals(updateUserRequest.getConfirmPassword())) { + String encryptedOldPassword = PasswordUtils.authAdminPwd(updateUserRequest.getOldPassword()); + String storedEncryptedPassword = PasswordUtils.authAdminPwd(authAdmin.getPassWord()); + + if (encryptedOldPassword.equals(storedEncryptedPassword) || + updateUserRequest.getOldPassword().equals(authAdmin.getPassWord()) || + encryptedOldPassword.equals(authAdmin.getPassWord())) { + + String newEncryptedPassword = PasswordUtils.authAdminPwd(updateUserRequest.getNewPassword()); + authAdmin.setPassWord(newEncryptedPassword); + authAdmin.setLastUpdatePwdTime(new Date()); + authAdminService.updateAuthAdmin(authAdmin); + + return ResultVOUtils.success("修改成功"); + } else { + return ResultVOUtils.error(500, "旧密码不正确！"); + } } else { return ResultVOUtils.error(500, "新密码与确认密码不相同！请重新修改！"); } - } + } diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index 1ad8a55b9..6cc237751 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -119,10 +119,10 @@ public class LoginController extends BaseController { // authLoginService.listRuleByAdminId(authAdmin.getId()); // cn.hutool.core.date.DateUtil.between(authAdmin.getLastUpdatePwdTime() == null ? - if (cn.hutool.core.date.DateUtil.between(authAdmin.getLastUpdatePwdTime() == null ? cn.hutool.core.date.DateUtil.date() : authAdmin.getLastUpdatePwdTime() - , cn.hutool.core.date.DateUtil.date(), DateUnit.DAY) >= 90) { - return ResultVOUtils.error(509, "密码已过期，请修改密码"); - } +// if (cn.hutool.core.date.DateUtil.between(authAdmin.getLastUpdatePwdTime() == null ? cn.hutool.core.date.DateUtil.date() : authAdmin.getLastUpdatePwdTime() +// , cn.hutool.core.date.DateUtil.date(), DateUnit.DAY) >= 90) { +// return ResultVOUtils.error(509, "密码已过期，请修改密码"); +// } Map claims = new HashMap<>(); claims.put("admin_id", authAdmin.getId());