From b90754839cd2b2ed5f35258cdb2fb5ff82f641b0 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Sun, 23 Feb 2025 18:28:51 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=96=B0=E5=A2=9E=20sa-token-demo/?= =?UTF-8?q?pom.xml=20=E4=BB=A5=E4=BE=BF=E5=9C=A8=20idea=20=E4=B8=AD?= =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=AF=BC=E5=85=A5=E6=89=80=E6=9C=89=20demo?= =?UTF-8?q?=20=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sa-token-demo/pom.xml | 79 +++++++++++++++++++ .../sa-token-demo-solon-redisson/pom.xml | 2 +- .../java/com/pj/satoken/SaTokenConfigure.java | 11 +-- sa-token-dependencies/pom.xml | 2 +- .../satoken/dao/SaTokenDaoForRedisson.java | 2 +- .../dev33/satoken/jboot/SaTokenCacheDao.java | 15 ++-- .../solon/dao/SaTokenDaoOfRedisJson.java | 5 +- .../dao/SaTokenDaoOfRedissonJackson.java | 3 +- 8 files changed, 98 insertions(+), 21 deletions(-) create mode 100644 sa-token-demo/pom.xml diff --git a/sa-token-demo/pom.xml b/sa-token-demo/pom.xml new file mode 100644 index 00000000..76af1051 --- /dev/null +++ b/sa-token-demo/pom.xml @@ -0,0 +1,79 @@ + + 4.0.0 + cn.dev33 + sa-token-demo + 0.0.1-SNAPSHOT + pom + + + + sa-token-demo-alone-redis + sa-token-demo-alone-redis-cluster + sa-token-demo-beetl + sa-token-demo-bom-import + sa-token-demo-case + sa-token-demo-dubbo/sa-token-demo-dubbo-provider + sa-token-demo-dubbo/sa-token-demo-dubbo-consumer + sa-token-demo-dubbo/sa-token-demo-dubbo3-provider + sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer + sa-token-demo-freemarker + sa-token-demo-grpc + sa-token-demo-hutool-timed-cache + sa-token-demo-jwt + sa-token-demo-oauth2/sa-token-demo-oauth2-server + sa-token-demo-oauth2/sa-token-demo-oauth2-client + sa-token-demo-quick-login + sa-token-demo-remember-me/sa-token-demo-remember-me-server + sa-token-demo-solon + sa-token-demo-solon-redisson + sa-token-demo-springboot + sa-token-demo-springboot3-redis + sa-token-demo-springboot-redis + sa-token-demo-springboot-redisson + sa-token-demo-ssm + sa-token-demo-sso/sa-token-demo-sso-server + sa-token-demo-sso/sa-token-demo-sso1-client + sa-token-demo-sso/sa-token-demo-sso2-client + sa-token-demo-sso/sa-token-demo-sso3-client + sa-token-demo-sso/sa-token-demo-sso3-client-test2 + sa-token-demo-sso/sa-token-demo-sso3-client-nosdk + sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon + sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon + sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon + sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon + sa-token-demo-test + sa-token-demo-thymeleaf + sa-token-demo-webflux + sa-token-demo-webflux-springboot3 + sa-token-demo-websocket + sa-token-demo-webflux-springboot3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sa-token-demo/sa-token-demo-solon-redisson/pom.xml b/sa-token-demo/sa-token-demo-solon-redisson/pom.xml index ff4c8836..9934d46f 100644 --- a/sa-token-demo/sa-token-demo-solon-redisson/pom.xml +++ b/sa-token-demo/sa-token-demo-solon-redisson/pom.xml @@ -49,7 +49,7 @@ cn.dev33 - sa-token-redisson-jackson2 + sa-token-redisson ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-solon-redisson/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-solon-redisson/src/main/java/com/pj/satoken/SaTokenConfigure.java index 3c2e72ef..fe686cf0 100644 --- a/sa-token-demo/sa-token-demo-solon-redisson/src/main/java/com/pj/satoken/SaTokenConfigure.java +++ b/sa-token-demo/sa-token-demo-solon-redisson/src/main/java/com/pj/satoken/SaTokenConfigure.java @@ -1,16 +1,13 @@ package com.pj.satoken; +import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.dao.SaTokenDao; -import cn.dev33.satoken.dao.SaTokenDaoRedissonJackson; +import cn.dev33.satoken.dao.SaTokenDaoForRedisson; import cn.dev33.satoken.solon.integration.SaTokenInterceptor; -import org.noear.solon.Solon; +import com.pj.util.AjaxJson; import org.noear.solon.annotation.Bean; import org.noear.solon.annotation.Configuration; - -import com.pj.util.AjaxJson; - -import cn.dev33.satoken.context.SaHolder; import org.noear.solon.annotation.Inject; import org.redisson.api.RedissonClient; import org.redisson.solon.RedissonSupplier; @@ -76,6 +73,6 @@ public class SaTokenConfigure { * */ @Bean public SaTokenDao saTokenDaoInit(RedissonClient redissonClient) { - return new SaTokenDaoRedissonJackson(redissonClient); + return new SaTokenDaoForRedisson(redissonClient); } } diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml index c027c52b..8e10d7f1 100644 --- a/sa-token-dependencies/pom.xml +++ b/sa-token-dependencies/pom.xml @@ -24,7 +24,7 @@ 6.0.0 3.0.9.RELEASE 2.3.34 - 3.0.4 + 3.0.1 1.6.2 3.2.88 4.9.17 diff --git a/sa-token-plugin/sa-token-redisson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoForRedisson.java b/sa-token-plugin/sa-token-redisson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoForRedisson.java index ff984324..71a8a692 100644 --- a/sa-token-plugin/sa-token-redisson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoForRedisson.java +++ b/sa-token-plugin/sa-token-redisson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoForRedisson.java @@ -28,7 +28,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; /** - * Sa-Token 持久层实现 [ Redisson客户端、Redis存储、Jackson序列化 ] + * Sa-Token 持久层实现 [ Redisson客户端、Redis存储 ] * * @author 疯狂的狮子Li * @author noear diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java index ccb65884..7beec111 100644 --- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java +++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java @@ -16,6 +16,7 @@ package cn.dev33.satoken.jboot; import cn.dev33.satoken.dao.SaTokenDao; +import cn.dev33.satoken.dao.auto.SaTokenDaoBySessionFollowObject; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.util.SaFoxUtil; import io.jboot.Jboot; @@ -35,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap; * 使用Jboot的缓存方法存取Token数据 */ @SuppressWarnings({"unchecked", "rawtypes"}) -public class SaTokenCacheDao implements SaTokenDao { +public class SaTokenCacheDao implements SaTokenDaoBySessionFollowObject { protected SaRedisCache saRedisCache; protected JbootSerializer serializer; @@ -236,32 +237,32 @@ public class SaTokenCacheDao implements SaTokenDao { @Override public SaSession getSession(String sessionId) { - return SaTokenDao.super.getSession(sessionId); + return SaTokenDaoBySessionFollowObject.super.getSession(sessionId); } @Override public void setSession(SaSession session, long timeout) { - SaTokenDao.super.setSession(session, timeout); + SaTokenDaoBySessionFollowObject.super.setSession(session, timeout); } @Override public void updateSession(SaSession session) { - SaTokenDao.super.updateSession(session); + SaTokenDaoBySessionFollowObject.super.updateSession(session); } @Override public void deleteSession(String sessionId) { - SaTokenDao.super.deleteSession(sessionId); + SaTokenDaoBySessionFollowObject.super.deleteSession(sessionId); } @Override public long getSessionTimeout(String sessionId) { - return SaTokenDao.super.getSessionTimeout(sessionId); + return SaTokenDaoBySessionFollowObject.super.getSessionTimeout(sessionId); } @Override public void updateSessionTimeout(String sessionId, long timeout) { - SaTokenDao.super.updateSessionTimeout(sessionId, timeout); + SaTokenDaoBySessionFollowObject.super.updateSessionTimeout(sessionId, timeout); } @Override diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java index 4b20b36a..c6ee6608 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java @@ -16,8 +16,7 @@ package cn.dev33.satoken.solon.dao; import cn.dev33.satoken.dao.SaTokenDao; -import cn.dev33.satoken.session.SaSession; -import cn.dev33.satoken.strategy.SaStrategy; +import cn.dev33.satoken.dao.auto.SaTokenDaoBySessionFollowObject; import cn.dev33.satoken.util.SaFoxUtil; import org.noear.redisx.RedisClient; import org.noear.redisx.plus.RedisBucket; @@ -34,7 +33,7 @@ import java.util.Set; * @author noear * @since 1.6 */ -public class SaTokenDaoOfRedisJson implements SaTokenDao { +public class SaTokenDaoOfRedisJson implements SaTokenDaoBySessionFollowObject { private final RedisBucket redisBucket; public SaTokenDaoOfRedisJson(Properties props) { diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedissonJackson.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedissonJackson.java index 0eb8eb3e..7d84e923 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedissonJackson.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedissonJackson.java @@ -16,6 +16,7 @@ package cn.dev33.satoken.solon.dao; import cn.dev33.satoken.dao.SaTokenDao; +import cn.dev33.satoken.dao.auto.SaTokenDaoBySessionFollowObject; import cn.dev33.satoken.strategy.SaStrategy; import cn.dev33.satoken.util.SaFoxUtil; import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -51,7 +52,7 @@ import java.util.stream.Stream; * @author noear * @since 1.34.0 */ -public class SaTokenDaoOfRedissonJackson implements SaTokenDao { +public class SaTokenDaoOfRedissonJackson implements SaTokenDaoBySessionFollowObject { public static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss"; public static final String DATE_PATTERN = "yyyy-MM-dd";