diff --git a/chushang-common/chushang-common-redis/src/main/java/com/chushang/redis/cache/utils/CacheUtils.java b/chushang-common/chushang-common-redis/src/main/java/com/chushang/redis/cache/utils/CacheUtils.java deleted file mode 100644 index f3bf708..0000000 --- a/chushang-common/chushang-common-redis/src/main/java/com/chushang/redis/cache/utils/CacheUtils.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.chushang.redis.cache.utils; - -import cn.hutool.extra.spring.SpringUtil; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.redisson.api.RMap; -import org.springframework.cache.Cache; -import org.springframework.cache.CacheManager; - -import java.util.Set; - -/** - * 缓存操作工具类 {@link } - * - * @author Michelle.Chung - * @date 2022/8/13 - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -@SuppressWarnings(value = {"unchecked"}) -public class CacheUtils { - - private static final CacheManager CACHE_MANAGER = SpringUtil.getBean(CacheManager.class); - - /** - * 获取缓存组内所有的KEY - * - * @param cacheNames 缓存组名称 - */ - public static Set keys(String cacheNames) { - RMap rmap = (RMap) CACHE_MANAGER.getCache(cacheNames).getNativeCache(); - return rmap.keySet(); - } - - /** - * 获取缓存值 - * - * @param cacheNames 缓存组名称 - * @param key 缓存key - */ - public static T get(String cacheNames, Object key) { - Cache.ValueWrapper wrapper = CACHE_MANAGER.getCache(cacheNames).get(key); - return wrapper != null ? (T) wrapper.get() : null; - } - - /** - * 保存缓存值 - * - * @param cacheNames 缓存组名称 - * @param key 缓存key - * @param value 缓存值 - */ - public static void put(String cacheNames, Object key, Object value) { - CACHE_MANAGER.getCache(cacheNames).put(key, value); - } - - /** - * 删除缓存值 - * - * @param cacheNames 缓存组名称 - * @param key 缓存key - */ - public static void evict(String cacheNames, Object key) { - CACHE_MANAGER.getCache(cacheNames).evict(key); - } - - /** - * 清空缓存值 - * - * @param cacheNames 缓存组名称 - */ - public static void clear(String cacheNames) { - CACHE_MANAGER.getCache(cacheNames).clear(); - } - -} diff --git a/chushang-common/chushang-common-redis/src/main/java/com/chushang/redis/config/properties/RedissonProperties.java b/chushang-common/chushang-common-redis/src/main/java/com/chushang/redis/config/properties/RedissonProperties.java index 2325368..1a4c2ff 100644 --- a/chushang-common/chushang-common-redis/src/main/java/com/chushang/redis/config/properties/RedissonProperties.java +++ b/chushang-common/chushang-common-redis/src/main/java/com/chushang/redis/config/properties/RedissonProperties.java @@ -84,6 +84,9 @@ public class RedissonProperties { private String nodes; } + /** + * 哨兵 + */ @Data @NoArgsConstructor public static class SentinelServersConfig { diff --git a/chushang-common/chushang-common-redis/src/main/resources/redisson-sentnel.yml b/chushang-common/chushang-common-redis/src/main/resources/redisson-sentnel.yml deleted file mode 100644 index 93befb5..0000000 --- a/chushang-common/chushang-common-redis/src/main/resources/redisson-sentnel.yml +++ /dev/null @@ -1,28 +0,0 @@ -spring: - redis: - redisson: - config: | - sentinelServersConfig: - idleConnectionTimeout: 10000 - connectTimeout: 10000 - timeout: 3000 - retryAttempts: 3 - retryInterval: 1500 - password: ${conf.redis.sentinel.password} - subscriptionsPerConnection: 5 - clientName: null - loadBalancer: ! {} - slaveSubscriptionConnectionMinimumIdleSize: 1 - slaveSubscriptionConnectionPoolSize: 50 - slaveConnectionMinimumIdleSize: 32 - slaveConnectionPoolSize: 64 - masterConnectionMinimumIdleSize: 32 - masterConnectionPoolSize: 64 - readMode: "SLAVE" - sentinelAddresses: ${conf.redis.sentinel.address} - masterName: ${conf.redis.sentinel.masterName} - database: ${conf.redis.sentinel.database} - threads: 0 - nettyThreads: 0 - codec: ! {} - "transportMode": "NIO" \ No newline at end of file diff --git a/chushang-common/chushang-common-redis/src/main/resources/redisson.yml b/chushang-common/chushang-common-redis/src/main/resources/redisson.yml deleted file mode 100644 index 39d7e2a..0000000 --- a/chushang-common/chushang-common-redis/src/main/resources/redisson.yml +++ /dev/null @@ -1,38 +0,0 @@ -spring: - redis: - redisson: - config: | - singleServerConfig: - # 连接空闲超时 如果当前连接池里的连接数量超过了最小空闲连接数,而同时有连接空闲时间超过了该数值,那么这些连接将会自动被关闭,并从连接池里去掉。时间单位是毫秒。 - idleConnectionTimeout: 8000 - # ping超时 - #pingTimeout: 1000 - # 连接超时 - connectTimeout: ${conf.redis.timeout} - # 命令等待超时 - timeout: 3000 - # 命令失败重试次数 - retryAttempts: 3 - # 命令重试发送时间间隔 - retryInterval: 1500 - # 重新连接时间间隔 - #reconnectionTimeout: 3000 - # failedAttempts - #failedAttempts: 3 - # 单个连接最大订阅数量 - subscriptionsPerConnection: 5 - # 客户端名称 - clientName: null - address: "redis://${conf.redis.host}:${conf.redis.port}" - password: ${conf.redis.password} - database: ${conf.redis.database} - subscriptionConnectionMinimumIdleSize: 1 - subscriptionConnectionPoolSize: 50 - connectionMinimumIdleSize: 32 - connectionPoolSize: 64 - # dnsMonitoring: false - # dnsMonitoringInterval: 5000 - threads: 0 - nettyThreads: 0 - codec: ! {} - "transportMode": "NIO" \ No newline at end of file