From 098cb49576136aec0049fea8333ec87e143e626f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 22 Aug 2022 10:24:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Context=E4=BF=A1=E6=81=AF,?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=B3=84=E6=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/constant/UserConstants.java     |  5 -----
 .../security/context/PermissionContextHolder.java    | 12 +++++++++---
 .../framework/security/service/SysLoginService.java  |  4 ++++
 .../project/system/controller/SysRoleController.java |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/common/constant/UserConstants.java b/src/main/java/com/ruoyi/common/constant/UserConstants.java
index 737c9d5..c6c7797 100644
--- a/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -12,11 +12,6 @@ public class UserConstants
      */
     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/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java b/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java
index fcd93b6..2fcd65b 100644
--- a/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java
+++ b/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 @@ package com.ruoyi.framework.security.context;
  */
 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/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java b/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
index 3261d3b..9b7380e 100644
--- a/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
+++ b/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
@@ -89,6 +89,10 @@ public class SysLoginService
                 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/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java b/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
index 7bdd909..69f6366 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
@@ -251,7 +251,7 @@ public class SysRoleController extends BaseController
     /**
      * 获取对应角色部门树列表
      */
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/deptTree/{roleId}")
     public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
     {