From aadb7a41cb4c69177a0251c251813070f7f97cd5 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 22 八月 2022 10:24:20 +0800
Subject: [PATCH] 优化Context信息,防止泄漏问题
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 4 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 3 +--
ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java | 12 +++++++++---
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java | 5 -----
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 1 -
5 files changed, 14 insertions(+), 11 deletions(-)
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 76731f0..a2c8d4d 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
@@ -251,7 +251,7 @@
/**
* 鑾峰彇瀵瑰簲瑙掕壊閮ㄩ棬鏍戝垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping(value = "/deptTree/{roleId}")
public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
{
@@ -260,5 +260,4 @@
ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
return ajax;
}
-
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
index 737c9d5..c6c7797 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -12,11 +12,6 @@
*/
public static final String SYS_USER = "SYS_USER";
- /**
- * ss鏍囪鐨勬潈闄愬瓧绗�
- */
- public static final String SS_PERMISSION = "SS_PERMISSION";
-
/** 姝ｅ父鐘舵�� */
public static final String NORMAL = "0";
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java
index fcd93b6..2fcd65b 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java
@@ -1,5 +1,9 @@
package com.ruoyi.framework.security.context;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import com.ruoyi.common.core.text.Convert;
+
/**
* 鏉冮檺淇℃伅
*
@@ -7,15 +11,17 @@
*/
public class PermissionContextHolder
{
- private static final ThreadLocal<String> contextHolder = new ThreadLocal<>();
+ private static final String PERMISSION_CONTEXT_ATTRIBUTES = "PERMISSION_CONTEXT";
public static void setContext(String permission)
{
- contextHolder.set(permission);
+ RequestContextHolder.currentRequestAttributes().setAttribute(PERMISSION_CONTEXT_ATTRIBUTES, permission,
+ RequestAttributes.SCOPE_REQUEST);
}
public static String getContext()
{
- return contextHolder.get();
+ return Convert.toStr(RequestContextHolder.currentRequestAttributes().getAttribute(PERMISSION_CONTEXT_ATTRIBUTES,
+ RequestAttributes.SCOPE_REQUEST));
}
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index 08157b6..56669a7 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -89,6 +89,10 @@
throw new ServiceException(e.getMessage());
}
}
+ finally
+ {
+ AuthenticationContextHolder.clearContext();
+ }
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
LoginUser loginUser = (LoginUser) authentication.getPrincipal();
recordLoginInfo(loginUser.getUserId());
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index a8dc0b9..e90f6ba 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -118,7 +118,6 @@
where m.status = '0' and rm.role_id = #{roleId}
</select>
-
<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
<include refid="selectMenuVo"/>
where menu_id = #{menuId}
--
Gitblit v1.9.3