Browse Source

移除 resilience4j 组件

YunaiV 11 months ago
parent
commit
2e03dcba69
19 changed files with 5 additions and 107 deletions
  1. 0 12
      yudao-dependencies/pom.xml
  2. 0 6
      yudao-framework/yudao-spring-boot-starter-protection/pom.xml
  3. 0 9
      yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/resilience4j/package-info.java
  4. 0 1
      yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md
  5. 5 19
      yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
  6. 0 2
      yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/application-unit-test.yaml
  7. 0 2
      yudao-module-crm/yudao-module-crm-biz/src/test/resources/application-unit-test.yaml
  8. 0 2
      yudao-module-infra/yudao-module-infra-biz/src/test/resources/application-unit-test.yaml
  9. 0 2
      yudao-module-mall/yudao-module-product-biz/src/test/resources/application-unit-test.yaml
  10. 0 2
      yudao-module-mall/yudao-module-promotion-biz/src/test/resources/application-unit-test.yaml
  11. 0 2
      yudao-module-mall/yudao-module-trade-biz/src/test/resources/application-unit-test.yaml
  12. 0 2
      yudao-module-member/yudao-module-member-biz/src/test/resources/application-unit-test.yaml
  13. 0 10
      yudao-module-pay/yudao-module-pay-biz/src/test-integration/resources/application-integration-test.yaml
  14. 0 2
      yudao-module-pay/yudao-module-pay-biz/src/test/resources/application-unit-test.yaml
  15. 0 2
      yudao-module-report/yudao-module-report-biz/src/test/resources/application-unit-test.yaml
  16. 0 10
      yudao-module-system/yudao-module-system-biz/src/test-integration/resources/application-integration-test.yaml
  17. 0 2
      yudao-module-system/yudao-module-system-biz/src/test/resources/application-unit-test.yaml
  18. 0 10
      yudao-server/src/main/resources/application-dev.yaml
  19. 0 10
      yudao-server/src/main/resources/application-local.yaml

+ 0 - 12
yudao-dependencies/pom.xml

@@ -34,7 +34,6 @@
         <rocketmq-spring.version>2.2.3</rocketmq-spring.version>
         <!-- 服务保障相关 -->
         <lock4j.version>2.2.7</lock4j.version>
-        <resilience4j.version>2.1.0</resilience4j.version>
         <!-- 监控相关 -->
         <skywalking.version>9.0.0</skywalking.version>
         <spring-boot-admin.version>3.2.1</spring-boot-admin.version>
