[UPDATE]3.0

Exrick · Dec 4, 2020 · 3cf6c3a · 3cf6c3a
1 parent 8f45cfb
commit 3cf6c3a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/xboot-fast/pom.xml b/xboot-fast/pom.xml
@@ -105,7 +105,7 @@
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>
-            <version>3.13.6</version>
+            <version>3.14.0</version>
             <exclusions>
                 <exclusion>
                     <artifactId>javassist</artifactId>

diff --git a/xboot-fast/src/main/java/cn/exrick/xboot/common/limit/RedisRaterLimiter.java b/xboot-fast/src/main/java/cn/exrick/xboot/common/limit/RedisRaterLimiter.java
@@ -37,8 +37,13 @@ public Boolean acquireByRedis(String name, Long rate, Long rateInterval) {
         RRateLimiter rateLimiter = redisson.getRateLimiter(CommonConstant.LIMIT_PRE + name);
         rateLimiter.trySetRate(RateType.OVERALL, rate, rateInterval, RateIntervalUnit.MILLISECONDS);
 
-        boolean getToken = rateLimiter.tryAcquire();
-        rateLimiter.expireAsync(rateInterval, TimeUnit.MILLISECONDS);
+        boolean getToken;
+        try {
+            getToken = rateLimiter.tryAcquire();
+            rateLimiter.expireAsync(rateInterval * 2, TimeUnit.MILLISECONDS);
+        } catch (Exception e) {
+            getToken = false;
+        }
         return getToken;
     }
 

diff --git a/xboot-module/pom.xml b/xboot-module/pom.xml
@@ -28,7 +28,7 @@
         <jjwt.version>0.9.1</jjwt.version>
         <mysql.connector.version>8.0.17</mysql.connector.version>
         <mybatis.plus.version>3.4.1</mybatis.plus.version>
-        <redission.version>3.13.6</redission.version>
+        <redission.version>3.14.0</redission.version>
         <knife4j.version>2.0.8</knife4j.version>
         <gson.version>2.8.6</gson.version>
         <hutool.version>5.5.1</hutool.version>

diff --git a/...-module/xboot-core/src/main/java/cn/exrick/xboot/core/common/limit/RedisRaterLimiter.java b/...-module/xboot-core/src/main/java/cn/exrick/xboot/core/common/limit/RedisRaterLimiter.java
@@ -37,8 +37,13 @@ public Boolean acquireByRedis(String name, Long rate, Long rateInterval) {
         RRateLimiter rateLimiter = redisson.getRateLimiter(CommonConstant.LIMIT_PRE + name);
         rateLimiter.trySetRate(RateType.OVERALL, rate, rateInterval, RateIntervalUnit.MILLISECONDS);
 
-        boolean getToken = rateLimiter.tryAcquire();
-        rateLimiter.expireAsync(rateInterval, TimeUnit.MILLISECONDS);
+        boolean getToken;
+        try {
+            getToken = rateLimiter.tryAcquire();
+            rateLimiter.expireAsync(rateInterval * 2, TimeUnit.MILLISECONDS);
+        } catch (Exception e) {
+            getToken = false;
+        }
         return getToken;
     }