diff --git a/sa-token-plugin/pom.xml b/sa-token-plugin/pom.xml index a036b008..68766485 100644 --- a/sa-token-plugin/pom.xml +++ b/sa-token-plugin/pom.xml @@ -25,11 +25,11 @@ sa-token-fastjson sa-token-fastjson2 sa-token-hutool-timed-cache + sa-token-alone-redis sa-token-redisson-jackson sa-token-redisson-jackson2 sa-token-redisx - sa-token-alone-redis sa-token-dialect-thymeleaf sa-token-freemarker sa-token-sso diff --git a/sa-token-plugin/sa-token-alone-redis/pom.xml b/sa-token-plugin/sa-token-alone-redis/pom.xml index 4ee80f60..483c76df 100644 --- a/sa-token-plugin/sa-token-alone-redis/pom.xml +++ b/sa-token-plugin/sa-token-alone-redis/pom.xml @@ -24,20 +24,10 @@ true - cn.dev33 - sa-token-jackson + cn.dev33 + sa-token-redis-template-jdk-serializer true - - - cn.dev33 - sa-token-fastjson - true - - - cn.dev33 - sa-token-fastjson2 - true - + org.apache.commons 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 c051783a..7fc2938d 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 @@ -17,9 +17,8 @@ package cn.dev33.satoken.dao.alone; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.dao.SaTokenDaoDefaultImpl; -import cn.dev33.satoken.dao.SaTokenDaoRedisFastjson; -import cn.dev33.satoken.dao.SaTokenDaoRedisFastjson2; import cn.dev33.satoken.dao.SaTokenDaoForRedisTemplate; +import cn.dev33.satoken.dao.SaTokenDaoForRedisTemplateUseJdkSerializer; import cn.dev33.satoken.exception.SaTokenException; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.springframework.beans.factory.annotation.Autowired; @@ -44,10 +43,8 @@ import java.util.stream.Collectors; *

* 使用方式:在引入 sa-token redis 集成相关包的前提下,继续引入当前依赖

* 注意事项:目前本依赖仅对以下插件有 Redis 分离效果:
- * sa-token-redis
- * sa-token-redis-jackson
- * sa-token-redis-fastjson
- * sa-token-redis-fastjson2
+ * sa-token-redis-template
+ * sa-token-redis-template-jdk-serializer
*

* * @@ -212,7 +209,16 @@ public class SaAloneRedisInject implements EnvironmentAware{ // 3. 开始初始化 SaTokenDao ,此处需要依次判断开发者引入的是哪个 redis 库 - // 如果开发者引入的是:sa-token-redis + // 如果开发者引入的是:sa-token-redis-template-jdk-serializer + try { + Class.forName("cn.dev33.satoken.dao.SaTokenDaoForRedisTemplateUseJdkSerializer"); + SaTokenDaoForRedisTemplateUseJdkSerializer dao = (SaTokenDaoForRedisTemplateUseJdkSerializer)saTokenDao; + dao.isInit = false; + dao.init(factory); + return; + } catch (ClassNotFoundException ignored) { + } + // 如果开发者引入的是:sa-token-redis-template try { Class.forName("cn.dev33.satoken.dao.SaTokenDaoForRedisTemplate"); SaTokenDaoForRedisTemplate dao = (SaTokenDaoForRedisTemplate)saTokenDao; @@ -221,33 +227,6 @@ public class SaAloneRedisInject implements EnvironmentAware{ return; } catch (ClassNotFoundException ignored) { } - // TODO: 如果开发者引入的是:sa-token-redis-jdk-serializer -// try { -// Class.forName("cn.dev33.satoken.dao.SaTokenDaoForRedisTemplate"); -// SaTokenDaoRedisJackson dao = (SaTokenDaoRedisJackson)saTokenDao; -// dao.isInit = false; -// dao.init(factory); -// return; -// } catch (ClassNotFoundException ignored) { -// } - // 如果开发者引入的是:sa-token-redis-fastjson - try { - Class.forName("cn.dev33.satoken.dao.SaTokenDaoRedisFastjson"); - SaTokenDaoRedisFastjson dao = (SaTokenDaoRedisFastjson)saTokenDao; - dao.isInit = false; - dao.init(factory); - return; - } catch (ClassNotFoundException ignored) { - } - // 如果开发者引入的是:sa-token-redis-fastjson2 - try { - Class.forName("cn.dev33.satoken.dao.SaTokenDaoRedisFastjson2"); - SaTokenDaoRedisFastjson2 dao = (SaTokenDaoRedisFastjson2)saTokenDao; - dao.isInit = false; - dao.init(factory); - return; - } catch (ClassNotFoundException ignored) { - } // 至此,说明开发者一个 redis 插件也没引入,或者引入的 redis 插件不在 sa-token-alone-redis 的支持范围内 diff --git a/sa-token-plugin/sa-token-redis-template-jdk-serializer/src/main/java/cn/dev33/satoken/dao/SaTokenDaoForRedisTemplate.java b/sa-token-plugin/sa-token-redis-template-jdk-serializer/src/main/java/cn/dev33/satoken/dao/SaTokenDaoForRedisTemplate.java index b8ba5692..38b3574c 100644 --- a/sa-token-plugin/sa-token-redis-template-jdk-serializer/src/main/java/cn/dev33/satoken/dao/SaTokenDaoForRedisTemplate.java +++ b/sa-token-plugin/sa-token-redis-template-jdk-serializer/src/main/java/cn/dev33/satoken/dao/SaTokenDaoForRedisTemplate.java @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; /** * Sa-Token 持久层实现 [ RedisTemplate 存储 ] (可用环境: SpringBoot2、SpringBoot3) - *
copy by: sa-token-redis-template 插件 + *
copy by: sa-token-redis-template 插件 * * @author click33 * @since 1.34.0