@@ -282,17 +281,6 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>io.github.resilience4j</groupId>
-                <artifactId>resilience4j-ratelimiter</artifactId>
-                <version>${resilience4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.github.resilience4j</groupId>
-                <artifactId>resilience4j-spring-boot2</artifactId>
-                <version>${resilience4j.version}</version>
-            </dependency>
-
             <!-- 监控相关 -->
             <dependency>
                 <groupId>cn.iocoder.boot</groupId>

+ 0 - 6
yudao-framework/yudao-spring-boot-starter-protection/pom.xml

@@ -35,12 +35,6 @@
             <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
             <optional>true</optional>
         </dependency>
-
-        <dependency>
-            <groupId>io.github.resilience4j</groupId>
-            <artifactId>resilience4j-spring-boot2</artifactId>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
 </project>

+ 0 - 9
yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/resilience4j/package-info.java

@@ -1,9 +0,0 @@
-/**
- * 使用 Resilience4j 组件,实现服务保障,包括:
- * 1. 熔断器
- * 2. 限流器
- * 3. 舱壁隔离
- * 4. 重试
- * 5. 限时器
- */
-package cn.iocoder.yudao.framework.resilience4j;

+ 0 - 1
yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/resilience4j/《芋道 Spring Boot 服务容错 Resilience4j 入门》.md

@@ -1 +0,0 @@
-<https://www.iocoder.cn/Spring-Boot/Resilience4j/?yudao>

+ 5 - 19
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java

@@ -11,6 +11,10 @@ import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
 import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
 import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.ValidationException;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
@@ -26,13 +30,8 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 import org.springframework.web.servlet.NoHandlerFoundException;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.validation.ConstraintViolation;
-import jakarta.validation.ConstraintViolationException;
-import jakarta.validation.ValidationException;
 import java.time.LocalDateTime;
 import java.util.Map;
-import java.util.Objects;
 
 import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.*;
 
@@ -181,14 +180,6 @@ public class GlobalExceptionHandler {
         return CommonResult.error(METHOD_NOT_ALLOWED.getCode(), String.format("请求方法不正确:%s", ex.getMessage()));
     }
 
-    /**
-     * 处理 Resilience4j 限流抛出的异常
-     */
-    public CommonResult<?> requestNotPermittedExceptionHandler(HttpServletRequest req, Throwable ex) {
-        log.warn("[requestNotPermittedExceptionHandler][url({}) 访问过于频繁]", req.getRequestURL(), ex);
-        return CommonResult.error(TOO_MANY_REQUESTS);
-    }
-
     /**
      * 处理 Spring Security 权限不足的异常
      *
@@ -223,12 +214,7 @@ public class GlobalExceptionHandler {
             return tableNotExistsResult;
         }
 
-        // 情况二:部分特殊的库的处理
-        if (Objects.equals("io.github.resilience4j.ratelimiter.RequestNotPermitted", ex.getClass().getName())) {
-            return requestNotPermittedExceptionHandler(req, ex);
-        }
-
-        // 情况三:处理异常
+        // 情况二:处理异常
         log.error("[defaultExceptionHandler]", ex);
         // 插入异常日志
         this.createExceptionLog(req, ex);

+ 0 - 2
yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/application-unit-test.yaml

@@ -32,8 +32,6 @@ mybatis-plus:
 
 # Lock4j 配置项(单元测试,禁用 Lock4j)
 
-# Resilience4j 配置项
-
 --- #################### 监控相关配置 ####################
 
 --- #################### 芋道相关配置 ####################

+ 0 - 2
yudao-module-crm/yudao-module-crm-biz/src/test/resources/application-unit-test.yaml

@@ -39,8 +39,6 @@ mybatis-plus:
 
 # Lock4j 配置项(单元测试,禁用 Lock4j)
 
-# Resilience4j 配置项
-
 --- #################### 监控相关配置 ####################
 
 --- #################### 芋道相关配置 ####################

+ 0 - 2
yudao-module-infra/yudao-module-infra-biz/src/test/resources/application-unit-test.yaml

@@ -39,8 +39,6 @@ mybatis-plus:
 
 # Lock4j 配置项(单元测试,禁用 Lock4j)
 
-# Resilience4j 配置项
-
 --- #################### 监控相关配置 ####################
 
 --- #################### 芋道相关配置 ####################

+ 0 - 2
yudao-module-mall/yudao-module-product-biz/src/test/resources/application-unit-test.yaml

@@ -39,8 +39,6 @@ mybatis-plus:
 
 # Lock4j 配置项(单元测试,禁用 Lock4j)
 
-# Resilience4j 配置项
-
 --- #################### 监控相关配置 ####################
 
 --- #################### 芋道相关配置 ####################

+ 0 - 2
yudao-module-mall/yudao-module-promotion-biz/src/test/resources/application-unit-test.yaml

@@ -38,8 +38,6 @@ mybatis:
 
 # Lock4j 配置项(单元测试,禁用 Lock4j)
 
-# Resilience4j 配置项
-
 --- #################### 监控相关配置 ####################
 
 --- #################### 芋道相关配置 ####################

+ 0 - 2
yudao-module-mall/yudao-module-trade-biz/src/test/resources/application-unit-test.yaml

@@ -38,8 +38,6 @@ mybatis:
 
 # Lock4j 配置项(单元测试,禁用 Lock4j)
 
-# Resilience4j 配置项
-
 --- #################### 监控相关配置 ####################
 
 --- #################### 芋道相关配置 ####################

+ 0 - 2
yudao-module-member/yudao-module-member-biz/src/test/resources/application-unit-test.yaml

@@ -38,8 +38,6 @@ mybatis:
 
 # Lock4j 配置项(单元测试,禁用 Lock4j)
 
-# Resilience4j 配置项
-
 --- #################### 监控相关配置 ####################
 
 --- #################### 芋道相关配置 ####################

+ 0 - 10
yudao-module-pay/yudao-module-pay-biz/src/test-integration/resources/application-integration-test.yaml

@@ -71,16 +71,6 @@ mybatis-plus:
 
 # Lock4j 配置项(单元测试,禁用 Lock4j)
 
-# Resilience4j 配置项
-resilience4j:
-  ratelimiter:
-    instances:
-      backendA:
-        limit-for-period: 1 # 每个周期内,允许的请求数。默认为 50
-        limit-refresh-period: 60s # 每个周期的时长,单位:微秒。默认为 500
-        timeout-duration: 1s # 被限流时,阻塞等待的时长,单位:微秒。默认为 5s
-        register-health-indicator: true # 是否注册到健康监测
-
 --- #################### 监控相关配置 ####################
 
 --- #################### 芋道相关配置 ####################

+ 0 - 2
yudao-module-pay/yudao-module-pay-biz/src/test/resources/application-unit-test.yaml

@@ -38,8 +38,6 @@ mybatis:
 
 # Lock4j 配置项(单元测试,禁用 Lock4j)
 
-# Resilience4j 配置项
-
 --- #################### 监控相关配置 ####################
 
 --- #################### 芋道相关配置 ####################

+ 0 - 2
yudao-module-report/yudao-module-report-biz/src/test/resources/application-unit-test.yaml

@@ -38,8 +38,6 @@ mybatis:
 
 # Lock4j 配置项(单元测试,禁用 Lock4j)
 
-# Resilience4j 配置项
-
 --- #################### 监控相关配置 ####################
 
 --- #################### 芋道相关配置 ####################

+ 0 - 10
yudao-module-system/yudao-module-system-biz/src/test-integration/resources/application-integration-test.yaml

@@ -75,16 +75,6 @@ mybatis:
 
 # Lock4j 配置项(单元测试,禁用 Lock4j)
 
-# Resilience4j 配置项
-resilience4j:
-  ratelimiter:
-    instances:
-      backendA:
-        limit-for-period: 1 # 每个周期内,允许的请求数。默认为 50
-        limit-refresh-period: 60s # 每个周期的时长,单位:微秒。默认为 500
-        timeout-duration: 1s # 被限流时,阻塞等待的时长,单位:微秒。默认为 5s
-        register-health-indicator: true # 是否注册到健康监测
-
 --- #################### 监控相关配置 ####################
 
 --- #################### 芋道相关配置 ####################

+ 0 - 2
yudao-module-system/yudao-module-system-biz/src/test/resources/application-unit-test.yaml

@@ -38,8 +38,6 @@ mybatis:
 
 # Lock4j 配置项(单元测试,禁用 Lock4j)
 
-# Resilience4j 配置项
-
 --- #################### 监控相关配置 ####################
 
 --- #################### 芋道相关配置 ####################

+ 0 - 10
yudao-server/src/main/resources/application-dev.yaml

@@ -115,16 +115,6 @@ lock4j:
   acquire-timeout: 3000 # 获取分布式锁超时时间,默认为 3000 毫秒
   expire: 30000 # 分布式锁的超时时间,默认为 30 毫秒
 
-# Resilience4j 配置项
-resilience4j:
-  ratelimiter:
-    instances:
-      backendA:
-        limit-for-period: 1 # 每个周期内,允许的请求数。默认为 50
-        limit-refresh-period: 60s # 每个周期的时长,单位:微秒。默认为 500
-        timeout-duration: 1s # 被限流时,阻塞等待的时长,单位:微秒。默认为 5s
-        register-health-indicator: true # 是否注册到健康监测
-
 --- #################### 监控相关配置 ####################
 
 # Actuator 监控端点的配置项

+ 0 - 10
yudao-server/src/main/resources/application-local.yaml

@@ -135,16 +135,6 @@ lock4j:
   acquire-timeout: 3000 # 获取分布式锁超时时间,默认为 3000 毫秒
   expire: 30000 # 分布式锁的超时时间,默认为 30 毫秒
 
-# Resilience4j 配置项
-resilience4j:
-  ratelimiter:
-    instances:
-      backendA:
-        limit-for-period: 1 # 每个周期内,允许的请求数。默认为 50
-        limit-refresh-period: 60s # 每个周期的时长,单位:微秒。默认为 500
-        timeout-duration: 1s # 被限流时,阻塞等待的时长,单位:微秒。默认为 5s
-        register-health-indicator: true # 是否注册到健康监测
-
 --- #################### 监控相关配置 ####################
 
 # Actuator 监控端点的配置项