From 714f00423c36a75c2ea5754068fa84a37e34aedf Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Mon, 18 Dec 2023 20:43:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coal/filter/RateLimitFilter.java          | 17 +++++++++++++-
 .../loginUser/service/LoginUserService.java   |  2 +-
 .../coal/ratelimit/RateLimiterService.java    | 22 +++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cn/lihongjie/coal/filter/RateLimitFilter.java b/src/main/java/cn/lihongjie/coal/filter/RateLimitFilter.java
index d608a716..40532f82 100644
--- a/src/main/java/cn/lihongjie/coal/filter/RateLimitFilter.java
+++ b/src/main/java/cn/lihongjie/coal/filter/RateLimitFilter.java
@@ -65,8 +65,16 @@ public class RateLimitFilter extends OncePerRequestFilter {
 
 
             RateLimiterService.RateLimitAcquireResult acquireSessionRL = rateLimiterService.acquireSessionRL(sessionId);
+
+
             if (acquireSessionRL != RateLimiterService.RateLimitAcquireResult.SUCCESS ) {
                 sysLogService.saveSysLog(request, "限流模块", "会话限流", acquireSessionRL.name());
+
+                if (acquireSessionRL == RateLimiterService.RateLimitAcquireResult.ERROR){
+                    writeResponse(new BizException("invalidToken","请重新登录"), response);
+                    return;
+                }
+
                 writeResponse(new BizException("当前会话请求被限流,请稍后再试"), response);
                 log.warn(
                         "会话限流: sessionId {} user {} request {} type {}",
@@ -80,6 +88,10 @@ public class RateLimitFilter extends OncePerRequestFilter {
             RateLimiterService.RateLimitAcquireResult acquireUserRL = rateLimiterService.acquireUserRL(Ctx.currentUser().getId());
             if (acquireUserRL != RateLimiterService.RateLimitAcquireResult.SUCCESS ) {
                 sysLogService.saveSysLog(request, "限流模块", "用户限流", acquireSessionRL.name());
+                if (acquireUserRL == RateLimiterService.RateLimitAcquireResult.ERROR){
+                    writeResponse(new BizException("invalidToken","请重新登录"), response);
+                    return;
+                }
                 writeResponse(new BizException("当前会话请求被限流,请稍后再试"), response);
                 log.warn(
                         "用户限流: sessionId {} user {} request {} type {}",
@@ -100,7 +112,10 @@ public class RateLimitFilter extends OncePerRequestFilter {
 
             if (acquire != RateLimiterService.RateLimitAcquireResult.SUCCESS) {
                 sysLogService.saveSysLog(request, "限流模块", "IP限流", acquire.name());
-
+                if (acquire == RateLimiterService.RateLimitAcquireResult.ERROR){
+                    writeResponse(new BizException("invalidToken","请重新登录"), response);
+                    return;
+                }
                 writeResponse(new BizException("请求被限流,请稍后再试"), response);
                 log.warn("ip {} request {} type {} is rate limited", ip, request.getRequestURI(), acquire.name());
                 return;
diff --git a/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java b/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java
index eef874ed..474dfa90 100644
--- a/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java
+++ b/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java
@@ -248,7 +248,7 @@ public class LoginUserService extends BaseService<LoginUserEntity, LoginUserRepo
             rateLimiterService.destroyRL(sessionId, loginUser.getUser().getId());
             this.repository.deleteById(sessionId);
         } catch (Exception e) {
-
+            log.warn("删除会话失败 {}",sessionId, e);
         }
 
         this.clearCache(sessionId);
diff --git a/src/main/java/cn/lihongjie/coal/ratelimit/RateLimiterService.java b/src/main/java/cn/lihongjie/coal/ratelimit/RateLimiterService.java
index 1973fea8..ddc1fb14 100644
--- a/src/main/java/cn/lihongjie/coal/ratelimit/RateLimiterService.java
+++ b/src/main/java/cn/lihongjie/coal/ratelimit/RateLimiterService.java
@@ -70,6 +70,8 @@ public class RateLimiterService {
             throw new RuntimeException("ip is empty");
         }
 
+        try{
+
         RRateLimiter rateLimiter =
                 redissonClient.getRateLimiter(RATE_LIMIT_GLOBAL_ANONYMOUS_MIN_PREFIX + ip);
 
@@ -92,6 +94,10 @@ public class RateLimiterService {
         }
 
         return RateLimitAcquireResult.SUCCESS;
+        }catch (Exception e){
+            log.warn("获取IP限流失败", e);
+            return RateLimitAcquireResult.ERROR;
+        }
 
     }
 
@@ -104,6 +110,8 @@ public class RateLimiterService {
         RRateLimiter rateLimiter =
                 redissonClient.getRateLimiter(RATE_LIMIT_GLOBAL_SESSION_MIN_PREFIX + session);
 
+        try{
+
         if (!rateLimiter.tryAcquire(1)) {
             return RateLimitAcquireResult.MIN;
         }
@@ -123,6 +131,10 @@ public class RateLimiterService {
         }
         return RateLimitAcquireResult.SUCCESS;
 
+        }catch (Exception e){
+            log.warn("获取会话限流失败", e);
+            return RateLimitAcquireResult.ERROR;
+        }
 
     }
 
@@ -132,6 +144,9 @@ public class RateLimiterService {
             throw new RuntimeException("userId is empty");
         }
 
+        try{
+
+
         RRateLimiter rateLimiter =
                 redissonClient.getRateLimiter(RATE_LIMIT_GLOBAL_USER_MIN_PREFIX + userId);
 
@@ -154,6 +169,10 @@ public class RateLimiterService {
         }
 
         return RateLimitAcquireResult.SUCCESS;
+        }catch (Exception e){
+            log.warn("获取用户限流失败", e);
+            return RateLimitAcquireResult.ERROR;
+        }
     }
 
     public void initRL(String sessionId, String userId) {
@@ -242,6 +261,8 @@ public class RateLimiterService {
             throw new RuntimeException("userId is empty");
         }
 
+        log.info("删除会话限流 session: {} user: {}", sessionId, userId);
+
         try {
 
             RRateLimiter sessionMinRL =
@@ -300,6 +321,7 @@ public class RateLimiterService {
 
     public enum RateLimitAcquireResult {
         SUCCESS,
+        ERROR,
         MIN, HOUR, DAY,
     }
 }