instanceMap = new ConcurrentHashMap<>();
+
+ /**
+ * Creates CacheManager supplied by Redisson instance
+ */
+ public PlusSpringCacheManager() {
+ }
+
+
+ /**
+ * Defines possibility of storing {@code null} values.
+ *
+ * Default is true
+ *
+ * @param allowNullValues stores if true
+ */
+ public void setAllowNullValues(boolean allowNullValues) {
+ this.allowNullValues = allowNullValues;
+ }
+
+ /**
+ * Defines if cache aware of Spring-managed transactions.
+ * If {@code true} put/evict operations are executed only for successful transaction in after-commit phase.
+ *
+ * Default is false
+ *
+ * @param transactionAware cache is transaction aware if true
+ */
+ public void setTransactionAware(boolean transactionAware) {
+ this.transactionAware = transactionAware;
+ }
+
+ /**
+ * Defines 'fixed' cache names.
+ * A new cache instance will not be created in dynamic for non-defined names.
+ *
+ * `null` parameter setups dynamic mode
+ *
+ * @param names of caches
+ */
+ public void setCacheNames(Collection names) {
+ if (names != null) {
+ for (String name : names) {
+ getCache(name);
+ }
+ dynamic = false;
+ } else {
+ dynamic = true;
+ }
+ }
+
+ /**
+ * Set cache config mapped by cache name
+ *
+ * @param config object
+ */
+ public void setConfig(Map config) {
+ this.configMap = (Map) config;
+ }
+
+ protected CacheConfig createDefaultConfig() {
+ return new CacheConfig();
+ }
+
+ @Override
+ public Cache getCache(String name) {
+ // 重写 cacheName 支持多参数
+ String[] array = StringUtils.delimitedListToStringArray(name, "#");
+ name = array[0];
+
+ Cache cache = instanceMap.get(name);
+ if (cache != null) {
+ return cache;
+ }
+ if (!dynamic) {
+ return cache;
+ }
+
+ CacheConfig config = configMap.get(name);
+ if (config == null) {
+ config = createDefaultConfig();
+ configMap.put(name, config);
+ }
+
+ if (array.length > 1) {
+ config.setTTL(DurationStyle.detectAndParse(array[1]).toMillis());
+ }
+ if (array.length > 2) {
+ config.setMaxIdleTime(DurationStyle.detectAndParse(array[2]).toMillis());
+ }
+ if (array.length > 3) {
+ config.setMaxSize(Integer.parseInt(array[3]));
+ }
+ int local = 1;
+ if (array.length > 4) {
+ local = Integer.parseInt(array[4]);
+ }
+
+ if (config.getMaxIdleTime() == 0 && config.getTTL() == 0 && config.getMaxSize() == 0) {
+ return createMap(name, config, local);
+ }
+
+ return createMapCache(name, config, local);
+ }
+
+ private Cache createMap(String name, CacheConfig config, int local) {
+ RMap map = RedisUtils.getClient().getMap(name);
+
+ Cache cache = new RedissonCache(map, allowNullValues);
+ if (local == 1) {
+ cache = new CaffeineCacheDecorator(name, cache);
+ }
+ if (transactionAware) {
+ cache = new TransactionAwareCacheDecorator(cache);
+ }
+ Cache oldCache = instanceMap.putIfAbsent(name, cache);
+ if (oldCache != null) {
+ cache = oldCache;
+ }
+ return cache;
+ }
+
+ private Cache createMapCache(String name, CacheConfig config, int local) {
+ RMapCache map = RedisUtils.getClient().getMapCache(name);
+
+ Cache cache = new RedissonCache(map, config, allowNullValues);
+ if (local == 1) {
+ cache = new CaffeineCacheDecorator(name, cache);
+ }
+ if (transactionAware) {
+ cache = new TransactionAwareCacheDecorator(cache);
+ }
+ Cache oldCache = instanceMap.putIfAbsent(name, cache);
+ if (oldCache != null) {
+ cache = oldCache;
+ } else {
+ map.setMaxSize(config.getMaxSize());
+ }
+ return cache;
+ }
+
+ @Override
+ public Collection getCacheNames() {
+ return Collections.unmodifiableSet(configMap.keySet());
+ }
+
+
+}
diff --git a/agileboot-common/wol-common-redis/src/main/java/com/agileboot/common/redis/utils/CacheUtils.java b/agileboot-common/wol-common-redis/src/main/java/com/agileboot/common/redis/utils/CacheUtils.java
new file mode 100644
index 0000000..d2bf0ea
--- /dev/null
+++ b/agileboot-common/wol-common-redis/src/main/java/com/agileboot/common/redis/utils/CacheUtils.java
@@ -0,0 +1,61 @@
+package com.agileboot.common.redis.utils;
+
+import cn.hutool.extra.spring.SpringUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+
+/**
+ * 缓存操作工具类
+ *
+ * @author Michelle.Chung
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@SuppressWarnings(value = {"unchecked"})
+public class CacheUtils {
+
+ private static final CacheManager CACHE_MANAGER = SpringUtil.getBean(CacheManager.class);
+
+ /**
+ * 获取缓存值
+ *
+ * @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/agileboot-common/wol-common-redis/src/main/java/com/agileboot/common/redis/utils/RedisUtils.java b/agileboot-common/wol-common-redis/src/main/java/com/agileboot/common/redis/utils/RedisUtils.java
new file mode 100644
index 0000000..c1bc7c6
--- /dev/null
+++ b/agileboot-common/wol-common-redis/src/main/java/com/agileboot/common/redis/utils/RedisUtils.java
@@ -0,0 +1,581 @@
+package com.agileboot.common.redis.utils;
+
+import cn.hutool.extra.spring.SpringUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.redisson.api.*;
+import org.redisson.api.options.KeysScanOptions;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * redis 工具类
+ *
+ * @author Lion Li
+ * @version 3.1.0 新增
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@SuppressWarnings(value = {"unchecked", "rawtypes"})
+public class RedisUtils {
+
+ private static final RedissonClient CLIENT = SpringUtil.getBean(RedissonClient.class);
+
+ /**
+ * 限流
+ *
+ * @param key 限流key
+ * @param rateType 限流类型
+ * @param rate 速率
+ * @param rateInterval 速率间隔
+ * @return -1 表示失败
+ */
+ public static long rateLimiter(String key, RateType rateType, int rate, int rateInterval) {
+ return rateLimiter(key, rateType, rate, rateInterval, 0);
+ }
+
+ /**
+ * 限流
+ *
+ * @param key 限流key
+ * @param rateType 限流类型
+ * @param rate 速率
+ * @param rateInterval 速率间隔
+ * @param timeout 超时时间
+ * @return -1 表示失败
+ */
+ public static long rateLimiter(String key, RateType rateType, int rate, int rateInterval, int timeout) {
+ RRateLimiter rateLimiter = CLIENT.getRateLimiter(key);
+ rateLimiter.trySetRate(rateType, rate, Duration.ofSeconds(rateInterval), Duration.ofSeconds(timeout));
+ if (rateLimiter.tryAcquire()) {
+ return rateLimiter.availablePermits();
+ } else {
+ return -1L;
+ }
+ }
+
+ /**
+ * 获取客户端实例
+ */
+ public static RedissonClient getClient() {
+ return CLIENT;
+ }
+
+ /**
+ * 发布通道消息
+ *
+ * @param channelKey 通道key
+ * @param msg 发送数据
+ * @param consumer 自定义处理
+ */
+ public static void publish(String channelKey, T msg, Consumer consumer) {
+ RTopic topic = CLIENT.getTopic(channelKey);
+ topic.publish(msg);
+ consumer.accept(msg);
+ }
+
+ /**
+ * 发布消息到指定的频道
+ *
+ * @param channelKey 通道key
+ * @param msg 发送数据
+ */
+ public static void publish(String channelKey, T msg) {
+ RTopic topic = CLIENT.getTopic(channelKey);
+ topic.publish(msg);
+ }
+
+ /**
+ * 订阅通道接收消息
+ *
+ * @param channelKey 通道key
+ * @param clazz 消息类型
+ * @param consumer 自定义处理
+ */
+ public static void subscribe(String channelKey, Class clazz, Consumer consumer) {
+ RTopic topic = CLIENT.getTopic(channelKey);
+ topic.addListener(clazz, (channel, msg) -> consumer.accept(msg));
+ }
+
+ /**
+ * 缓存基本的对象，Integer、String、实体类等
+ *
+ * @param key 缓存的键值
+ * @param value 缓存的值
+ */
+ public static void setCacheObject(final String key, final T value) {
+ setCacheObject(key, value, false);
+ }
+
+ /**
+ * 缓存基本的对象，保留当前对象 TTL 有效期
+ *
+ * @param key 缓存的键值
+ * @param value 缓存的值
+ * @param isSaveTtl 是否保留TTL有效期(例如: set之前ttl剩余90 set之后还是为90)
+ * @since Redis 6.X 以上使用 setAndKeepTTL 兼容 5.X 方案
+ */
+ public static void setCacheObject(final String key, final T value, final boolean isSaveTtl) {
+ RBucket bucket = CLIENT.getBucket(key);
+ if (isSaveTtl) {
+ try {
+ bucket.setAndKeepTTL(value);
+ } catch (Exception e) {
+ long timeToLive = bucket.remainTimeToLive();
+ if (timeToLive == -1) {
+ bucket.set(value);
+ } else {
+ bucket.set(value, Duration.ofMillis(timeToLive));
+ }
+ }
+ } else {
+ bucket.set(value);
+ }
+ }
+
+ /**
+ * 缓存基本的对象，Integer、String、实体类等
+ *
+ * @param key 缓存的键值
+ * @param value 缓存的值
+ * @param duration 时间
+ */
+ public static void setCacheObject(final String key, final T value, final Duration duration) {
+ RBucket bucket = CLIENT.getBucket(key);
+ bucket.set(value, duration);
+ }
+
+ /**
+ * 如果不存在则设置 并返回 true 如果存在则返回 false
+ *
+ * @param key 缓存的键值
+ * @param value 缓存的值
+ * @return set成功或失败
+ */
+ public static boolean setObjectIfAbsent(final String key, final T value, final Duration duration) {
+ RBucket bucket = CLIENT.getBucket(key);
+ return bucket.setIfAbsent(value, duration);
+ }
+
+ /**
+ * 如果存在则设置 并返回 true 如果存在则返回 false
+ *
+ * @param key 缓存的键值
+ * @param value 缓存的值
+ * @return set成功或失败
+ */
+ public static boolean setObjectIfExists(final String key, final T value, final Duration duration) {
+ RBucket bucket = CLIENT.getBucket(key);
+ return bucket.setIfExists(value, duration);
+ }
+
+ /**
+ * 注册对象监听器
+ *
+ * key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
+ *
+ * @param key 缓存的键值
+ * @param listener 监听器配置
+ */
+ public static void addObjectListener(final String key, final ObjectListener listener) {
+ RBucket result = CLIENT.getBucket(key);
+ result.addListener(listener);
+ }
+
+ /**
+ * 设置有效时间
+ *
+ * @param key Redis键
+ * @param timeout 超时时间
+ * @return true=设置成功；false=设置失败
+ */
+ public static boolean expire(final String key, final long timeout) {
+ return expire(key, Duration.ofSeconds(timeout));
+ }
+
+ /**
+ * 设置有效时间
+ *
+ * @param key Redis键
+ * @param duration 超时时间
+ * @return true=设置成功；false=设置失败
+ */
+ public static boolean expire(final String key, final Duration duration) {
+ RBucket rBucket = CLIENT.getBucket(key);
+ return rBucket.expire(duration);
+ }
+
+ /**
+ * 获得缓存的基本对象。
+ *
+ * @param key 缓存键值
+ * @return 缓存键值对应的数据
+ */
+ public static T getCacheObject(final String key) {
+ RBucket rBucket = CLIENT.getBucket(key);
+ return rBucket.get();
+ }
+
+ /**
+ * 获得key剩余存活时间
+ *
+ * @param key 缓存键值
+ * @return 剩余存活时间
+ */
+ public static long getTimeToLive(final String key) {
+ RBucket rBucket = CLIENT.getBucket(key);
+ return rBucket.remainTimeToLive();
+ }
+
+ /**
+ * 删除单个对象
+ *
+ * @param key 缓存的键值
+ */
+ public static boolean deleteObject(final String key) {
+ return CLIENT.getBucket(key).delete();
+ }
+
+ /**
+ * 删除集合对象
+ *
+ * @param collection 多个对象
+ */
+ public static void deleteObject(final Collection collection) {
+ RBatch batch = CLIENT.createBatch();
+ collection.forEach(t -> {
+ batch.getBucket(t.toString()).deleteAsync();
+ });
+ batch.execute();
+ }
+
+ /**
+ * 检查缓存对象是否存在
+ *
+ * @param key 缓存的键值
+ */
+ public static boolean isExistsObject(final String key) {
+ return CLIENT.getBucket(key).isExists();
+ }
+
+ /**
+ * 缓存List数据
+ *
+ * @param key 缓存的键值
+ * @param dataList 待缓存的List数据
+ * @return 缓存的对象
+ */
+ public static boolean setCacheList(final String key, final List dataList) {
+ RList rList = CLIENT.getList(key);
+ return rList.addAll(dataList);
+ }
+
+ /**
+ * 追加缓存List数据
+ *
+ * @param key 缓存的键值
+ * @param data 待缓存的数据
+ * @return 缓存的对象
+ */
+ public static boolean addCacheList(final String key, final T data) {
+ RList rList = CLIENT.getList(key);
+ return rList.add(data);
+ }
+
+ /**
+ * 注册List监听器
+ *
+ * key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
+ *
+ * @param key 缓存的键值
+ * @param listener 监听器配置
+ */
+ public static void addListListener(final String key, final ObjectListener listener) {
+ RList rList = CLIENT.getList(key);
+ rList.addListener(listener);
+ }
+
+ /**
+ * 获得缓存的list对象
+ *
+ * @param key 缓存的键值
+ * @return 缓存键值对应的数据
+ */
+ public static List getCacheList(final String key) {
+ RList rList = CLIENT.getList(key);
+ return rList.readAll();
+ }
+
+ /**
+ * 获得缓存的list对象(范围)
+ *
+ * @param key 缓存的键值
+ * @param form 起始下标
+ * @param to 截止下标
+ * @return 缓存键值对应的数据
+ */
+ public static List getCacheListRange(final String key, int form, int to) {
+ RList rList = CLIENT.getList(key);
+ return rList.range(form, to);
+ }
+
+ /**
+ * 缓存Set
+ *
+ * @param key 缓存键值
+ * @param dataSet 缓存的数据
+ * @return 缓存数据的对象
+ */
+ public static boolean setCacheSet(final String key, final Set dataSet) {
+ RSet rSet = CLIENT.getSet(key);
+ return rSet.addAll(dataSet);
+ }
+
+ /**
+ * 追加缓存Set数据
+ *
+ * @param key 缓存的键值
+ * @param data 待缓存的数据
+ * @return 缓存的对象
+ */
+ public static boolean addCacheSet(final String key, final T data) {
+ RSet rSet = CLIENT.getSet(key);
+ return rSet.add(data);
+ }
+
+ /**
+ * 注册Set监听器
+ *
+ * key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
+ *
+ * @param key 缓存的键值
+ * @param listener 监听器配置
+ */
+ public static void addSetListener(final String key, final ObjectListener listener) {
+ RSet rSet = CLIENT.getSet(key);
+ rSet.addListener(listener);
+ }
+
+ /**
+ * 获得缓存的set
+ *
+ * @param key 缓存的key
+ * @return set对象
+ */
+ public static Set getCacheSet(final String key) {
+ RSet rSet = CLIENT.getSet(key);
+ return rSet.readAll();
+ }
+
+ /**
+ * 缓存Map
+ *
+ * @param key 缓存的键值
+ * @param dataMap 缓存的数据
+ */
+ public static void setCacheMap(final String key, final Map dataMap) {
+ if (dataMap != null) {
+ RMap rMap = CLIENT.getMap(key);
+ rMap.putAll(dataMap);
+ }
+ }
+
+ /**
+ * 注册Map监听器
+ *
+ * key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
+ *
+ * @param key 缓存的键值
+ * @param listener 监听器配置
+ */
+ public static void addMapListener(final String key, final ObjectListener listener) {
+ RMap rMap = CLIENT.getMap(key);
+ rMap.addListener(listener);
+ }
+
+ /**
+ * 获得缓存的Map
+ *
+ * @param key 缓存的键值
+ * @return map对象
+ */
+ public static Map getCacheMap(final String key) {
+ RMap rMap = CLIENT.getMap(key);
+ return rMap.getAll(rMap.keySet());
+ }
+
+ /**
+ * 获得缓存Map的key列表
+ *
+ * @param key 缓存的键值
+ * @return key列表
+ */
+ public static Set getCacheMapKeySet(final String key) {
+ RMap rMap = CLIENT.getMap(key);
+ return rMap.keySet();
+ }
+
+ /**
+ * 往Hash中存入数据
+ *
+ * @param key Redis键
+ * @param hKey Hash键
+ * @param value 值
+ */
+ public static void setCacheMapValue(final String key, final String hKey, final T value) {
+ RMap rMap = CLIENT.getMap(key);
+ rMap.put(hKey, value);
+ }
+
+ /**
+ * 获取Hash中的数据
+ *
+ * @param key Redis键
+ * @param hKey Hash键
+ * @return Hash中的对象
+ */
+ public static T getCacheMapValue(final String key, final String hKey) {
+ RMap rMap = CLIENT.getMap(key);
+ return rMap.get(hKey);
+ }
+
+ /**
+ * 删除Hash中的数据
+ *
+ * @param key Redis键
+ * @param hKey Hash键
+ * @return Hash中的对象
+ */
+ public static T delCacheMapValue(final String key, final String hKey) {
+ RMap rMap = CLIENT.getMap(key);
+ return rMap.remove(hKey);
+ }
+
+ /**
+ * 删除Hash中的数据
+ *
+ * @param key Redis键
+ * @param hKeys Hash键
+ */
+ public static void delMultiCacheMapValue(final String key, final Set hKeys) {
+ RBatch batch = CLIENT.createBatch();
+ RMapAsync rMap = batch.getMap(key);
+ for (String hKey : hKeys) {
+ rMap.removeAsync(hKey);
+ }
+ batch.execute();
+ }
+
+ /**
+ * 获取多个Hash中的数据
+ *
+ * @param key Redis键
+ * @param hKeys Hash键集合
+ * @return Hash对象集合
+ */
+ public static Map getMultiCacheMapValue(final String key, final Set hKeys) {
+ RMap rMap = CLIENT.getMap(key);
+ return rMap.getAll(hKeys);
+ }
+
+ /**
+ * 设置原子值
+ *
+ * @param key Redis键
+ * @param value 值
+ */
+ public static void setAtomicValue(String key, long value) {
+ RAtomicLong atomic = CLIENT.getAtomicLong(key);
+ atomic.set(value);
+ }
+
+ /**
+ * 获取原子值
+ *
+ * @param key Redis键
+ * @return 当前值
+ */
+ public static long getAtomicValue(String key) {
+ RAtomicLong atomic = CLIENT.getAtomicLong(key);
+ return atomic.get();
+ }
+
+ /**
+ * 递增原子值
+ *
+ * @param key Redis键
+ * @return 当前值
+ */
+ public static long incrAtomicValue(String key) {
+ RAtomicLong atomic = CLIENT.getAtomicLong(key);
+ return atomic.incrementAndGet();
+ }
+
+ /**
+ * 递减原子值
+ *
+ * @param key Redis键
+ * @return 当前值
+ */
+ public static long decrAtomicValue(String key) {
+ RAtomicLong atomic = CLIENT.getAtomicLong(key);
+ return atomic.decrementAndGet();
+ }
+
+ /**
+ * 获得缓存的基本对象列表(全局匹配忽略租户 自行拼接租户id)
+ *
+ * limit-设置扫描的限制数量(默认为0,查询全部)
+ * pattern-设置键的匹配模式(默认为null)
+ * chunkSize-设置每次扫描的块大小(默认为0,本方法设置为1000)
+ * type-设置键的类型(默认为null,查询全部类型)
+ *
+ * @see KeysScanOptions
+ * @param pattern 字符串前缀
+ * @return 对象列表
+ */
+ public static Collection keys(final String pattern) {
+ return keys(KeysScanOptions.defaults().pattern(pattern).chunkSize(1000));
+ }
+
+ /**
+ * 通过扫描参数获取缓存的基本对象列表
+ * @param keysScanOptions 扫描参数
+ *
+ * limit-设置扫描的限制数量(默认为0,查询全部)
+ * pattern-设置键的匹配模式(默认为null)
+ * chunkSize-设置每次扫描的块大小(默认为0)
+ * type-设置键的类型(默认为null,查询全部类型)
+ *
+ * @see KeysScanOptions
+ */
+ public static Collection keys(final KeysScanOptions keysScanOptions) {
+ Stream keysStream = CLIENT.getKeys().getKeysStream(keysScanOptions);
+ return keysStream.collect(Collectors.toList());
+ }
+
+ /**
+ * 删除缓存的基本对象列表(全局匹配忽略租户 自行拼接租户id)
+ *
+ * @param pattern 字符串前缀
+ */
+ public static void deleteKeys(final String pattern) {
+ CLIENT.getKeys().deleteByPattern(pattern);
+ }
+
+ /**
+ * 检查redis中是否存在key
+ *
+ * @param key 键
+ */
+ public static Boolean hasKey(String key) {
+ RKeys rKeys = CLIENT.getKeys();
+ return rKeys.countExists(key) > 0;
+ }
+}
diff --git a/agileboot-common/wol-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/agileboot-common/wol-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..df1a37d
--- /dev/null
+++ b/agileboot-common/wol-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+com.agileboot.common.redis.config.CacheConfiguration
+com.agileboot.common.redis.config.RedisConfiguration
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 742dd34..308f488 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,8 @@
2.6.5
4.1.2
1.6.8
+ 3.50.0
+ 2.2.7
@@ -110,7 +112,17 @@
+
+ org.redisson
+ redisson-spring-boot-starter
+ ${redisson.version}
+
+
+ com.baomidou
+ lock4j-redisson-spring-boot-starter
+ ${lock4j.version}
+