Skip to content

Commit bcd7ceb

Browse files
committed
[UPDATE]3.3.3
1 parent 21883cd commit bcd7ceb

File tree

7 files changed

+11
-13
lines changed

7 files changed

+11
-13
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# XBoot
22
[![AUR](https://img.shields.io/badge/GPL-v3-red)](https://github.com/Exrick/xmall/blob/master/License)
33
[![](https://img.shields.io/badge/Author-Exrick-orange.svg)](http://blog.exrick.cn)
4-
[![](https://img.shields.io/badge/version-3.3.2-brightgreen.svg)](https://github.com/Exrick/x-boot)
4+
[![](https://img.shields.io/badge/version-3.3.3-brightgreen.svg)](https://github.com/Exrick/x-boot)
55
[![GitHub stars](https://img.shields.io/github/stars/Exrick/x-boot.svg?style=social&label=Stars)](https://github.com/Exrick/x-boot)
66
[![GitHub forks](https://img.shields.io/github/forks/Exrick/x-boot.svg?style=social&label=Fork)](https://github.com/Exrick/x-boot)
77

@@ -22,8 +22,8 @@ https://www.kancloud.cn/exrick/xboot/content
2222
- xboot-fast:单应用版本
2323
- xboot-module:多模块版本
2424
### 项目简介
25-
- [x] 代码拥有详细注释 无复杂逻辑 核心使用 SpringBoot 2.3.6.RELEASE
26-
- [x] JWT / 基于Redis可配置单设备登录Token交互 任意切换 支持点单登录 提供开放平台
25+
- [x] 代码拥有详细注释 无复杂逻辑 核心使用 SpringBoot 2.3.7.RELEASE
26+
- [x] JWT / 基于Redis可配置单设备登录Token交互 任意切换 提供开放平台、OAuth2认证中心 支持点单登录
2727
- [x] JPA + Mybatis-Plus 任意切换
2828
- [x] 操作日志记录方式任意切换Mysql或Elasticseach记录
2929
- [x] Java、Vue、SQL代码生成效率翻四倍

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.15.0</version>
108+
<version>3.15.1</version>
109109
<exclusions>
110110
<exclusion>
111111
<artifactId>javassist</artifactId>

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@ public class RedisRaterLimiter {
3434
*/
3535
public Boolean acquireByRedis(String name, Long rate, Long rateInterval) {
3636

37-
RRateLimiter rateLimiter = redisson.getRateLimiter(CommonConstant.LIMIT_PRE + name);
38-
rateLimiter.trySetRate(RateType.OVERALL, rate, rateInterval, RateIntervalUnit.MILLISECONDS);
39-
4037
boolean getToken;
4138
try {
39+
RRateLimiter rateLimiter = redisson.getRateLimiter(CommonConstant.LIMIT_PRE + name);
40+
rateLimiter.trySetRate(RateType.OVERALL, rate, rateInterval, RateIntervalUnit.MILLISECONDS);
4241
getToken = rateLimiter.tryAcquire();
4342
rateLimiter.expireAsync(rateInterval * 2, TimeUnit.MILLISECONDS);
4443
} catch (Exception e) {

xboot-fast/src/main/resources/banner.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ ____ _____________ __
44
/ \ | | \( <_> )( <_> ) | |
55
/___/\ \ |______ / \____/ \____/ |__|
66
\_/ \/
7-
v3.3.2 By Exrick :: Spring Boot v2.3.7.RELEASE
7+
v3.3.3 By Exrick :: Spring Boot v2.3.7.RELEASE

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.2</mybatis.plus.version>
31-
<redission.version>3.15.0</redission.version>
31+
<redission.version>3.15.1</redission.version>
3232
<knife4j.version>2.0.8</knife4j.version>
3333
<gson.version>2.8.6</gson.version>
3434
<hutool.version>5.5.8</hutool.version>

xboot-module/xboot-admin/src/main/resources/banner.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ ____ _____________ __
44
/ \ | | \( <_> )( <_> ) | |
55
/___/\ \ |______ / \____/ \____/ |__|
66
\_/ \/
7-
v3.3.2 By Exrick :: Spring Boot v2.3.7.RELEASE
7+
v3.3.3 By Exrick :: Spring Boot v2.3.7.RELEASE

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@ public class RedisRaterLimiter {
3434
*/
3535
public Boolean acquireByRedis(String name, Long rate, Long rateInterval) {
3636

37-
RRateLimiter rateLimiter = redisson.getRateLimiter(CommonConstant.LIMIT_PRE + name);
38-
rateLimiter.trySetRate(RateType.OVERALL, rate, rateInterval, RateIntervalUnit.MILLISECONDS);
39-
4037
boolean getToken;
4138
try {
39+
RRateLimiter rateLimiter = redisson.getRateLimiter(CommonConstant.LIMIT_PRE + name);
40+
rateLimiter.trySetRate(RateType.OVERALL, rate, rateInterval, RateIntervalUnit.MILLISECONDS);
4241
getToken = rateLimiter.tryAcquire();
4342
rateLimiter.expireAsync(rateInterval * 2, TimeUnit.MILLISECONDS);
4443
} catch (Exception e) {

0 commit comments

Comments
 (0)