From 9d6b0b35a33a6d6abe56bb1b92135df01c5b4567 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 19 十二月 2022 14:30:01 +0800
Subject: [PATCH] update redisson 3.18.0 => 3.19.0
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java | 17 ++++-------------
pom.xml | 2 +-
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3de969c..ab3f102 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<hutool.version>5.8.10</hutool.version>
<okhttp.version>4.10.0</okhttp.version>
<spring-boot-admin.version>2.7.7</spring-boot-admin.version>
- <redisson.version>3.18.0</redisson.version>
+ <redisson.version>3.19.0</redisson.version>
<lock4j.version>2.2.3</lock4j.version>
<dynamic-ds.version>3.5.2</dynamic-ds.version>
<alibaba-ttl.version>2.14.2</alibaba-ttl.version>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java
index 80f5f52..ecba4ca 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java
@@ -4,7 +4,6 @@
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.redisson.api.*;
-import org.redisson.config.Config;
import java.time.Duration;
import java.util.Collection;
@@ -26,14 +25,6 @@
public class RedisUtils {
private static final RedissonClient CLIENT = SpringUtils.getBean(RedissonClient.class);
-
- public static NameMapper getNameMapper() {
- Config config = CLIENT.getConfig();
- if (config.isClusterConfig()) {
- return config.useClusterServers().getNameMapper();
- }
- return config.useSingleServer().getNameMapper();
- }
/**
* 闄愭祦
@@ -437,8 +428,8 @@
* @return 瀵硅薄鍒楄〃
*/
public static Collection<String> keys(final String pattern) {
- Stream<String> stream = CLIENT.getKeys().getKeysStreamByPattern(getNameMapper().map(pattern));
- return stream.map(key -> getNameMapper().unmap(key)).collect(Collectors.toList());
+ Stream<String> stream = CLIENT.getKeys().getKeysStreamByPattern(pattern);
+ return stream.collect(Collectors.toList());
}
/**
@@ -447,7 +438,7 @@
* @param pattern 瀛楃涓插墠缂�
*/
public static void deleteKeys(final String pattern) {
- CLIENT.getKeys().deleteByPattern(getNameMapper().map(pattern));
+ CLIENT.getKeys().deleteByPattern(pattern);
}
/**
@@ -457,6 +448,6 @@
*/
public static Boolean hasKey(String key) {
RKeys rKeys = CLIENT.getKeys();
- return rKeys.countExists(getNameMapper().map(key)) > 0;
+ return rKeys.countExists(key) > 0;
}
}
--
Gitblit v1.9.3