From 8984ecba865b4ccbf542e4e612134306b8e05f75 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 09 Jul 2024 12:12:01 +0800
Subject: [PATCH] 记录用户登录IP地址和登录时间
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
index 3b67ad9..7163c44 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
@@ -73,13 +73,13 @@
currentUser.setSex(user.getSex());
if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
{
- return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+ return error("修改用户'" + loginUser.getUsername() + "'失败，手机号码已存在");
}
if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))
{
- return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+ return error("修改用户'" + loginUser.getUsername() + "'失败，邮箱账号已存在");
}
- if (userService.updateUserProfile(user) > 0)
+ if (userService.updateUserProfile(currentUser))
{
// 更新缓存用户信息
tokenService.setLoginUser(loginUser);
@@ -106,11 +106,12 @@
{
return error("新密码不能与旧密码相同");
}
- if (userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0)
+ newPassword = SecurityUtils.encryptPassword(newPassword);
+ if (userService.resetUserPwd(username, newPassword) > 0)
{
// 更新缓存用户密码
LoginUser loginUser = SecurityUtils.getLoginUser();
- loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+ loginUser.getSysUser().setPassword(newPassword);
tokenService.setLoginUser(loginUser);
return success();
}
--
Gitblit v1.9.3