refactor: 重构 sa-token-fastjson、sa-token-fastjson2 适配 SPI 机制

sa-token-bom/pom.xml

@@ -116,12 +116,17 @@
             </dependency>
             <dependency>
                 <groupId>cn.dev33</groupId>
-                <artifactId>sa-token-redis-fastjson</artifactId>
+                <artifactId>sa-token-jackson</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
                 <groupId>cn.dev33</groupId>
-                <artifactId>sa-token-redis-fastjson2</artifactId>
+                <artifactId>sa-token-fastjson</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-fastjson2</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
@@ -194,11 +199,6 @@
                 <artifactId>sa-token-temp-jwt</artifactId>
                 <version>${revision}</version>
             </dependency>
-            <dependency>
-                <groupId>cn.dev33</groupId>
-                <artifactId>sa-token-jackson</artifactId>
-                <version>${revision}</version>
-            </dependency>
             <dependency>
                 <groupId>cn.dev33</groupId>
                 <artifactId>sa-token-redis-template-jdk-serializer</artifactId>

sa-token-plugin/pom.xml

@@ -22,9 +22,9 @@
         <module>sa-token-redis-template</module>
         <module>sa-token-redis-template-jdk-serializer</module>
         <module>sa-token-redis-jackson</module>
+        <module>sa-token-fastjson</module>
+        <module>sa-token-fastjson2</module>
 
-        <module>sa-token-redis-fastjson</module>
-        <module>sa-token-redis-fastjson2</module>
         <module>sa-token-redisson-jackson</module>
         <module>sa-token-redisson-jackson2</module>
         <module>sa-token-redisx</module>

sa-token-plugin/sa-token-alone-redis/pom.xml

@@ -25,17 +25,17 @@
         </dependency>
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-redis-jackson</artifactId>
+            <artifactId>sa-token-jackson</artifactId>
 			<optional>true</optional>
         </dependency>
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-redis-fastjson</artifactId>
+            <artifactId>sa-token-fastjson</artifactId>
 			<optional>true</optional>
         </dependency>
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-redis-fastjson2</artifactId>
+            <artifactId>sa-token-fastjson2</artifactId>
 			<optional>true</optional>
         </dependency>
         <!-- redis pool -->

sa-token-plugin/sa-token-fastjson/pom.xml

@@ -10,20 +10,13 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>sa-token-redis-fastjson</artifactId>
+    <artifactId>sa-token-fastjson</artifactId>
 
     <dependencies>
-        <!-- sa-token-spring-boot-starter -->
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-core</artifactId>
         </dependency>
-        <!-- RedisTemplate 相关操作API -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <!-- fastjson -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>

sa-token-plugin/sa-token-fastjson/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForFastjson.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.dev33.satoken.json;
+
+import cn.dev33.satoken.session.SaSessionForFastjsonCustomized;
+import com.alibaba.fastjson.JSON;
+
+import java.util.Map;
+
+/**
+ * JSON 转换器， Fastjson 版实现
+ * 
+ * @author click33
+ * @since 1.34.0
+ */
+public class SaJsonTemplateForFastjson implements SaJsonTemplate {
+
+	/**
+	 * 序列化：对象 -> json 字符串
+	 */
+	@Override
+	public String objectToJson(Object obj) {
+		return JSON.toJSONString(obj);
+	}
+
+	/**
+	 * 反序列化：json 字符串 → 对象
+	 */
+	@Override
+	public Object jsonToObject(String jsonStr) {
+		// TODO: 此处待更改，需要让其自动识别类型
+		return JSON.parseObject(jsonStr, SaSessionForFastjsonCustomized.class);
+	}
+
+	/**
+	 * 反序列化：json 字符串 → Map
+	 */
+	@Override
+	public Map<String, Object> jsonToMap(String jsonStr) {
+		return JSON.parseObject(jsonStr, Map.class);
+	}
+
+}

