From feb0d70c15516cdb132c1ea8575ca843f7ee14e5 Mon Sep 17 00:00:00 2001 From: liangwen <2357318727@qq.com> Date: Fri, 29 Aug 2025 14:16:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E7=BD=AE=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/system/SysLoginController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index 46672db..fb5e697 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginBody; import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.lang.LangUnit; @@ -77,9 +78,6 @@ public class SysLoginController extends BaseController @Autowired private EmailService emailService; - @Autowired - private LangUnit langUnit; - @PostConstruct public void init() { @@ -208,20 +206,22 @@ public class SysLoginController extends BaseController @ApiOperation(value = "3.5 重置密码") @ApiOperationSupport(order = 5) @PostMapping("/restPassword") - public AjaxResult restPassword(String email, String code, String uuid, String newPassword) + public AjaxResult restPassword(String email, String code, String uuid, String newPassword, HttpServletRequest request) { emailService.validateEmailCode(email, code, uuid); SysUser sysUser = userService.selectUserByEmail(email); + String language = global.getCurrentLanguage(request); + if (SecurityUtils.matchesPassword(newPassword, sysUser.getPassword())) { - return error(langUnit.getValueTag("sysProfile.updatePwd.1002","新密码不能与旧密码相同") ); + return error(MessageUtils.message("sysProfile.updatePwd.1002", language)); } if (userService.resetUserPwd(sysUser.getUserName(), SecurityUtils.encryptPassword(newPassword)) > 0) { return success(); } - return error(langUnit.getValueTag("sysProfile.updatePwd.1003","修改密码异常，请联系管理员") ); + return error(MessageUtils.message("sysProfile.updatePwd.1003", language)); } }