szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: RateIntervalUnit 已过期

This commit is contained in:
xingyu4j 2025-05-27 10:32:38 +08:00
parent 0fb8f683c8
commit 4286f16974
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/ratelimiter/core/redis/RateLimiterRedisDAO.java
View File

@ -3,6 +3,7 @@ package cn.iocoder.yudao.framework.ratelimiter.core.redis;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.redisson.api.*; import org.redisson.api.*;
import java.time.Duration;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -40,11 +41,13 @@ public class RateLimiterRedisDAO {
String redisKey = formatKey(key); String redisKey = formatKey(key);
RRateLimiter rateLimiter = redissonClient.getRateLimiter(redisKey); RRateLimiter rateLimiter = redissonClient.getRateLimiter(redisKey);
long rateInterval = timeUnit.toSeconds(time); long rateInterval = timeUnit.toSeconds(time);
Duration duration = Duration.ofSeconds(rateInterval);
// 1. 如果不存在，设置 rate 速率 // 1. 如果不存在，设置 rate 速率
RateLimiterConfig config = rateLimiter.getConfig(); RateLimiterConfig config = rateLimiter.getConfig();
if (config == null) { if (config == null) {
rateLimiter.trySetRate(RateType.OVERALL, count, rateInterval, RateIntervalUnit.SECONDS); rateLimiter.trySetRate(RateType.OVERALL, count, duration);
rateLimiter.expire(rateInterval, TimeUnit.SECONDS); // 原因参见 https://t.zsxq.com/lcR0W // 原因参见 https://t.zsxq.com/lcR0W
rateLimiter.expire(duration);
return rateLimiter; return rateLimiter;
} }
// 2. 如果存在，并且配置相同，则直接返回 // 2. 如果存在，并且配置相同，则直接返回
@ -54,8 +57,9 @@ public class RateLimiterRedisDAO {
return rateLimiter; return rateLimiter;
} }
// 3. 如果存在，并且配置不同，则进行新建 // 3. 如果存在，并且配置不同，则进行新建
rateLimiter.setRate(RateType.OVERALL, count, rateInterval, RateIntervalUnit.SECONDS); rateLimiter.setRate(RateType.OVERALL, count, duration);
rateLimiter.expire(rateInterval, TimeUnit.SECONDS); // 原因参见 https://t.zsxq.com/lcR0W // 原因参见 https://t.zsxq.com/lcR0W
rateLimiter.expire(duration);
return rateLimiter; return rateLimiter;
} }