From 387af986c6414f4236ad82b93383011d8f97a2e8 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sun, 14 May 2023 01:31:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=20redis=20=E5=92=8C=20rpc=20?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=9B=86=E6=88=90=E5=8C=85=E7=9A=84=E5=8C=85?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-plugin/pom.xml                        | 18 +++++++++---------
 sa-token-plugin/sa-token-alone-redis/pom.xml   |  8 ++++----
 .../satoken/dao/alone/SaAloneRedisInject.java  | 16 ++++++++--------
 .../.gitignore                                 |  0
 .../pom.xml                                    |  6 +++---
 .../SaTokenSecondContextCreatorForDubbo.java   |  0
 .../dubbo/SaTokenSecondContextForDubbo.java    |  0
 .../filter/SaTokenDubboConsumerFilter.java     |  0
 .../filter/SaTokenDubboProviderFilter.java     |  0
 .../context/dubbo/model/SaRequestForDubbo.java |  0
 .../dubbo/model/SaResponseForDubbo.java        |  0
 .../context/dubbo/model/SaStorageForDubbo.java |  0
 .../META-INF/dubbo/org.apache.dubbo.rpc.Filter |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 sa-token-plugin/sa-token-dubbo3/.gitignore     | 12 ++++++++++++
 .../pom.xml                                    |  6 +++---
 .../SaTokenSecondContextCreatorForDubbo3.java  |  0
 .../dubbo3/SaTokenSecondContextForDubbo3.java  |  0
 .../filter/SaTokenDubbo3ConsumerFilter.java    |  0
 .../filter/SaTokenDubbo3ProviderFilter.java    |  0
 .../dubbo3/model/SaRequestForDubbo3.java       |  0
 .../dubbo3/model/SaResponseForDubbo3.java      |  0
 .../dubbo3/model/SaStorageForDubbo3.java       |  0
 .../META-INF/dubbo/org.apache.dubbo.rpc.Filter |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 sa-token-plugin/sa-token-grpc/.gitignore       | 12 ++++++++++++
 .../pom.xml                                    |  2 +-
 .../SaTokenSecondContextCreatorForGrpc.java    |  0
 .../grpc/SaTokenSecondContextForGrpc.java      |  0
 .../grpc/constants/GrpcContextConstants.java   |  0
 .../grpc/context/SaTokenGrpcContext.java       |  0
 .../SaTokenContextGrpcServerInterceptor.java   |  0
 .../SaTokenGrpcClientInterceptor.java          |  0
 .../SaTokenGrpcServerInterceptor.java          |  0
 .../context/grpc/model/SaRequestForGrpc.java   |  0
 .../context/grpc/model/SaResponseForGrpc.java  |  0
 .../context/grpc/model/SaStorageForGrpc.java   |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 .../.gitignore                                 |  0
 .../pom.xml                                    |  2 +-
 .../dao/SaSessionForFastjsonCustomized.java    |  0
 .../satoken/dao/SaTokenDaoRedisFastjson.java   |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 .../.gitignore                                 |  0
 .../pom.xml                                    |  2 +-
 .../dao/SaSessionForFastjson2Customized.java   |  0
 .../satoken/dao/SaTokenDaoRedisFastjson2.java  |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 .../.gitignore                                 |  0
 .../pom.xml                                    |  4 ++--
 .../dao/SaSessionForJacksonCustomized.java     |  0
 .../satoken/dao/SaTokenDaoRedisJackson.java    |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 .../.gitignore                                 |  0
 .../pom.xml                                    |  4 ++--
 .../cn/dev33/satoken/dao/SaTokenDaoRedis.java  |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 .../.gitignore                                 |  0
 .../pom.xml                                    |  4 ++--
 .../dao/SaSessionForJacksonCustomized.java     |  0
 .../satoken/dao/SaTokenDaoRedissonJackson.java |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 .../README.md                                  |  6 +++---
 .../pom.xml                                    |  4 ++--
 .../cn/dev33/satoken/dao/SaSessionForJson.java |  0
 .../dev33/satoken/dao/SaTokenDaoOfRedis.java   |  0
 .../satoken/dao/SaTokenDaoOfRedisBase64.java   |  0
 .../satoken/dao/SaTokenDaoOfRedisJson.java     |  0
 .../src/test/java/demo/App.java                |  0
 .../src/test/java/demo/Config.java             |  4 ++--
 .../src/test/resources/app.yml                 |  2 +-
 79 files changed, 68 insertions(+), 44 deletions(-)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/.gitignore (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/pom.xml (87%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 create mode 100644 sa-token-plugin/sa-token-dubbo3/.gitignore
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/pom.xml (88%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 create mode 100644 sa-token-plugin/sa-token-grpc/.gitignore
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/pom.xml (95%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson => sa-token-redis-fastjson}/.gitignore (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson => sa-token-redis-fastjson}/pom.xml (95%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson => sa-token-redis-fastjson}/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson => sa-token-redis-fastjson}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson => sa-token-redis-fastjson}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson => sa-token-redis-fastjson}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson2 => sa-token-redis-fastjson2}/.gitignore (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson2 => sa-token-redis-fastjson2}/pom.xml (94%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson2 => sa-token-redis-fastjson2}/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson2 => sa-token-redis-fastjson2}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson2 => sa-token-redis-fastjson2}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson2 => sa-token-redis-fastjson2}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 rename sa-token-plugin/{sa-token-dao-redis-jackson => sa-token-redis-jackson}/.gitignore (100%)
 rename sa-token-plugin/{sa-token-dao-redis-jackson => sa-token-redis-jackson}/pom.xml (93%)
 rename sa-token-plugin/{sa-token-dao-redis-jackson => sa-token-redis-jackson}/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java (100%)
 rename sa-token-plugin/{sa-token-dao-redis-jackson => sa-token-redis-jackson}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java (100%)
 rename sa-token-plugin/{sa-token-dao-redis-jackson => sa-token-redis-jackson}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-dao-redis-jackson => sa-token-redis-jackson}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 rename sa-token-plugin/{sa-token-dao-redis => sa-token-redis}/.gitignore (100%)
 rename sa-token-plugin/{sa-token-dao-redis => sa-token-redis}/pom.xml (92%)
 rename sa-token-plugin/{sa-token-dao-redis => sa-token-redis}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java (100%)
 rename sa-token-plugin/{sa-token-dao-redis => sa-token-redis}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-dao-redis => sa-token-redis}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 rename sa-token-plugin/{sa-token-dao-redisson-jackson => sa-token-redisson-jackson}/.gitignore (100%)
 rename sa-token-plugin/{sa-token-dao-redisson-jackson => sa-token-redisson-jackson}/pom.xml (92%)
 rename sa-token-plugin/{sa-token-dao-redisson-jackson => sa-token-redisson-jackson}/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java (100%)
 rename sa-token-plugin/{sa-token-dao-redisson-jackson => sa-token-redisson-jackson}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java (100%)
 rename sa-token-plugin/{sa-token-dao-redisson-jackson => sa-token-redisson-jackson}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-dao-redisson-jackson => sa-token-redisson-jackson}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/README.md (65%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/pom.xml (93%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java (100%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java (100%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java (100%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java (100%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/src/test/java/demo/App.java (100%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/src/test/java/demo/Config.java (73%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/src/test/resources/app.yml (71%)

diff --git a/sa-token-plugin/pom.xml b/sa-token-plugin/pom.xml
index 9d9a871a..013c8d74 100644
--- a/sa-token-plugin/pom.xml
+++ b/sa-token-plugin/pom.xml
@@ -18,12 +18,12 @@
 	
 	<!-- 所有子模块 -->
     <modules>
-        <module>sa-token-dao-redis</module>
-        <module>sa-token-dao-redis-jackson</module>
-        <module>sa-token-dao-redis-fastjson</module>
-        <module>sa-token-dao-redis-fastjson2</module>
-        <module>sa-token-dao-redisson-jackson</module>
-        <module>sa-token-dao-redisx</module>
+        <module>sa-token-redis</module>
+        <module>sa-token-redis-jackson</module>
+        <module>sa-token-redis-fastjson</module>
+        <module>sa-token-redis-fastjson2</module>
+        <module>sa-token-redisson-jackson</module>
+        <module>sa-token-redisx</module>
         <module>sa-token-alone-redis</module>
         <module>sa-token-dialect-thymeleaf</module>
        	<module>sa-token-sso</module>
@@ -32,9 +32,9 @@
         <module>sa-token-spring-aop</module>
         <module>sa-token-temp-jwt</module>
         <module>sa-token-jwt</module>
-        <module>sa-token-context-dubbo</module>
-        <module>sa-token-context-dubbo3</module>
-        <module>sa-token-context-grpc</module>
+        <module>sa-token-dubbo</module>
+        <module>sa-token-dubbo3</module>
+        <module>sa-token-grpc</module>
     </modules>
 
 	<dependencies>
diff --git a/sa-token-plugin/sa-token-alone-redis/pom.xml b/sa-token-plugin/sa-token-alone-redis/pom.xml
index f20309de..8f22844a 100644
--- a/sa-token-plugin/sa-token-alone-redis/pom.xml
+++ b/sa-token-plugin/sa-token-alone-redis/pom.xml
@@ -20,22 +20,22 @@
 		<!-- Sa-Token Redis Dependency -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis</artifactId>
+            <artifactId>sa-token-redis</artifactId>
 			<optional>true</optional>
         </dependency>
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
 			<optional>true</optional>
         </dependency>
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-fastjson</artifactId>
+            <artifactId>sa-token-redis-fastjson</artifactId>
 			<optional>true</optional>
         </dependency>
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-fastjson2</artifactId>
+            <artifactId>sa-token-redis-fastjson2</artifactId>
 			<optional>true</optional>
         </dependency>
         <!-- redis pool -->
diff --git a/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java b/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
index ff7a6c07..a313c6f7 100644
--- a/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
+++ b/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
@@ -25,10 +25,10 @@ import java.util.stream.Collectors;
  * <p>
  *     使用方式：在引入 sa-token redis 集成相关包的前提下，继续引入当前依赖 <br> <br>
  *     注意事项：目前本依赖仅对以下插件有 Redis 分离效果： <br>
- *     sa-token-dao-redis  <br>
- *     sa-token-dao-redis-jackson  <br>
- *     sa-token-dao-redis-fastjson  <br>
- *     sa-token-dao-redis-fastjson2 <br>
+ *     sa-token-redis  <br>
+ *     sa-token-redis-jackson  <br>
+ *     sa-token-redis-fastjson  <br>
+ *     sa-token-redis-fastjson2 <br>
  * </p>
  *
  *
@@ -172,7 +172,7 @@ public class SaAloneRedisInject implements EnvironmentAware{
 			
 			// 3. 开始初始化 SaTokenDao ，此处需要依次判断开发者引入的是哪个 redis 库
 
-			// 如果开发者引入的是：sa-token-dao-redis
+			// 如果开发者引入的是：sa-token-redis
 			try {
 				Class.forName("cn.dev33.satoken.dao.SaTokenDaoRedis");
 				SaTokenDaoRedis dao = (SaTokenDaoRedis)saTokenDao;
@@ -181,7 +181,7 @@ public class SaAloneRedisInject implements EnvironmentAware{
 				return;
 			} catch (ClassNotFoundException e) {
 			}
-			// 如果开发者引入的是：sa-token-dao-redis-jackson
+			// 如果开发者引入的是：sa-token-redis-jackson
 			try {
 				Class.forName("cn.dev33.satoken.dao.SaTokenDaoRedisJackson");
 				SaTokenDaoRedisJackson dao = (SaTokenDaoRedisJackson)saTokenDao;
@@ -190,7 +190,7 @@ public class SaAloneRedisInject implements EnvironmentAware{
 				return;
 			} catch (ClassNotFoundException e) {
 			}
-			// 如果开发者引入的是：sa-token-dao-redis-fastjson
+			// 如果开发者引入的是：sa-token-redis-fastjson
 			try {
 				Class.forName("cn.dev33.satoken.dao.SaTokenDaoRedisFastjson");
 				SaTokenDaoRedisFastjson dao = (SaTokenDaoRedisFastjson)saTokenDao;
@@ -199,7 +199,7 @@ public class SaAloneRedisInject implements EnvironmentAware{
 				return;
 			} catch (ClassNotFoundException e) {
 			}
-			// 如果开发者引入的是：sa-token-dao-redis-fastjson2
+			// 如果开发者引入的是：sa-token-redis-fastjson2
 			try {
 				Class.forName("cn.dev33.satoken.dao.SaTokenDaoRedisFastjson2");
 				SaTokenDaoRedisFastjson2 dao = (SaTokenDaoRedisFastjson2)saTokenDao;
diff --git a/sa-token-plugin/sa-token-context-dubbo/.gitignore b/sa-token-plugin/sa-token-dubbo/.gitignore
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/.gitignore
rename to sa-token-plugin/sa-token-dubbo/.gitignore
diff --git a/sa-token-plugin/sa-token-context-dubbo/pom.xml b/sa-token-plugin/sa-token-dubbo/pom.xml
similarity index 87%
rename from sa-token-plugin/sa-token-context-dubbo/pom.xml
rename to sa-token-plugin/sa-token-dubbo/pom.xml
index 010d0c71..a7ca941d 100644
--- a/sa-token-plugin/sa-token-context-dubbo/pom.xml
+++ b/sa-token-plugin/sa-token-dubbo/pom.xml
@@ -12,9 +12,9 @@
     </parent>
     <packaging>jar</packaging>
 
-	<name>sa-token-context-dubbo</name>
-    <artifactId>sa-token-context-dubbo</artifactId>
-	<description>sa-token-context-dubbo</description>
+	<name>sa-token-dubbo</name>
+    <artifactId>sa-token-dubbo</artifactId>
+	<description>sa-token-dubbo</description>
 
 	<dependencies>
 		<!-- sa-token-core -->
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
rename to sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
rename to sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
rename to sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
rename to sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
rename to sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
rename to sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
rename to sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter b/sa-token-plugin/sa-token-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
rename to sa-token-plugin/sa-token-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-dubbo/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-dubbo/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-dubbo3/.gitignore b/sa-token-plugin/sa-token-dubbo3/.gitignore
new file mode 100644
index 00000000..f56feec7
--- /dev/null
+++ b/sa-token-plugin/sa-token-dubbo3/.gitignore
@@ -0,0 +1,12 @@
+target/
+
+node_modules/
+bin/
+.settings/
+unpackage/
+.classpath
+.project
+
+.factorypath
+
+.idea/
\ No newline at end of file
diff --git a/sa-token-plugin/sa-token-context-dubbo3/pom.xml b/sa-token-plugin/sa-token-dubbo3/pom.xml
similarity index 88%
rename from sa-token-plugin/sa-token-context-dubbo3/pom.xml
rename to sa-token-plugin/sa-token-dubbo3/pom.xml
index 2820c6c8..a974692a 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/pom.xml
+++ b/sa-token-plugin/sa-token-dubbo3/pom.xml
@@ -10,9 +10,9 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <name>sa-token-context-dubbo3</name>
-    <artifactId>sa-token-context-dubbo3</artifactId>
-    <description>sa-token-context-dubbo3</description>
+    <name>sa-token-dubbo3</name>
+    <artifactId>sa-token-dubbo3</artifactId>
+    <description>sa-token-dubbo3</description>
 
 
     <properties>
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
rename to sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
rename to sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
rename to sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
rename to sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
rename to sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
rename to sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
rename to sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter b/sa-token-plugin/sa-token-dubbo3/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
rename to sa-token-plugin/sa-token-dubbo3/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-dubbo3/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-dubbo3/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-dubbo3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-dubbo3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-grpc/.gitignore b/sa-token-plugin/sa-token-grpc/.gitignore
new file mode 100644
index 00000000..f56feec7
--- /dev/null
+++ b/sa-token-plugin/sa-token-grpc/.gitignore
@@ -0,0 +1,12 @@
+target/
+
+node_modules/
+bin/
+.settings/
+unpackage/
+.classpath
+.project
+
+.factorypath
+
+.idea/
\ No newline at end of file
diff --git a/sa-token-plugin/sa-token-context-grpc/pom.xml b/sa-token-plugin/sa-token-grpc/pom.xml
similarity index 95%
rename from sa-token-plugin/sa-token-context-grpc/pom.xml
rename to sa-token-plugin/sa-token-grpc/pom.xml
index 5ac2dd98..27a7c974 100644
--- a/sa-token-plugin/sa-token-context-grpc/pom.xml
+++ b/sa-token-plugin/sa-token-grpc/pom.xml
@@ -13,7 +13,7 @@
 
     <packaging>jar</packaging>
 
-    <artifactId>sa-token-context-grpc</artifactId>
+    <artifactId>sa-token-grpc</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-grpc/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-grpc/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-grpc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-grpc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson/.gitignore b/sa-token-plugin/sa-token-redis-fastjson/.gitignore
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson/.gitignore
rename to sa-token-plugin/sa-token-redis-fastjson/.gitignore
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson/pom.xml b/sa-token-plugin/sa-token-redis-fastjson/pom.xml
similarity index 95%
rename from sa-token-plugin/sa-token-dao-redis-fastjson/pom.xml
rename to sa-token-plugin/sa-token-redis-fastjson/pom.xml
index 6bfa1389..e5cdb72c 100644
--- a/sa-token-plugin/sa-token-dao-redis-fastjson/pom.xml
+++ b/sa-token-plugin/sa-token-redis-fastjson/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>sa-token-dao-redis-fastjson</artifactId>
+    <artifactId>sa-token-redis-fastjson</artifactId>
 
     <dependencies>
         <!-- sa-token-spring-boot-starter -->
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
rename to sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
rename to sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-redis-fastjson/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-redis-fastjson/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-redis-fastjson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-redis-fastjson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/.gitignore b/sa-token-plugin/sa-token-redis-fastjson2/.gitignore
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson2/.gitignore
rename to sa-token-plugin/sa-token-redis-fastjson2/.gitignore
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/pom.xml b/sa-token-plugin/sa-token-redis-fastjson2/pom.xml
similarity index 94%
rename from sa-token-plugin/sa-token-dao-redis-fastjson2/pom.xml
rename to sa-token-plugin/sa-token-redis-fastjson2/pom.xml
index 99fea3b8..82d43bc1 100644
--- a/sa-token-plugin/sa-token-dao-redis-fastjson2/pom.xml
+++ b/sa-token-plugin/sa-token-redis-fastjson2/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>sa-token-dao-redis-fastjson2</artifactId>
+    <artifactId>sa-token-redis-fastjson2</artifactId>
 
     <dependencies>
         <!-- sa-token-spring-boot-starter -->
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
rename to sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
rename to sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-redis-fastjson2/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-redis-fastjson2/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-redis-fastjson2/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-redis-fastjson2/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/.gitignore b/sa-token-plugin/sa-token-redis-jackson/.gitignore
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-jackson/.gitignore
rename to sa-token-plugin/sa-token-redis-jackson/.gitignore
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/pom.xml b/sa-token-plugin/sa-token-redis-jackson/pom.xml
similarity index 93%
rename from sa-token-plugin/sa-token-dao-redis-jackson/pom.xml
rename to sa-token-plugin/sa-token-redis-jackson/pom.xml
index 675e5862..4384248c 100644
--- a/sa-token-plugin/sa-token-dao-redis-jackson/pom.xml
+++ b/sa-token-plugin/sa-token-redis-jackson/pom.xml
@@ -12,8 +12,8 @@
     </parent>
     <packaging>jar</packaging>
 
-	<name>sa-token-dao-redis-jackson</name>
-    <artifactId>sa-token-dao-redis-jackson</artifactId>
+	<name>sa-token-redis-jackson</name>
+    <artifactId>sa-token-redis-jackson</artifactId>
 	<description>sa-token integrate redis (to jackson)</description>
 
 	<dependencies>
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
rename to sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
rename to sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-redis-jackson/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-jackson/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-redis-jackson/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-redis-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-redis-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-dao-redis/.gitignore b/sa-token-plugin/sa-token-redis/.gitignore
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis/.gitignore
rename to sa-token-plugin/sa-token-redis/.gitignore
diff --git a/sa-token-plugin/sa-token-dao-redis/pom.xml b/sa-token-plugin/sa-token-redis/pom.xml
similarity index 92%
rename from sa-token-plugin/sa-token-dao-redis/pom.xml
rename to sa-token-plugin/sa-token-redis/pom.xml
index f6e98186..a7603150 100644
--- a/sa-token-plugin/sa-token-dao-redis/pom.xml
+++ b/sa-token-plugin/sa-token-redis/pom.xml
@@ -12,8 +12,8 @@
     </parent>
     <packaging>jar</packaging>
 
-	<name>sa-token-dao-redis</name>
-    <artifactId>sa-token-dao-redis</artifactId>
+	<name>sa-token-redis</name>
+    <artifactId>sa-token-redis</artifactId>
 	<description>sa-token integrate redis</description>
 
 	<dependencies>
diff --git a/sa-token-plugin/sa-token-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java b/sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
rename to sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
diff --git a/sa-token-plugin/sa-token-dao-redis/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-redis/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-redis/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-dao-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-dao-redisson-jackson/.gitignore b/sa-token-plugin/sa-token-redisson-jackson/.gitignore
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisson-jackson/.gitignore
rename to sa-token-plugin/sa-token-redisson-jackson/.gitignore
diff --git a/sa-token-plugin/sa-token-dao-redisson-jackson/pom.xml b/sa-token-plugin/sa-token-redisson-jackson/pom.xml
similarity index 92%
rename from sa-token-plugin/sa-token-dao-redisson-jackson/pom.xml
rename to sa-token-plugin/sa-token-redisson-jackson/pom.xml
index 568c020e..882dd41b 100644
--- a/sa-token-plugin/sa-token-dao-redisson-jackson/pom.xml
+++ b/sa-token-plugin/sa-token-redisson-jackson/pom.xml
@@ -12,8 +12,8 @@
     </parent>
     <packaging>jar</packaging>
 
-	<name>sa-token-dao-redisson-jackson</name>
-    <artifactId>sa-token-dao-redisson-jackson</artifactId>
+	<name>sa-token-redisson-jackson</name>
+    <artifactId>sa-token-redisson-jackson</artifactId>
 	<description>sa-token integrate redisson (to jackson)</description>
 
 	<dependencies>
diff --git a/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
rename to sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
diff --git a/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
rename to sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
diff --git a/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-redisson-jackson/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisson-jackson/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-redisson-jackson/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-redisson-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisson-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-redisson-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-dao-redisx/README.md b/sa-token-plugin/sa-token-redisx/README.md
similarity index 65%
rename from sa-token-plugin/sa-token-dao-redisx/README.md
rename to sa-token-plugin/sa-token-redisx/README.md
index 95ccce2d..eb83983d 100644
--- a/sa-token-plugin/sa-token-dao-redisx/README.md
+++ b/sa-token-plugin/sa-token-redisx/README.md
@@ -1,12 +1,12 @@
 
-sa-token-dao-redisx 是中立的扩展。可任何应用开发框架下使用（springboot, solon, jfinal 等..）
+sa-token-redisx 是中立的扩展。可任何应用开发框架下使用（springboot, solon, jfinal 等..）
 
 ### 使用示例
 
 #### 1.配置
 
 ```yaml
-sa-token-dao: #名字可以随意取
+sa-token: #名字可以随意取
   redis:
     server: "localhost:6379"
     password: 123456
@@ -22,7 +22,7 @@ sa-token-dao: #名字可以随意取
 @Configuration
 public class Config {
     @Bean
-    public SaTokenDao saTokenDaoInit(@Inject("${sa-token-dao.redis}") SaTokenDaoOfRedis saTokenDao) {
+    public SaTokenDao saTokenDaoInit(@Inject("${sa-token.redis}") SaTokenDaoOfRedis saTokenDao) {
         return saTokenDao;
     }
 }
diff --git a/sa-token-plugin/sa-token-dao-redisx/pom.xml b/sa-token-plugin/sa-token-redisx/pom.xml
similarity index 93%
rename from sa-token-plugin/sa-token-dao-redisx/pom.xml
rename to sa-token-plugin/sa-token-redisx/pom.xml
index e7042391..d9e1c784 100644
--- a/sa-token-plugin/sa-token-dao-redisx/pom.xml
+++ b/sa-token-plugin/sa-token-redisx/pom.xml
@@ -12,8 +12,8 @@
     </parent>
     <packaging>jar</packaging>
 
-	<name>sa-token-dao-redisx</name>
-    <artifactId>sa-token-dao-redisx</artifactId>
+	<name>sa-token-redisx</name>
+    <artifactId>sa-token-redisx</artifactId>
 	<description>sa-token integrate redis</description>
 
 	<dependencies>
diff --git a/sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java
rename to sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java
diff --git a/sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java
rename to sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java
diff --git a/sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
rename to sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
diff --git a/sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
rename to sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
diff --git a/sa-token-plugin/sa-token-dao-redisx/src/test/java/demo/App.java b/sa-token-plugin/sa-token-redisx/src/test/java/demo/App.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisx/src/test/java/demo/App.java
rename to sa-token-plugin/sa-token-redisx/src/test/java/demo/App.java
diff --git a/sa-token-plugin/sa-token-dao-redisx/src/test/java/demo/Config.java b/sa-token-plugin/sa-token-redisx/src/test/java/demo/Config.java
similarity index 73%
rename from sa-token-plugin/sa-token-dao-redisx/src/test/java/demo/Config.java
rename to sa-token-plugin/sa-token-redisx/src/test/java/demo/Config.java
index 41f34b5c..4e763fc7 100644
--- a/sa-token-plugin/sa-token-dao-redisx/src/test/java/demo/Config.java
+++ b/sa-token-plugin/sa-token-redisx/src/test/java/demo/Config.java
@@ -13,14 +13,14 @@ import org.noear.solon.annotation.Inject;
 @Configuration
 public class Config {
     @Bean
-    public void saTokenDaoInit(@Inject("${sa-token-dao.redis}") SaTokenDaoOfRedis saTokenDao) {
+    public void saTokenDaoInit(@Inject("${sa-token.redis}") SaTokenDaoOfRedis saTokenDao) {
         //手动操作，可适用于任何框架
         SaManager.setSaTokenDao(saTokenDao);
     }
 
 
     @Bean
-    public SaTokenDao saTokenDaoInit2(@Inject("${sa-token-dao.redis}") SaTokenDaoOfRedis saTokenDao) {
+    public SaTokenDao saTokenDaoInit2(@Inject("${sa-token.redis}") SaTokenDaoOfRedis saTokenDao) {
         //Solon 项目，可用此案
         return saTokenDao;
     }
diff --git a/sa-token-plugin/sa-token-dao-redisx/src/test/resources/app.yml b/sa-token-plugin/sa-token-redisx/src/test/resources/app.yml
similarity index 71%
rename from sa-token-plugin/sa-token-dao-redisx/src/test/resources/app.yml
rename to sa-token-plugin/sa-token-redisx/src/test/resources/app.yml
index 3e45af02..e71d125c 100644
--- a/sa-token-plugin/sa-token-dao-redisx/src/test/resources/app.yml
+++ b/sa-token-plugin/sa-token-redisx/src/test/resources/app.yml
@@ -2,7 +2,7 @@
 
 
 
-sa-token-dao: #名字可以随意取
+sa-token: #名字可以随意取
   redis:
     server: "localhost:6379"
     password: 123456