sa-token-plugin/sa-token-fastjson/src/main/java/cn/dev33/satoken/plugin/SaTokenPluginFastjson.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.dev33.satoken.plugin;
+
+import cn.dev33.satoken.SaManager;
+import cn.dev33.satoken.json.SaJsonTemplateForFastjson;
+import cn.dev33.satoken.session.SaSessionForFastjsonCustomized;
+import cn.dev33.satoken.strategy.SaStrategy;
+
+/**
+ * SaToken 插件安装：JSON 转换器 - Fastjson 版
+ *
+ * @author click33
+ * @since 1.41.0
+ */
+public class SaTokenPluginFastjson implements SaTokenPlugin {
+
+    @Override
+    public void setup() {
+
+        // 设置JSON转换器：Fastjson 版
+        SaManager.setSaJsonTemplate(new SaJsonTemplateForFastjson());
+
+        // 重写 SaSession 生成策略
+        SaStrategy.instance.createSession = SaSessionForFastjsonCustomized::new;
+
+    }
+
+}

sa-token-plugin/sa-token-fastjson/src/main/java/cn/dev33/satoken/session/SaSessionForFastjsonCustomized.java

@@ -13,16 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.dev33.satoken.dao;
+package cn.dev33.satoken.session;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.annotation.JSONField;
-
-import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.util.SaFoxUtil;
+import com.alibaba.fastjson.JSON;
 
 /**
- * Fastjson 定制版 SaSession，重写类型转换API、忽略 timeout 字段的序列化
+ * Fastjson 定制版 SaSession，重写类型转换API
  * 
  * @author click33
  * @since 1.34.0
@@ -31,10 +28,6 @@ public class SaSessionForFastjsonCustomized extends SaSession {
 
 	private static final long serialVersionUID = -7600983549653130681L;
 
-	public SaSessionForFastjsonCustomized() {
-		super();
-	}
-
 	/**
 	 * 构建一个 SaSession 对象
 	 * @param id Session 的 id
@@ -79,13 +72,4 @@ public class SaSessionForFastjsonCustomized extends SaSession {
 		return JSON.parseObject(getString(key), cs);
 	}
 
-	/**
-	 * 忽略 timeout 字段的序列化
-	 */
-	@Override
-	@JSONField(serialize = false)
-	public long timeout() {
-		return super.timeout();
-	}
-	
 }

sa-token-plugin/sa-token-fastjson/src/main/resources/META-INF/services/cn.dev33.satoken.plugin.SaTokenPlugin

@@ -0,0 +1 @@
+cn.dev33.satoken.plugin.SaTokenPluginFastjson

sa-token-plugin/sa-token-fastjson2/pom.xml

@@ -10,20 +10,13 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>sa-token-redis-fastjson2</artifactId>
+    <artifactId>sa-token-fastjson2</artifactId>
 
     <dependencies>
-        <!-- sa-token-spring-boot-starter -->
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-core</artifactId>
         </dependency>
-        <!-- RedisTemplate 相关操作API -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <!-- fastjson2 -->
         <dependency>
 			<groupId>com.alibaba.fastjson2</groupId>
 			<artifactId>fastjson2</artifactId>

sa-token-plugin/sa-token-fastjson2/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForFastjson2.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.dev33.satoken.json;
+
+
+import cn.dev33.satoken.session.SaSessionForFastjson2Customized;
+import com.alibaba.fastjson2.JSON;
+
+import java.util.Map;
+
+/**
+ * JSON 转换器， Fastjson 版实现
+ * 
+ * @author click33
+ * @since 1.34.0
+ */
+public class SaJsonTemplateForFastjson2 implements SaJsonTemplate {
+
+	/**
+	 * 序列化：对象 -> json 字符串
+	 */
+	@Override
+	public String objectToJson(Object obj) {
+		return JSON.toJSONString(obj);
+	}
+
+	/**
+	 * 反序列化：json 字符串 → 对象
+	 */
+	@Override
+	public Object jsonToObject(String jsonStr) {
+		// TODO: 此处待更改，需要让其自动识别类型
+		return JSON.parseObject(jsonStr, SaSessionForFastjson2Customized.class);
+	}
+
+	/**
+	 * 反序列化：json 字符串 → Map
+	 */
+	@Override
+	public Map<String, Object> jsonToMap(String jsonStr) {
+		return JSON.parseObject(jsonStr, Map.class);
+	}
+
+}

