From bcd7cebc41aab3f61b93c777b9da5d9af7f5e20f Mon Sep 17 00:00:00 2001 From: exrick <1012139570@qq.com> Date: Fri, 5 Mar 2021 11:54:38 +0800 Subject: [PATCH] [UPDATE]3.3.3 --- README.md | 6 +++--- xboot-fast/pom.xml | 2 +- .../cn/exrick/xboot/common/limit/RedisRaterLimiter.java | 5 ++--- xboot-fast/src/main/resources/banner.txt | 2 +- xboot-module/pom.xml | 2 +- xboot-module/xboot-admin/src/main/resources/banner.txt | 2 +- .../exrick/xboot/core/common/limit/RedisRaterLimiter.java | 5 ++--- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index fccaee3e..f7b7b653 100644 --- 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 index eb24771a..1d82d673 100644 --- a/xboot-fast/pom.xml +++ b/xboot-fast/pom.xml @@ -105,7 +105,7 @@ org.redisson redisson-spring-boot-starter - 3.15.0 + 3.15.1 javassist 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 index ec53353d..415a786e 100644 --- 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 index 9f6f785e..d2d11375 100644 --- 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 \ No newline at end of file +v3.3.3 By Exrick :: Spring Boot v2.3.7.RELEASE \ No newline at end of file diff --git a/xboot-module/pom.xml b/xboot-module/pom.xml index 54547015..b91a8b53 100644 --- a/xboot-module/pom.xml +++ b/xboot-module/pom.xml @@ -28,7 +28,7 @@ 0.9.1 8.0.17 3.4.2 - 3.15.0 + 3.15.1 2.0.8 2.8.6 5.5.8 diff --git a/xboot-module/xboot-admin/src/main/resources/banner.txt b/xboot-module/xboot-admin/src/main/resources/banner.txt index 9f6f785e..d2d11375 100644 --- 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 \ No newline at end of file +v3.3.3 By Exrick :: Spring Boot v2.3.7.RELEASE \ No newline at end of file diff --git a/xboot-module/xboot-core/src/main/java/cn/exrick/xboot/core/common/limit/RedisRaterLimiter.java b/xboot-module/xboot-core/src/main/java/cn/exrick/xboot/core/common/limit/RedisRaterLimiter.java index 94e99857..21f07998 100644 --- a/xboot-module/xboot-core/src/main/java/cn/exrick/xboot/core/common/limit/RedisRaterLimiter.java +++ b/xboot-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) {