add 增加 redisson key 前缀配置
parent
1e1300fceb
commit
f045c36494
|
|
@ -113,6 +113,8 @@ spring:
|
||||||
|
|
||||||
# redisson 配置
|
# redisson 配置
|
||||||
redisson:
|
redisson:
|
||||||
|
# redis key前缀
|
||||||
|
keyPrefix:
|
||||||
# 线程池数量
|
# 线程池数量
|
||||||
threads: 4
|
threads: 4
|
||||||
# Netty线程池数量
|
# Netty线程池数量
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ package com.ruoyi.common.redis.config;
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import com.ruoyi.common.redis.config.properties.RedissonProperties;
|
import com.ruoyi.common.redis.config.properties.RedissonProperties;
|
||||||
|
import com.ruoyi.common.redis.handler.KeyPrefixHandler;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.redisson.api.RedissonClient;
|
import org.redisson.api.RedissonClient;
|
||||||
import org.redisson.codec.JsonJacksonCodec;
|
import org.redisson.codec.JsonJacksonCodec;
|
||||||
|
|
@ -46,6 +47,8 @@ public class RedisConfiguration extends CachingConfigurerSupport {
|
||||||
if (ObjectUtil.isNotNull(singleServerConfig)) {
|
if (ObjectUtil.isNotNull(singleServerConfig)) {
|
||||||
// 使用单机模式
|
// 使用单机模式
|
||||||
config.useSingleServer()
|
config.useSingleServer()
|
||||||
|
//设置redis key前缀
|
||||||
|
.setNameMapper(new KeyPrefixHandler(redissonProperties.getKeyPrefix()))
|
||||||
.setTimeout(singleServerConfig.getTimeout())
|
.setTimeout(singleServerConfig.getTimeout())
|
||||||
.setClientName(singleServerConfig.getClientName())
|
.setClientName(singleServerConfig.getClientName())
|
||||||
.setIdleConnectionTimeout(singleServerConfig.getIdleConnectionTimeout())
|
.setIdleConnectionTimeout(singleServerConfig.getIdleConnectionTimeout())
|
||||||
|
|
@ -57,6 +60,8 @@ public class RedisConfiguration extends CachingConfigurerSupport {
|
||||||
RedissonProperties.ClusterServersConfig clusterServersConfig = redissonProperties.getClusterServersConfig();
|
RedissonProperties.ClusterServersConfig clusterServersConfig = redissonProperties.getClusterServersConfig();
|
||||||
if (ObjectUtil.isNotNull(clusterServersConfig)) {
|
if (ObjectUtil.isNotNull(clusterServersConfig)) {
|
||||||
config.useClusterServers()
|
config.useClusterServers()
|
||||||
|
//设置redis key前缀
|
||||||
|
.setNameMapper(new KeyPrefixHandler(redissonProperties.getKeyPrefix()))
|
||||||
.setTimeout(clusterServersConfig.getTimeout())
|
.setTimeout(clusterServersConfig.getTimeout())
|
||||||
.setClientName(clusterServersConfig.getClientName())
|
.setClientName(clusterServersConfig.getClientName())
|
||||||
.setIdleConnectionTimeout(clusterServersConfig.getIdleConnectionTimeout())
|
.setIdleConnectionTimeout(clusterServersConfig.getIdleConnectionTimeout())
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@ import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import org.redisson.config.ReadMode;
|
import org.redisson.config.ReadMode;
|
||||||
import org.redisson.config.SubscriptionMode;
|
import org.redisson.config.SubscriptionMode;
|
||||||
import org.redisson.config.TransportMode;
|
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -18,6 +17,11 @@ import java.util.List;
|
||||||
@ConfigurationProperties(prefix = "redisson")
|
@ConfigurationProperties(prefix = "redisson")
|
||||||
public class RedissonProperties {
|
public class RedissonProperties {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* redis缓存key前缀
|
||||||
|
*/
|
||||||
|
private String keyPrefix;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 线程池数量,默认值 = 当前处理核数量 * 2
|
* 线程池数量,默认值 = 当前处理核数量 * 2
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,50 @@
|
||||||
|
package com.ruoyi.common.redis.handler;
|
||||||
|
|
||||||
|
import com.ruoyi.common.core.utils.StringUtils;
|
||||||
|
import org.redisson.api.NameMapper;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* redis缓存key前缀处理
|
||||||
|
*
|
||||||
|
* @author ye
|
||||||
|
* @date 2022/7/14 17:44
|
||||||
|
* @since 4.3.0
|
||||||
|
*/
|
||||||
|
public class KeyPrefixHandler implements NameMapper {
|
||||||
|
|
||||||
|
private final String keyPrefix;
|
||||||
|
|
||||||
|
public KeyPrefixHandler(String keyPrefix) {
|
||||||
|
//前缀为空 则返回空前缀
|
||||||
|
this.keyPrefix = StringUtils.isBlank(keyPrefix) ? "" : keyPrefix + ":";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 增加前缀
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public String map(String name) {
|
||||||
|
if (StringUtils.isBlank(name)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (StringUtils.isNotBlank(keyPrefix) && !name.startsWith(keyPrefix)) {
|
||||||
|
return keyPrefix + name;
|
||||||
|
}
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 去除前缀
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public String unmap(String name) {
|
||||||
|
if (StringUtils.isBlank(name)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (StringUtils.isNotBlank(keyPrefix) && name.startsWith(keyPrefix)) {
|
||||||
|
return name.substring(keyPrefix.length());
|
||||||
|
}
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
package com.ruoyi.common.redis.utils;
|
package com.ruoyi.common.redis.utils;
|
||||||
|
|
||||||
import cn.hutool.core.collection.IterUtil;
|
|
||||||
import com.ruoyi.common.core.utils.SpringUtils;
|
import com.ruoyi.common.core.utils.SpringUtils;
|
||||||
import lombok.AccessLevel;
|
import lombok.AccessLevel;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import org.redisson.api.*;
|
import org.redisson.api.*;
|
||||||
|
import org.redisson.config.Config;
|
||||||
|
|
||||||
import java.time.Duration;
|
import java.time.Duration;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
|
@ -12,6 +12,8 @@ import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* redis 工具类
|
* redis 工具类
|
||||||
|
|
@ -25,6 +27,14 @@ public class RedisUtils {
|
||||||
|
|
||||||
private static final RedissonClient CLIENT = SpringUtils.getBean(RedissonClient.class);
|
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();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 限流
|
* 限流
|
||||||
*
|
*
|
||||||
|
|
@ -415,8 +425,17 @@ public class RedisUtils {
|
||||||
* @return 对象列表
|
* @return 对象列表
|
||||||
*/
|
*/
|
||||||
public static Collection<String> keys(final String pattern) {
|
public static Collection<String> keys(final String pattern) {
|
||||||
Iterable<String> iterable = CLIENT.getKeys().getKeysByPattern(pattern);
|
Stream<String> stream = CLIENT.getKeys().getKeysStreamByPattern(getNameMapper().map(pattern));
|
||||||
return IterUtil.toList(iterable);
|
return stream.map(key -> getNameMapper().unmap(key)).collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除缓存的基本对象列表
|
||||||
|
*
|
||||||
|
* @param pattern 字符串前缀
|
||||||
|
*/
|
||||||
|
public static void deleteKeys(final String pattern) {
|
||||||
|
CLIENT.getKeys().deleteByPattern(getNameMapper().map(pattern));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -426,7 +445,7 @@ public class RedisUtils {
|
||||||
*/
|
*/
|
||||||
public static Boolean hasKey(String key) {
|
public static Boolean hasKey(String key) {
|
||||||
RKeys rKeys = CLIENT.getKeys();
|
RKeys rKeys = CLIENT.getKeys();
|
||||||
return rKeys.countExists(key) > 0;
|
return rKeys.countExists(getNameMapper().map(key)) > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue