From 1899a832b95c1060b7cdf2dd35ceaa0d7a0852d7 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 21 Oct 2024 17:15:30 +0800
Subject: [PATCH] 优化权限更新后同步缓存
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 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 41f82a9..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
@@ -66,27 +66,22 @@
public AjaxResult updateProfile(@RequestBody SysUser user)
{
LoginUser loginUser = SecurityUtils.getLoginUser();
- SysUser sysUser = loginUser.getSysUser();
- user.setUserName(sysUser.getUserName());
- if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
+ SysUser currentUser = loginUser.getSysUser();
+ currentUser.setNickName(user.getNickName());
+ currentUser.setEmail(user.getEmail());
+ currentUser.setPhonenumber(user.getPhonenumber());
+ currentUser.setSex(user.getSex());
+ if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
{
- return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+ return error("修改用户'" + loginUser.getUsername() + "'失败，手机号码已存在");
}
- else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
+ if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))
{
- return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+ return error("修改用户'" + loginUser.getUsername() + "'失败，邮箱账号已存在");
}
- user.setUserId(sysUser.getUserId());
- user.setPassword(null);
- user.setAvatar(null);
- user.setDeptId(null);
- if (userService.updateUserProfile(user) > 0)
+ if (userService.updateUserProfile(currentUser))
{
// 更新缓存用户信息
- loginUser.getSysUser().setNickName(user.getNickName());
- loginUser.getSysUser().setPhonenumber(user.getPhonenumber());
- loginUser.getSysUser().setEmail(user.getEmail());
- loginUser.getSysUser().setSex(user.getSex());
tokenService.setLoginUser(loginUser);
return success();
}
@@ -111,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