sa-token-plugin/sa-token-fastjson2/src/main/java/cn/dev33/satoken/plugin/SaTokenPluginFastjson2.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.dev33.satoken.plugin;
+
+import cn.dev33.satoken.SaManager;
+import cn.dev33.satoken.json.SaJsonTemplateForFastjson2;
+import cn.dev33.satoken.session.SaSessionForFastjson2Customized;
+import cn.dev33.satoken.strategy.SaStrategy;
+
+/**
+ * SaToken 插件安装：JSON 转换器 - Fastjson2 版
+ *
+ * @author click33
+ * @since 1.41.0
+ */
+public class SaTokenPluginFastjson2 implements SaTokenPlugin {
+
+    @Override
+    public void setup() {
+
+        // 设置 JSON 转换器：Fastjson2 版
+        SaManager.setSaJsonTemplate(new SaJsonTemplateForFastjson2());
+
+        // 重写 SaSession 生成策略
+        SaStrategy.instance.createSession = SaSessionForFastjson2Customized::new;
+
+
+    }
+
+}

sa-token-plugin/sa-token-fastjson2/src/main/java/cn/dev33/satoken/session/SaSessionForFastjson2Customized.java

@@ -13,13 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.dev33.satoken.dao;
+package cn.dev33.satoken.session;
 
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.annotation.JSONField;
-
-import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.util.SaFoxUtil;
+import com.alibaba.fastjson2.JSON;
 
 /**
  * Fastjson2 定制版 SaSession，重写类型转换API、忽略 timeout 字段的序列化
@@ -31,10 +28,6 @@ public class SaSessionForFastjson2Customized extends SaSession {
 
 	private static final long serialVersionUID = -7600983549653130681L;
 
-	public SaSessionForFastjson2Customized() {
-		super();
-	}
-
 	/**
 	 * 构建一个 SaSession 对象
 	 * @param id Session 的 id
@@ -79,13 +72,4 @@ public class SaSessionForFastjson2Customized extends SaSession {
 		return JSON.parseObject(getString(key), cs);
 	}
 
-	/**
-	 * 忽略 timeout 字段的序列化
-	 */
-	@Override
-	@JSONField(serialize = false)
-	public long timeout() {
-		return super.timeout();
-	}
-	
 }

sa-token-plugin/sa-token-fastjson2/src/main/resources/META-INF/services/cn.dev33.satoken.plugin.SaTokenPlugin

@@ -0,0 +1 @@
+cn.dev33.satoken.plugin.SaTokenPluginFastjson2

sa-token-plugin/sa-token-jackson/src/main/java/cn/dev33/satoken/json/SaJsonTemplateForJackson.java

@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.dev33.satoken.dao;
+package cn.dev33.satoken.json;
 
 import cn.dev33.satoken.exception.SaJsonConvertException;
-import cn.dev33.satoken.json.SaJsonTemplate;
 import cn.dev33.satoken.util.SaFoxUtil;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.core.JsonProcessingException;

sa-token-plugin/sa-token-jackson/src/main/java/cn/dev33/satoken/plugin/SaTokenPluginForJackson.java

@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.dev33.satoken.plugin.impl;
+package cn.dev33.satoken.plugin;
 
 import cn.dev33.satoken.SaManager;
