lsm/sa-token
1
0
Fork 0
mirror of https://gitee.com/dromara/sa-token.git synced 2025-04-05 17:37:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复 sa-token-dao-redis-fastjson 插件 session.getModel 无法反序列化实体类的问题。

Browse Source
This commit is contained in:
click33 2022-10-19 07:15:59 +08:00
parent f288855de1
commit 1c5653dae3
12 changed files with 268 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
View File

@ -208,6 +208,25 @@ public class SaFoxUtil {
// 正则匹配
return Pattern.matches(patt.replaceAll("\\*", ".*"), str);
}
/**
* 判断类型是否为8大包装类型
* @param cs /
* @return /
*/
public static boolean isWrapperType(Class<?> cs) {
return cs == Integer.class || cs == Short.class || cs == Long.class || cs == Byte.class
|| cs == Float.class || cs == Double.class || cs == Boolean.class || cs == Character.class;
}
/**
* 判断类型是否为基础类型：8大基本数据类型、8大包装类、String
* @param cs /
* @return /
*/
public static boolean isBasicType(Class<?> cs) {
return cs.isPrimitive() || isWrapperType(cs) || cs == String.class;
}
/**
* 将指定值转化为指定类型
@ -241,6 +260,8 @@ public class SaFoxUtil {
obj3 = Double.valueOf(obj2);
} else if (cs.equals(boolean.class) || cs.equals(Boolean.class)) {
obj3 = Boolean.valueOf(obj2);
} else if (cs.equals(char.class) || cs.equals(Character.class)) {
obj3 = obj2.charAt(0);
} else {
obj3 = (T)obj;
}

84
sa-token-demo/sa-token-demo-test/src/main/java/com/pj/model/SysUser.java Normal file
View File

@ -0,0 +1,84 @@
package com.pj.model;
/**
* User 实体类
*
* @author kong
* @since 2022-10-15
*/
public class SysUser {
public SysUser() {
}
public SysUser(long id, String name, int age) {
super();
this.id = id;
this.name = name;
this.age = age;
}
/**
* 用户id
*/
private long id;
/**
* 用户名称
*/
private String name;
/**
* 用户年龄
*/
private int age;
/**
* @return id
*/
public long getId() {
return id;
}
/**
* @param id 要设置的 id
*/
public void setId(long id) {
this.id = id;
}
/**
* @return name
*/
public String getName() {
return name;
}
/**
* @param name 要设置的 name
*/
public void setName(String name) {
this.name = name;
}
/**
* @return age
*/
public int getAge() {
return age;
}
/**
* @param age 要设置的 age
*/
public void setAge(int age) {
this.age = age;
}
@Override
public String toString() {
return "SysUser [id=" + id + ", name=" + name + ", age=" + age + "]";
}
}

21
sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
View File

