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)); } }