mirror of
				https://gitee.com/hhyykk/ipms-sjy.git
				synced 2025-10-31 10:18:42 +08:00 
			
		
		
		
	移除 resilience4j 组件
This commit is contained in:
		| @@ -34,7 +34,6 @@ | |||||||
|         <rocketmq-spring.version>2.2.3</rocketmq-spring.version> |         <rocketmq-spring.version>2.2.3</rocketmq-spring.version> | ||||||
|         <!-- 服务保障相关 --> |         <!-- 服务保障相关 --> | ||||||
|         <lock4j.version>2.2.7</lock4j.version> |         <lock4j.version>2.2.7</lock4j.version> | ||||||
|         <resilience4j.version>2.1.0</resilience4j.version> |  | ||||||
|         <!-- 监控相关 --> |         <!-- 监控相关 --> | ||||||
|         <skywalking.version>9.0.0</skywalking.version> |         <skywalking.version>9.0.0</skywalking.version> | ||||||
|         <spring-boot-admin.version>3.2.1</spring-boot-admin.version> |         <spring-boot-admin.version>3.2.1</spring-boot-admin.version> | ||||||
| @@ -282,17 +281,6 @@ | |||||||
|                 </exclusions> |                 </exclusions> | ||||||
|             </dependency> |             </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> |             <dependency> | ||||||
|                 <groupId>cn.iocoder.boot</groupId> |                 <groupId>cn.iocoder.boot</groupId> | ||||||
|   | |||||||
| @@ -35,12 +35,6 @@ | |||||||
|             <artifactId>lock4j-redisson-spring-boot-starter</artifactId> |             <artifactId>lock4j-redisson-spring-boot-starter</artifactId> | ||||||
|             <optional>true</optional> |             <optional>true</optional> | ||||||
|         </dependency> |         </dependency> | ||||||
|  |  | ||||||
|         <dependency> |  | ||||||
|             <groupId>io.github.resilience4j</groupId> |  | ||||||
|             <artifactId>resilience4j-spring-boot2</artifactId> |  | ||||||
|             <optional>true</optional> |  | ||||||
|         </dependency> |  | ||||||
|     </dependencies> |     </dependencies> | ||||||
|  |  | ||||||
| </project> | </project> | ||||||
|   | |||||||
| @@ -1,9 +0,0 @@ | |||||||
| /** |  | ||||||
|  * 使用 Resilience4j 组件,实现服务保障,包括: |  | ||||||
|  * 1. 熔断器 |  | ||||||
|  * 2. 限流器 |  | ||||||
|  * 3. 舱壁隔离 |  | ||||||
|  * 4. 重试 |  | ||||||
|  * 5. 限时器 |  | ||||||
|  */ |  | ||||||
| package cn.iocoder.yudao.framework.resilience4j; |  | ||||||
| @@ -1 +0,0 @@ | |||||||
| <https://www.iocoder.cn/Spring-Boot/Resilience4j/?yudao> |  | ||||||
| @@ -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.common.util.servlet.ServletUtils; | ||||||
| import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; | import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; | ||||||
| import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; | 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.AllArgsConstructor; | ||||||
| import lombok.extern.slf4j.Slf4j; | import lombok.extern.slf4j.Slf4j; | ||||||
| import org.apache.commons.lang3.exception.ExceptionUtils; | 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.method.annotation.MethodArgumentTypeMismatchException; | ||||||
| import org.springframework.web.servlet.NoHandlerFoundException; | 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.time.LocalDateTime; | ||||||
| import java.util.Map; | import java.util.Map; | ||||||
| import java.util.Objects; |  | ||||||
|  |  | ||||||
| import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.*; | 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())); |         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 权限不足的异常 |      * 处理 Spring Security 权限不足的异常 | ||||||
|      * |      * | ||||||
| @@ -223,12 +214,7 @@ public class GlobalExceptionHandler { | |||||||
|             return tableNotExistsResult; |             return tableNotExistsResult; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         // 情况二:部分特殊的库的处理 |         // 情况二:处理异常 | ||||||
|         if (Objects.equals("io.github.resilience4j.ratelimiter.RequestNotPermitted", ex.getClass().getName())) { |  | ||||||
|             return requestNotPermittedExceptionHandler(req, ex); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         // 情况三:处理异常 |  | ||||||
|         log.error("[defaultExceptionHandler]", ex); |         log.error("[defaultExceptionHandler]", ex); | ||||||
|         // 插入异常日志 |         // 插入异常日志 | ||||||
|         this.createExceptionLog(req, ex); |         this.createExceptionLog(req, ex); | ||||||
|   | |||||||
| @@ -32,8 +32,6 @@ mybatis-plus: | |||||||
|  |  | ||||||
| # Lock4j 配置项(单元测试,禁用 Lock4j) | # Lock4j 配置项(单元测试,禁用 Lock4j) | ||||||
|  |  | ||||||
| # Resilience4j 配置项 |  | ||||||
|  |  | ||||||
| --- #################### 监控相关配置 #################### | --- #################### 监控相关配置 #################### | ||||||
|  |  | ||||||
| --- #################### 芋道相关配置 #################### | --- #################### 芋道相关配置 #################### | ||||||
|   | |||||||
| @@ -39,8 +39,6 @@ mybatis-plus: | |||||||
|  |  | ||||||
| # Lock4j 配置项(单元测试,禁用 Lock4j) | # Lock4j 配置项(单元测试,禁用 Lock4j) | ||||||
|  |  | ||||||
| # Resilience4j 配置项 |  | ||||||
|  |  | ||||||
| --- #################### 监控相关配置 #################### | --- #################### 监控相关配置 #################### | ||||||
|  |  | ||||||
| --- #################### 芋道相关配置 #################### | --- #################### 芋道相关配置 #################### | ||||||
|   | |||||||
| @@ -39,8 +39,6 @@ mybatis-plus: | |||||||
|  |  | ||||||
| # Lock4j 配置项(单元测试,禁用 Lock4j) | # Lock4j 配置项(单元测试,禁用 Lock4j) | ||||||
|  |  | ||||||
| # Resilience4j 配置项 |  | ||||||
|  |  | ||||||
| --- #################### 监控相关配置 #################### | --- #################### 监控相关配置 #################### | ||||||
|  |  | ||||||
| --- #################### 芋道相关配置 #################### | --- #################### 芋道相关配置 #################### | ||||||
|   | |||||||
| @@ -39,8 +39,6 @@ mybatis-plus: | |||||||
|  |  | ||||||
| # Lock4j 配置项(单元测试,禁用 Lock4j) | # Lock4j 配置项(单元测试,禁用 Lock4j) | ||||||
|  |  | ||||||
| # Resilience4j 配置项 |  | ||||||
|  |  | ||||||
| --- #################### 监控相关配置 #################### | --- #################### 监控相关配置 #################### | ||||||
|  |  | ||||||
| --- #################### 芋道相关配置 #################### | --- #################### 芋道相关配置 #################### | ||||||
|   | |||||||
| @@ -38,8 +38,6 @@ mybatis: | |||||||
|  |  | ||||||
| # Lock4j 配置项(单元测试,禁用 Lock4j) | # Lock4j 配置项(单元测试,禁用 Lock4j) | ||||||
|  |  | ||||||
| # Resilience4j 配置项 |  | ||||||
|  |  | ||||||
| --- #################### 监控相关配置 #################### | --- #################### 监控相关配置 #################### | ||||||
|  |  | ||||||
| --- #################### 芋道相关配置 #################### | --- #################### 芋道相关配置 #################### | ||||||
|   | |||||||
| @@ -38,8 +38,6 @@ mybatis: | |||||||
|  |  | ||||||
| # Lock4j 配置项(单元测试,禁用 Lock4j) | # Lock4j 配置项(单元测试,禁用 Lock4j) | ||||||
|  |  | ||||||
| # Resilience4j 配置项 |  | ||||||
|  |  | ||||||
| --- #################### 监控相关配置 #################### | --- #################### 监控相关配置 #################### | ||||||
|  |  | ||||||
| --- #################### 芋道相关配置 #################### | --- #################### 芋道相关配置 #################### | ||||||
|   | |||||||
| @@ -38,8 +38,6 @@ mybatis: | |||||||
|  |  | ||||||
| # Lock4j 配置项(单元测试,禁用 Lock4j) | # Lock4j 配置项(单元测试,禁用 Lock4j) | ||||||
|  |  | ||||||
| # Resilience4j 配置项 |  | ||||||
|  |  | ||||||
| --- #################### 监控相关配置 #################### | --- #################### 监控相关配置 #################### | ||||||
|  |  | ||||||
| --- #################### 芋道相关配置 #################### | --- #################### 芋道相关配置 #################### | ||||||
|   | |||||||
| @@ -71,16 +71,6 @@ mybatis-plus: | |||||||
|  |  | ||||||
| # Lock4j 配置项(单元测试,禁用 Lock4j) | # 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 # 是否注册到健康监测 |  | ||||||
|  |  | ||||||
| --- #################### 监控相关配置 #################### | --- #################### 监控相关配置 #################### | ||||||
|  |  | ||||||
| --- #################### 芋道相关配置 #################### | --- #################### 芋道相关配置 #################### | ||||||
|   | |||||||
| @@ -38,8 +38,6 @@ mybatis: | |||||||
|  |  | ||||||
| # Lock4j 配置项(单元测试,禁用 Lock4j) | # Lock4j 配置项(单元测试,禁用 Lock4j) | ||||||
|  |  | ||||||
| # Resilience4j 配置项 |  | ||||||
|  |  | ||||||
| --- #################### 监控相关配置 #################### | --- #################### 监控相关配置 #################### | ||||||
|  |  | ||||||
| --- #################### 芋道相关配置 #################### | --- #################### 芋道相关配置 #################### | ||||||
|   | |||||||
| @@ -38,8 +38,6 @@ mybatis: | |||||||
|  |  | ||||||
| # Lock4j 配置项(单元测试,禁用 Lock4j) | # Lock4j 配置项(单元测试,禁用 Lock4j) | ||||||
|  |  | ||||||
| # Resilience4j 配置项 |  | ||||||
|  |  | ||||||
| --- #################### 监控相关配置 #################### | --- #################### 监控相关配置 #################### | ||||||
|  |  | ||||||
| --- #################### 芋道相关配置 #################### | --- #################### 芋道相关配置 #################### | ||||||
|   | |||||||
| @@ -75,16 +75,6 @@ mybatis: | |||||||
|  |  | ||||||
| # Lock4j 配置项(单元测试,禁用 Lock4j) | # 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 # 是否注册到健康监测 |  | ||||||
|  |  | ||||||
| --- #################### 监控相关配置 #################### | --- #################### 监控相关配置 #################### | ||||||
|  |  | ||||||
| --- #################### 芋道相关配置 #################### | --- #################### 芋道相关配置 #################### | ||||||
|   | |||||||
| @@ -38,8 +38,6 @@ mybatis: | |||||||
|  |  | ||||||
| # Lock4j 配置项(单元测试,禁用 Lock4j) | # Lock4j 配置项(单元测试,禁用 Lock4j) | ||||||
|  |  | ||||||
| # Resilience4j 配置项 |  | ||||||
|  |  | ||||||
| --- #################### 监控相关配置 #################### | --- #################### 监控相关配置 #################### | ||||||
|  |  | ||||||
| --- #################### 芋道相关配置 #################### | --- #################### 芋道相关配置 #################### | ||||||
|   | |||||||
| @@ -115,16 +115,6 @@ lock4j: | |||||||
|   acquire-timeout: 3000 # 获取分布式锁超时时间,默认为 3000 毫秒 |   acquire-timeout: 3000 # 获取分布式锁超时时间,默认为 3000 毫秒 | ||||||
|   expire: 30000 # 分布式锁的超时时间,默认为 30 毫秒 |   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 监控端点的配置项 | # Actuator 监控端点的配置项 | ||||||
|   | |||||||
| @@ -135,16 +135,6 @@ lock4j: | |||||||
|   acquire-timeout: 3000 # 获取分布式锁超时时间,默认为 3000 毫秒 |   acquire-timeout: 3000 # 获取分布式锁超时时间,默认为 3000 毫秒 | ||||||
|   expire: 30000 # 分布式锁的超时时间,默认为 30 毫秒 |   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 监控端点的配置项 | # Actuator 监控端点的配置项 | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 YunaiV
					YunaiV