diff --git a/pom.xml b/pom.xml index f225fe8e..08d8706b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 5.2.3 3.1.3 5.8.10 - 3.18.0 + 3.19.0 2.2.3 2.3.1 1.33.0 diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/utils/RedisUtils.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/utils/RedisUtils.java index 2af32fca..ce49c735 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/utils/RedisUtils.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/utils/RedisUtils.java @@ -4,7 +4,6 @@ import com.ruoyi.common.core.utils.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.redisson.api.*; -import org.redisson.config.Config; import java.time.Duration; import java.util.Collection; @@ -27,14 +26,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 @@ public class RedisUtils { * @return 对象列表 */ public static Collection keys(final String pattern) { - Stream stream = CLIENT.getKeys().getKeysStreamByPattern(getNameMapper().map(pattern)); - return stream.map(key -> getNameMapper().unmap(key)).collect(Collectors.toList()); + Stream stream = CLIENT.getKeys().getKeysStreamByPattern(pattern); + return stream.collect(Collectors.toList()); } /** @@ -447,7 +438,7 @@ public class RedisUtils { * @param pattern 字符串前缀 */ public static void deleteKeys(final String pattern) { - CLIENT.getKeys().deleteByPattern(getNameMapper().map(pattern)); + CLIENT.getKeys().deleteByPattern(pattern); } /** @@ -457,7 +448,7 @@ public class RedisUtils { */ public static Boolean hasKey(String key) { RKeys rKeys = CLIENT.getKeys(); - return rKeys.countExists(getNameMapper().map(key)) > 0; + return rKeys.countExists(key) > 0; } }