From eeb60e2eefdaf04a6e1d2dc1ebd86d7c0d64ad55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Mon, 23 May 2022 17:46:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BD=BF=E7=94=A8=20SaStorage=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20DataPermissionHelper.getContext()=20?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/helper/DataPermissionHelper.java  | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataPermissionHelper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataPermissionHelper.java
index 38b30895..33cb1b0e 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataPermissionHelper.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataPermissionHelper.java
@@ -1,13 +1,11 @@
 package com.ruoyi.common.mybatis.helper;
 
+import cn.dev33.satoken.context.SaHolder;
+import cn.dev33.satoken.context.model.SaStorage;
 import cn.hutool.core.util.ObjectUtil;
-import com.ruoyi.common.core.utils.ServletUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.apache.dubbo.rpc.RpcContext;
-import org.apache.dubbo.rpc.RpcServiceContext;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -35,21 +33,11 @@ public class DataPermissionHelper {
     }
 
     public static Map<String, Object> getContext() {
-        HttpServletRequest request = ServletUtils.getRequest();
-        Object attribute;
-        if (request != null) {
-            attribute = request.getAttribute(DATA_PERMISSION_KEY);
-            if (ObjectUtil.isNull(attribute)) {
-                request.setAttribute(DATA_PERMISSION_KEY, new HashMap<>());
-                attribute = request.getAttribute(DATA_PERMISSION_KEY);
-            }
-        } else {
-            RpcServiceContext context = RpcContext.getServiceContext();
-            attribute = context.getObjectAttachment(DATA_PERMISSION_KEY);
-            if (ObjectUtil.isNull(attribute)) {
-                context.setObjectAttachment(DATA_PERMISSION_KEY, new HashMap<>());
-                attribute = context.getObjectAttachment(DATA_PERMISSION_KEY);
-            }
+        SaStorage saStorage = SaHolder.getStorage();
+        Object attribute = saStorage.get(DATA_PERMISSION_KEY);
+        if (ObjectUtil.isNull(attribute)) {
+            saStorage.set(DATA_PERMISSION_KEY, new HashMap<>());
+            attribute = saStorage.get(DATA_PERMISSION_KEY);
         }
         if (attribute instanceof Map) {
             return (Map<String, Object>) attribute;