Skip to content

Commit 3cf6c3a

Browse files
committed
[UPDATE]3.0
1 parent 8f45cfb commit 3cf6c3a

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

xboot-fast/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<dependency>
106106
<groupId>org.redisson</groupId>
107107
<artifactId>redisson-spring-boot-starter</artifactId>
108-
<version>3.13.6</version>
108+
<version>3.14.0</version>
109109
<exclusions>
110110
<exclusion>
111111
<artifactId>javassist</artifactId>

xboot-fast/src/main/java/cn/exrick/xboot/common/limit/RedisRaterLimiter.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,13 @@ public Boolean acquireByRedis(String name, Long rate, Long rateInterval) {
3737
RRateLimiter rateLimiter = redisson.getRateLimiter(CommonConstant.LIMIT_PRE + name);
3838
rateLimiter.trySetRate(RateType.OVERALL, rate, rateInterval, RateIntervalUnit.MILLISECONDS);
3939

40-
boolean getToken = rateLimiter.tryAcquire();
41-
rateLimiter.expireAsync(rateInterval, TimeUnit.MILLISECONDS);
40+
boolean getToken;
41+
try {
42+
getToken = rateLimiter.tryAcquire();
43+
rateLimiter.expireAsync(rateInterval * 2, TimeUnit.MILLISECONDS);
44+
} catch (Exception e) {
45+
getToken = false;
46+
}
4247
return getToken;
4348
}
4449

xboot-module/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<jjwt.version>0.9.1</jjwt.version>
2929
<mysql.connector.version>8.0.17</mysql.connector.version>
3030
<mybatis.plus.version>3.4.1</mybatis.plus.version>
31-
<redission.version>3.13.6</redission.version>
31+
<redission.version>3.14.0</redission.version>
3232
<knife4j.version>2.0.8</knife4j.version>
3333
<gson.version>2.8.6</gson.version>
3434
<hutool.version>5.5.1</hutool.version>

xboot-module/xboot-core/src/main/java/cn/exrick/xboot/core/common/limit/RedisRaterLimiter.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,13 @@ public Boolean acquireByRedis(String name, Long rate, Long rateInterval) {
3737
RRateLimiter rateLimiter = redisson.getRateLimiter(CommonConstant.LIMIT_PRE + name);
3838
rateLimiter.trySetRate(RateType.OVERALL, rate, rateInterval, RateIntervalUnit.MILLISECONDS);
3939

40-
boolean getToken = rateLimiter.tryAcquire();
41-
rateLimiter.expireAsync(rateInterval, TimeUnit.MILLISECONDS);
40+
boolean getToken;
41+
try {
42+
getToken = rateLimiter.tryAcquire();
43+
rateLimiter.expireAsync(rateInterval * 2, TimeUnit.MILLISECONDS);
44+
} catch (Exception e) {
45+
getToken = false;
46+
}
4247
return getToken;
4348
}
4449

0 commit comments

Comments
 (0)