From dff7d70f0ab665494970e2f138671d5b925eb2ce Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 03 十二月 2021 19:13:15 +0800
Subject: [PATCH] update 更改角色刷新缓存
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 2 --
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 12 ++++++++++++
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 2 +-
ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java | 9 ++++++++-
4 files changed, 21 insertions(+), 4 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 0a45d73..2a1c545 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
@@ -11,7 +11,6 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.service.ISysMenuService;
-import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysLoginService;
import com.ruoyi.system.service.SysPermissionService;
import io.swagger.annotations.Api;
@@ -42,7 +41,6 @@
private final SysLoginService loginService;
private final ISysMenuService menuService;
- private final ISysUserService userService;
private final SysPermissionService permissionService;
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index 2a33918..1e82188 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -7,12 +7,16 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.LoginUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.SysPermissionService;
import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +40,7 @@
private final ISysRoleService roleService;
private final ISysUserService userService;
+ private final SysPermissionService permissionService;
@ApiOperation("鏌ヨ瑙掕壊淇℃伅鍒楄〃")
@SaCheckPermission("system:role:list")
@@ -97,6 +102,13 @@
}
if (roleService.updateRole(role) > 0) {
+ // 鏇存柊缂撳瓨鐢ㄦ埛鏉冮檺
+ LoginUser loginUser = getLoginUser();
+ SysUser sysUser = userService.selectUserById(loginUser.getUserId());
+ if (StringUtils.isNotNull(sysUser) && !sysUser.isAdmin()) {
+ loginUser.setMenuPermission(permissionService.getMenuPermission(sysUser));
+ LoginUtils.setLoginUser(loginUser);
+ }
return AjaxResult.success();
}
return AjaxResult.error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑱旂郴绠＄悊鍛�");
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 8aed41c..4c5e197 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -70,7 +70,7 @@
/**
* 鑾峰彇鐢ㄦ埛缂撳瓨淇℃伅
*/
- public LoginUser getUser() {
+ public LoginUser getLoginUser() {
return LoginUtils.getLoginUser();
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java
index 2544fe8..a5dc50e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java
@@ -24,7 +24,7 @@
*/
public static void login(LoginUser loginUser, UserType userType) {
StpUtil.login(userType.getUserType() + loginUser.getUserId());
- StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
+ setLoginUser(loginUser);
}
/**
@@ -34,6 +34,13 @@
*/
public static void loginByDevice(LoginUser loginUser, UserType userType, DeviceType deviceType) {
StpUtil.login(userType.getUserType() + loginUser.getUserId(), deviceType.getDevice());
+ setLoginUser(loginUser);
+ }
+
+ /**
+ * 璁剧疆鐢ㄦ埛鏁版嵁
+ */
+ public static void setLoginUser(LoginUser loginUser) {
StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
}
--
Gitblit v1.9.3