From d001eae26b90fe7ab6b0dd36a42aba1e727772fb 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, 26 Jun 2023 12:26:06 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E6=9B=B4=E6=8D=A2?=
 =?UTF-8?q?=20satoken=20dubbo=20=E6=8F=92=E4=BB=B6=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=8C=85=E5=90=8D=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../filter/SaTokenDubbo3ConsumerFilter.java}                | 6 +++---
 .../filter/SaTokenDubbo3ProviderFilter.java}                | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/{dubbo/filter/SaTokenDubboConsumerFilter.java => dubbo3/filter/SaTokenDubbo3ConsumerFilter.java} (90%)
 rename ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/{dubbo/filter/SaTokenDubboProviderFilter.java => dubbo3/filter/SaTokenDubbo3ProviderFilter.java} (88%)

diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java b/ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
similarity index 90%
rename from ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
rename to ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
index f7518b0df..4eb93a76a 100644
--- a/ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
+++ b/ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
@@ -1,4 +1,4 @@
-package cn.dev33.satoken.context.dubbo.filter;
+package cn.dev33.satoken.context.dubbo3.filter;
 
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.context.SaTokenContextDefaultImpl;
@@ -6,10 +6,10 @@ import cn.dev33.satoken.same.SaSameUtil;
 import cn.dev33.satoken.spring.SaBeanInject;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaTokenConsts;
-import com.ruoyi.common.core.utils.SpringUtils;
 import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.extension.Activate;
 import org.apache.dubbo.rpc.*;
+import org.dromara.common.core.utils.SpringUtils;
 
 /**
  *
@@ -21,7 +21,7 @@ import org.apache.dubbo.rpc.*;
  *
  */
 @Activate(group = {CommonConstants.CONSUMER}, order = Integer.MIN_VALUE)
-public class SaTokenDubboConsumerFilter implements Filter {
+public class SaTokenDubbo3ConsumerFilter implements Filter {
 
 	@Override
 	public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java b/ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
similarity index 88%
rename from ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
rename to ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
index 6436b9917..409f554a6 100644
--- a/ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
+++ b/ruoyi-common/ruoyi-common-dubbo/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
@@ -1,12 +1,12 @@
-package cn.dev33.satoken.context.dubbo.filter;
+package cn.dev33.satoken.context.dubbo3.filter;
 
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.same.SaSameUtil;
 import cn.dev33.satoken.spring.SaBeanInject;
-import com.ruoyi.common.core.utils.SpringUtils;
 import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.extension.Activate;
 import org.apache.dubbo.rpc.*;
+import org.dromara.common.core.utils.SpringUtils;
 
 /**
  *
@@ -18,7 +18,7 @@ import org.apache.dubbo.rpc.*;
  *
  */
 @Activate(group = {CommonConstants.PROVIDER}, order = Integer.MIN_VALUE)
-public class SaTokenDubboProviderFilter implements Filter {
+public class SaTokenDubbo3ProviderFilter implements Filter {
 
 	@Override
 	public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {