liangwen/hb_resource_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复重置密码提示信息国际化报错问题

Browse Source
This commit is contained in:
liangwen 2025-08-29 14:16:53 +08:00
parent 5d12991a21
commit feb0d70c15
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
View File

@ -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.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody; import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.lang.LangUnit; import com.ruoyi.common.utils.lang.LangUnit;
@ -77,9 +78,6 @@ public class SysLoginController extends BaseController
@Autowired @Autowired
private EmailService emailService; private EmailService emailService;
@Autowired
private LangUnit langUnit;
@PostConstruct @PostConstruct
public void init() public void init()
{ {
@ -208,20 +206,22 @@ public class SysLoginController extends BaseController
@ApiOperation(value = "3.5 重置密码") @ApiOperation(value = "3.5 重置密码")
@ApiOperationSupport(order = 5) @ApiOperationSupport(order = 5)
@PostMapping("/restPassword") @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); emailService.validateEmailCode(email, code, uuid);
SysUser sysUser = userService.selectUserByEmail(email); SysUser sysUser = userService.selectUserByEmail(email);
String language = global.getCurrentLanguage(request);
if (SecurityUtils.matchesPassword(newPassword, sysUser.getPassword())) 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) if (userService.resetUserPwd(sysUser.getUserName(), SecurityUtils.encryptPassword(newPassword)) > 0)
{ {
return success(); return success();
} }
return error(langUnit.getValueTag("sysProfile.updatePwd.1003","修改密码异常，请联系管理员") ); return error(MessageUtils.message("sysProfile.updatePwd.1003", language));
} }
} }