lsm/sa-token
1
0
Fork 0
mirror of https://gitee.com/dromara/sa-token.git synced 2025-05-06 21:57:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitee.com/dromara/sa-token into dev

Browse Source
This commit is contained in:
click33 2023-10-31 07:47:21 +08:00
commit 670cd4ae98
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sa-token-dependencies/pom.xml
View File

@ -24,8 +24,8 @@
<jakarta-servlet-api.version>6.0.0</jakarta-servlet-api.version> <jakarta-servlet-api.version>6.0.0</jakarta-servlet-api.version>
<thymeleaf.version>3.0.9.RELEASE</thymeleaf.version> <thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
<solon.version>2.5.3</solon.version> <solon.version>2.5.3</solon.version>
<noear-redisx.version>1.4.8</noear-redisx.version> <noear-redisx.version>1.6.0</noear-redisx.version>
<noear-snack3.version>3.2.79</noear-snack3.version> <noear-snack3.version>3.2.80</noear-snack3.version>
<jfinal.version>4.9.17</jfinal.version> <jfinal.version>4.9.17</jfinal.version>
<jboot.version>3.14.4</jboot.version> <jboot.version>3.14.4</jboot.version>
<commons-pool2.version>2.5.0</commons-pool2.version> <commons-pool2.version>2.5.0</commons-pool2.version>

4
sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
View File

@ -101,7 +101,7 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
*/ */
@Override @Override
public Object getObject(String key) { public Object getObject(String key) {
return redisBucket.getAndDeserialize(key); return redisBucket.getAndDeserialize(key, Object.class);
} }
/** /**
@ -156,7 +156,7 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
@Override @Override
public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) { public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
Set<String> keys = redisBucket.keys(prefix + "*" + keyword + "*"); Set<String> keys = redisBucket.keys(prefix + "*" + keyword + "*");
List<String> list = new ArrayList<>(keys); List<String> list = new ArrayList<String>(keys);
return SaFoxUtil.searchList(list, start, size, sortType); return SaFoxUtil.searchList(list, start, size, sortType);
} }
} }

4
sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java
View File

@ -102,7 +102,7 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
*/ */
@Override @Override
public Object getObject(String key) { public Object getObject(String key) {
return redisBucket.getAndDeserialize(key); return redisBucket.getAndDeserialize(key, Object.class);
} }
/** /**
@ -157,7 +157,7 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
@Override @Override
public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) { public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
Set<String> keys = redisBucket.keys(prefix + "*" + keyword + "*"); Set<String> keys = redisBucket.keys(prefix + "*" + keyword + "*");
List<String> list = new ArrayList<>(keys); List<String> list = new ArrayList<String>(keys);
return SaFoxUtil.searchList(list, start, size, sortType); return SaFoxUtil.searchList(list, start, size, sortType);
} }
} }