[UPDATE]3.3.3

Exrick · Mar 5, 2021 · bcd7ceb · bcd7ceb
1 parent 21883cd
commit bcd7ceb
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # XBoot
 [![AUR](https://img.shields.io/badge/GPL-v3-red)](https://github.com/Exrick/xmall/blob/master/License)
 [![](https://img.shields.io/badge/Author-Exrick-orange.svg)](http://blog.exrick.cn)
-[![](https://img.shields.io/badge/version-3.3.2-brightgreen.svg)](https://github.com/Exrick/x-boot)
+[![](https://img.shields.io/badge/version-3.3.3-brightgreen.svg)](https://github.com/Exrick/x-boot)
 [![GitHub stars](https://img.shields.io/github/stars/Exrick/x-boot.svg?style=social&label=Stars)](https://github.com/Exrick/x-boot)
 [![GitHub forks](https://img.shields.io/github/forks/Exrick/x-boot.svg?style=social&label=Fork)](https://github.com/Exrick/x-boot)
 
@@ -22,8 +22,8 @@ https://www.kancloud.cn/exrick/xboot/content
 - xboot-fast：单应用版本
 - xboot-module：多模块版本
 ### 项目简介 
-- [x] 代码拥有详细注释 无复杂逻辑 核心使用 SpringBoot 2.3.6.RELEASE
-- [x] JWT / 基于Redis可配置单设备登录Token交互 任意切换 支持点单登录 提供开放平台
+- [x] 代码拥有详细注释 无复杂逻辑 核心使用 SpringBoot 2.3.7.RELEASE
+- [x] JWT / 基于Redis可配置单设备登录Token交互 任意切换 提供开放平台、OAuth2认证中心 支持点单登录
 - [x] JPA + Mybatis-Plus 任意切换
 - [x] 操作日志记录方式任意切换Mysql或Elasticseach记录
 - [x] Java、Vue、SQL代码生成效率翻四倍

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.15.0</version>
+            <version>3.15.1</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
@@ -34,11 +34,10 @@ public class RedisRaterLimiter {
      */
     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;
         try {
+            RRateLimiter rateLimiter = redisson.getRateLimiter(CommonConstant.LIMIT_PRE + name);
+            rateLimiter.trySetRate(RateType.OVERALL, rate, rateInterval, RateIntervalUnit.MILLISECONDS);
             getToken = rateLimiter.tryAcquire();
             rateLimiter.expireAsync(rateInterval * 2, TimeUnit.MILLISECONDS);
         } catch (Exception e) {

diff --git a/xboot-fast/src/main/resources/banner.txt b/xboot-fast/src/main/resources/banner.txt
@@ -4,4 +4,4 @@ ____  _____________                   __
  /     \  |    |   \(  <_> )(  <_> ) |  |
 /___/\  \ |______  / \____/  \____/  |__|
       \_/        \/
-v3.3.2 By Exrick :: Spring Boot v2.3.7.RELEASE
+v3.3.3 By Exrick :: Spring Boot v2.3.7.RELEASE
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.2</mybatis.plus.version>
-        <redission.version>3.15.0</redission.version>
+        <redission.version>3.15.1</redission.version>
         <knife4j.version>2.0.8</knife4j.version>
         <gson.version>2.8.6</gson.version>
         <hutool.version>5.5.8</hutool.version>

diff --git a/xboot-module/xboot-admin/src/main/resources/banner.txt b/xboot-module/xboot-admin/src/main/resources/banner.txt
@@ -4,4 +4,4 @@ ____  _____________                   __
  /     \  |    |   \(  <_> )(  <_> ) |  |
 /___/\  \ |______  / \____/  \____/  |__|
       \_/        \/
-v3.3.2 By Exrick :: Spring Boot v2.3.7.RELEASE
+v3.3.3 By Exrick :: Spring Boot v2.3.7.RELEASE
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
@@ -34,11 +34,10 @@ public class RedisRaterLimiter {
      */
     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;
         try {
+            RRateLimiter rateLimiter = redisson.getRateLimiter(CommonConstant.LIMIT_PRE + name);
+            rateLimiter.trySetRate(RateType.OVERALL, rate, rateInterval, RateIntervalUnit.MILLISECONDS);
             getToken = rateLimiter.tryAcquire();
             rateLimiter.expireAsync(rateInterval * 2, TimeUnit.MILLISECONDS);
         } catch (Exception e) {