From 42a3117e2ac087f5c2c28ca07a1c4443e2c38ca3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 25 十月 2021 18:24:55 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java | 18 +++++++++++++++---
1 files changed, 15 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..769ee71 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();
}
/**
--
Gitblit v1.9.3