@ -1,9 +1,11 @@
package com.pj.test;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.pj.util.AjaxJson;
import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.util.SaResult;
/**
* 测试专用Controller
@ -14,17 +16,26 @@ import com.pj.util.AjaxJson;
@RequestMapping("/test/")
public class TestController {
// 测试登录 ---- http://localhost:8081/test/login
@RequestMapping("login")
public SaResult login(@RequestParam(defaultValue = "10001") long id) {
StpUtil.login(id);
return SaResult.ok("登录成功");
}
// 测试 浏览器访问： http://localhost:8081/test/test
@RequestMapping("test")
public AjaxJson test() {
public SaResult test() {
System.out.println("------------进来了");
return AjaxJson.getSuccess();
// 返回
return SaResult.data("");
}
// 测试 浏览器访问： http://localhost:8081/test/test2
@RequestMapping("test2")
public AjaxJson test2() {
return AjaxJson.getSuccess();
public SaResult test2() {
return SaResult.ok();
}
}

17
sa-token-doc/start/new-version.md Normal file
View File

@ -0,0 +1,17 @@
# Sa-Token 最新版本
在线文档：[https://sa-token.dev33.cn/](https://sa-token.dev33.cn/)
---
正式版最新版本：
``` xml
<!-- Sa-Token 权限认证 -->
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-spring-boot-starter</artifactId>
<version>1.31.0</version>
</dependency>
```

6
sa-token-doc/use/session.md
View File

@ -140,10 +140,10 @@ session.logout();
``` java
@PostMapping("/resetPoints")
public void reset(HttpSession session) {
// 在HttpSession上写入一个值
// 在 HttpSession 上写入一个值
session.setAttribute("name", 66);
// 在SaSession进行取值
System.out.println(StpUtil.getSession().getAttribute("name")); // 输出null
// 在 SaSession 进行取值
System.out.println(StpUtil.getSession().get("name")); // 输出null
}
```
**要点：**

1
sa-token-plugin/pom.xml
View File

@ -22,6 +22,7 @@
<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-redisx</module>
<module>sa-token-dialect-thymeleaf</module>
<module>sa-token-sso</module>

1
sa-token-plugin/sa-token-dao-redis-fastjson/pom.xml
View File

@ -25,6 +25,7 @@
<artifactId>spring-boot-starter-data-redis</artifactId>
<version>2.3.3.RELEASE</version>
</dependency>
<!-- fastjson -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>

76
sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java Normal file
View File

@ -0,0 +1,76 @@
package cn.dev33.satoken.dao;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.annotation.JSONField;
import cn.dev33.satoken.session.SaSession;
import cn.dev33.satoken.util.SaFoxUtil;
/**
* Fastjson 定制版 SaSession，重写类型转换API
*
* @author kong
* @since 2022-10-19
*/
public class SaSessionForFastjsonCustomized extends SaSession {
private static final long serialVersionUID = -7600983549653130681L;
public SaSessionForFastjsonCustomized() {
super();
}
/**
* 构建一个 SaSession 对象
* @param id Session 的 id
*/
public SaSessionForFastjsonCustomized(String id) {
super(id);
}
/**
* 取值 (指定转换类型)
* @param <T> 泛型
* @param key key
* @param cs 指定转换类型
* @return 值
*/
@Override
public <T> T getModel(String key, Class<T> cs) {
if(SaFoxUtil.isBasicType(cs)) {
return SaFoxUtil.getValueByType(get(key), cs);
}
return JSON.parseObject(getString(key), cs);
}
/**
* 取值 (指定转换类型, 并指定值为Null时返回的默认值)
* @param <T> 泛型
* @param key key
* @param cs 指定转换类型
* @param defaultValue 值为Null时返回的默认值
* @return 值
*/
@Override
@SuppressWarnings("unchecked")
public <T> T getModel(String key, Class<T> cs, Object defaultValue) {
Object value = get(key);
if(valueIsNull(value)) {
return (T)defaultValue;
}
if(SaFoxUtil.isBasicType(cs)) {
return SaFoxUtil.getValueByType(get(key), cs);
}
return JSON.parseObject(getString(key), cs);
}
/**
* 忽略 timeout 字段的序列化
*/
@Override
@JSONField(serialize = false)
public long getTimeout() {
return super.getTimeout();
}
}

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

