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

ioshger0125 · Oct 30, 2023 · 670cd4a · 670cd4a
2 parents 4f84818 + 9398f07
commit 670cd4a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
@@ -24,8 +24,8 @@
 		<jakarta-servlet-api.version>6.0.0</jakarta-servlet-api.version>
 		<thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
 		<solon.version>2.5.3</solon.version>
-		<noear-redisx.version>1.4.8</noear-redisx.version>
-		<noear-snack3.version>3.2.79</noear-snack3.version>
+		<noear-redisx.version>1.6.0</noear-redisx.version>
+		<noear-snack3.version>3.2.80</noear-snack3.version>
 		<jfinal.version>4.9.17</jfinal.version>
 		<jboot.version>3.14.4</jboot.version>
 		<commons-pool2.version>2.5.0</commons-pool2.version>

diff --git a/...en-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java b/...en-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
@@ -101,7 +101,7 @@ public void updateTimeout(String key, long timeout) {
      */
     @Override
     public Object getObject(String key) {
-        return redisBucket.getAndDeserialize(key);
+        return redisBucket.getAndDeserialize(key, Object.class);
     }
 
     /**
@@ -156,7 +156,7 @@ public void updateObjectTimeout(String key, long timeout) {
     @Override
     public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
         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);
     }
 }
diff --git a/...-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java b/...-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java
@@ -102,7 +102,7 @@ public void updateTimeout(String key, long timeout) {
      */
     @Override
     public Object getObject(String key) {
-        return redisBucket.getAndDeserialize(key);
+        return redisBucket.getAndDeserialize(key, Object.class);
     }
 
     /**
@@ -157,7 +157,7 @@ public void updateObjectTimeout(String key, long timeout) {
     @Override
     public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
         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);
     }
 }