From be7766b5f0dec84d537af9811e50f46ab3dfdb2a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 08 八月 2022 10:03:56 +0800
Subject: [PATCH] update 同步ruoyi
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 95 insertions(+), 23 deletions(-)
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 aa5c0dc..c14b393 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
@@ -1,17 +1,19 @@
package com.ruoyi.common.utils.redis;
-import cn.hutool.core.collection.IterUtil;
import com.ruoyi.common.utils.spring.SpringUtils;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.redisson.api.*;
+import org.redisson.config.Config;
+import java.time.Duration;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* redis 宸ュ叿绫�
@@ -24,6 +26,14 @@
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();
+ }
/**
* 闄愭祦
@@ -100,14 +110,13 @@
* @since Redis 6.X 浠ヤ笂浣跨敤 setAndKeepTTL 鍏煎 5.X 鏂规
*/
public static <T> void setCacheObject(final String key, final T value, final boolean isSaveTtl) {
- RBucket<Object> bucket = CLIENT.getBucket(key);
+ RBucket<T> bucket = CLIENT.getBucket(key);
if (isSaveTtl) {
try {
bucket.setAndKeepTTL(value);
} catch (Exception e) {
long timeToLive = bucket.remainTimeToLive();
- bucket.set(value);
- bucket.expire(timeToLive, TimeUnit.MILLISECONDS);
+ setCacheObject(key, value, Duration.ofMillis(timeToLive));
}
} else {
bucket.set(value);
@@ -119,18 +128,19 @@
*
* @param key 缂撳瓨鐨勯敭鍊�
* @param value 缂撳瓨鐨勫��
- * @param timeout 鏃堕棿
- * @param timeUnit 鏃堕棿棰楃矑搴�
+ * @param duration 鏃堕棿
*/
- public static <T> void setCacheObject(final String key, final T value, final long timeout, final TimeUnit timeUnit) {
- RBucket<T> result = CLIENT.getBucket(key);
- result.set(value);
- result.expire(timeout, timeUnit);
+ public static <T> void setCacheObject(final String key, final T value, final Duration duration) {
+ RBatch batch = CLIENT.createBatch();
+ RBucketAsync<T> bucket = batch.getBucket(key);
+ bucket.setAsync(value);
+ bucket.expireAsync(duration);
+ batch.execute();
}
/**
* 娉ㄥ唽瀵硅薄鐩戝惉鍣�
- *
+ * <p>
* key 鐩戝惉鍣ㄩ渶寮�鍚� `notify-keyspace-events` 绛� redis 鐩稿叧閰嶇疆
*
* @param key 缂撳瓨鐨勯敭鍊�
@@ -149,20 +159,19 @@
* @return true=璁剧疆鎴愬姛锛沠alse=璁剧疆澶辫触
*/
public static boolean expire(final String key, final long timeout) {
- return expire(key, timeout, TimeUnit.SECONDS);
+ return expire(key, Duration.ofSeconds(timeout));
}
/**
* 璁剧疆鏈夋晥鏃堕棿
*
- * @param key Redis閿�
- * @param timeout 瓒呮椂鏃堕棿
- * @param unit 鏃堕棿鍗曚綅
+ * @param key Redis閿�
+ * @param duration 瓒呮椂鏃堕棿
* @return true=璁剧疆鎴愬姛锛沠alse=璁剧疆澶辫触
*/
- public static boolean expire(final String key, final long timeout, final TimeUnit unit) {
+ public static boolean expire(final String key, final Duration duration) {
RBucket rBucket = CLIENT.getBucket(key);
- return rBucket.expire(timeout, unit);
+ return rBucket.expire(duration);
}
/**
@@ -223,7 +232,7 @@
/**
* 娉ㄥ唽List鐩戝惉鍣�
- *
+ * <p>
* key 鐩戝惉鍣ㄩ渶寮�鍚� `notify-keyspace-events` 绛� redis 鐩稿叧閰嶇疆
*
* @param key 缂撳瓨鐨勯敭鍊�
@@ -259,7 +268,7 @@
/**
* 娉ㄥ唽Set鐩戝惉鍣�
- *
+ * <p>
* key 鐩戝惉鍣ㄩ渶寮�鍚� `notify-keyspace-events` 绛� redis 鐩稿叧閰嶇疆
*
* @param key 缂撳瓨鐨勯敭鍊�
@@ -296,7 +305,7 @@
/**
* 娉ㄥ唽Map鐩戝惉鍣�
- *
+ * <p>
* key 鐩戝惉鍣ㄩ渶寮�鍚� `notify-keyspace-events` 绛� redis 鐩稿叧閰嶇疆
*
* @param key 缂撳瓨鐨勯敭鍊�
@@ -367,13 +376,76 @@
}
/**
+ * 璁剧疆鍘熷瓙鍊�
+ *
+ * @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();
+ }
+
+ /**
* 鑾峰緱缂撳瓨鐨勫熀鏈璞″垪琛�
*
* @param pattern 瀛楃涓插墠缂�
* @return 瀵硅薄鍒楄〃
*/
public static Collection<String> keys(final String pattern) {
- Iterable<String> iterable = CLIENT.getKeys().getKeysByPattern(pattern);
- return IterUtil.toList(iterable);
+ Stream<String> stream = CLIENT.getKeys().getKeysStreamByPattern(getNameMapper().map(pattern));
+ 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));
+ }
+
+ /**
+ * 妫�鏌edis涓槸鍚﹀瓨鍦╧ey
+ *
+ * @param key 閿�
+ */
+ public static Boolean hasKey(String key) {
+ RKeys rKeys = CLIENT.getKeys();
+ return rKeys.countExists(getNameMapper().map(key)) > 0;
}
}
--
Gitblit v1.9.3