From 8826565f6ac334b7a9e2953ebb208063d5f7ff50 Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Wed, 18 Oct 2023 18:18:15 +0800
Subject: [PATCH] =?UTF-8?q?redisx=20=E6=A1=86=E6=9E=B6=E5=8D=87=E4=B8=BA?=
 =?UTF-8?q?=201.6.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-dependencies/pom.xml                                 | 4 ++--
 .../java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java    | 4 ++--
 .../cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
index e9898cab..77448568 100644
--- 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/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
index 410b7336..dafb2ae4 100644
--- a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
+++ b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
@@ -101,7 +101,7 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
      */
     @Override
     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
     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);
     }
 }
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java
index 5a2f2114..2fa5771d 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java
@@ -102,7 +102,7 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
      */
     @Override
     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
     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);
     }
 }
\ No newline at end of file