From c4e17ff8472fd9f8123e86b593b2968ad5936b15 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 01 十一月 2021 13:49:11 +0800
Subject: [PATCH] fix 修复 xxl-job-admin 部署问题
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java
index 5ee7c1b..394bdb2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java
@@ -29,14 +29,26 @@
* 闄愭祦
*
* @param key 闄愭祦key
- * @param limitType 闄愭祦绫诲瀷
+ * @param rateType 闄愭祦绫诲瀷
* @param rate 閫熺巼
* @param rateInterval 閫熺巼闂撮殧
+ * @return -1 琛ㄧず澶辫触
*/
- public static boolean rateLimiter(String key, RateType rateType, int rate, int rateInterval) {
+ public static long rateLimiter(String key, RateType rateType, int rate, int rateInterval) {
RRateLimiter rateLimiter = client.getRateLimiter(key);
rateLimiter.trySetRate(rateType, rate, rateInterval, RateIntervalUnit.SECONDS);
- return rateLimiter.tryAcquire();
+ if (rateLimiter.tryAcquire()) {
+ return rateLimiter.availablePermits();
+ } else {
+ return -1L;
+ }
+ }
+
+ /**
+ * 鑾峰彇瀹炰緥id
+ */
+ public static String getClientId() {
+ return client.getId();
}
/**
@@ -248,6 +260,18 @@
}
/**
+ * 鍒犻櫎Hash涓殑鏁版嵁
+ *
+ * @param key Redis閿�
+ * @param hKey Hash閿�
+ * @return Hash涓殑瀵硅薄
+ */
+ public static <T> T delCacheMapValue(final String key, final String hKey) {
+ RMap<String, T> rMap = client.getMap(key);
+ return rMap.remove(hKey);
+ }
+
+ /**
* 鑾峰彇澶氫釜Hash涓殑鏁版嵁
*
* @param key Redis閿�
--
Gitblit v1.9.3