From 7c8bfa34435129577ce5cbadd984af9ac40094ac Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 24 Feb 2021 20:59:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E4=BF=9D=E9=9A=9C=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E9=99=90=E6=B5=81=E3=80=81=E7=86=94=E6=96=AD=E7=AD=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=202.=20=E8=BF=9B=E4=B8=80=E6=AD=A5=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 32 +++++++++++++++++++ pom.xml | 7 ++++ ruoyi-ui/README.md | 30 ----------------- .../dashboard/DashboardApplication.java | 1 - .../enums/GlobalErrorCodeConstants.java | 3 +- ...Š‹é“ Spring Boot 异步任务入门》.md | 2 +- ...多数æ®æºï¼ˆè¯»å†™åˆ†ç¦»ï¼‰å…¥é—¨ã€‹.md | 1 + ...Spring Boot æ•°æ®åº“连接池入门》.md | 1 + .../core/DefaultLockFailureStrategy.java | 2 +- .../monitor/AdminServerConfiguration.java | 9 ++++++ .../framework/monitor/package-info.java | 4 +++ ...pring Boot 监控工具 Admin 入门》.md | 1 + ...ã€ŠèŠ‹é“ Spring Boot MyBatis 入门》.md | 1 + ...Š‹é“ Spring Boot 定时任务入门》.md | 1 + .../framework/redis/package-info.java | 4 +++ .../ã€ŠèŠ‹é“ Spring Boot Redis 入门》.md | 1 + .../framework/resilience4j/package-info.java | 9 ++++++ ... 安全框架 Spring Security 入门》.md | 1 + ... 安全框架 Spring Security 入门》.md | 4 +-- ...Boot API 接å£æ–‡æ¡£ Swagger 入门》.md | 2 +- ... Boot 链路追踪 SkyWalking 入门》.md | 1 + .../framework/validator/package-info.java | 4 +++ ... Boot å‚数校验 Validation 入门》.md | 1 + .../core/handler/GlobalExceptionHandler.java | 13 ++++++++ ...ŠèŠ‹é“ Spring Boot SpringMVC 入门》.md | 2 +- .../test/ToolTestDemoController.http | 6 +++- .../test/ToolTestDemoController.java | 2 ++ src/main/resources/application-dev.yaml | 10 ++++++ src/main/resources/application-local.yaml | 10 ++++++ 29 files changed, 126 insertions(+), 39 deletions(-) delete mode 100644 ruoyi-ui/README.md create mode 100644 src/main/java/cn/iocoder/dashboard/framework/datasource/ã€ŠèŠ‹é“ Spring Boot 多数æ®æºï¼ˆè¯»å†™åˆ†ç¦»ï¼‰å…¥é—¨ã€‹.md create mode 100644 src/main/java/cn/iocoder/dashboard/framework/datasource/ã€ŠèŠ‹é“ Spring Boot æ•°æ®åº“连接池入门》.md create mode 100644 src/main/java/cn/iocoder/dashboard/framework/monitor/AdminServerConfiguration.java create mode 100644 src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java create mode 100644 src/main/java/cn/iocoder/dashboard/framework/monitor/ã€ŠèŠ‹é“ Spring Boot 监控工具 Admin 入门》.md create mode 100644 src/main/java/cn/iocoder/dashboard/framework/mybatis/ã€ŠèŠ‹é“ Spring Boot MyBatis 入门》.md create mode 100644 src/main/java/cn/iocoder/dashboard/framework/quartz/ã€ŠèŠ‹é“ Spring Boot 定时任务入门》.md create mode 100644 src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java create mode 100644 src/main/java/cn/iocoder/dashboard/framework/redis/ã€ŠèŠ‹é“ Spring Boot Redis 入门》.md create mode 100644 src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java create mode 100644 src/main/java/cn/iocoder/dashboard/framework/resilience4j/ã€ŠèŠ‹é“ Spring Boot 安全框架 Spring Security 入门》.md create mode 100644 src/main/java/cn/iocoder/dashboard/framework/tracer/ã€ŠèŠ‹é“ Spring Boot 链路追踪 SkyWalking 入门》.md create mode 100644 src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java create mode 100644 src/main/java/cn/iocoder/dashboard/framework/validator/ã€ŠèŠ‹é“ Spring Boot å‚数校验 Validation 入门》.md diff --git a/README.md b/README.md index d859b51a7..e039c6ead 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ 1. 链路追踪：基于 SkyWalking 实现性能监控，特别是链路的追踪 1. 分布å¼é”：基于 Redis 实现分布å¼é”，满足并å‘场景 1. 幂等组件：基于 Redis 实现幂等组件，解决é‡å¤è¯·æ±‚问题 +1. æœåŠ¡ä¿éšœï¼šåŸºäºŽ Resilience4j 实现æœåŠ¡çš„稳定性，包括é™æµã€ç†”断等功能 ### ç ”å‘工具 @@ -58,6 +59,37 @@ > 未æ¥ä¼šè¡¥å……文档和视频，方便胖å‹å†²å†²å†²ï¼ +## 技术栈 + +**åŽç«¯** + +| 框架 | 说明 | 版本 | å­¦ä¹ æŒ‡å— | +| --- | --- | --- | --- | +| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开å‘框架 | 2.4.2 | [文档](https://github.com/YunaiV/SpringBoot-Labs) | +| [MySQL](https://www.mysql.com/cn/) | æ•°æ®åº“æœåŠ¡å™¨ | 5.7 | | +| [Druid](https://github.com/alibaba/druid) | JDBC 连接池ã€ç›‘控组件 | 1.2.4 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) | +| [MyBatis-Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.4.1 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) | +| [Redis](https://redis.io/) | key-value æ•°æ®åº“ | 5.0 | | +| [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 3.1.46 | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao) | +| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架 | 5.4.2 | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao) | +| [Spring Security](https://github.com/spring-projects/spring-security) | Spring 安全框架 | 5.4.2 | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) | +| [Hibernate Validator](https://github.com/hibernate/hibernate-validator) | å‚数校验组件 | 6.1.7 | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?yudao) | +| [Quartz](https://github.com/quartz-scheduler) | 任务调度组件 | 2.3.2 | [文档](http://www.iocoder.cn/Spring-Boot/Job/?yudao) | +| [Knife4j](https://gitee.com/xiaoym/knife4j) | Swagger 增强 UI 实现 | 3.0.2 | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?yudao) | +| [Resilience4j](https://github.com/quartz-scheduler) | æœåŠ¡ä¿éšœç»„件 | 1.7.0 | [文档](http://www.iocoder.cn/Spring-Boot/Resilience4j/?yudao) | +| [SkyWalking](https://skywalking.apache.org/) | 分布å¼åº”用追踪系统 | 8.6.0 | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao) | +| [Spring Boot Admin](https://github.com/skywalking) | Spring Boot ç›‘æŽ§å¹³å° | 8.6.0 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) | +| [Jackson](https://github.com/FasterXML/jackson) | JSON 工具库 | 2.11.4 | | +| [MapStruct](https://mapstruct.org/) | Java Bean è½¬æ¢ | 1.4.1 | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao) | +| [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代ç | 1.16.14 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao) | + +**å‰ç«¯** + +| 框架 | 说明 | 版本 | +| --- | --- | --- | +| [Vue](https://cn.vuejs.org/index.html) | JavaScript 框架 | 2.6.12 | +| [Vue Element Admin](https://ant.design/docs/react/introduce-cn) | åŽå°å‰ç«¯è§£å†³æ–¹æ¡ˆ | - | + ## 演示图 diff --git a/pom.xml b/pom.xml index 09b8f70e3..1249edaf5 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,7 @@ 1.7.02.2.0 + 1.7.08.3.02.3.1 @@ -145,6 +146,12 @@ ${lock4j.version} + + io.github.resilience4j + resilience4j-spring-boot2 + ${resilience4j.version} + + org.apache.skywalking diff --git a/ruoyi-ui/README.md b/ruoyi-ui/README.md deleted file mode 100644 index e8e6b3407..000000000 --- a/ruoyi-ui/README.md +++ /dev/null @@ -1,30 +0,0 @@ -## å¼€å‘ - -```bash -# 克隆项目 -git clone https://github.com/YunaiV/ruoyi-vue-pro - -# 进入项目目录 -cd ruoyi-ui - -# 安装ä¾èµ– -npm install - -# 建议ä¸è¦ç›´æŽ¥ä½¿ç”¨ cnpm 安装ä¾èµ–，会有å„ç§è¯¡å¼‚çš„ bug。å¯ä»¥é€šè¿‡å¦‚下æ“作解决 npm 下载速度慢的问题 -npm install --registry=https://registry.npm.taobao.org - -# å¯åŠ¨æœåŠ¡ -npm run dev -``` - -æµè§ˆå™¨è®¿é—® http://localhost:80 - -## å‘布 - -```bash -# 构建测试环境 -npm run build:stage - -# 构建生产环境 -npm run build:prod -``` diff --git a/src/main/java/cn/iocoder/dashboard/DashboardApplication.java b/src/main/java/cn/iocoder/dashboard/DashboardApplication.java index a0a95f0ef..b54744c2b 100644 --- a/src/main/java/cn/iocoder/dashboard/DashboardApplication.java +++ b/src/main/java/cn/iocoder/dashboard/DashboardApplication.java @@ -5,7 +5,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -@EnableAdminServer // TODO 芋艿：需è¦è¿ç§»å‡ºåŽ» public class DashboardApplication { public static void main(String[] args) { diff --git a/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java b/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java index d08121242..146de8078 100644 --- a/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java +++ b/src/main/java/cn/iocoder/dashboard/common/exception/enums/GlobalErrorCodeConstants.java @@ -23,6 +23,8 @@ public interface GlobalErrorCodeConstants { ErrorCode FORBIDDEN = new ErrorCode(403, "没有该æ“作æƒé™"); ErrorCode NOT_FOUND = new ErrorCode(404, "请求未找到"); ErrorCode METHOD_NOT_ALLOWED = new ErrorCode(405, "请求方法ä¸æ­£ç¡®"); + ErrorCode LOCKED = new ErrorCode(423, "请求失败，请ç¨åŽé‡è¯•"); // 并å‘请求，ä¸å…许 + ErrorCode TOO_MANY_REQUESTS = new ErrorCode(429, "请求过于频ç¹ï¼Œè¯·ç¨åŽé‡è¯•"); // ========== æœåŠ¡ç«¯é”™è¯¯æ®µ ========== @@ -30,7 +32,6 @@ public interface GlobalErrorCodeConstants { // ========== 自定义错误段 ========== ErrorCode REPEATED_REQUESTS = new ErrorCode(900, "é‡å¤è¯·æ±‚，请ç¨åŽé‡è¯•"); // é‡å¤è¯·æ±‚ - ErrorCode CONCURRENCY_REQUESTS = new ErrorCode(901, "请求失败，请ç¨åŽé‡è¯•"); // 并å‘请求，ä¸å…许 ErrorCode UNKNOWN = new ErrorCode(999, "未知错误"); diff --git a/src/main/java/cn/iocoder/dashboard/framework/async/ã€ŠèŠ‹é“ Spring Boot 异步任务入门》.md b/src/main/java/cn/iocoder/dashboard/framework/async/ã€ŠèŠ‹é“ Spring Boot 异步任务入门》.md index b2ef210bd..5822b838c 100644 --- a/src/main/java/cn/iocoder/dashboard/framework/async/ã€ŠèŠ‹é“ Spring Boot 异步任务入门》.md +++ b/src/main/java/cn/iocoder/dashboard/framework/async/ã€ŠèŠ‹é“ Spring Boot 异步任务入门》.md @@ -1 +1 @@ - + diff --git a/src/main/java/cn/iocoder/dashboard/framework/datasource/ã€ŠèŠ‹é“ Spring Boot 多数æ®æºï¼ˆè¯»å†™åˆ†ç¦»ï¼‰å…¥é—¨ã€‹.md b/src/main/java/cn/iocoder/dashboard/framework/datasource/ã€ŠèŠ‹é“ Spring Boot 多数æ®æºï¼ˆè¯»å†™åˆ†ç¦»ï¼‰å…¥é—¨ã€‹.md new file mode 100644 index 000000000..21133741e --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/datasource/ã€ŠèŠ‹é“ Spring Boot 多数æ®æºï¼ˆè¯»å†™åˆ†ç¦»ï¼‰å…¥é—¨ã€‹.md @@ -0,0 +1 @@ + diff --git a/src/main/java/cn/iocoder/dashboard/framework/datasource/ã€ŠèŠ‹é“ Spring Boot æ•°æ®åº“连接池入门》.md b/src/main/java/cn/iocoder/dashboard/framework/datasource/ã€ŠèŠ‹é“ Spring Boot æ•°æ®åº“连接池入门》.md new file mode 100644 index 000000000..21b5075d5 --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/datasource/ã€ŠèŠ‹é“ Spring Boot æ•°æ®åº“连接池入门》.md @@ -0,0 +1 @@ + diff --git a/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java b/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java index 7f1b19cb4..066cbf9fd 100644 --- a/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java +++ b/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java @@ -14,7 +14,7 @@ public class DefaultLockFailureStrategy implements LockFailureStrategy { @Override public void onLockFailure(String key, long acquireTimeout, int acquireCount) { log.debug("[onLockFailure][线程:{} 获å–é”失败，key:{} 获å–超时时长:{} ms]", Thread.currentThread().getName(), key, acquireTimeout); - throw new ServiceException(GlobalErrorCodeConstants.CONCURRENCY_REQUESTS); + throw new ServiceException(GlobalErrorCodeConstants.LOCKED); } } diff --git a/src/main/java/cn/iocoder/dashboard/framework/monitor/AdminServerConfiguration.java b/src/main/java/cn/iocoder/dashboard/framework/monitor/AdminServerConfiguration.java new file mode 100644 index 000000000..30e5e23c4 --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/monitor/AdminServerConfiguration.java @@ -0,0 +1,9 @@ +package cn.iocoder.dashboard.framework.monitor; + +import de.codecentric.boot.admin.server.config.EnableAdminServer; +import org.springframework.context.annotation.Configuration; + +@Configuration +@EnableAdminServer +public class AdminServerConfiguration { +} diff --git a/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java b/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java new file mode 100644 index 000000000..dec6e31fb --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/monitor/package-info.java @@ -0,0 +1,4 @@ +/** + * 使用 Spring Boot Admin 实现简å•çš„ç›‘æŽ§å¹³å° + */ +package cn.iocoder.dashboard.framework.monitor; diff --git a/src/main/java/cn/iocoder/dashboard/framework/monitor/ã€ŠèŠ‹é“ Spring Boot 监控工具 Admin 入门》.md b/src/main/java/cn/iocoder/dashboard/framework/monitor/ã€ŠèŠ‹é“ Spring Boot 监控工具 Admin 入门》.md new file mode 100644 index 000000000..a1e367684 --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/monitor/ã€ŠèŠ‹é“ Spring Boot 监控工具 Admin 入门》.md @@ -0,0 +1 @@ + diff --git a/src/main/java/cn/iocoder/dashboard/framework/mybatis/ã€ŠèŠ‹é“ Spring Boot MyBatis 入门》.md b/src/main/java/cn/iocoder/dashboard/framework/mybatis/ã€ŠèŠ‹é“ Spring Boot MyBatis 入门》.md new file mode 100644 index 000000000..d684e1dd6 --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/mybatis/ã€ŠèŠ‹é“ Spring Boot MyBatis 入门》.md @@ -0,0 +1 @@ + diff --git a/src/main/java/cn/iocoder/dashboard/framework/quartz/ã€ŠèŠ‹é“ Spring Boot 定时任务入门》.md b/src/main/java/cn/iocoder/dashboard/framework/quartz/ã€ŠèŠ‹é“ Spring Boot 定时任务入门》.md new file mode 100644 index 000000000..65647011c --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/quartz/ã€ŠèŠ‹é“ Spring Boot 定时任务入门》.md @@ -0,0 +1 @@ + diff --git a/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java b/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java new file mode 100644 index 000000000..8d1562ad0 --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/redis/package-info.java @@ -0,0 +1,4 @@ +/** + * 采用 Spring Data Redis æ“作 Redis，底层使用 Redisson 作为客户端 + */ +package cn.iocoder.dashboard.framework.redis; diff --git a/src/main/java/cn/iocoder/dashboard/framework/redis/ã€ŠèŠ‹é“ Spring Boot Redis 入门》.md b/src/main/java/cn/iocoder/dashboard/framework/redis/ã€ŠèŠ‹é“ Spring Boot Redis 入门》.md new file mode 100644 index 000000000..80c544590 --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/redis/ã€ŠèŠ‹é“ Spring Boot Redis 入门》.md @@ -0,0 +1 @@ + diff --git a/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java b/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java new file mode 100644 index 000000000..8fb776083 --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/resilience4j/package-info.java @@ -0,0 +1,9 @@ +/** + * 使用 Resilience4j 组件，实现æœåŠ¡ä¿éšœï¼ŒåŒ…括： + * 1. 熔断器 + * 2. é™æµå™¨ + * 3. 舱å£éš”离 + * 4. é‡è¯• + * 5. é™æ—¶å™¨ + */ +package cn.iocoder.dashboard.framework.resilience4j; diff --git a/src/main/java/cn/iocoder/dashboard/framework/resilience4j/ã€ŠèŠ‹é“ Spring Boot 安全框架 Spring Security 入门》.md b/src/main/java/cn/iocoder/dashboard/framework/resilience4j/ã€ŠèŠ‹é“ Spring Boot 安全框架 Spring Security 入门》.md new file mode 100644 index 000000000..3fa673793 --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/resilience4j/ã€ŠèŠ‹é“ Spring Boot 安全框架 Spring Security 入门》.md @@ -0,0 +1 @@ + diff --git a/src/main/java/cn/iocoder/dashboard/framework/security/ã€ŠèŠ‹é“ Spring Boot 安全框架 Spring Security 入门》.md b/src/main/java/cn/iocoder/dashboard/framework/security/ã€ŠèŠ‹é“ Spring Boot 安全框架 Spring Security 入门》.md index dddf73635..b8a89316f 100644 --- a/src/main/java/cn/iocoder/dashboard/framework/security/ã€ŠèŠ‹é“ Spring Boot 安全框架 Spring Security 入门》.md +++ b/src/main/java/cn/iocoder/dashboard/framework/security/ã€ŠèŠ‹é“ Spring Boot 安全框架 Spring Security 入门》.md @@ -1,2 +1,2 @@ -* èŠ‹é“ Spring Security 入门： -* Spring Security 基本概念： +* èŠ‹é“ Spring Security 入门： +* Spring Security 基本概念： diff --git a/src/main/java/cn/iocoder/dashboard/framework/swagger/ã€ŠèŠ‹é“ Spring Boot API 接å£æ–‡æ¡£ Swagger 入门》.md b/src/main/java/cn/iocoder/dashboard/framework/swagger/ã€ŠèŠ‹é“ Spring Boot API 接å£æ–‡æ¡£ Swagger 入门》.md index 906a67200..7ed5ebd1b 100644 --- a/src/main/java/cn/iocoder/dashboard/framework/swagger/ã€ŠèŠ‹é“ Spring Boot API 接å£æ–‡æ¡£ Swagger 入门》.md +++ b/src/main/java/cn/iocoder/dashboard/framework/swagger/ã€ŠèŠ‹é“ Spring Boot API 接å£æ–‡æ¡£ Swagger 入门》.md @@ -1 +1 @@ - + diff --git a/src/main/java/cn/iocoder/dashboard/framework/tracer/ã€ŠèŠ‹é“ Spring Boot 链路追踪 SkyWalking 入门》.md b/src/main/java/cn/iocoder/dashboard/framework/tracer/ã€ŠèŠ‹é“ Spring Boot 链路追踪 SkyWalking 入门》.md new file mode 100644 index 000000000..ed9d4fe47 --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/tracer/ã€ŠèŠ‹é“ Spring Boot 链路追踪 SkyWalking 入门》.md @@ -0,0 +1 @@ + diff --git a/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java b/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java new file mode 100644 index 000000000..e6a861e5c --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/validator/package-info.java @@ -0,0 +1,4 @@ +/** + * 使用 Hibernate Validator 实现å‚数校验 + */ +package cn.iocoder.dashboard.framework.validator; diff --git a/src/main/java/cn/iocoder/dashboard/framework/validator/ã€ŠèŠ‹é“ Spring Boot å‚数校验 Validation 入门》.md b/src/main/java/cn/iocoder/dashboard/framework/validator/ã€ŠèŠ‹é“ Spring Boot å‚数校验 Validation 入门》.md new file mode 100644 index 000000000..b2c2cf8f5 --- /dev/null +++ b/src/main/java/cn/iocoder/dashboard/framework/validator/ã€ŠèŠ‹é“ Spring Boot å‚数校验 Validation 入门》.md @@ -0,0 +1 @@ + diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java b/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java index c0974a0f0..5f2748dfd 100644 --- a/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java +++ b/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java @@ -4,6 +4,7 @@ import cn.iocoder.dashboard.common.exception.GlobalException; import cn.iocoder.dashboard.common.exception.ServiceException; import cn.iocoder.dashboard.common.pojo.CommonResult; import cn.iocoder.dashboard.framework.security.core.util.SecurityUtils; +import io.github.resilience4j.ratelimiter.RequestNotPermitted; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.AccessDeniedException; import org.springframework.validation.BindException; @@ -63,6 +64,9 @@ public class GlobalExceptionHandler { if (ex instanceof HttpRequestMethodNotSupportedException) { return httpRequestMethodNotSupportedExceptionHandler((HttpRequestMethodNotSupportedException) ex); } + if (ex instanceof RequestNotPermitted) { + return requestNotPermittedExceptionHandler(request, (RequestNotPermitted) ex); + } if (ex instanceof ServiceException) { return serviceExceptionHandler((ServiceException) ex); } @@ -163,6 +167,15 @@ public class GlobalExceptionHandler { return CommonResult.error(METHOD_NOT_ALLOWED.getCode(), String.format("请求方法ä¸æ­£ç¡®:%s", ex.getMessage())); } + /** + * å¤„ç† Resilience4j é™æµæŠ›å‡ºçš„异常 + */ + @ExceptionHandler(value = RequestNotPermitted.class) + public CommonResult requestNotPermittedExceptionHandler(HttpServletRequest req, RequestNotPermitted ex) { + log.warn("[requestNotPermittedExceptionHandler][url({}) 访问过于频ç¹]", req.getRequestURL(), ex); + return CommonResult.error(TOO_MANY_REQUESTS); + } + /** * å¤„ç† Spring Security æƒé™ä¸è¶³çš„异常 * diff --git a/src/main/java/cn/iocoder/dashboard/framework/web/ã€ŠèŠ‹é“ Spring Boot SpringMVC 入门》.md b/src/main/java/cn/iocoder/dashboard/framework/web/ã€ŠèŠ‹é“ Spring Boot SpringMVC 入门》.md index 82c1fe55f..7c36a1591 100644 --- a/src/main/java/cn/iocoder/dashboard/framework/web/ã€ŠèŠ‹é“ Spring Boot SpringMVC 入门》.md +++ b/src/main/java/cn/iocoder/dashboard/framework/web/ã€ŠèŠ‹é“ Spring Boot SpringMVC 入门》.md @@ -1 +1 @@ - + diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.http b/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.http index b9d9fea9b..b10a3d293 100644 --- a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.http +++ b/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.http @@ -1,3 +1,7 @@ -### 请求 /get-permission-info æŽ¥å£ => æˆåŠŸ +### 请求 /tool/test-demo/get æŽ¥å£ => æˆåŠŸ GET {{baseUrl}}/tool/test-demo/get?id=1 Authorization: Bearer {{token}} + +### 请求 /tool/test-demo/list æŽ¥å£ => æˆåŠŸ +GET {{baseUrl}}/tool/test-demo/list?ids=1 +Authorization: Bearer {{token}} diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java b/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java index e89b35f90..13f70ec0d 100644 --- a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java +++ b/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java @@ -10,6 +10,7 @@ import cn.iocoder.dashboard.modules.tool.convert.test.ToolTestDemoConvert; import cn.iocoder.dashboard.modules.tool.dal.dataobject.test.ToolTestDemoDO; import cn.iocoder.dashboard.modules.tool.service.test.ToolTestDemoService; import com.baomidou.lock.annotation.Lock4j; +import io.github.resilience4j.ratelimiter.annotation.RateLimiter; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -78,6 +79,7 @@ public class ToolTestDemoController { @ApiOperation("获得测试示例列表") @ApiImplicitParam(name = "ids", value = "ç¼–å·åˆ—表", required = true, dataTypeClass = List.class) @PreAuthorize("@ss.hasPermission('tool:test-demo:query')") + @RateLimiter(name = "backendA") public CommonResult> getTestDemoList(@RequestParam("ids") Collection ids) { List list = testDemoService.getTestDemoList(ids); return success(ToolTestDemoConvert.INSTANCE.convertList(list)); diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index 08209bfa9..01349ef49 100644 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -88,6 +88,16 @@ 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 监控端点的é…置项 diff --git a/src/main/resources/application-local.yaml b/src/main/resources/application-local.yaml index 6a5b2995b..5dc75f500 100644 --- a/src/main/resources/application-local.yaml +++ b/src/main/resources/application-local.yaml @@ -88,6 +88,16 @@ 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 监控端点的é…置项