-import cn.dev33.satoken.dao.SaJsonTemplateForJackson;
-import cn.dev33.satoken.plugin.SaTokenPlugin;
+import cn.dev33.satoken.json.SaJsonTemplateForJackson;
 
 /**
  * SaToken 插件：JSON 转换器安装

sa-token-plugin/sa-token-jackson/src/main/resources/META-INF/services/cn.dev33.satoken.plugin.SaTokenPlugin

@@ -1 +1 @@
-cn.dev33.satoken.plugin.impl.SaTokenPluginForJackson
+cn.dev33.satoken.plugin.SaTokenPluginForJackson

sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java

@@ -1,264 +0,0 @@
-/*
- * Copyright 2020-2099 sa-token.cc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.dev33.satoken.dao;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-import org.springframework.stereotype.Component;
-
-import com.alibaba.fastjson.JSON;
-
-import cn.dev33.satoken.session.SaSession;
-import cn.dev33.satoken.strategy.SaStrategy;
-import cn.dev33.satoken.util.SaFoxUtil;
-
-/**
- * Sa-Token 持久层实现 [ Redis存储、fastjson序列化 ]
- * 
- * @author sikadai
- * @since 1.34.0
- */
-@Component
-public class SaTokenDaoRedisFastjson implements SaTokenDao {
-
-	/**
-	 * String 读写专用
-	 */
-	public StringRedisTemplate stringRedisTemplate;	
-
-	/**
-	 * Object 读写专用
-	 */
-	public StringRedisTemplate objectRedisTemplate;
-
-	/**
-	 * 标记：是否已初始化成功
-	 */
-	public boolean isInit;
-	
-	@Autowired
-	public void init(RedisConnectionFactory connectionFactory) {
-		// 如果已经初始化成功了，就立刻退出，不重复初始化
-		if(this.isInit) {
-			return;
-		}
-
-		// 重写 SaSession 生成策略 
-		SaStrategy.instance.createSession = (sessionId) -> new SaSessionForFastjsonCustomized(sessionId);
-		
-		// 指定相应的序列化方案 
-		StringRedisSerializer keySerializer = new StringRedisSerializer();
-		StringRedisSerializer valueSerializer = new StringRedisSerializer();
-
-		// 构建StringRedisTemplate
-		StringRedisTemplate stringTemplate = new StringRedisTemplate();
-		stringTemplate.setConnectionFactory(connectionFactory);
-		stringTemplate.afterPropertiesSet();
-
-		// 构建RedisTemplate
-		StringRedisTemplate template = new StringRedisTemplate();
-		template.setConnectionFactory(connectionFactory);
-		template.setKeySerializer(keySerializer);
-		template.setHashKeySerializer(keySerializer);
-		template.setValueSerializer(valueSerializer);
-		template.setHashValueSerializer(valueSerializer);
-		template.afterPropertiesSet();
-
-		// 开始初始化相关组件 
-		this.stringRedisTemplate = stringTemplate;
-		this.objectRedisTemplate = template;
-
-		// 打上标记，表示已经初始化成功，后续无需再重新初始化
-		this.isInit = true;
-	}
-	
-	
-	/**
-	 * 获取Value，如无返空 
-	 */
-	@Override
-	public String get(String key) {
-		return stringRedisTemplate.opsForValue().get(key);
-	}
-
-	/**
-	 * 写入Value，并设定存活时间 (单位: 秒)
-	 */
-	@Override
-	public void set(String key, String value, long timeout) {
-		if(timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE)  {
-			return;
-		}
-		// 判断是否为永不过期 
-		if(timeout == SaTokenDao.NEVER_EXPIRE) {
-			stringRedisTemplate.opsForValue().set(key, value);
-		} else {
-			stringRedisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS);
-		}
-	}
-
-	/**
-	 * 修改指定key-value键值对 (过期时间不变) 
-	 */
-	@Override
-	public void update(String key, String value) {
-		long expire = getTimeout(key);
-		// -2 = 无此键 
-		if(expire == SaTokenDao.NOT_VALUE_EXPIRE) {
-			return;
-		}
-		this.set(key, value, expire);
-	}
-	
-	/**
-	 * 删除Value 
-	 */
-	@Override
-	public void delete(String key) {
-		stringRedisTemplate.delete(key);
-	}
-
-	/**
-	 * 获取Value的剩余存活时间 (单位: 秒) 
-	 */
-	@Override
-	public long getTimeout(String key) {
-		return stringRedisTemplate.getExpire(key);
-	}
-
-	/**
-	 * 修改Value的剩余存活时间 (单位: 秒) 
-	 */
-	@Override
-	public void updateTimeout(String key, long timeout) {
-		// 判断是否想要设置为永久
-		if(timeout == SaTokenDao.NEVER_EXPIRE) {
-			long expire = getTimeout(key);
-			if(expire == SaTokenDao.NEVER_EXPIRE) {
-				// 如果其已经被设置为永久，则不作任何处理 
-			} else {
-				// 如果尚未被设置为永久，那么再次set一次
-				this.set(key, this.get(key), timeout);
-			}
-			return;
-		}
-		stringRedisTemplate.expire(key, timeout, TimeUnit.SECONDS);
-	}
-	
-	
-	/**
-	 * 获取Object，如无返空 
-	 */
-	@Override
-	public Object getObject(String key) {
-		return objectRedisTemplate.opsForValue().get(key);
-	}
-
-	@Override
-	public SaSession getSession(String sessionId) {
-		Object obj = getObject(sessionId);
-		if (obj == null) {
-			return null;
-		}
-		return JSON.parseObject(obj.toString(), SaSessionForFastjsonCustomized.class);
-	}
-
-	/**
-	 * 写入Object，并设定存活时间 (单位: 秒) 
-	 */
-	@Override
-	public void setObject(String key, Object object, long timeout) {
-		if(timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE)  {
-			return;
-		}
-		String toValue = JSON.toJSONString(object);
-		// 判断是否为永不过期 
-		if(timeout == SaTokenDao.NEVER_EXPIRE) {
-			objectRedisTemplate.opsForValue().set(key, toValue);
-		} else {
-			objectRedisTemplate.opsForValue().set(key, toValue, timeout, TimeUnit.SECONDS);
-		}
-	}
-
-	/**
-	 * 更新Object (过期时间不变) 
-	 */
-	@Override
-	public void updateObject(String key, Object object) {
-		long expire = getObjectTimeout(key);
-		// -2 = 无此键 
-		if(expire == SaTokenDao.NOT_VALUE_EXPIRE) {
-			return;
-		}
-		this.setObject(key, object, expire);
-	}
-
-	/**
-	 * 删除Object 
-	 */
-	@Override
-	public void deleteObject(String key) {
-		objectRedisTemplate.delete(key);
-	}
-
-	/**
-	 * 获取Object的剩余存活时间 (单位: 秒)
-	 */
-	@Override
-	public long getObjectTimeout(String key) {
-		return objectRedisTemplate.getExpire(key);
-	}
-
-	/**
-	 * 修改Object的剩余存活时间 (单位: 秒)
-	 */
-	@Override
-	public void updateObjectTimeout(String key, long timeout) {
-		// 判断是否想要设置为永久
-		if(timeout == SaTokenDao.NEVER_EXPIRE) {
-			long expire = getObjectTimeout(key);
-			if(expire == SaTokenDao.NEVER_EXPIRE) {
-				// 如果其已经被设置为永久，则不作任何处理 
-			} else {
-				// 如果尚未被设置为永久，那么再次set一次
-				this.setObject(key, this.getObject(key), timeout);
-			}
-			return;
-		}
-		objectRedisTemplate.expire(key, timeout, TimeUnit.SECONDS);
-	}
-
-
-	
-	/**
-	 * 搜索数据 
-	 */
-	@Override
-	public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
-		Set<String> keys = stringRedisTemplate.keys(prefix + "*" + keyword + "*");
-		List<String> list = new ArrayList<>(keys);
-		return SaFoxUtil.searchList(list, start, size, sortType);
-	}
-	
-	
-}

