From 3addd684d64f50a07966b401ae5d8f74b4b4eab4 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Sun, 21 Aug 2022 15:38:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=92=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=EF=BC=9Asa-token-dao-redis-string=20->=20sa-token-dao?= =?UTF-8?q?-redis-fastjson?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sa-token-plugin/pom.xml | 2 +- .../.gitignore | 0 .../pom.xml | 2 +- .../satoken/dao/SaTokenDaoRedisFastjson.java} | 17 ++++++++++------- .../main/resources/META-INF/spring.factories | 2 +- .../satoken/dao/SaTokenDaoRedisJackson.java | 12 +++++++----- .../cn/dev33/satoken/dao/SaTokenDaoRedis.java | 13 ++++++++----- 7 files changed, 28 insertions(+), 20 deletions(-) rename sa-token-plugin/{sa-token-dao-redis-string => sa-token-dao-redis-fastjson}/.gitignore (100%) rename sa-token-plugin/{sa-token-dao-redis-string => sa-token-dao-redis-fastjson}/pom.xml (94%) rename sa-token-plugin/{sa-token-dao-redis-string/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisString.java => sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java} (95%) rename sa-token-plugin/{sa-token-dao-redis-string => sa-token-dao-redis-fastjson}/src/main/resources/META-INF/spring.factories (59%) diff --git a/sa-token-plugin/pom.xml b/sa-token-plugin/pom.xml index 61ad0051..36c831c7 100644 --- a/sa-token-plugin/pom.xml +++ b/sa-token-plugin/pom.xml @@ -21,8 +21,8 @@ sa-token-alone-redis sa-token-dao-redis sa-token-dao-redis-jackson + sa-token-dao-redis-fastjson sa-token-dao-redisx - sa-token-dao-redis-string sa-token-dialect-thymeleaf sa-token-sso sa-token-oauth2 diff --git a/sa-token-plugin/sa-token-dao-redis-string/.gitignore b/sa-token-plugin/sa-token-dao-redis-fastjson/.gitignore similarity index 100% rename from sa-token-plugin/sa-token-dao-redis-string/.gitignore rename to sa-token-plugin/sa-token-dao-redis-fastjson/.gitignore diff --git a/sa-token-plugin/sa-token-dao-redis-string/pom.xml b/sa-token-plugin/sa-token-dao-redis-fastjson/pom.xml similarity index 94% rename from sa-token-plugin/sa-token-dao-redis-string/pom.xml rename to sa-token-plugin/sa-token-dao-redis-fastjson/pom.xml index fbf0d58d..97a4d7f6 100644 --- a/sa-token-plugin/sa-token-dao-redis-string/pom.xml +++ b/sa-token-plugin/sa-token-dao-redis-fastjson/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - sa-token-dao-redix-string + sa-token-dao-redis-fastjson diff --git a/sa-token-plugin/sa-token-dao-redis-string/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisString.java b/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java similarity index 95% rename from sa-token-plugin/sa-token-dao-redis-string/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisString.java rename to sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java index 9a588605..ff68bdde 100644 --- a/sa-token-plugin/sa-token-dao-redis-string/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisString.java +++ b/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java @@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit; * */ @Component -public class SaTokenDaoRedisString implements SaTokenDao { +public class SaTokenDaoRedisFastjson implements SaTokenDao { /** * String专用 @@ -29,7 +29,7 @@ public class SaTokenDaoRedisString implements SaTokenDao { public StringRedisTemplate stringRedisTemplate; /** - * Objecy专用 + * Object专用 */ public StringRedisTemplate objectRedisTemplate; @@ -40,6 +40,11 @@ public class SaTokenDaoRedisString implements SaTokenDao { @Autowired public void init(RedisConnectionFactory connectionFactory) { + // 不重复初始化 + if(this.isInit) { + return; + } + // 指定相应的序列化方案 StringRedisSerializer keySerializer = new StringRedisSerializer(); StringRedisSerializer valueSerializer = new StringRedisSerializer(); @@ -57,11 +62,9 @@ public class SaTokenDaoRedisString implements SaTokenDao { template.afterPropertiesSet(); // 开始初始化相关组件 - if(!this.isInit) { - this.stringRedisTemplate = stringTemplate; - this.objectRedisTemplate = template; - this.isInit = true; - } + this.stringRedisTemplate = stringTemplate; + this.objectRedisTemplate = template; + this.isInit = true; } diff --git a/sa-token-plugin/sa-token-dao-redis-string/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/resources/META-INF/spring.factories similarity index 59% rename from sa-token-plugin/sa-token-dao-redis-string/src/main/resources/META-INF/spring.factories rename to sa-token-plugin/sa-token-dao-redis-fastjson/src/main/resources/META-INF/spring.factories index 09ff20cb..b88e60f8 100644 --- a/sa-token-plugin/sa-token-dao-redis-string/src/main/resources/META-INF/spring.factories +++ b/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.dev33.satoken.dao.SaTokenDaoRedisString \ No newline at end of file +org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.dev33.satoken.dao.SaTokenDaoRedisFastjson \ No newline at end of file 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-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java index 98c3a2a4..d81207f5 100644 --- a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java +++ b/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java @@ -69,6 +69,10 @@ public class SaTokenDaoRedisJackson implements SaTokenDao { @Autowired public void init(RedisConnectionFactory connectionFactory) { + // 不重复初始化 + if(this.isInit) { + return; + } // 指定相应的序列化方案 StringRedisSerializer keySerializer = new StringRedisSerializer(); @@ -112,11 +116,9 @@ public class SaTokenDaoRedisJackson implements SaTokenDao { template.afterPropertiesSet(); // 开始初始化相关组件 - if(this.isInit == false) { - this.stringRedisTemplate = stringTemplate; - this.objectRedisTemplate = template; - this.isInit = true; - } + this.stringRedisTemplate = stringTemplate; + this.objectRedisTemplate = template; + this.isInit = true; } 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-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java index a4bf7870..dcfd6aee 100644 --- a/sa-token-plugin/sa-token-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java +++ b/sa-token-plugin/sa-token-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java @@ -41,6 +41,11 @@ public class SaTokenDaoRedis implements SaTokenDao { @Autowired public void init(RedisConnectionFactory connectionFactory) { + // 不重复初始化 + if(this.isInit) { + return; + } + // 指定相应的序列化方案 StringRedisSerializer keySerializer = new StringRedisSerializer(); JdkSerializationRedisSerializer valueSerializer = new JdkSerializationRedisSerializer(); @@ -58,11 +63,9 @@ public class SaTokenDaoRedis implements SaTokenDao { template.afterPropertiesSet(); // 开始初始化相关组件 - if(this.isInit == false) { - this.stringRedisTemplate = stringTemplate; - this.objectRedisTemplate = template; - this.isInit = true; - } + this.stringRedisTemplate = stringTemplate; + this.objectRedisTemplate = template; + this.isInit = true; }