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 @@ 6.0.0 3.0.9.RELEASE 2.5.3 - 1.4.8 - 3.2.79 + 1.6.0 + 3.2.80 4.9.17 3.14.4 2.5.0 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 searchData(String prefix, String keyword, int start, int size, boolean sortType) { Set keys = redisBucket.keys(prefix + "*" + keyword + "*"); - List list = new ArrayList<>(keys); + List list = new ArrayList(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 searchData(String prefix, String keyword, int start, int size, boolean sortType) { Set keys = redisBucket.keys(prefix + "*" + keyword + "*"); - List list = new ArrayList<>(keys); + List list = new ArrayList(keys); return SaFoxUtil.searchList(list, start, size, sortType); } } \ No newline at end of file