sa-token-plugin/sa-token-redis-fastjson/src/main/resources/META-INF/spring.factories

@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.dev33.satoken.dao.SaTokenDaoRedisFastjson

sa-token-plugin/sa-token-redis-fastjson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +0,0 @@
-cn.dev33.satoken.dao.SaTokenDaoRedisFastjson

sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java

@@ -1,264 +0,0 @@
-/*
- * Copyright 2020-2099 sa-token.cc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.dev33.satoken.dao;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-import org.springframework.stereotype.Component;
-
-import com.alibaba.fastjson2.JSON;
-
-import cn.dev33.satoken.session.SaSession;
-import cn.dev33.satoken.strategy.SaStrategy;
-import cn.dev33.satoken.util.SaFoxUtil;
-
-/**
- * Sa-Token 持久层实现 [ Redis存储、fastjson2序列化 ]
- * 
- * @author sikadai
- * @since 1.34.0
- */
-@Component
-public class SaTokenDaoRedisFastjson2 implements SaTokenDao {
-
-	/**
-	 * String 读写专用
-	 */
-	public StringRedisTemplate stringRedisTemplate;	
-
-	/**
-	 * Object 读写专用
-	 */
-	public StringRedisTemplate objectRedisTemplate;
-
-	/**
-	 * 标记：是否已初始化成功
-	 */
-	public boolean isInit;
-	
-	@Autowired
-	public void init(RedisConnectionFactory connectionFactory) {
-		// 如果已经初始化成功了，就立刻退出，不重复初始化
-		if(this.isInit) {
-			return;
-		}
-
-		// 重写 SaSession 生成策略 
-		SaStrategy.instance.createSession = (sessionId) -> new SaSessionForFastjson2Customized(sessionId);
-		
-		// 指定相应的序列化方案 
-		StringRedisSerializer keySerializer = new StringRedisSerializer();
-		StringRedisSerializer valueSerializer = new StringRedisSerializer();
-
-		// 构建StringRedisTemplate
-		StringRedisTemplate stringTemplate = new StringRedisTemplate();
-		stringTemplate.setConnectionFactory(connectionFactory);
-		stringTemplate.afterPropertiesSet();
-
-		// 构建RedisTemplate
-		StringRedisTemplate template = new StringRedisTemplate();
-		template.setConnectionFactory(connectionFactory);
-		template.setKeySerializer(keySerializer);
-		template.setHashKeySerializer(keySerializer);
-		template.setValueSerializer(valueSerializer);
-		template.setHashValueSerializer(valueSerializer);
-		template.afterPropertiesSet();
-
-		// 开始初始化相关组件 
-		this.stringRedisTemplate = stringTemplate;
-		this.objectRedisTemplate = template;
-
-		// 打上标记，表示已经初始化成功，后续无需再重新初始化
-		this.isInit = true;
-	}
-	
-	
-	/**
-	 * 获取Value，如无返空 
-	 */
-	@Override
-	public String get(String key) {
-		return stringRedisTemplate.opsForValue().get(key);
-	}
-
-	/**
-	 * 写入Value，并设定存活时间 (单位: 秒)
-	 */
-	@Override
-	public void set(String key, String value, long timeout) {
-		if(timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE)  {
-			return;
-		}
-		// 判断是否为永不过期 
-		if(timeout == SaTokenDao.NEVER_EXPIRE) {
-			stringRedisTemplate.opsForValue().set(key, value);
-		} else {
-			stringRedisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS);
-		}
-	}
-
-	/**
-	 * 修改指定key-value键值对 (过期时间不变) 
-	 */
-	@Override
-	public void update(String key, String value) {
-		long expire = getTimeout(key);
-		// -2 = 无此键 
-		if(expire == SaTokenDao.NOT_VALUE_EXPIRE) {
-			return;
-		}
-		this.set(key, value, expire);
-	}
-	
-	/**
-	 * 删除Value 
-	 */
-	@Override
-	public void delete(String key) {
-		stringRedisTemplate.delete(key);
-	}
-
-	/**
-	 * 获取Value的剩余存活时间 (单位: 秒) 
-	 */
-	@Override
-	public long getTimeout(String key) {
-		return stringRedisTemplate.getExpire(key);
-	}
-
-	/**
-	 * 修改Value的剩余存活时间 (单位: 秒) 
-	 */
-	@Override
-	public void updateTimeout(String key, long timeout) {
-		// 判断是否想要设置为永久
-		if(timeout == SaTokenDao.NEVER_EXPIRE) {
-			long expire = getTimeout(key);
-			if(expire == SaTokenDao.NEVER_EXPIRE) {
-				// 如果其已经被设置为永久，则不作任何处理 
-			} else {
-				// 如果尚未被设置为永久，那么再次set一次
-				this.set(key, this.get(key), timeout);
-			}
-			return;
-		}
-		stringRedisTemplate.expire(key, timeout, TimeUnit.SECONDS);
-	}
-	
-	
-	/**
-	 * 获取Object，如无返空 
-	 */
-	@Override
-	public Object getObject(String key) {
-		return objectRedisTemplate.opsForValue().get(key);
-	}
-
-	@Override
-	public SaSession getSession(String sessionId) {
-		Object obj = getObject(sessionId);
-		if (obj == null) {
-			return null;
-		}
-		return JSON.parseObject(obj.toString(), SaSessionForFastjson2Customized.class);
-	}
-
-	/**
-	 * 写入Object，并设定存活时间 (单位: 秒) 
-	 */
-	@Override
-	public void setObject(String key, Object object, long timeout) {
-		if(timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE)  {
-			return;
-		}
-		String toValue = JSON.toJSONString(object);
-		// 判断是否为永不过期 
-		if(timeout == SaTokenDao.NEVER_EXPIRE) {
-			objectRedisTemplate.opsForValue().set(key, toValue);
-		} else {
-			objectRedisTemplate.opsForValue().set(key, toValue, timeout, TimeUnit.SECONDS);
-		}
-	}
-
-	/**
-	 * 更新Object (过期时间不变) 
-	 */
-	@Override
-	public void updateObject(String key, Object object) {
-		long expire = getObjectTimeout(key);
-		// -2 = 无此键 
-		if(expire == SaTokenDao.NOT_VALUE_EXPIRE) {
-			return;
-		}
-		this.setObject(key, object, expire);
-	}
-
-	/**
-	 * 删除Object 
-	 */
-	@Override
-	public void deleteObject(String key) {
-		objectRedisTemplate.delete(key);
-	}
-
-	/**
-	 * 获取Object的剩余存活时间 (单位: 秒)
-	 */
-	@Override
-	public long getObjectTimeout(String key) {
-		return objectRedisTemplate.getExpire(key);
-	}
-
-	/**
-	 * 修改Object的剩余存活时间 (单位: 秒)
-	 */
-	@Override
-	public void updateObjectTimeout(String key, long timeout) {
-		// 判断是否想要设置为永久
-		if(timeout == SaTokenDao.NEVER_EXPIRE) {
-			long expire = getObjectTimeout(key);
-			if(expire == SaTokenDao.NEVER_EXPIRE) {
-				// 如果其已经被设置为永久，则不作任何处理 
-			} else {
-				// 如果尚未被设置为永久，那么再次set一次
-				this.setObject(key, this.getObject(key), timeout);
-			}
-			return;
-		}
-		objectRedisTemplate.expire(key, timeout, TimeUnit.SECONDS);
-	}
-
-
-	
-	/**
-	 * 搜索数据 
-	 */
-	@Override
-	public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
-		Set<String> keys = stringRedisTemplate.keys(prefix + "*" + keyword + "*");
-		List<String> list = new ArrayList<>(keys);
-		return SaFoxUtil.searchList(list, start, size, sortType);
-	}
-	
-	
-}

sa-token-plugin/sa-token-redis-fastjson2/src/main/resources/META-INF/spring.factories

@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.dev33.satoken.dao.SaTokenDaoRedisFastjson2

sa-token-plugin/sa-token-redis-fastjson2/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +0,0 @@
-cn.dev33.satoken.dao.SaTokenDaoRedisFastjson2