@ -1,18 +1,21 @@
package cn.dev33.satoken.dao;
import cn.dev33.satoken.session.SaSession;
import cn.dev33.satoken.util.SaFoxUtil;
import com.alibaba.fastjson.JSON;
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 java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
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版 (使用JSON字符串进行序列化)]
@ -44,6 +47,10 @@ public class SaTokenDaoRedisFastjson implements SaTokenDao {
if(this.isInit) {
return;
}
// 重写 SaSession 生成策略
SaStrategy.me.createSession = (sessionId) -> new SaSessionForFastjsonCustomized(sessionId);
System.out.println("------------------ 执行了");
// 指定相应的序列化方案
StringRedisSerializer keySerializer = new StringRedisSerializer();
@ -155,7 +162,7 @@ public class SaTokenDaoRedisFastjson implements SaTokenDao {
if (obj == null) {
return null;
}
return JSON.parseObject(obj.toString(), SaSession.class);
return JSON.parseObject(obj.toString(), SaSessionForFastjsonCustomized.class);
}
/**

4
sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
View File

@ -32,7 +32,7 @@ import cn.dev33.satoken.strategy.SaStrategy;
import cn.dev33.satoken.util.SaFoxUtil;
/**
* Sa-Token持久层接口 [Redis版] (使用 jackson 序列化方式)
* Sa-Token 持久层实现 [Redis存储、Jackson序列化]
*
* @author kong
*
@ -97,7 +97,7 @@ public class SaTokenDaoRedisJackson implements SaTokenDao {
timeModule.addSerializer(new LocalTimeSerializer(TIME_FORMATTER));
timeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(TIME_FORMATTER));
this.objectMapper.registerModule(timeModule);
// 重写Session生成策略
// 重写 SaSession 生成策略
SaStrategy.me.createSession = (sessionId) -> new SaSessionForJacksonCustomized(sessionId);
} catch (Exception e) {
System.err.println(e.getMessage());

2
sa-token-plugin/sa-token-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
View File

@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
import cn.dev33.satoken.util.SaFoxUtil;
/**
* Sa-Token持久层接口 [Redis版 (使用JDK默认序列化方式)]
* Sa-Token 持久层实现 [Redis存储、JDK默认序列化]
*
* @author kong
*

31
sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaFoxUtilTest.java
View File

@ -6,6 +6,7 @@ import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@ -108,6 +109,34 @@ public class SaFoxUtilTest {
Assertions.assertFalse(SaFoxUtil.vagueMatch("hello*", null));
}
@Test
public void isWrapperType() {
Assertions.assertTrue(SaFoxUtil.isWrapperType(Integer.class));
Assertions.assertTrue(SaFoxUtil.isWrapperType(Short.class));
Assertions.assertTrue(SaFoxUtil.isWrapperType(Long.class));
Assertions.assertTrue(SaFoxUtil.isWrapperType(Byte.class));
Assertions.assertTrue(SaFoxUtil.isWrapperType(Float.class));
Assertions.assertTrue(SaFoxUtil.isWrapperType(Double.class));
Assertions.assertTrue(SaFoxUtil.isWrapperType(Boolean.class));
Assertions.assertTrue(SaFoxUtil.isWrapperType(Character.class));
Assertions.assertFalse(SaFoxUtil.isWrapperType(int.class));
Assertions.assertFalse(SaFoxUtil.isWrapperType(long.class));
Assertions.assertFalse(SaFoxUtil.isWrapperType(Object.class));
}
@Test
public void isBasicType() {
Assertions.assertTrue(SaFoxUtil.isBasicType(int.class));
Assertions.assertTrue(SaFoxUtil.isBasicType(Integer.class));
Assertions.assertTrue(SaFoxUtil.isBasicType(long.class));
Assertions.assertTrue(SaFoxUtil.isBasicType(Long.class));
Assertions.assertTrue(SaFoxUtil.isBasicType(String.class));
Assertions.assertFalse(SaFoxUtil.isBasicType(List.class));
Assertions.assertFalse(SaFoxUtil.isBasicType(Map.class));
}
@Test
public void getValueByType() {
// 基础类型，转换
@ -125,6 +154,8 @@ public class SaFoxUtilTest {
Assertions.assertEquals(SaFoxUtil.getValueByType("1", Double.class), 1.0);
Assertions.assertEquals(SaFoxUtil.getValueByType("1", boolean.class), false);
Assertions.assertEquals(SaFoxUtil.getValueByType("1", Boolean.class), false);
Assertions.assertEquals(SaFoxUtil.getValueByType("1", char.class), '1');
Assertions.assertEquals(SaFoxUtil.getValueByType("1", Character.class), '1');
Assertions.assertEquals(SaFoxUtil.getValueByType(1, String.class), "1");
// 复杂类型，还原