Commit 613eef375805e282ee90b3c25ff0ec977c4deb8d
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
Showing
210 changed files
with
2275 additions
and
2308 deletions
README.md
| @@ -157,27 +157,27 @@ ps：核心功能已经实现，正在对接微信小程序中... | @@ -157,27 +157,27 @@ ps：核心功能已经实现，正在对接微信小程序中... | ||
| 157 | 157 | ||
| 158 | | 框架 | 说明 | 版本 | 学习指南 | | 158 | | 框架 | 说明 | 版本 | 学习指南 | |
| 159 | |---------------------------------------------------------------------------------------------|------------------|----------|----------------------------------------------------------------| | 159 | |---------------------------------------------------------------------------------------------|------------------|----------|----------------------------------------------------------------| |
| 160 | -| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.5.12 | [文档](https://github.com/YunaiV/SpringBoot-Labs) | | 160 | +| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.6.8 | [文档](https://github.com/YunaiV/SpringBoot-Labs) | |
| 161 | | [MySQL](https://www.mysql.com/cn/) | 数据库服务器 | 5.7 | | | 161 | | [MySQL](https://www.mysql.com/cn/) | 数据库服务器 | 5.7 | | |
| 162 | | [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.8 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) | | 162 | | [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.8 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) | |
| 163 | -| [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.5.1 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) | | 163 | +| [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.5.2 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) | |
| 164 | | [Dynamic Datasource](https://dynamic-datasource.com/) | 动态数据源 | 3.5.0 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) | | 164 | | [Dynamic Datasource](https://dynamic-datasource.com/) | 动态数据源 | 3.5.0 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) | |
| 165 | | [Redis](https://redis.io/) | key-value 数据库 | 5.0 | | | 165 | | [Redis](https://redis.io/) | key-value 数据库 | 5.0 | | |
| 166 | -| [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 3.16.8 | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao) | | ||
| 167 | -| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架 | 5.3.16 | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao) | | ||
| 168 | -| [Spring Security](https://github.com/spring-projects/spring-security) | Spring 安全框架 | 5.5.5 | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) | | ||
| 169 | -| [Hibernate Validator](https://github.com/hibernate/hibernate-validator) | 参数校验组件 | 6.2.2 | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?yudao) | | 166 | +| [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 3.17.3 | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao) | |
| 167 | +| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架 | 5.3.20 | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao) | | ||
| 168 | +| [Spring Security](https://github.com/spring-projects/spring-security) | Spring 安全框架 | 5.6.5 | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) | | ||
| 169 | +| [Hibernate Validator](https://github.com/hibernate/hibernate-validator) | 参数校验组件 | 6.2.3 | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?yudao) | | ||
| 170 | | [Activiti](https://github.com/Activiti/Activiti) | 工作流引擎 | 7.1.0.M6 | [文档](TODO) | | 170 | | [Activiti](https://github.com/Activiti/Activiti) | 工作流引擎 | 7.1.0.M6 | [文档](TODO) | |
| 171 | | [Quartz](https://github.com/quartz-scheduler) | 任务调度组件 | 2.3.2 | [文档](http://www.iocoder.cn/Spring-Boot/Job/?yudao) | | 171 | | [Quartz](https://github.com/quartz-scheduler) | 任务调度组件 | 2.3.2 | [文档](http://www.iocoder.cn/Spring-Boot/Job/?yudao) | |
| 172 | -| [Knife4j](https://gitee.com/xiaoym/knife4j) | Swagger 增强 UI 实现 | 3.0.2 | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?yudao) | | ||
| 173 | -| [Resilience4j](https://github.com/resilience4j/resilience4j) | 服务保障组件 | 1.7.0 | [文档](http://www.iocoder.cn/Spring-Boot/Resilience4j/?yudao) | | 172 | +| [Knife4j](https://gitee.com/xiaoym/knife4j) | Swagger 增强 UI 实现 | 3.0.3 | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?yudao) | |
| 173 | +| [Resilience4j](https://github.com/resilience4j/resilience4j) | 服务保障组件 | 1.7.1 | [文档](http://www.iocoder.cn/Spring-Boot/Resilience4j/?yudao) | | ||
| 174 | | [SkyWalking](https://skywalking.apache.org/) | 分布式应用追踪系统 | 8.5.0 | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao) | | 174 | | [SkyWalking](https://skywalking.apache.org/) | 分布式应用追踪系统 | 8.5.0 | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao) | |
| 175 | -| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.4.2 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) | | ||
| 176 | -| [Jackson](https://github.com/FasterXML/jackson) | JSON 工具库 | 2.12.6 | | | 175 | +| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.6.7 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) | |
| 176 | +| [Jackson](https://github.com/FasterXML/jackson) | JSON 工具库 | 2.13.3 | | | ||
| 177 | | [MapStruct](https://mapstruct.org/) | Java Bean 转换 | 1.4.1 | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao) | | 177 | | [MapStruct](https://mapstruct.org/) | Java Bean 转换 | 1.4.1 | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao) | |
| 178 | | [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代码 | 1.16.14 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao) | | 178 | | [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代码 | 1.16.14 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao) | |
| 179 | -| [JUnit](https://junit.org/junit5/) | Java 单元测试框架 | 5.7.2 | - | | ||
| 180 | -| [Mockito](https://github.com/mockito/mockito) | Java Mock 框架 | 3.9.0 | - | | 179 | +| [JUnit](https://junit.org/junit5/) | Java 单元测试框架 | 5.8.2 | - | |
| 180 | +| [Mockito](https://github.com/mockito/mockito) | Java Mock 框架 | 4.0.0 | - | | ||
| 181 | 181 | ||
| 182 | ### 前端 | 182 | ### 前端 |
| 183 | 183 | ||
| @@ -192,42 +192,41 @@ ps：核心功能已经实现，正在对接微信小程序中... | @@ -192,42 +192,41 @@ ps：核心功能已经实现，正在对接微信小程序中... | ||
| 192 | 192 | ||
| 193 | | 模块 | biu | biu | biu | | 193 | | 模块 | biu | biu | biu | |
| 194 | |----------|--------------------------------------------------------------------|------------------------------------------------------------------|------------------------------------------------------------------| | 194 | |----------|--------------------------------------------------------------------|------------------------------------------------------------------|------------------------------------------------------------------| |
| 195 | -| 登录 & 首页 |  |  |  | | ||
| 196 | -| 用户 |  |  | - | | ||
| 197 | -| 租户 & 套餐 |  |  | - | | ||
| 198 | -| 部门 & 岗位 |  |  | - | | ||
| 199 | -| 菜单 & 角色 |  |  | - | | ||
| 200 | -| 审计日志 |  |  | - | | ||
| 201 | -| 短信 |  |  |  | | ||
| 202 | -| 字典 |  |  | - | | ||
| 203 | -| 错误码 & 通知 |  |  | - | | 195 | +| 登录 & 首页 |  |  |  | |
| 196 | +| 用户 |  |  | - | | ||
| 197 | +| 租户 & 套餐 |  |  | - | | ||
| 198 | +| 部门 & 岗位 |  |  | - | | ||
| 199 | +| 菜单 & 角色 |  |  | - | | ||
| 200 | +| 审计日志 |  |  | - | | ||
| 201 | +| 短信 |  |  |  | | ||
| 202 | +| 字典 |  |  | - | | ||
| 203 | +| 错误码 & 通知 |  |  | - | | ||
| 204 | 204 | ||
| 205 | ### 工作流程 | 205 | ### 工作流程 |
| 206 | 206 | ||
| 207 | | 模块 | biu | biu | biu | | 207 | | 模块 | biu | biu | biu | |
| 208 | |---------|------------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------| | 208 | |---------|------------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------| |
| 209 | -| 流程模型 |  |  |  | | ||
| 210 | -| 表单 & 分组 |  |  | - | | ||
| 211 | -| 我的流程 |  |  |  | | ||
| 212 | -| 待办 & 已办 |  |  |  | | ||
| 213 | -| OA 请假 |  |  |  | | ||
| 214 | - | ||
| 215 | -### 支付系统 | ||
| 216 | - | ||
| 217 | -| 模块 | biu | biu | biu | | ||
| 218 | -|---------|------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------| | ||
| 219 | -| 商家 & 应用 |  |  |  | | ||
| 220 | -| 支付 & 退款 |  |  | --- | | 209 | +| 流程模型 |  |  |  | |
| 210 | +| 表单 & 分组 |  |  | - | | ||
| 211 | +| 我的流程 |  |  |  | | ||
| 212 | +| 待办 & 已办 |  |  |  | | ||
| 213 | +| OA 请假 |  |  |  | | ||
| 221 | 214 | ||
| 222 | ### 基础设施 | 215 | ### 基础设施 |
| 223 | 216 | ||
| 224 | | 模块 | biu | biu | biu | | 217 | | 模块 | biu | biu | biu | |
| 225 | |---------------|----------------------------------------------------------------------|--------------------------------------------------------------------|------------------------------------------------------------------| | 218 | |---------------|----------------------------------------------------------------------|--------------------------------------------------------------------|------------------------------------------------------------------| |
| 226 | -| 代码生成 |  |  | - | | ||
| 227 | -| 文档 |  |  | - | | ||
| 228 | -| 文件 & 配置 |  |  |  | | ||
| 229 | -| 定时任务 |  |  | - | | ||
| 230 | -| API 日志 |  |  | - | | ||
| 231 | -| MySQL & Redis |  |  | - | | ||
| 232 | -| 监控平台 |  |  |  | | 219 | +| 代码生成 |  |  | - | |
| 220 | +| 文档 |  |  | - | | ||
| 221 | +| 文件 & 配置 |  |  |  | | ||
| 222 | +| 定时任务 |  |  | - | | ||
| 223 | +| API 日志 |  |  | - | | ||
| 224 | +| MySQL & Redis |  |  | - | | ||
| 225 | +| 监控平台 |  |  |  | | ||
| 233 | 226 | ||
| 227 | +### 支付系统 | ||
| 228 | + | ||
| 229 | +| 模块 | biu | biu | biu | | ||
| 230 | +|---------|------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------| | ||
| 231 | +| 商家 & 应用 |  |  |  | | ||
| 232 | +| 支付 & 退款 |  |  | --- | |
http-client.env.json
| @@ -7,5 +7,14 @@ | @@ -7,5 +7,14 @@ | ||
| 7 | "appApi": "http://127.0.0.1:48080/app-api", | 7 | "appApi": "http://127.0.0.1:48080/app-api", |
| 8 | "appToken": "test1", | 8 | "appToken": "test1", |
| 9 | "appTenentId": "1" | 9 | "appTenentId": "1" |
| 10 | + }, | ||
| 11 | + "gateway": { | ||
| 12 | + "baseUrl": "http://127.0.0.1:8888/admin-api", | ||
| 13 | + "token": "test1", | ||
| 14 | + "adminTenentId": "1", | ||
| 15 | + | ||
| 16 | + "appApi": "http://127.0.0.1:8888/app-api", | ||
| 17 | + "appToken": "test1", | ||
| 18 | + "appTenentId": "1" | ||
| 10 | } | 19 | } |
| 11 | } | 20 | } |
sql/mysql/ruoyi-vue-pro.sql
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | Target Server Version : 80026 | 11 | Target Server Version : 80026 |
| 12 | File Encoding : 65001 | 12 | File Encoding : 65001 |
| 13 | 13 | ||
| 14 | - Date: 25/05/2022 23:28:25 | 14 | + Date: 15/06/2022 08:11:25 |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | SET NAMES utf8mb4; | 17 | SET NAMES utf8mb4; |
| @@ -300,7 +300,7 @@ CREATE TABLE `bpm_form` ( | @@ -300,7 +300,7 @@ CREATE TABLE `bpm_form` ( | ||
| 300 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 300 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 301 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 301 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 302 | PRIMARY KEY (`id`) USING BTREE | 302 | PRIMARY KEY (`id`) USING BTREE |
| 303 | -) ENGINE = InnoDB AUTO_INCREMENT = 17 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的表单定义'; | 303 | +) ENGINE = InnoDB AUTO_INCREMENT = 18 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的表单定义'; |
| 304 | 304 | ||
| 305 | -- ---------------------------- | 305 | -- ---------------------------- |
| 306 | -- Records of bpm_form | 306 | -- Records of bpm_form |
| @@ -359,7 +359,7 @@ CREATE TABLE `bpm_process_definition_ext` ( | @@ -359,7 +359,7 @@ CREATE TABLE `bpm_process_definition_ext` ( | ||
| 359 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 359 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 360 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 360 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 361 | PRIMARY KEY (`id`) USING BTREE | 361 | PRIMARY KEY (`id`) USING BTREE |
| 362 | -) ENGINE = InnoDB AUTO_INCREMENT = 104 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Bpm 流程定义的拓展表\n'; | 362 | +) ENGINE = InnoDB AUTO_INCREMENT = 119 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Bpm 流程定义的拓展表\n'; |
| 363 | 363 | ||
| 364 | -- ---------------------------- | 364 | -- ---------------------------- |
| 365 | -- Records of bpm_process_definition_ext | 365 | -- Records of bpm_process_definition_ext |
| @@ -389,7 +389,7 @@ CREATE TABLE `bpm_process_instance_ext` ( | @@ -389,7 +389,7 @@ CREATE TABLE `bpm_process_instance_ext` ( | ||
| 389 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 389 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 390 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 390 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 391 | PRIMARY KEY (`id`) USING BTREE | 391 | PRIMARY KEY (`id`) USING BTREE |
| 392 | -) ENGINE = InnoDB AUTO_INCREMENT = 204 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的流程实例的拓展'; | 392 | +) ENGINE = InnoDB AUTO_INCREMENT = 256 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的流程实例的拓展'; |
| 393 | 393 | ||
| 394 | -- ---------------------------- | 394 | -- ---------------------------- |
| 395 | -- Records of bpm_process_instance_ext | 395 | -- Records of bpm_process_instance_ext |
| @@ -415,7 +415,7 @@ CREATE TABLE `bpm_task_assign_rule` ( | @@ -415,7 +415,7 @@ CREATE TABLE `bpm_task_assign_rule` ( | ||
| 415 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 415 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 416 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 416 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 417 | PRIMARY KEY (`id`) USING BTREE | 417 | PRIMARY KEY (`id`) USING BTREE |
| 418 | -) ENGINE = InnoDB AUTO_INCREMENT = 201 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Bpm 任务规则表'; | 418 | +) ENGINE = InnoDB AUTO_INCREMENT = 225 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Bpm 任务规则表'; |
| 419 | 419 | ||
| 420 | -- ---------------------------- | 420 | -- ---------------------------- |
| 421 | -- Records of bpm_task_assign_rule | 421 | -- Records of bpm_task_assign_rule |
| @@ -431,6 +431,7 @@ CREATE TABLE `bpm_task_ext` ( | @@ -431,6 +431,7 @@ CREATE TABLE `bpm_task_ext` ( | ||
| 431 | `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号', | 431 | `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号', |
| 432 | `assignee_user_id` bigint NULL DEFAULT NULL COMMENT '任务的审批人', | 432 | `assignee_user_id` bigint NULL DEFAULT NULL COMMENT '任务的审批人', |
| 433 | `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '任务的名字', | 433 | `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '任务的名字', |
| 434 | + `task_def_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '流程任务key', | ||
| 434 | `task_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '任务的编号', | 435 | `task_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '任务的编号', |
| 435 | `result` tinyint NOT NULL COMMENT '任务的结果', | 436 | `result` tinyint NOT NULL COMMENT '任务的结果', |
| 436 | `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '审批建议', | 437 | `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '审批建议', |
| @@ -444,7 +445,7 @@ CREATE TABLE `bpm_task_ext` ( | @@ -444,7 +445,7 @@ CREATE TABLE `bpm_task_ext` ( | ||
| 444 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 445 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 445 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 446 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 446 | PRIMARY KEY (`id`) USING BTREE | 447 | PRIMARY KEY (`id`) USING BTREE |
| 447 | -) ENGINE = InnoDB AUTO_INCREMENT = 217 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的流程任务的拓展表'; | 448 | +) ENGINE = InnoDB AUTO_INCREMENT = 295 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的流程任务的拓展表'; |
| 448 | 449 | ||
| 449 | -- ---------------------------- | 450 | -- ---------------------------- |
| 450 | -- Records of bpm_task_ext | 451 | -- Records of bpm_task_ext |
| @@ -504,7 +505,7 @@ CREATE TABLE `infra_api_access_log` ( | @@ -504,7 +505,7 @@ CREATE TABLE `infra_api_access_log` ( | ||
| 504 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 505 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 505 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 506 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 506 | PRIMARY KEY (`id`) USING BTREE | 507 | PRIMARY KEY (`id`) USING BTREE |
| 507 | -) ENGINE = InnoDB AUTO_INCREMENT = 33232 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'API 访问日志表'; | 508 | +) ENGINE = InnoDB AUTO_INCREMENT = 35150 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'API 访问日志表'; |
| 508 | 509 | ||
| 509 | -- ---------------------------- | 510 | -- ---------------------------- |
| 510 | -- Records of infra_api_access_log | 511 | -- Records of infra_api_access_log |
| @@ -546,7 +547,7 @@ CREATE TABLE `infra_api_error_log` ( | @@ -546,7 +547,7 @@ CREATE TABLE `infra_api_error_log` ( | ||
| 546 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 547 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 547 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 548 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 548 | PRIMARY KEY (`id`) USING BTREE | 549 | PRIMARY KEY (`id`) USING BTREE |
| 549 | -) ENGINE = InnoDB AUTO_INCREMENT = 454 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统异常日志'; | 550 | +) ENGINE = InnoDB AUTO_INCREMENT = 627 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统异常日志'; |
| 550 | 551 | ||
| 551 | -- ---------------------------- | 552 | -- ---------------------------- |
| 552 | -- Records of infra_api_error_log | 553 | -- Records of infra_api_error_log |
| @@ -688,6 +689,7 @@ DROP TABLE IF EXISTS `infra_file`; | @@ -688,6 +689,7 @@ DROP TABLE IF EXISTS `infra_file`; | ||
| 688 | CREATE TABLE `infra_file` ( | 689 | CREATE TABLE `infra_file` ( |
| 689 | `id` bigint NOT NULL AUTO_INCREMENT COMMENT '文件编号', | 690 | `id` bigint NOT NULL AUTO_INCREMENT COMMENT '文件编号', |
| 690 | `config_id` bigint NULL DEFAULT NULL COMMENT '配置编号', | 691 | `config_id` bigint NULL DEFAULT NULL COMMENT '配置编号', |
| 692 | + `name` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '文件名', | ||
| 691 | `path` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '文件路径', | 693 | `path` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '文件路径', |
| 692 | `url` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '文件 URL', | 694 | `url` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '文件 URL', |
| 693 | `type` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '文件类型', | 695 | `type` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '文件类型', |
| @@ -698,7 +700,7 @@ CREATE TABLE `infra_file` ( | @@ -698,7 +700,7 @@ CREATE TABLE `infra_file` ( | ||
| 698 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', | 700 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', |
| 699 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 701 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 700 | PRIMARY KEY (`id`) USING BTREE | 702 | PRIMARY KEY (`id`) USING BTREE |
| 701 | -) ENGINE = InnoDB AUTO_INCREMENT = 83 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表'; | 703 | +) ENGINE = InnoDB AUTO_INCREMENT = 85 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表'; |
| 702 | 704 | ||
| 703 | -- ---------------------------- | 705 | -- ---------------------------- |
| 704 | -- Records of infra_file | 706 | -- Records of infra_file |
| @@ -723,7 +725,7 @@ CREATE TABLE `infra_file_config` ( | @@ -723,7 +725,7 @@ CREATE TABLE `infra_file_config` ( | ||
| 723 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', | 725 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', |
| 724 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 726 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 725 | PRIMARY KEY (`id`) USING BTREE | 727 | PRIMARY KEY (`id`) USING BTREE |
| 726 | -) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件配置表'; | 728 | +) ENGINE = InnoDB AUTO_INCREMENT = 18 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件配置表'; |
| 727 | 729 | ||
| 728 | -- ---------------------------- | 730 | -- ---------------------------- |
| 729 | -- Records of infra_file_config | 731 | -- Records of infra_file_config |
| @@ -732,6 +734,9 @@ BEGIN; | @@ -732,6 +734,9 @@ BEGIN; | ||
| 732 | INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (4, '数据库', 1, '我是数据库', b'0', '{\"@class\":\"cn.iocoder.yudao.framework.file.core.client.db.DBFileClientConfig\",\"domain\":\"http://127.0.0.1:48080\"}', '1', '2022-03-15 23:56:24', '1', '2022-03-26 21:39:26', b'0'); | 734 | INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (4, '数据库', 1, '我是数据库', b'0', '{\"@class\":\"cn.iocoder.yudao.framework.file.core.client.db.DBFileClientConfig\",\"domain\":\"http://127.0.0.1:48080\"}', '1', '2022-03-15 23:56:24', '1', '2022-03-26 21:39:26', b'0'); |
| 733 | INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (5, '本地磁盘', 10, '测试下本地存储', b'0', '{\"@class\":\"cn.iocoder.yudao.framework.file.core.client.local.LocalFileClientConfig\",\"basePath\":\"/Users/yunai/file_test\",\"domain\":\"http://127.0.0.1:48080\"}', '1', '2022-03-15 23:57:00', '1', '2022-03-26 21:39:26', b'0'); | 735 | INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (5, '本地磁盘', 10, '测试下本地存储', b'0', '{\"@class\":\"cn.iocoder.yudao.framework.file.core.client.local.LocalFileClientConfig\",\"basePath\":\"/Users/yunai/file_test\",\"domain\":\"http://127.0.0.1:48080\"}', '1', '2022-03-15 23:57:00', '1', '2022-03-26 21:39:26', b'0'); |
| 734 | INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (11, 'S3 - 七牛云', 20, NULL, b'1', '{\"@class\":\"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3-cn-south-1.qiniucs.com\",\"domain\":\"http://test.yudao.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8\",\"accessSecret\":\"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP\"}', '1', '2022-03-19 18:00:03', '1', '2022-03-26 21:39:26', b'0'); | 736 | INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (11, 'S3 - 七牛云', 20, NULL, b'1', '{\"@class\":\"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3-cn-south-1.qiniucs.com\",\"domain\":\"http://test.yudao.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8\",\"accessSecret\":\"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP\"}', '1', '2022-03-19 18:00:03', '1', '2022-03-26 21:39:26', b'0'); |
| 737 | +INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (15, 'S3 - 七牛云', 20, '', b'0', '{\"@class\":\"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3-cn-south-1.qiniucs.com\",\"domain\":\"http://test.yudao.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8\",\"accessSecret\":\"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP\"}', '1', '2022-06-10 20:50:41', '1', '2022-06-10 20:50:41', b'0'); | ||
| 738 | +INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (16, 'S3 - 七牛云', 20, '', b'0', '{\"@class\":\"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3-cn-south-1.qiniucs.com\",\"domain\":\"http://test.yudao.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8\",\"accessSecret\":\"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP\"}', '1', '2022-06-11 20:32:08', '1', '2022-06-11 20:32:08', b'0'); | ||
| 739 | +INSERT INTO `infra_file_config` (`id`, `name`, `storage`, `remark`, `master`, `config`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (17, 'S3 - 七牛云', 20, '', b'0', '{\"@class\":\"cn.iocoder.yudao.framework.file.core.client.s3.S3FileClientConfig\",\"endpoint\":\"s3-cn-south-1.qiniucs.com\",\"domain\":\"http://test.yudao.iocoder.cn\",\"bucket\":\"ruoyi-vue-pro\",\"accessKey\":\"b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8\",\"accessSecret\":\"kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP\"}', '1', '2022-06-11 20:32:47', '1', '2022-06-11 20:32:47', b'0'); | ||
| 735 | COMMIT; | 740 | COMMIT; |
| 736 | 741 | ||
| 737 | -- ---------------------------- | 742 | -- ---------------------------- |
| @@ -862,7 +867,7 @@ CREATE TABLE `member_user` ( | @@ -862,7 +867,7 @@ CREATE TABLE `member_user` ( | ||
| 862 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 867 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 863 | PRIMARY KEY (`id`) USING BTREE, | 868 | PRIMARY KEY (`id`) USING BTREE, |
| 864 | UNIQUE INDEX `uk_mobile`(`mobile` ASC) USING BTREE COMMENT '手机号' | 869 | UNIQUE INDEX `uk_mobile`(`mobile` ASC) USING BTREE COMMENT '手机号' |
| 865 | -) ENGINE = InnoDB AUTO_INCREMENT = 247 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户'; | 870 | +) ENGINE = InnoDB AUTO_INCREMENT = 248 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户'; |
| 866 | 871 | ||
| 867 | -- ---------------------------- | 872 | -- ---------------------------- |
| 868 | -- Records of member_user | 873 | -- Records of member_user |
| @@ -1258,7 +1263,6 @@ INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `st | @@ -1258,7 +1263,6 @@ INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `st | ||
| 1258 | INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (79, 2, '手动编辑', '2', 'system_error_code_type', 0, 'primary', '', NULL, '1', '2021-04-21 00:07:14', '1', '2022-02-16 13:57:24', b'0'); | 1263 | INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (79, 2, '手动编辑', '2', 'system_error_code_type', 0, 'primary', '', NULL, '1', '2021-04-21 00:07:14', '1', '2022-02-16 13:57:24', b'0'); |
| 1259 | INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (80, 100, '账号登录', '100', 'system_login_type', 0, 'primary', '', '账号登录', '1', '2021-10-06 00:52:02', '1', '2022-02-16 13:11:34', b'0'); | 1264 | INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (80, 100, '账号登录', '100', 'system_login_type', 0, 'primary', '', '账号登录', '1', '2021-10-06 00:52:02', '1', '2022-02-16 13:11:34', b'0'); |
| 1260 | INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (81, 101, '社交登录', '101', 'system_login_type', 0, 'info', '', '社交登录', '1', '2021-10-06 00:52:17', '1', '2022-02-16 13:11:40', b'0'); | 1265 | INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (81, 101, '社交登录', '101', 'system_login_type', 0, 'info', '', '社交登录', '1', '2021-10-06 00:52:17', '1', '2022-02-16 13:11:40', b'0'); |
| 1261 | -INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (82, 102, 'Mock 登录', '102', 'system_login_type', 0, 'danger', '', 'Mock 登录', '1', '2021-10-06 00:52:32', '1', '2022-02-16 13:11:44', b'0'); | ||
| 1262 | INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (83, 200, '主动登出', '200', 'system_login_type', 0, 'primary', '', '主动登出', '1', '2021-10-06 00:52:58', '1', '2022-02-16 13:11:49', b'0'); | 1266 | INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (83, 200, '主动登出', '200', 'system_login_type', 0, 'primary', '', '主动登出', '1', '2021-10-06 00:52:58', '1', '2022-02-16 13:11:49', b'0'); |
| 1263 | INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (85, 202, '强制登出', '202', 'system_login_type', 0, 'danger', '', '强制退出', '1', '2021-10-06 00:53:41', '1', '2022-02-16 13:11:57', b'0'); | 1267 | INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (85, 202, '强制登出', '202', 'system_login_type', 0, 'danger', '', '强制退出', '1', '2021-10-06 00:53:41', '1', '2022-02-16 13:11:57', b'0'); |
| 1264 | INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (86, 0, '病假', '1', 'bpm_oa_leave_type', 0, 'primary', '', NULL, '1', '2021-09-21 22:35:28', '1', '2022-02-16 10:00:41', b'0'); | 1268 | INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (86, 0, '病假', '1', 'bpm_oa_leave_type', 0, 'primary', '', NULL, '1', '2021-09-21 22:35:28', '1', '2022-02-16 10:00:41', b'0'); |
| @@ -1411,7 +1415,7 @@ CREATE TABLE `system_error_code` ( | @@ -1411,7 +1415,7 @@ CREATE TABLE `system_error_code` ( | ||
| 1411 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', | 1415 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', |
| 1412 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 1416 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 1413 | PRIMARY KEY (`id`) USING BTREE | 1417 | PRIMARY KEY (`id`) USING BTREE |
| 1414 | -) ENGINE = InnoDB AUTO_INCREMENT = 5829 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '错误码表'; | 1418 | +) ENGINE = InnoDB AUTO_INCREMENT = 5832 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '错误码表'; |
| 1415 | 1419 | ||
| 1416 | -- ---------------------------- | 1420 | -- ---------------------------- |
| 1417 | -- Records of system_error_code | 1421 | -- Records of system_error_code |
| @@ -1440,7 +1444,7 @@ CREATE TABLE `system_login_log` ( | @@ -1440,7 +1444,7 @@ CREATE TABLE `system_login_log` ( | ||
| 1440 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 1444 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 1441 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 1445 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 1442 | PRIMARY KEY (`id`) USING BTREE | 1446 | PRIMARY KEY (`id`) USING BTREE |
| 1443 | -) ENGINE = InnoDB AUTO_INCREMENT = 1416 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统访问记录'; | 1447 | +) ENGINE = InnoDB AUTO_INCREMENT = 1489 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统访问记录'; |
| 1444 | 1448 | ||
| 1445 | -- ---------------------------- | 1449 | -- ---------------------------- |
| 1446 | -- Records of system_login_log | 1450 | -- Records of system_login_log |
| @@ -1757,7 +1761,7 @@ CREATE TABLE `system_oauth2_access_token` ( | @@ -1757,7 +1761,7 @@ CREATE TABLE `system_oauth2_access_token` ( | ||
| 1757 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 1761 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 1758 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 1762 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 1759 | PRIMARY KEY (`id`) USING BTREE | 1763 | PRIMARY KEY (`id`) USING BTREE |
| 1760 | -) ENGINE = InnoDB AUTO_INCREMENT = 172 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 访问令牌'; | 1764 | +) ENGINE = InnoDB AUTO_INCREMENT = 231 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 访问令牌'; |
| 1761 | 1765 | ||
| 1762 | -- ---------------------------- | 1766 | -- ---------------------------- |
| 1763 | -- Records of system_oauth2_access_token | 1767 | -- Records of system_oauth2_access_token |
| @@ -1877,7 +1881,7 @@ CREATE TABLE `system_oauth2_refresh_token` ( | @@ -1877,7 +1881,7 @@ CREATE TABLE `system_oauth2_refresh_token` ( | ||
| 1877 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 1881 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 1878 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 1882 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 1879 | PRIMARY KEY (`id`) USING BTREE | 1883 | PRIMARY KEY (`id`) USING BTREE |
| 1880 | -) ENGINE = InnoDB AUTO_INCREMENT = 106 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '刷新令牌'; | 1884 | +) ENGINE = InnoDB AUTO_INCREMENT = 165 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '刷新令牌'; |
| 1881 | 1885 | ||
| 1882 | -- ---------------------------- | 1886 | -- ---------------------------- |
| 1883 | -- Records of system_oauth2_refresh_token | 1887 | -- Records of system_oauth2_refresh_token |
| @@ -1917,7 +1921,7 @@ CREATE TABLE `system_operate_log` ( | @@ -1917,7 +1921,7 @@ CREATE TABLE `system_operate_log` ( | ||
| 1917 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 1921 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 1918 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 1922 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 1919 | PRIMARY KEY (`id`) USING BTREE | 1923 | PRIMARY KEY (`id`) USING BTREE |
| 1920 | -) ENGINE = InnoDB AUTO_INCREMENT = 2214 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '操作日志记录'; | 1924 | +) ENGINE = InnoDB AUTO_INCREMENT = 2432 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '操作日志记录'; |
| 1921 | 1925 | ||
| 1922 | -- ---------------------------- | 1926 | -- ---------------------------- |
| 1923 | -- Records of system_operate_log | 1927 | -- Records of system_operate_log |
| @@ -1983,7 +1987,7 @@ CREATE TABLE `system_role` ( | @@ -1983,7 +1987,7 @@ CREATE TABLE `system_role` ( | ||
| 1983 | BEGIN; | 1987 | BEGIN; |
| 1984 | INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, '超级管理员', 'super_admin', 1, 1, '', 0, 1, '超级管理员', 'admin', '2021-01-05 17:03:48', '', '2022-02-22 05:08:21', b'0', 1); | 1988 | INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, '超级管理员', 'super_admin', 1, 1, '', 0, 1, '超级管理员', 'admin', '2021-01-05 17:03:48', '', '2022-02-22 05:08:21', b'0', 1); |
| 1985 | INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2, '普通角色', 'common', 2, 2, '', 0, 1, '普通角色', 'admin', '2021-01-05 17:03:48', '', '2022-02-22 05:08:20', b'0', 1); | 1989 | INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2, '普通角色', 'common', 2, 2, '', 0, 1, '普通角色', 'admin', '2021-01-05 17:03:48', '', '2022-02-22 05:08:20', b'0', 1); |
| 1986 | -INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (101, '测试账号', 'test', 0, 1, '[]', 0, 2, '132', '', '2021-01-06 13:49:35', '1', '2022-04-01 21:37:13', b'0', 1); | 1990 | +INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (101, '测试账号', 'test', 0, 1, '[]', 0, 2, '132', '', '2021-01-06 13:49:35', '1', '2022-05-28 16:11:05', b'0', 1); |
| 1987 | INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (109, '租户管理员', 'tenant_admin', 0, 1, '', 0, 1, '系统自动生成', '1', '2022-02-22 00:56:14', '1', '2022-02-22 00:56:14', b'0', 121); | 1991 | INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (109, '租户管理员', 'tenant_admin', 0, 1, '', 0, 1, '系统自动生成', '1', '2022-02-22 00:56:14', '1', '2022-02-22 00:56:14', b'0', 121); |
| 1988 | INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (110, '测试角色', 'test', 0, 1, '[]', 0, 2, '嘿嘿', '110', '2022-02-23 00:14:34', '110', '2022-02-23 13:14:58', b'0', 121); | 1992 | INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (110, '测试角色', 'test', 0, 1, '[]', 0, 2, '嘿嘿', '110', '2022-02-23 00:14:34', '110', '2022-02-23 13:14:58', b'0', 121); |
| 1989 | INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (111, '租户管理员', 'tenant_admin', 0, 1, '', 0, 1, '系统自动生成', '1', '2022-03-07 21:37:58', '1', '2022-03-07 21:37:58', b'0', 122); | 1993 | INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (111, '租户管理员', 'tenant_admin', 0, 1, '', 0, 1, '系统自动生成', '1', '2022-03-07 21:37:58', '1', '2022-03-07 21:37:58', b'0', 122); |
| @@ -2253,7 +2257,7 @@ COMMIT; | @@ -2253,7 +2257,7 @@ COMMIT; | ||
| 2253 | DROP TABLE IF EXISTS `system_sms_channel`; | 2257 | DROP TABLE IF EXISTS `system_sms_channel`; |
| 2254 | CREATE TABLE `system_sms_channel` ( | 2258 | CREATE TABLE `system_sms_channel` ( |
| 2255 | `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号', | 2259 | `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号', |
| 2256 | - `signature` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '短信签名', | 2260 | + `signature` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '短信签名', |
| 2257 | `code` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '渠道编码', | 2261 | `code` varchar(63) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '渠道编码', |
| 2258 | `status` tinyint NOT NULL COMMENT '开启状态', | 2262 | `status` tinyint NOT NULL COMMENT '开启状态', |
| 2259 | `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注', | 2263 | `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注', |
| @@ -2300,7 +2304,7 @@ CREATE TABLE `system_sms_code` ( | @@ -2300,7 +2304,7 @@ CREATE TABLE `system_sms_code` ( | ||
| 2300 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 2304 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 2301 | PRIMARY KEY (`id`) USING BTREE, | 2305 | PRIMARY KEY (`id`) USING BTREE, |
| 2302 | INDEX `idx_mobile`(`mobile` ASC) USING BTREE COMMENT '手机号' | 2306 | INDEX `idx_mobile`(`mobile` ASC) USING BTREE COMMENT '手机号' |
| 2303 | -) ENGINE = InnoDB AUTO_INCREMENT = 468 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '手机验证码'; | 2307 | +) ENGINE = InnoDB AUTO_INCREMENT = 469 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '手机验证码'; |
| 2304 | 2308 | ||
| 2305 | -- ---------------------------- | 2309 | -- ---------------------------- |
| 2306 | -- Records of system_sms_code | 2310 | -- Records of system_sms_code |
| @@ -2343,7 +2347,7 @@ CREATE TABLE `system_sms_log` ( | @@ -2343,7 +2347,7 @@ CREATE TABLE `system_sms_log` ( | ||
| 2343 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', | 2347 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', |
| 2344 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 2348 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 2345 | PRIMARY KEY (`id`) USING BTREE | 2349 | PRIMARY KEY (`id`) USING BTREE |
| 2346 | -) ENGINE = InnoDB AUTO_INCREMENT = 144 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '短信日志'; | 2350 | +) ENGINE = InnoDB AUTO_INCREMENT = 242 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '短信日志'; |
| 2347 | 2351 | ||
| 2348 | -- ---------------------------- | 2352 | -- ---------------------------- |
| 2349 | -- Records of system_sms_log | 2353 | -- Records of system_sms_log |
| @@ -2413,7 +2417,7 @@ CREATE TABLE `system_social_user` ( | @@ -2413,7 +2417,7 @@ CREATE TABLE `system_social_user` ( | ||
| 2413 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 2417 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 2414 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 2418 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 2415 | PRIMARY KEY (`id`) USING BTREE | 2419 | PRIMARY KEY (`id`) USING BTREE |
| 2416 | -) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '社交用户表'; | 2420 | +) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '社交用户表'; |
| 2417 | 2421 | ||
| 2418 | -- ---------------------------- | 2422 | -- ---------------------------- |
| 2419 | -- Records of system_social_user | 2423 | -- Records of system_social_user |
| @@ -2438,7 +2442,7 @@ CREATE TABLE `system_social_user_bind` ( | @@ -2438,7 +2442,7 @@ CREATE TABLE `system_social_user_bind` ( | ||
| 2438 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', | 2442 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', |
| 2439 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 2443 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 2440 | PRIMARY KEY (`id`) USING BTREE | 2444 | PRIMARY KEY (`id`) USING BTREE |
| 2441 | -) ENGINE = InnoDB AUTO_INCREMENT = 12 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '社交绑定表'; | 2445 | +) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '社交绑定表'; |
| 2442 | 2446 | ||
| 2443 | -- ---------------------------- | 2447 | -- ---------------------------- |
| 2444 | -- Records of system_social_user_bind | 2448 | -- Records of system_social_user_bind |
| @@ -2545,7 +2549,7 @@ CREATE TABLE `system_user_role` ( | @@ -2545,7 +2549,7 @@ CREATE TABLE `system_user_role` ( | ||
| 2545 | `deleted` bit(1) NULL DEFAULT b'0' COMMENT '是否删除', | 2549 | `deleted` bit(1) NULL DEFAULT b'0' COMMENT '是否删除', |
| 2546 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', | 2550 | `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', |
| 2547 | PRIMARY KEY (`id`) USING BTREE | 2551 | PRIMARY KEY (`id`) USING BTREE |
| 2548 | -) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户和角色关联表'; | 2552 | +) ENGINE = InnoDB AUTO_INCREMENT = 21 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户和角色关联表'; |
| 2549 | 2553 | ||
| 2550 | -- ---------------------------- | 2554 | -- ---------------------------- |
| 2551 | -- Records of system_user_role | 2555 | -- Records of system_user_role |
| @@ -2556,7 +2560,6 @@ INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_t | @@ -2556,7 +2560,6 @@ INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_t | ||
| 2556 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (4, 100, 101, '', '2022-01-11 13:19:45', '', '2022-05-12 12:35:13', b'0', 1); | 2560 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (4, 100, 101, '', '2022-01-11 13:19:45', '', '2022-05-12 12:35:13', b'0', 1); |
| 2557 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (5, 100, 1, '', '2022-01-11 13:19:45', '', '2022-05-12 12:35:12', b'0', 1); | 2561 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (5, 100, 1, '', '2022-01-11 13:19:45', '', '2022-05-12 12:35:12', b'0', 1); |
| 2558 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (6, 100, 2, '', '2022-01-11 13:19:45', '', '2022-05-12 12:35:11', b'0', 1); | 2562 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (6, 100, 2, '', '2022-01-11 13:19:45', '', '2022-05-12 12:35:11', b'0', 1); |
| 2559 | -INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (7, 104, 101, '', '2022-01-11 13:19:45', '', '2022-05-12 12:35:11', b'0', 1); | ||
| 2560 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (10, 103, 1, '1', '2022-01-11 13:19:45', '1', '2022-01-11 13:19:45', b'0', 1); | 2563 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (10, 103, 1, '1', '2022-01-11 13:19:45', '1', '2022-01-11 13:19:45', b'0', 1); |
| 2561 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (11, 107, 106, '1', '2022-02-20 22:59:33', '1', '2022-02-20 22:59:33', b'0', 118); | 2564 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (11, 107, 106, '1', '2022-02-20 22:59:33', '1', '2022-02-20 22:59:33', b'0', 118); |
| 2562 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (12, 108, 107, '1', '2022-02-20 23:00:50', '1', '2022-02-20 23:00:50', b'0', 119); | 2565 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (12, 108, 107, '1', '2022-02-20 23:00:50', '1', '2022-02-20 23:00:50', b'0', 119); |
| @@ -2567,6 +2570,7 @@ INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_t | @@ -2567,6 +2570,7 @@ INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_t | ||
| 2567 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (17, 114, 101, '1', '2022-03-19 21:51:13', '1', '2022-03-19 21:51:13', b'0', 1); | 2570 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (17, 114, 101, '1', '2022-03-19 21:51:13', '1', '2022-03-19 21:51:13', b'0', 1); |
| 2568 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (18, 1, 2, '1', '2022-05-12 20:39:29', '1', '2022-05-12 20:39:29', b'0', 1); | 2571 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (18, 1, 2, '1', '2022-05-12 20:39:29', '1', '2022-05-12 20:39:29', b'0', 1); |
| 2569 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (19, 116, 113, '1', '2022-05-17 10:07:10', '1', '2022-05-17 10:07:10', b'0', 124); | 2572 | INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (19, 116, 113, '1', '2022-05-17 10:07:10', '1', '2022-05-17 10:07:10', b'0', 124); |
| 2573 | +INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (20, 104, 101, '1', '2022-05-28 15:43:57', '1', '2022-05-28 15:43:57', b'0', 1); | ||
| 2570 | COMMIT; | 2574 | COMMIT; |
| 2571 | 2575 | ||
| 2572 | -- ---------------------------- | 2576 | -- ---------------------------- |
| @@ -2630,10 +2634,10 @@ CREATE TABLE `system_users` ( | @@ -2630,10 +2634,10 @@ CREATE TABLE `system_users` ( | ||
| 2630 | -- Records of system_users | 2634 | -- Records of system_users |
| 2631 | -- ---------------------------- | 2635 | -- ---------------------------- |
| 2632 | BEGIN; | 2636 | BEGIN; |
| 2633 | -INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 'admin', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '芋道源码', '管理员', 103, '[1]', 'aoteman@126.com', '15612345678', 1, 'http://test.yudao.iocoder.cn/48934f2f-92d4-4250-b917-d10d2b262c6a', 0, '127.0.0.1', '2022-05-23 20:27:29', 'admin', '2021-01-05 17:03:47', NULL, '2022-05-23 20:27:29', b'0', 1); | 2637 | +INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 'admin', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '芋道源码', '管理员', 103, '[1]', 'aoteman@126.com', '15612345678', 1, 'http://test.yudao.iocoder.cn/48934f2f-92d4-4250-b917-d10d2b262c6a', 0, '127.0.0.1', '2022-06-15 08:03:23', 'admin', '2021-01-05 17:03:47', NULL, '2022-06-15 08:03:23', b'0', 1); |
| 2634 | INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (100, 'yudao', '$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', '芋道', '不要吓我', 104, '[1]', 'yudao@iocoder.cn', '15601691300', 1, '', 1, '127.0.0.1', '2022-05-22 19:35:33', '', '2021-01-07 09:07:17', NULL, '2022-05-22 19:35:33', b'0', 1); | 2638 | INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (100, 'yudao', '$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', '芋道', '不要吓我', 104, '[1]', 'yudao@iocoder.cn', '15601691300', 1, '', 1, '127.0.0.1', '2022-05-22 19:35:33', '', '2021-01-07 09:07:17', NULL, '2022-05-22 19:35:33', b'0', 1); |
| 2635 | INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (103, 'yuanma', '$2a$10$wWoPT7sqriM2O1YXRL.je.GiL538OR6ZTN8aQZr9JAGdnpCH2tpYe', '源码', NULL, 106, NULL, 'yuanma@iocoder.cn', '15601701300', 0, '', 0, '127.0.0.1', '2022-01-18 00:33:40', '', '2021-01-13 23:50:35', NULL, '2022-01-18 00:33:40', b'0', 1); | 2639 | INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (103, 'yuanma', '$2a$10$wWoPT7sqriM2O1YXRL.je.GiL538OR6ZTN8aQZr9JAGdnpCH2tpYe', '源码', NULL, 106, NULL, 'yuanma@iocoder.cn', '15601701300', 0, '', 0, '127.0.0.1', '2022-01-18 00:33:40', '', '2021-01-13 23:50:35', NULL, '2022-01-18 00:33:40', b'0', 1); |
| 2636 | -INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (104, 'test', '$2a$10$e5RpuDCC0GYSt0Hvd2.CjujIXwgGct4SnXi6dVGxdgFsnqgEryk5a', '测试号', NULL, 107, '[1]', '111@qq.com', '15601691200', 1, '', 0, '127.0.0.1', '2022-03-19 21:46:19', '', '2021-01-21 02:13:53', '1', '2022-05-16 19:36:28', b'0', 1); | 2640 | +INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (104, 'test', '$2a$10$GP8zvqHB//TekuzYZSBYAuBQJiNq1.fxQVDYJ.uBCOnWCtDVKE4H6', '测试号', NULL, 107, '[1]', '111@qq.com', '15601691200', 1, '', 0, '127.0.0.1', '2022-05-28 15:43:17', '', '2021-01-21 02:13:53', NULL, '2022-05-28 15:43:17', b'0', 1); |
| 2637 | INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (107, 'admin107', '$2a$10$dYOOBKMO93v/.ReCqzyFg.o67Tqk.bbc2bhrpyBGkIw9aypCtr2pm', '芋艿', NULL, NULL, NULL, '', '15601691300', 0, '', 0, '', NULL, '1', '2022-02-20 22:59:33', '1', '2022-02-27 08:26:51', b'0', 118); | 2641 | INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (107, 'admin107', '$2a$10$dYOOBKMO93v/.ReCqzyFg.o67Tqk.bbc2bhrpyBGkIw9aypCtr2pm', '芋艿', NULL, NULL, NULL, '', '15601691300', 0, '', 0, '', NULL, '1', '2022-02-20 22:59:33', '1', '2022-02-27 08:26:51', b'0', 118); |
| 2638 | INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (108, 'admin108', '$2a$10$y6mfvKoNYL1GXWak8nYwVOH.kCWqjactkzdoIDgiKl93WN3Ejg.Lu', '芋艿', NULL, NULL, NULL, '', '15601691300', 0, '', 0, '', NULL, '1', '2022-02-20 23:00:50', '1', '2022-02-27 08:26:53', b'0', 119); | 2642 | INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (108, 'admin108', '$2a$10$y6mfvKoNYL1GXWak8nYwVOH.kCWqjactkzdoIDgiKl93WN3Ejg.Lu', '芋艿', NULL, NULL, NULL, '', '15601691300', 0, '', 0, '', NULL, '1', '2022-02-20 23:00:50', '1', '2022-02-27 08:26:53', b'0', 119); |
| 2639 | INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (109, 'admin109', '$2a$10$JAqvH0tEc0I7dfDVBI7zyuB4E3j.uH6daIjV53.vUS6PknFkDJkuK', '芋艿', NULL, NULL, NULL, '', '15601691300', 0, '', 0, '', NULL, '1', '2022-02-20 23:11:50', '1', '2022-02-27 08:26:56', b'0', 120); | 2643 | INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (109, 'admin109', '$2a$10$JAqvH0tEc0I7dfDVBI7zyuB4E3j.uH6daIjV53.vUS6PknFkDJkuK', '芋艿', NULL, NULL, NULL, '', '15601691300', 0, '', 0, '', NULL, '1', '2022-02-20 23:11:50', '1', '2022-02-27 08:26:56', b'0', 120); |
sql/oracle/ruoyi-vue-pro.sql
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | Target Server Version : 110200 | 11 | Target Server Version : 110200 |
| 12 | File Encoding : 65001 | 12 | File Encoding : 65001 |
| 13 | 13 | ||
| 14 | - Date: 26/05/2022 00:38:28 | 14 | + Date: 15/06/2022 08:20:08 |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | 17 | ||
| @@ -884,7 +884,8 @@ CREATE TABLE "INFRA_FILE" ( | @@ -884,7 +884,8 @@ CREATE TABLE "INFRA_FILE" ( | ||
| 884 | "CREATE_TIME" DATE NOT NULL, | 884 | "CREATE_TIME" DATE NOT NULL, |
| 885 | "UPDATER" NVARCHAR2(64), | 885 | "UPDATER" NVARCHAR2(64), |
| 886 | "UPDATE_TIME" DATE NOT NULL, | 886 | "UPDATE_TIME" DATE NOT NULL, |
| 887 | - "DELETED" NUMBER(1,0) DEFAULT 0 | 887 | + "DELETED" NUMBER(1,0) DEFAULT 0, |
| 888 | + "NAME" NVARCHAR2(512) | ||
| 888 | ) | 889 | ) |
| 889 | LOGGING | 890 | LOGGING |
| 890 | NOCOMPRESS | 891 | NOCOMPRESS |
| @@ -913,6 +914,7 @@ COMMENT ON COLUMN "INFRA_FILE"."CREATOR" IS '创建者'; | @@ -913,6 +914,7 @@ COMMENT ON COLUMN "INFRA_FILE"."CREATOR" IS '创建者'; | ||
| 913 | COMMENT ON COLUMN "INFRA_FILE"."CREATE_TIME" IS '创建时间'; | 914 | COMMENT ON COLUMN "INFRA_FILE"."CREATE_TIME" IS '创建时间'; |
| 914 | COMMENT ON COLUMN "INFRA_FILE"."UPDATER" IS '更新者'; | 915 | COMMENT ON COLUMN "INFRA_FILE"."UPDATER" IS '更新者'; |
| 915 | COMMENT ON COLUMN "INFRA_FILE"."UPDATE_TIME" IS '更新时间'; | 916 | COMMENT ON COLUMN "INFRA_FILE"."UPDATE_TIME" IS '更新时间'; |
| 917 | +COMMENT ON COLUMN "INFRA_FILE"."NAME" IS '文件名'; | ||
| 916 | COMMENT ON TABLE "INFRA_FILE" IS '文件表'; | 918 | COMMENT ON TABLE "INFRA_FILE" IS '文件表'; |
| 917 | 919 | ||
| 918 | -- ---------------------------- | 920 | -- ---------------------------- |
| @@ -3196,7 +3198,7 @@ COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."STATUS" IS '状态'; | @@ -3196,7 +3198,7 @@ COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."STATUS" IS '状态'; | ||
| 3196 | COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."ACCESS_TOKEN_VALIDITY_SECONDS" IS '访问令牌的有效期'; | 3198 | COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."ACCESS_TOKEN_VALIDITY_SECONDS" IS '访问令牌的有效期'; |
| 3197 | COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."REFRESH_TOKEN_VALIDITY_SECONDS" IS '刷新令牌的有效期'; | 3199 | COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."REFRESH_TOKEN_VALIDITY_SECONDS" IS '刷新令牌的有效期'; |
| 3198 | COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."REDIRECT_URIS" IS '可重定向的 URI 地址'; | 3200 | COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."REDIRECT_URIS" IS '可重定向的 URI 地址'; |
| 3199 | -COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."AUTO_APPROVE_SCOPES" IS '是否自动授权'; | 3201 | +COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."AUTO_APPROVE_SCOPES" IS '自动通过的授权范围'; |
| 3200 | COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."AUTHORIZED_GRANT_TYPES" IS '授权类型'; | 3202 | COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."AUTHORIZED_GRANT_TYPES" IS '授权类型'; |
| 3201 | COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."SCOPES" IS '授权范围'; | 3203 | COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."SCOPES" IS '授权范围'; |
| 3202 | COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."AUTHORITIES" IS '权限'; | 3204 | COMMENT ON COLUMN "SYSTEM_OAUTH2_CLIENT"."AUTHORITIES" IS '权限'; |
| @@ -3795,7 +3797,7 @@ COMMIT; | @@ -3795,7 +3797,7 @@ COMMIT; | ||
| 3795 | DROP TABLE "SYSTEM_SMS_CHANNEL"; | 3797 | DROP TABLE "SYSTEM_SMS_CHANNEL"; |
| 3796 | CREATE TABLE "SYSTEM_SMS_CHANNEL" ( | 3798 | CREATE TABLE "SYSTEM_SMS_CHANNEL" ( |
| 3797 | "ID" NUMBER(20,0) NOT NULL, | 3799 | "ID" NUMBER(20,0) NOT NULL, |
| 3798 | - "SIGNATURE" NVARCHAR2(10), | 3800 | + "SIGNATURE" NVARCHAR2(12), |
| 3799 | "CODE" NVARCHAR2(63), | 3801 | "CODE" NVARCHAR2(63), |
| 3800 | "STATUS" NUMBER(4,0) NOT NULL, | 3802 | "STATUS" NUMBER(4,0) NOT NULL, |
| 3801 | "REMARK" NVARCHAR2(255), | 3803 | "REMARK" NVARCHAR2(255), |
| @@ -5393,10 +5395,8 @@ ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CONSTRAINT "SYS_C008671" CHECK ("STATE" IS | @@ -5393,10 +5395,8 @@ ALTER TABLE "QRTZ_FIRED_TRIGGERS" ADD CONSTRAINT "SYS_C008671" CHECK ("STATE" IS | ||
| 5393 | -- Indexes structure for table QRTZ_FIRED_TRIGGERS | 5395 | -- Indexes structure for table QRTZ_FIRED_TRIGGERS |
| 5394 | -- ---------------------------- | 5396 | -- ---------------------------- |
| 5395 | CREATE INDEX "IDX_QRTZ_FT_INST_JOB_REQ_RCVRY" | 5397 | CREATE INDEX "IDX_QRTZ_FT_INST_JOB_REQ_RCVRY" |
| 5396 | - ON "QRTZ_FIRED_TRIGGERS" ("SCHED_NAME" ASC, "INSTANCE_NAME" ASC, "REQUESTS_RECOVERY" ASC) LOCAL | 5398 | + ON "QRTZ_FIRED_TRIGGERS" ("SCHED_NAME" ASC, "INSTANCE_NAME" ASC, "REQUESTS_RECOVERY" ASC) |
| 5397 | LOGGING | 5399 | LOGGING |
| 5398 | - ONLINE | ||
| 5399 | - NOSORT | ||
| 5400 | VISIBLE | 5400 | VISIBLE |
| 5401 | PCTFREE 10 | 5401 | PCTFREE 10 |
| 5402 | INITRANS 2 | 5402 | INITRANS 2 |
| @@ -5410,7 +5410,7 @@ STORAGE ( | @@ -5410,7 +5410,7 @@ STORAGE ( | ||
| 5410 | BUFFER_POOL DEFAULT | 5410 | BUFFER_POOL DEFAULT |
| 5411 | ); | 5411 | ); |
| 5412 | CREATE INDEX "IDX_QRTZ_FT_JG" | 5412 | CREATE INDEX "IDX_QRTZ_FT_JG" |
| 5413 | - ON "QRTZ_FIRED_TRIGGERS" ("SCHED_NAME" ASC, "JOB_GROUP" ASC) LOCAL | 5413 | + ON "QRTZ_FIRED_TRIGGERS" ("SCHED_NAME" ASC, "JOB_GROUP" ASC) |
| 5414 | LOGGING | 5414 | LOGGING |
| 5415 | ONLINE | 5415 | ONLINE |
| 5416 | NOSORT | 5416 | NOSORT |
| @@ -5427,10 +5427,8 @@ STORAGE ( | @@ -5427,10 +5427,8 @@ STORAGE ( | ||
| 5427 | BUFFER_POOL DEFAULT | 5427 | BUFFER_POOL DEFAULT |
| 5428 | ); | 5428 | ); |
| 5429 | CREATE INDEX "IDX_QRTZ_FT_J_G" | 5429 | CREATE INDEX "IDX_QRTZ_FT_J_G" |
| 5430 | - ON "QRTZ_FIRED_TRIGGERS" ("SCHED_NAME" ASC, "JOB_NAME" ASC, "JOB_GROUP" ASC) LOCAL | 5430 | + ON "QRTZ_FIRED_TRIGGERS" ("SCHED_NAME" ASC, "JOB_NAME" ASC, "JOB_GROUP" ASC) |
| 5431 | LOGGING | 5431 | LOGGING |
| 5432 | - ONLINE | ||
| 5433 | - NOSORT | ||
| 5434 | VISIBLE | 5432 | VISIBLE |
| 5435 | PCTFREE 10 | 5433 | PCTFREE 10 |
| 5436 | INITRANS 2 | 5434 | INITRANS 2 |
| @@ -5446,7 +5444,6 @@ STORAGE ( | @@ -5446,7 +5444,6 @@ STORAGE ( | ||
| 5446 | CREATE INDEX "IDX_QRTZ_FT_TG" | 5444 | CREATE INDEX "IDX_QRTZ_FT_TG" |
| 5447 | ON "QRTZ_FIRED_TRIGGERS" ("SCHED_NAME" ASC, "TRIGGER_GROUP" ASC) LOCAL | 5445 | ON "QRTZ_FIRED_TRIGGERS" ("SCHED_NAME" ASC, "TRIGGER_GROUP" ASC) LOCAL |
| 5448 | LOGGING | 5446 | LOGGING |
| 5449 | - ONLINE | ||
| 5450 | NOSORT | 5447 | NOSORT |
| 5451 | VISIBLE | 5448 | VISIBLE |
| 5452 | PCTFREE 10 | 5449 | PCTFREE 10 |
| @@ -5499,8 +5496,6 @@ STORAGE ( | @@ -5499,8 +5496,6 @@ STORAGE ( | ||
| 5499 | CREATE INDEX "IDX_QRTZ_J_REQ_RECOVERY" | 5496 | CREATE INDEX "IDX_QRTZ_J_REQ_RECOVERY" |
| 5500 | ON "QRTZ_JOB_DETAILS" ("SCHED_NAME" ASC, "REQUESTS_RECOVERY" ASC) LOCAL | 5497 | ON "QRTZ_JOB_DETAILS" ("SCHED_NAME" ASC, "REQUESTS_RECOVERY" ASC) LOCAL |
| 5501 | LOGGING | 5498 | LOGGING |
| 5502 | - ONLINE | ||
| 5503 | - NOSORT | ||
| 5504 | VISIBLE | 5499 | VISIBLE |
| 5505 | PCTFREE 10 | 5500 | PCTFREE 10 |
| 5506 | INITRANS 2 | 5501 | INITRANS 2 |
| @@ -5622,8 +5617,10 @@ ALTER TABLE "QRTZ_TRIGGERS" ADD CONSTRAINT "SYS_C008696" CHECK ("START_TIME" IS | @@ -5622,8 +5617,10 @@ ALTER TABLE "QRTZ_TRIGGERS" ADD CONSTRAINT "SYS_C008696" CHECK ("START_TIME" IS | ||
| 5622 | -- Indexes structure for table QRTZ_TRIGGERS | 5617 | -- Indexes structure for table QRTZ_TRIGGERS |
| 5623 | -- ---------------------------- | 5618 | -- ---------------------------- |
| 5624 | CREATE INDEX "IDX_QRTZ_T_C" | 5619 | CREATE INDEX "IDX_QRTZ_T_C" |
| 5625 | - ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "CALENDAR_NAME" ASC) | 5620 | + ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "CALENDAR_NAME" ASC) LOCAL |
| 5626 | LOGGING | 5621 | LOGGING |
| 5622 | + ONLINE | ||
| 5623 | + NOSORT | ||
| 5627 | VISIBLE | 5624 | VISIBLE |
| 5628 | PCTFREE 10 | 5625 | PCTFREE 10 |
| 5629 | INITRANS 2 | 5626 | INITRANS 2 |
| @@ -5637,10 +5634,8 @@ STORAGE ( | @@ -5637,10 +5634,8 @@ STORAGE ( | ||
| 5637 | BUFFER_POOL DEFAULT | 5634 | BUFFER_POOL DEFAULT |
| 5638 | ); | 5635 | ); |
| 5639 | CREATE INDEX "IDX_QRTZ_T_J" | 5636 | CREATE INDEX "IDX_QRTZ_T_J" |
| 5640 | - ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "JOB_NAME" ASC, "JOB_GROUP" ASC) LOCAL | 5637 | + ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "JOB_NAME" ASC, "JOB_GROUP" ASC) |
| 5641 | LOGGING | 5638 | LOGGING |
| 5642 | - ONLINE | ||
| 5643 | - NOSORT | ||
| 5644 | VISIBLE | 5639 | VISIBLE |
| 5645 | PCTFREE 10 | 5640 | PCTFREE 10 |
| 5646 | INITRANS 2 | 5641 | INITRANS 2 |
| @@ -5654,8 +5649,10 @@ STORAGE ( | @@ -5654,8 +5649,10 @@ STORAGE ( | ||
| 5654 | BUFFER_POOL DEFAULT | 5649 | BUFFER_POOL DEFAULT |
| 5655 | ); | 5650 | ); |
| 5656 | CREATE INDEX "IDX_QRTZ_T_JG" | 5651 | CREATE INDEX "IDX_QRTZ_T_JG" |
| 5657 | - ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "JOB_GROUP" ASC) | 5652 | + ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "JOB_GROUP" ASC) LOCAL |
| 5658 | LOGGING | 5653 | LOGGING |
| 5654 | + ONLINE | ||
| 5655 | + NOSORT | ||
| 5659 | VISIBLE | 5656 | VISIBLE |
| 5660 | PCTFREE 10 | 5657 | PCTFREE 10 |
| 5661 | INITRANS 2 | 5658 | INITRANS 2 |
| @@ -5669,10 +5666,8 @@ STORAGE ( | @@ -5669,10 +5666,8 @@ STORAGE ( | ||
| 5669 | BUFFER_POOL DEFAULT | 5666 | BUFFER_POOL DEFAULT |
| 5670 | ); | 5667 | ); |
| 5671 | CREATE INDEX "IDX_QRTZ_T_NEXT_FIRE_TIME" | 5668 | CREATE INDEX "IDX_QRTZ_T_NEXT_FIRE_TIME" |
| 5672 | - ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "NEXT_FIRE_TIME" ASC) LOCAL | 5669 | + ON "QRTZ_TRIGGERS" ("SCHED_NAME" ASC, "NEXT_FIRE_TIME" ASC) |
| 5673 | LOGGING | 5670 | LOGGING |
| 5674 | - ONLINE | ||
| 5675 | - NOSORT | ||
| 5676 | VISIBLE | 5671 | VISIBLE |
| 5677 | PCTFREE 10 | 5672 | PCTFREE 10 |
| 5678 | INITRANS 2 | 5673 | INITRANS 2 |
sql/postgresql/ruoyi-vue-pro.sql
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | Target Server Version : 140002 | 12 | Target Server Version : 140002 |
| 13 | File Encoding : 65001 | 13 | File Encoding : 65001 |
| 14 | 14 | ||
| 15 | - Date: 26/05/2022 00:10:12 | 15 | + Date: 15/06/2022 08:13:44 |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | 18 | ||
| @@ -365,17 +365,6 @@ START 1 | @@ -365,17 +365,6 @@ START 1 | ||
| 365 | CACHE 1; | 365 | CACHE 1; |
| 366 | 366 | ||
| 367 | -- ---------------------------- | 367 | -- ---------------------------- |
| 368 | --- Sequence structure for system_oauth2_approve_seq | ||
| 369 | --- ---------------------------- | ||
| 370 | -DROP SEQUENCE IF EXISTS "system_oauth2_approve_seq"; | ||
| 371 | -CREATE SEQUENCE "system_oauth2_approve_seq" | ||
| 372 | -INCREMENT 1 | ||
| 373 | -MINVALUE 1 | ||
| 374 | -MAXVALUE 9223372036854775807 | ||
| 375 | -START 1 | ||
| 376 | -CACHE 1; | ||
| 377 | - | ||
| 378 | --- ---------------------------- | ||
| 379 | -- Sequence structure for system_oauth2_client_seq | 368 | -- Sequence structure for system_oauth2_client_seq |
| 380 | -- ---------------------------- | 369 | -- ---------------------------- |
| 381 | DROP SEQUENCE IF EXISTS "system_oauth2_client_seq"; | 370 | DROP SEQUENCE IF EXISTS "system_oauth2_client_seq"; |
| @@ -387,17 +376,6 @@ START 1 | @@ -387,17 +376,6 @@ START 1 | ||
| 387 | CACHE 1; | 376 | CACHE 1; |
| 388 | 377 | ||
| 389 | -- ---------------------------- | 378 | -- ---------------------------- |
| 390 | --- Sequence structure for system_oauth2_code_seq | ||
| 391 | --- ---------------------------- | ||
| 392 | -DROP SEQUENCE IF EXISTS "system_oauth2_code_seq"; | ||
| 393 | -CREATE SEQUENCE "system_oauth2_code_seq" | ||
| 394 | -INCREMENT 1 | ||
| 395 | -MINVALUE 1 | ||
| 396 | -MAXVALUE 9223372036854775807 | ||
| 397 | -START 1 | ||
| 398 | -CACHE 1; | ||
| 399 | - | ||
| 400 | --- ---------------------------- | ||
| 401 | -- Sequence structure for system_oauth2_refresh_token_seq | 379 | -- Sequence structure for system_oauth2_refresh_token_seq |
| 402 | -- ---------------------------- | 380 | -- ---------------------------- |
| 403 | DROP SEQUENCE IF EXISTS "system_oauth2_refresh_token_seq"; | 381 | DROP SEQUENCE IF EXISTS "system_oauth2_refresh_token_seq"; |
| @@ -1745,7 +1723,8 @@ CREATE TABLE "infra_file" ( | @@ -1745,7 +1723,8 @@ CREATE TABLE "infra_file" ( | ||
| 1745 | "create_time" timestamp(6) NOT NULL, | 1723 | "create_time" timestamp(6) NOT NULL, |
| 1746 | "updater" varchar(64) COLLATE "pg_catalog"."default", | 1724 | "updater" varchar(64) COLLATE "pg_catalog"."default", |
| 1747 | "update_time" timestamp(6) NOT NULL, | 1725 | "update_time" timestamp(6) NOT NULL, |
| 1748 | - "deleted" int2 NOT NULL DEFAULT 0 | 1726 | + "deleted" int2 NOT NULL DEFAULT 0, |
| 1727 | + "name" varchar(255) COLLATE "pg_catalog"."default" | ||
| 1749 | ) | 1728 | ) |
| 1750 | ; | 1729 | ; |
| 1751 | COMMENT ON COLUMN "infra_file"."id" IS '文件编号'; | 1730 | COMMENT ON COLUMN "infra_file"."id" IS '文件编号'; |
| @@ -1759,6 +1738,7 @@ COMMENT ON COLUMN "infra_file"."create_time" IS '创建时间'; | @@ -1759,6 +1738,7 @@ COMMENT ON COLUMN "infra_file"."create_time" IS '创建时间'; | ||
| 1759 | COMMENT ON COLUMN "infra_file"."updater" IS '更新者'; | 1738 | COMMENT ON COLUMN "infra_file"."updater" IS '更新者'; |
| 1760 | COMMENT ON COLUMN "infra_file"."update_time" IS '更新时间'; | 1739 | COMMENT ON COLUMN "infra_file"."update_time" IS '更新时间'; |
| 1761 | COMMENT ON COLUMN "infra_file"."deleted" IS '是否删除'; | 1740 | COMMENT ON COLUMN "infra_file"."deleted" IS '是否删除'; |
| 1741 | +COMMENT ON COLUMN "infra_file"."name" IS '文件名'; | ||
| 1762 | COMMENT ON TABLE "infra_file" IS '文件表'; | 1742 | COMMENT ON TABLE "infra_file" IS '文件表'; |
| 1763 | 1743 | ||
| 1764 | -- ---------------------------- | 1744 | -- ---------------------------- |
| @@ -3413,47 +3393,6 @@ BEGIN; | @@ -3413,47 +3393,6 @@ BEGIN; | ||
| 3413 | COMMIT; | 3393 | COMMIT; |
| 3414 | 3394 | ||
| 3415 | -- ---------------------------- | 3395 | -- ---------------------------- |
| 3416 | --- Table structure for system_oauth2_approve | ||
| 3417 | --- ---------------------------- | ||
| 3418 | -DROP TABLE IF EXISTS "system_oauth2_approve"; | ||
| 3419 | -CREATE TABLE "system_oauth2_approve" ( | ||
| 3420 | - "id" int8 NOT NULL, | ||
| 3421 | - "user_id" int8 NOT NULL, | ||
| 3422 | - "user_type" int2 NOT NULL, | ||
| 3423 | - "client_id" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, | ||
| 3424 | - "scope" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, | ||
| 3425 | - "approved" bool NOT NULL, | ||
| 3426 | - "expires_time" timestamp(6) NOT NULL, | ||
| 3427 | - "creator" varchar(64) COLLATE "pg_catalog"."default", | ||
| 3428 | - "create_time" timestamp(6) NOT NULL, | ||
| 3429 | - "updater" varchar(64) COLLATE "pg_catalog"."default", | ||
| 3430 | - "update_time" timestamp(6) NOT NULL, | ||
| 3431 | - "deleted" int2 NOT NULL DEFAULT 0, | ||
| 3432 | - "tenant_id" int8 NOT NULL | ||
| 3433 | -) | ||
| 3434 | -; | ||
| 3435 | -COMMENT ON COLUMN "system_oauth2_approve"."id" IS '编号'; | ||
| 3436 | -COMMENT ON COLUMN "system_oauth2_approve"."user_id" IS '用户编号'; | ||
| 3437 | -COMMENT ON COLUMN "system_oauth2_approve"."user_type" IS '用户类型'; | ||
| 3438 | -COMMENT ON COLUMN "system_oauth2_approve"."client_id" IS '客户端编号'; | ||
| 3439 | -COMMENT ON COLUMN "system_oauth2_approve"."scope" IS '授权范围'; | ||
| 3440 | -COMMENT ON COLUMN "system_oauth2_approve"."approved" IS '是否接受'; | ||
| 3441 | -COMMENT ON COLUMN "system_oauth2_approve"."expires_time" IS '过期时间'; | ||
| 3442 | -COMMENT ON COLUMN "system_oauth2_approve"."creator" IS '创建者'; | ||
| 3443 | -COMMENT ON COLUMN "system_oauth2_approve"."create_time" IS '创建时间'; | ||
| 3444 | -COMMENT ON COLUMN "system_oauth2_approve"."updater" IS '更新者'; | ||
| 3445 | -COMMENT ON COLUMN "system_oauth2_approve"."update_time" IS '更新时间'; | ||
| 3446 | -COMMENT ON COLUMN "system_oauth2_approve"."deleted" IS '是否删除'; | ||
| 3447 | -COMMENT ON COLUMN "system_oauth2_approve"."tenant_id" IS '租户编号'; | ||
| 3448 | -COMMENT ON TABLE "system_oauth2_approve" IS 'OAuth2 批准表'; | ||
| 3449 | - | ||
| 3450 | --- ---------------------------- | ||
| 3451 | --- Records of system_oauth2_approve | ||
| 3452 | --- ---------------------------- | ||
| 3453 | -BEGIN; | ||
| 3454 | -COMMIT; | ||
| 3455 | - | ||
| 3456 | --- ---------------------------- | ||
| 3457 | -- Table structure for system_oauth2_client | 3396 | -- Table structure for system_oauth2_client |
| 3458 | -- ---------------------------- | 3397 | -- ---------------------------- |
| 3459 | DROP TABLE IF EXISTS "system_oauth2_client"; | 3398 | DROP TABLE IF EXISTS "system_oauth2_client"; |
| @@ -3513,51 +3452,6 @@ INSERT INTO "system_oauth2_client" ("id", "client_id", "secret", "name", "logo", | @@ -3513,51 +3452,6 @@ INSERT INTO "system_oauth2_client" ("id", "client_id", "secret", "name", "logo", | ||
| 3513 | COMMIT; | 3452 | COMMIT; |
| 3514 | 3453 | ||
| 3515 | -- ---------------------------- | 3454 | -- ---------------------------- |
| 3516 | --- Table structure for system_oauth2_code | ||
| 3517 | --- ---------------------------- | ||
| 3518 | -DROP TABLE IF EXISTS "system_oauth2_code"; | ||
| 3519 | -CREATE TABLE "system_oauth2_code" ( | ||
| 3520 | - "id" int8 NOT NULL, | ||
| 3521 | - "user_id" int8 NOT NULL, | ||
| 3522 | - "user_type" int2 NOT NULL, | ||
| 3523 | - "code" varchar(32) COLLATE "pg_catalog"."default" NOT NULL, | ||
| 3524 | - "client_id" varchar(255) COLLATE "pg_catalog"."default" NOT NULL, | ||
| 3525 | - "scopes" varchar(255) COLLATE "pg_catalog"."default", | ||
| 3526 | - "expires_time" timestamp(6) NOT NULL, | ||
| 3527 | - "redirect_uri" varchar(255) COLLATE "pg_catalog"."default", | ||
| 3528 | - "state" varchar(255) COLLATE "pg_catalog"."default", | ||
| 3529 | - "creator" varchar(64) COLLATE "pg_catalog"."default", | ||
| 3530 | - "create_time" timestamp(6) NOT NULL, | ||
| 3531 | - "updater" varchar(64) COLLATE "pg_catalog"."default", | ||
| 3532 | - "update_time" timestamp(6) NOT NULL, | ||
| 3533 | - "deleted" int2 NOT NULL DEFAULT 0, | ||
| 3534 | - "tenant_id" int8 NOT NULL | ||
| 3535 | -) | ||
| 3536 | -; | ||
| 3537 | -COMMENT ON COLUMN "system_oauth2_code"."id" IS '编号'; | ||
| 3538 | -COMMENT ON COLUMN "system_oauth2_code"."user_id" IS '用户编号'; | ||
| 3539 | -COMMENT ON COLUMN "system_oauth2_code"."user_type" IS '用户类型'; | ||
| 3540 | -COMMENT ON COLUMN "system_oauth2_code"."code" IS '授权码'; | ||
| 3541 | -COMMENT ON COLUMN "system_oauth2_code"."client_id" IS '客户端编号'; | ||
| 3542 | -COMMENT ON COLUMN "system_oauth2_code"."scopes" IS '授权范围'; | ||
| 3543 | -COMMENT ON COLUMN "system_oauth2_code"."expires_time" IS '过期时间'; | ||
| 3544 | -COMMENT ON COLUMN "system_oauth2_code"."redirect_uri" IS '可重定向的 URI 地址'; | ||
| 3545 | -COMMENT ON COLUMN "system_oauth2_code"."state" IS '状态'; | ||
| 3546 | -COMMENT ON COLUMN "system_oauth2_code"."creator" IS '创建者'; | ||
| 3547 | -COMMENT ON COLUMN "system_oauth2_code"."create_time" IS '创建时间'; | ||
| 3548 | -COMMENT ON COLUMN "system_oauth2_code"."updater" IS '更新者'; | ||
| 3549 | -COMMENT ON COLUMN "system_oauth2_code"."update_time" IS '更新时间'; | ||
| 3550 | -COMMENT ON COLUMN "system_oauth2_code"."deleted" IS '是否删除'; | ||
| 3551 | -COMMENT ON COLUMN "system_oauth2_code"."tenant_id" IS '租户编号'; | ||
| 3552 | -COMMENT ON TABLE "system_oauth2_code" IS 'OAuth2 授权码表'; | ||
| 3553 | - | ||
| 3554 | --- ---------------------------- | ||
| 3555 | --- Records of system_oauth2_code | ||
| 3556 | --- ---------------------------- | ||
| 3557 | -BEGIN; | ||
| 3558 | -COMMIT; | ||
| 3559 | - | ||
| 3560 | --- ---------------------------- | ||
| 3561 | -- Table structure for system_oauth2_refresh_token | 3455 | -- Table structure for system_oauth2_refresh_token |
| 3562 | -- ---------------------------- | 3456 | -- ---------------------------- |
| 3563 | DROP TABLE IF EXISTS "system_oauth2_refresh_token"; | 3457 | DROP TABLE IF EXISTS "system_oauth2_refresh_token"; |
| @@ -4025,7 +3919,7 @@ COMMIT; | @@ -4025,7 +3919,7 @@ COMMIT; | ||
| 4025 | DROP TABLE IF EXISTS "system_sms_channel"; | 3919 | DROP TABLE IF EXISTS "system_sms_channel"; |
| 4026 | CREATE TABLE "system_sms_channel" ( | 3920 | CREATE TABLE "system_sms_channel" ( |
| 4027 | "id" int8 NOT NULL, | 3921 | "id" int8 NOT NULL, |
| 4028 | - "signature" varchar(10) COLLATE "pg_catalog"."default" NOT NULL, | 3922 | + "signature" varchar(12) COLLATE "pg_catalog"."default" NOT NULL, |
| 4029 | "code" varchar(63) COLLATE "pg_catalog"."default" NOT NULL, | 3923 | "code" varchar(63) COLLATE "pg_catalog"."default" NOT NULL, |
| 4030 | "status" int2 NOT NULL, | 3924 | "status" int2 NOT NULL, |
| 4031 | "remark" varchar(255) COLLATE "pg_catalog"."default", | 3925 | "remark" varchar(255) COLLATE "pg_catalog"."default", |
| @@ -4729,21 +4623,11 @@ SELECT setval('"system_oauth2_access_token_seq"', 11, true); | @@ -4729,21 +4623,11 @@ SELECT setval('"system_oauth2_access_token_seq"', 11, true); | ||
| 4729 | -- ---------------------------- | 4623 | -- ---------------------------- |
| 4730 | -- Alter sequences owned by | 4624 | -- Alter sequences owned by |
| 4731 | -- ---------------------------- | 4625 | -- ---------------------------- |
| 4732 | -SELECT setval('"system_oauth2_approve_seq"', 4, true); | ||
| 4733 | - | ||
| 4734 | --- ---------------------------- | ||
| 4735 | --- Alter sequences owned by | ||
| 4736 | --- ---------------------------- | ||
| 4737 | SELECT setval('"system_oauth2_client_seq"', 1, false); | 4626 | SELECT setval('"system_oauth2_client_seq"', 1, false); |
| 4738 | 4627 | ||
| 4739 | -- ---------------------------- | 4628 | -- ---------------------------- |
| 4740 | -- Alter sequences owned by | 4629 | -- Alter sequences owned by |
| 4741 | -- ---------------------------- | 4630 | -- ---------------------------- |
| 4742 | -SELECT setval('"system_oauth2_code_seq"', 4, true); | ||
| 4743 | - | ||
| 4744 | --- ---------------------------- | ||
| 4745 | --- Alter sequences owned by | ||
| 4746 | --- ---------------------------- | ||
| 4747 | SELECT setval('"system_oauth2_refresh_token_seq"', 1, true); | 4631 | SELECT setval('"system_oauth2_refresh_token_seq"', 1, true); |
| 4748 | 4632 | ||
| 4749 | -- ---------------------------- | 4633 | -- ---------------------------- |
| @@ -5169,21 +5053,11 @@ ALTER TABLE "system_notice" ADD CONSTRAINT "system_notice_pkey" PRIMARY KEY ("id | @@ -5169,21 +5053,11 @@ ALTER TABLE "system_notice" ADD CONSTRAINT "system_notice_pkey" PRIMARY KEY ("id | ||
| 5169 | ALTER TABLE "system_oauth2_access_token" ADD CONSTRAINT "system_oauth2_access_token_pkey" PRIMARY KEY ("id"); | 5053 | ALTER TABLE "system_oauth2_access_token" ADD CONSTRAINT "system_oauth2_access_token_pkey" PRIMARY KEY ("id"); |
| 5170 | 5054 | ||
| 5171 | -- ---------------------------- | 5055 | -- ---------------------------- |
| 5172 | --- Primary Key structure for table system_oauth2_approve | ||
| 5173 | --- ---------------------------- | ||
| 5174 | -ALTER TABLE "system_oauth2_approve" ADD CONSTRAINT "system_oauth2_approve_pkey" PRIMARY KEY ("id"); | ||
| 5175 | - | ||
| 5176 | --- ---------------------------- | ||
| 5177 | -- Primary Key structure for table system_oauth2_client | 5056 | -- Primary Key structure for table system_oauth2_client |
| 5178 | -- ---------------------------- | 5057 | -- ---------------------------- |
| 5179 | ALTER TABLE "system_oauth2_client" ADD CONSTRAINT "system_oauth2_client_pkey" PRIMARY KEY ("id"); | 5058 | ALTER TABLE "system_oauth2_client" ADD CONSTRAINT "system_oauth2_client_pkey" PRIMARY KEY ("id"); |
| 5180 | 5059 | ||
| 5181 | -- ---------------------------- | 5060 | -- ---------------------------- |
| 5182 | --- Primary Key structure for table system_oauth2_code | ||
| 5183 | --- ---------------------------- | ||
| 5184 | -ALTER TABLE "system_oauth2_code" ADD CONSTRAINT "system_oauth2_code_pkey" PRIMARY KEY ("id"); | ||
| 5185 | - | ||
| 5186 | --- ---------------------------- | ||
| 5187 | -- Primary Key structure for table system_oauth2_refresh_token | 5061 | -- Primary Key structure for table system_oauth2_refresh_token |
| 5188 | -- ---------------------------- | 5062 | -- ---------------------------- |
| 5189 | ALTER TABLE "system_oauth2_refresh_token" ADD CONSTRAINT "system_oauth2_refresh_token_pkey" PRIMARY KEY ("id"); | 5063 | ALTER TABLE "system_oauth2_refresh_token" ADD CONSTRAINT "system_oauth2_refresh_token_pkey" PRIMARY KEY ("id"); |
sql/sqlserver/ruoyi-vue-pro.sql
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | Target Server Version : 15004198 | 12 | Target Server Version : 15004198 |
| 13 | File Encoding : 65001 | 13 | File Encoding : 65001 |
| 14 | 14 | ||
| 15 | - Date: 26/05/2022 01:01:02 | 15 | + Date: 15/06/2022 08:15:45 |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | 18 | ||
| @@ -2640,7 +2640,8 @@ CREATE TABLE [dbo].[infra_file] ( | @@ -2640,7 +2640,8 @@ CREATE TABLE [dbo].[infra_file] ( | ||
| 2640 | [create_time] datetime2(7) NOT NULL, | 2640 | [create_time] datetime2(7) NOT NULL, |
| 2641 | [updater] nvarchar(64) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, | 2641 | [updater] nvarchar(64) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, |
| 2642 | [update_time] datetime2(7) NOT NULL, | 2642 | [update_time] datetime2(7) NOT NULL, |
| 2643 | - [deleted] bit DEFAULT 0 NOT NULL | 2643 | + [deleted] bit DEFAULT 0 NOT NULL, |
| 2644 | + [name] nvarchar(256) COLLATE SQL_Latin1_General_CP1_CI_AS NULL | ||
| 2644 | ) | 2645 | ) |
| 2645 | GO | 2646 | GO |
| 2646 | 2647 | ||
| @@ -2725,6 +2726,13 @@ EXEC sp_addextendedproperty | @@ -2725,6 +2726,13 @@ EXEC sp_addextendedproperty | ||
| 2725 | GO | 2726 | GO |
| 2726 | 2727 | ||
| 2727 | EXEC sp_addextendedproperty | 2728 | EXEC sp_addextendedproperty |
| 2729 | +'MS_Description', N'文件路径', | ||
| 2730 | +'SCHEMA', N'dbo', | ||
| 2731 | +'TABLE', N'infra_file', | ||
| 2732 | +'COLUMN', N'name' | ||
| 2733 | +GO | ||
| 2734 | + | ||
| 2735 | +EXEC sp_addextendedproperty | ||
| 2728 | 'MS_Description', N'文件表', | 2736 | 'MS_Description', N'文件表', |
| 2729 | 'SCHEMA', N'dbo', | 2737 | 'SCHEMA', N'dbo', |
| 2730 | 'TABLE', N'infra_file' | 2738 | 'TABLE', N'infra_file' |
| @@ -9490,7 +9498,7 @@ GO | @@ -9490,7 +9498,7 @@ GO | ||
| 9490 | 9498 | ||
| 9491 | CREATE TABLE [dbo].[system_sms_channel] ( | 9499 | CREATE TABLE [dbo].[system_sms_channel] ( |
| 9492 | [id] bigint IDENTITY(1,1) NOT NULL, | 9500 | [id] bigint IDENTITY(1,1) NOT NULL, |
| 9493 | - [signature] nvarchar(10) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, | 9501 | + [signature] nvarchar(12) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, |
| 9494 | [code] nvarchar(63) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, | 9502 | [code] nvarchar(63) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, |
| 9495 | [status] tinyint NOT NULL, | 9503 | [status] tinyint NOT NULL, |
| 9496 | [remark] nvarchar(255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, | 9504 | [remark] nvarchar(255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, |
yudao-dependencies/pom.xml
| @@ -16,31 +16,31 @@ | @@ -16,31 +16,31 @@ | ||
| 16 | <properties> | 16 | <properties> |
| 17 | <revision>1.6.2-snapshot</revision> | 17 | <revision>1.6.2-snapshot</revision> |
| 18 | <!-- 统一依赖管理 --> | 18 | <!-- 统一依赖管理 --> |
| 19 | - <spring.boot.version>2.5.12</spring.boot.version> | 19 | + <spring.boot.version>2.6.8</spring.boot.version> |
| 20 | <!-- Web 相关 --> | 20 | <!-- Web 相关 --> |
| 21 | - <knife4j.version>3.0.2</knife4j.version> | ||
| 22 | - <swagger-annotations.version>1.5.22</swagger-annotations.version> | 21 | + <knife4j.version>3.0.3</knife4j.version> |
| 22 | + <swagger-annotations.version>1.6.6</swagger-annotations.version> | ||
| 23 | <servlet.versoin>2.5</servlet.versoin> | 23 | <servlet.versoin>2.5</servlet.versoin> |
| 24 | <!-- DB 相关 --> | 24 | <!-- DB 相关 --> |
| 25 | <druid.version>1.2.8</druid.version> | 25 | <druid.version>1.2.8</druid.version> |
| 26 | - <mybatis-plus.version>3.4.3.4</mybatis-plus.version> | 26 | + <mybatis-plus.version>3.5.2</mybatis-plus.version> |
| 27 | <mybatis-plus-generator.version>3.5.2</mybatis-plus-generator.version> | 27 | <mybatis-plus-generator.version>3.5.2</mybatis-plus-generator.version> |
| 28 | <dynamic-datasource.version>3.5.0</dynamic-datasource.version> | 28 | <dynamic-datasource.version>3.5.0</dynamic-datasource.version> |
| 29 | - <redisson.version>3.17.0</redisson.version> | 29 | + <redisson.version>3.17.3</redisson.version> |
| 30 | <!-- Config 配置中心相关 --> | 30 | <!-- Config 配置中心相关 --> |
| 31 | <apollo.version>1.9.2</apollo.version> | 31 | <apollo.version>1.9.2</apollo.version> |
| 32 | <!-- Job 定时任务相关 --> | 32 | <!-- Job 定时任务相关 --> |
| 33 | <!-- 服务保障相关 --> | 33 | <!-- 服务保障相关 --> |
| 34 | <lock4j.version>2.2.0</lock4j.version> | 34 | <lock4j.version>2.2.0</lock4j.version> |
| 35 | - <resilience4j.version>1.7.0</resilience4j.version> | 35 | + <resilience4j.version>1.7.1</resilience4j.version> |
| 36 | <!-- 监控相关 --> | 36 | <!-- 监控相关 --> |
| 37 | <skywalking.version>8.7.0</skywalking.version> | 37 | <skywalking.version>8.7.0</skywalking.version> |
| 38 | - <spring-boot-admin.version>2.6.2</spring-boot-admin.version> | 38 | + <spring-boot-admin.version>2.6.7</spring-boot-admin.version> |
| 39 | <opentracing.version>0.31.0</opentracing.version> | 39 | <opentracing.version>0.31.0</opentracing.version> |
| 40 | <!-- Test 测试相关 --> | 40 | <!-- Test 测试相关 --> |
| 41 | <podam.version>7.2.6.RELEASE</podam.version> | 41 | <podam.version>7.2.6.RELEASE</podam.version> |
| 42 | <jedis-mock.version>0.1.16</jedis-mock.version> | 42 | <jedis-mock.version>0.1.16</jedis-mock.version> |
| 43 | - <mockito-inline.version>3.9.0</mockito-inline.version> | 43 | + <mockito-inline.version>4.0.0</mockito-inline.version> |
| 44 | <!-- Bpm 工作流相关 --> | 44 | <!-- Bpm 工作流相关 --> |
| 45 | <activiti.version>7.1.0.M6</activiti.version> | 45 | <activiti.version>7.1.0.M6</activiti.version> |
| 46 | <flowable.version>6.7.0</flowable.version> | 46 | <flowable.version>6.7.0</flowable.version> |
| @@ -52,6 +52,7 @@ | @@ -52,6 +52,7 @@ | ||
| 52 | <easyexcel.verion>2.2.7</easyexcel.verion> | 52 | <easyexcel.verion>2.2.7</easyexcel.verion> |
| 53 | <velocity.version>2.2</velocity.version> | 53 | <velocity.version>2.2</velocity.version> |
| 54 | <screw.version>1.0.5</screw.version> | 54 | <screw.version>1.0.5</screw.version> |
| 55 | + <fastjson.version>2.0.5</fastjson.version> | ||
| 55 | <guava.version>30.1.1-jre</guava.version> | 56 | <guava.version>30.1.1-jre</guava.version> |
| 56 | <guice.version>5.1.0</guice.version> | 57 | <guice.version>5.1.0</guice.version> |
| 57 | <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version> | 58 | <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version> |
| @@ -80,6 +81,11 @@ | @@ -80,6 +81,11 @@ | ||
| 80 | <!-- 业务组件 --> | 81 | <!-- 业务组件 --> |
| 81 | <dependency> | 82 | <dependency> |
| 82 | <groupId>cn.iocoder.boot</groupId> | 83 | <groupId>cn.iocoder.boot</groupId> |
| 84 | + <artifactId>yudao-spring-boot-starter-banner</artifactId> | ||
| 85 | + <version>${revision}</version> | ||
| 86 | + </dependency> | ||
| 87 | + <dependency> | ||
| 88 | + <groupId>cn.iocoder.boot</groupId> | ||
| 83 | <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId> | 89 | <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId> |
| 84 | <version>${revision}</version> | 90 | <version>${revision}</version> |
| 85 | </dependency> | 91 | </dependency> |
| @@ -118,6 +124,11 @@ | @@ -118,6 +124,11 @@ | ||
| 118 | <artifactId>yudao-spring-boot-starter-biz-social</artifactId> | 124 | <artifactId>yudao-spring-boot-starter-biz-social</artifactId> |
| 119 | <version>${revision}</version> | 125 | <version>${revision}</version> |
| 120 | </dependency> | 126 | </dependency> |
| 127 | + <dependency> | ||
| 128 | + <groupId>cn.iocoder.boot</groupId> | ||
| 129 | + <artifactId>yudao-spring-boot-starter-biz-error-code</artifactId> | ||
| 130 | + <version>${revision}</version> | ||
| 131 | + </dependency> | ||
| 121 | 132 | ||
| 122 | <!-- Spring 核心 --> | 133 | <!-- Spring 核心 --> |
| 123 | <dependency> | 134 | <dependency> |
| @@ -476,6 +487,12 @@ | @@ -476,6 +487,12 @@ | ||
| 476 | </dependency> | 487 | </dependency> |
| 477 | 488 | ||
| 478 | <dependency> | 489 | <dependency> |
| 490 | + <groupId>com.alibaba</groupId> | ||
| 491 | + <artifactId>fastjson</artifactId> | ||
| 492 | + <version>${fastjson.version}</version> | ||
| 493 | + </dependency> | ||
| 494 | + | ||
| 495 | + <dependency> | ||
| 479 | <groupId>cn.smallbun.screw</groupId> | 496 | <groupId>cn.smallbun.screw</groupId> |
| 480 | <artifactId>screw-core</artifactId> <!-- 实现数据库文档 --> | 497 | <artifactId>screw-core</artifactId> <!-- 实现数据库文档 --> |
| 481 | <version>${screw.version}</version> | 498 | <version>${screw.version}</version> |
| @@ -484,6 +501,10 @@ | @@ -484,6 +501,10 @@ | ||
| 484 | <groupId>org.freemarker</groupId> | 501 | <groupId>org.freemarker</groupId> |
| 485 | <artifactId>freemarker</artifactId> <!-- 移除 Freemarker 依赖，采用 Velocity 作为模板引擎 --> | 502 | <artifactId>freemarker</artifactId> <!-- 移除 Freemarker 依赖，采用 Velocity 作为模板引擎 --> |
| 486 | </exclusion> | 503 | </exclusion> |
| 504 | + <exclusion> | ||
| 505 | + <groupId>com.alibaba</groupId> | ||
| 506 | + <artifactId>fastjson</artifactId> <!-- 最新版screw-core1.0.5依赖fastjson1.2.73存在漏洞，移除。 --> | ||
| 507 | + </exclusion> | ||
| 487 | </exclusions> | 508 | </exclusions> |
| 488 | </dependency> | 509 | </dependency> |
| 489 | 510 |
yudao-framework/pom.xml
| @@ -11,6 +11,7 @@ | @@ -11,6 +11,7 @@ | ||
| 11 | <packaging>pom</packaging> | 11 | <packaging>pom</packaging> |
| 12 | <modules> | 12 | <modules> |
| 13 | <module>yudao-common</module> | 13 | <module>yudao-common</module> |
| 14 | + <module>yudao-spring-boot-starter-banner</module> | ||
| 14 | <module>yudao-spring-boot-starter-mybatis</module> | 15 | <module>yudao-spring-boot-starter-mybatis</module> |
| 15 | <module>yudao-spring-boot-starter-redis</module> | 16 | <module>yudao-spring-boot-starter-redis</module> |
| 16 | <module>yudao-spring-boot-starter-web</module> | 17 | <module>yudao-spring-boot-starter-web</module> |
| @@ -25,17 +26,19 @@ | @@ -25,17 +26,19 @@ | ||
| 25 | 26 | ||
| 26 | <module>yudao-spring-boot-starter-excel</module> | 27 | <module>yudao-spring-boot-starter-excel</module> |
| 27 | <module>yudao-spring-boot-starter-test</module> | 28 | <module>yudao-spring-boot-starter-test</module> |
| 28 | - <module>yudao-spring-boot-starter-extension</module> | ||
| 29 | 29 | ||
| 30 | <module>yudao-spring-boot-starter-biz-operatelog</module> | 30 | <module>yudao-spring-boot-starter-biz-operatelog</module> |
| 31 | <module>yudao-spring-boot-starter-biz-dict</module> | 31 | <module>yudao-spring-boot-starter-biz-dict</module> |
| 32 | <module>yudao-spring-boot-starter-biz-sms</module> | 32 | <module>yudao-spring-boot-starter-biz-sms</module> |
| 33 | - <module>yudao-spring-boot-starter-activiti</module> | 33 | + |
| 34 | <module>yudao-spring-boot-starter-biz-pay</module> | 34 | <module>yudao-spring-boot-starter-biz-pay</module> |
| 35 | <module>yudao-spring-boot-starter-biz-weixin</module> | 35 | <module>yudao-spring-boot-starter-biz-weixin</module> |
| 36 | <module>yudao-spring-boot-starter-biz-social</module> | 36 | <module>yudao-spring-boot-starter-biz-social</module> |
| 37 | <module>yudao-spring-boot-starter-biz-tenant</module> | 37 | <module>yudao-spring-boot-starter-biz-tenant</module> |
| 38 | <module>yudao-spring-boot-starter-biz-data-permission</module> | 38 | <module>yudao-spring-boot-starter-biz-data-permission</module> |
| 39 | + <module>yudao-spring-boot-starter-biz-error-code</module> | ||
| 40 | + | ||
| 41 | + <module>yudao-spring-boot-starter-activiti</module> | ||
| 39 | <module>yudao-spring-boot-starter-flowable</module> | 42 | <module>yudao-spring-boot-starter-flowable</module> |
| 40 | </modules> | 43 | </modules> |
| 41 | 44 |
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/WebFilterOrderEnum.java
| @@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.common.enums; | @@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.common.enums; | ||
| 3 | /** | 3 | /** |
| 4 | * Web 过滤器顺序的枚举类，保证过滤器按照符合我们的预期 | 4 | * Web 过滤器顺序的枚举类，保证过滤器按照符合我们的预期 |
| 5 | * | 5 | * |
| 6 | - * 考虑到每个 starter 都需要用到该工具类，所以放到 common 模块下的 util 包下 | 6 | + * 考虑到每个 starter 都需要用到该工具类，所以放到 common 模块下的 enums 包下 |
| 7 | * | 7 | * |
| 8 | * @author 芋道源码 | 8 | * @author 芋道源码 |
| 9 | */ | 9 | */ |
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ServerException.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework.common.exception; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; | ||
| 4 | +import lombok.Data; | ||
| 5 | +import lombok.EqualsAndHashCode; | ||
| 6 | + | ||
| 7 | +/** | ||
| 8 | + * 服务器异常 Exception | ||
| 9 | + */ | ||
| 10 | +@Data | ||
| 11 | +@EqualsAndHashCode(callSuper = true) | ||
| 12 | +public final class ServerException extends RuntimeException { | ||
| 13 | + | ||
| 14 | + /** | ||
| 15 | + * 全局错误码 | ||
| 16 | + * | ||
| 17 | + * @see GlobalErrorCodeConstants | ||
| 18 | + */ | ||
| 19 | + private Integer code; | ||
| 20 | + /** | ||
| 21 | + * 错误提示 | ||
| 22 | + */ | ||
| 23 | + private String message; | ||
| 24 | + | ||
| 25 | + /** | ||
| 26 | + * 空构造方法，避免反序列化问题 | ||
| 27 | + */ | ||
| 28 | + public ServerException() { | ||
| 29 | + } | ||
| 30 | + | ||
| 31 | + public ServerException(ErrorCode errorCode) { | ||
| 32 | + this.code = errorCode.getCode(); | ||
| 33 | + this.message = errorCode.getMsg(); | ||
| 34 | + } | ||
| 35 | + | ||
| 36 | + public ServerException(Integer code, String message) { | ||
| 37 | + this.code = code; | ||
| 38 | + this.message = message; | ||
| 39 | + } | ||
| 40 | + | ||
| 41 | + public Integer getCode() { | ||
| 42 | + return code; | ||
| 43 | + } | ||
| 44 | + | ||
| 45 | + public ServerException setCode(Integer code) { | ||
| 46 | + this.code = code; | ||
| 47 | + return this; | ||
| 48 | + } | ||
| 49 | + | ||
| 50 | + @Override | ||
| 51 | + public String getMessage() { | ||
| 52 | + return message; | ||
| 53 | + } | ||
| 54 | + | ||
| 55 | + public ServerException setMessage(String message) { | ||
| 56 | + this.message = message; | ||
| 57 | + return this; | ||
| 58 | + } | ||
| 59 | + | ||
| 60 | +} |
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/enums/GlobalErrorCodeConstants.java
| @@ -36,9 +36,15 @@ public interface GlobalErrorCodeConstants { | @@ -36,9 +36,15 @@ public interface GlobalErrorCodeConstants { | ||
| 36 | 36 | ||
| 37 | ErrorCode UNKNOWN = new ErrorCode(999, "未知错误"); | 37 | ErrorCode UNKNOWN = new ErrorCode(999, "未知错误"); |
| 38 | 38 | ||
| 39 | - static boolean isMatch(Integer code) { | 39 | + /** |
| 40 | + * 是否为服务端错误，参考 HTTP 5XX 错误码段 | ||
| 41 | + * | ||
| 42 | + * @param code 错误码 | ||
| 43 | + * @return 是否 | ||
| 44 | + */ | ||
| 45 | + static boolean isServerErrorCode(Integer code) { | ||
| 40 | return code != null | 46 | return code != null |
| 41 | - && code >= SUCCESS.getCode() && code <= UNKNOWN.getCode(); | 47 | + && code >= INTERNAL_SERVER_ERROR.getCode() && code <= INTERNAL_SERVER_ERROR.getCode() + 99; |
| 42 | } | 48 | } |
| 43 | 49 | ||
| 44 | } | 50 | } |
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/enums/ServiceErrorCodeRange.java
| @@ -29,6 +29,10 @@ package cn.iocoder.yudao.framework.common.exception.enums; | @@ -29,6 +29,10 @@ package cn.iocoder.yudao.framework.common.exception.enums; | ||
| 29 | */ | 29 | */ |
| 30 | public class ServiceErrorCodeRange { | 30 | public class ServiceErrorCodeRange { |
| 31 | 31 | ||
| 32 | - // 模块 system 错误码区间 [1-000-001-000 ~ 1-000-002-000] | 32 | + // 模块 infra 错误码区间 [1-001-000-000 ~ 1-002-000-000) |
| 33 | + // 模块 system 错误码区间 [1-002-000-000 ~ 1-003-000-000) | ||
| 34 | + // 模块 member 错误码区间 [1-004-000-000 ~ 1-005-000-000) | ||
| 35 | + // 模块 pay 错误码区间 [1-007-000-000 ~ 1-008-000-000) | ||
| 36 | + // 模块 bpm 错误码区间 [1-009-000-000 ~ 1-010-000-000) | ||
| 33 | 37 | ||
| 34 | } | 38 | } |
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/CommonResult.java
| 1 | package cn.iocoder.yudao.framework.common.pojo; | 1 | package cn.iocoder.yudao.framework.common.pojo; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.exception.ErrorCode; | 3 | import cn.iocoder.yudao.framework.common.exception.ErrorCode; |
| 4 | +import cn.iocoder.yudao.framework.common.exception.ServerException; | ||
| 4 | import cn.iocoder.yudao.framework.common.exception.ServiceException; | 5 | import cn.iocoder.yudao.framework.common.exception.ServiceException; |
| 5 | import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; | 6 | import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; |
| 6 | import com.fasterxml.jackson.annotation.JsonIgnore; | 7 | import com.fasterxml.jackson.annotation.JsonIgnore; |
| @@ -91,10 +92,24 @@ public class CommonResult<T> implements Serializable { | @@ -91,10 +92,24 @@ public class CommonResult<T> implements Serializable { | ||
| 91 | if (isSuccess()) { | 92 | if (isSuccess()) { |
| 92 | return; | 93 | return; |
| 93 | } | 94 | } |
| 95 | + // 服务端异常 | ||
| 96 | + if (GlobalErrorCodeConstants.isServerErrorCode(code)) { | ||
| 97 | + throw new ServerException(code, msg); | ||
| 98 | + } | ||
| 94 | // 业务异常 | 99 | // 业务异常 |
| 95 | throw new ServiceException(code, msg); | 100 | throw new ServiceException(code, msg); |
| 96 | } | 101 | } |
| 97 | 102 | ||
| 103 | + /** | ||
| 104 | + * 判断是否有异常。如果有，则抛出 {@link ServiceException} 异常 | ||
| 105 | + * 如果没有，则返回 {@link #data} 数据 | ||
| 106 | + */ | ||
| 107 | + @JsonIgnore // 避免 jackson 序列化 | ||
| 108 | + public T getCheckedData() { | ||
| 109 | + checkError(); | ||
| 110 | + return data; | ||
| 111 | + } | ||
| 112 | + | ||
| 98 | public static <T> CommonResult<T> error(ServiceException serviceException) { | 113 | public static <T> CommonResult<T> error(ServiceException serviceException) { |
| 99 | return error(serviceException.getCode(), serviceException.getMessage()); | 114 | return error(serviceException.getCode(), serviceException.getMessage()); |
| 100 | } | 115 | } |
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java
| @@ -23,8 +23,8 @@ public class PageParam implements Serializable { | @@ -23,8 +23,8 @@ public class PageParam implements Serializable { | ||
| 23 | 23 | ||
| 24 | @ApiModelProperty(value = "每页条数，最大值为 100", required = true, example = "10") | 24 | @ApiModelProperty(value = "每页条数，最大值为 100", required = true, example = "10") |
| 25 | @NotNull(message = "每页条数不能为空") | 25 | @NotNull(message = "每页条数不能为空") |
| 26 | - @Min(value = 1, message = "页码最小值为 1") | ||
| 27 | - @Max(value = 100, message = "页码最大值为 100") | 26 | + @Min(value = 1, message = "每页条数最小值为 1") |
| 27 | + @Max(value = 100, message = "每页条数最大值为 100") | ||
| 28 | private Integer pageSize = PAGE_SIZE; | 28 | private Integer pageSize = PAGE_SIZE; |
| 29 | 29 | ||
| 30 | } | 30 | } |
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/cache/CacheUtils.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework.common.util.cache; | ||
| 2 | + | ||
| 3 | +import com.google.common.cache.CacheBuilder; | ||
| 4 | +import com.google.common.cache.CacheLoader; | ||
| 5 | +import com.google.common.cache.LoadingCache; | ||
| 6 | + | ||
| 7 | +import java.time.Duration; | ||
| 8 | +import java.util.concurrent.Executors; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * Cache 工具类 | ||
| 12 | + * | ||
| 13 | + * @author 芋道源码 | ||
| 14 | + */ | ||
| 15 | +public class CacheUtils { | ||
| 16 | + | ||
| 17 | + public static <K, V> LoadingCache<K, V> buildAsyncReloadingCache(Duration duration, CacheLoader<K, V> loader) { | ||
| 18 | + return CacheBuilder.newBuilder() | ||
| 19 | + // 只阻塞当前数据加载线程，其他线程返回旧值 | ||
| 20 | + .refreshAfterWrite(duration) | ||
| 21 | + // 通过 asyncReloading 实现全异步加载，包括 refreshAfterWrite 被阻塞的加载线程 | ||
| 22 | + .build(CacheLoader.asyncReloading(loader, Executors.newCachedThreadPool())); // TODO 芋艿：可能要思考下，未来要不要做成可配置 | ||
| 23 | + } | ||
| 24 | + | ||
| 25 | +} |
yudao-framework/yudao-spring-boot-starter-banner/pom.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| 3 | + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| 4 | + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| 5 | + <parent> | ||
| 6 | + <artifactId>yudao-framework</artifactId> | ||
| 7 | + <groupId>cn.iocoder.boot</groupId> | ||
| 8 | + <version>${revision}</version> | ||
| 9 | + </parent> | ||
| 10 | + <modelVersion>4.0.0</modelVersion> | ||
| 11 | + <artifactId>yudao-spring-boot-starter-banner</artifactId> | ||
| 12 | + <packaging>jar</packaging> | ||
| 13 | + | ||
| 14 | + <name>${project.artifactId}</name> | ||
| 15 | + <description>Banner 用于在 console 控制台，打印开发文档、接口文档等</description> | ||
| 16 | + <url>https://github.com/YunaiV/ruoyi-vue-pro</url> | ||
| 17 | + | ||
| 18 | + <dependencies> | ||
| 19 | + <dependency> | ||
| 20 | + <groupId>cn.iocoder.boot</groupId> | ||
| 21 | + <artifactId>yudao-common</artifactId> | ||
| 22 | + </dependency> | ||
| 23 | + | ||
| 24 | + <dependency> | ||
| 25 | + <groupId>org.springframework.boot</groupId> | ||
| 26 | + <artifactId>spring-boot-starter</artifactId> | ||
| 27 | + </dependency> | ||
| 28 | + </dependencies> | ||
| 29 | + | ||
| 30 | +</project> |
yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/config/YudaoBannerAutoConfiguration.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework.banner.config; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.framework.banner.core.BannerApplicationRunner; | ||
| 4 | +import org.springframework.context.annotation.Bean; | ||
| 5 | +import org.springframework.context.annotation.Configuration; | ||
| 6 | + | ||
| 7 | +/** | ||
| 8 | + * Banner 的自动配置类 | ||
| 9 | + * | ||
| 10 | + * @author 芋道源码 | ||
| 11 | + */ | ||
| 12 | +@Configuration | ||
| 13 | +public class YudaoBannerAutoConfiguration { | ||
| 14 | + | ||
| 15 | + @Bean | ||
| 16 | + public BannerApplicationRunner bannerApplicationRunner() { | ||
| 17 | + return new BannerApplicationRunner(); | ||
| 18 | + } | ||
| 19 | + | ||
| 20 | +} |
yudao-server/src/main/java/cn/iocoder/yudao/server/framework/tip/core/TipApplicationRunner.java renamed to yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java
| 1 | -package cn.iocoder.yudao.server.framework.tip.core; | 1 | +package cn.iocoder.yudao.framework.banner.core; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.thread.ThreadUtil; | 3 | import cn.hutool.core.thread.ThreadUtil; |
| 4 | import lombok.extern.slf4j.Slf4j; | 4 | import lombok.extern.slf4j.Slf4j; |
| 5 | import org.springframework.boot.ApplicationArguments; | 5 | import org.springframework.boot.ApplicationArguments; |
| 6 | import org.springframework.boot.ApplicationRunner; | 6 | import org.springframework.boot.ApplicationRunner; |
| 7 | -import org.springframework.stereotype.Component; | ||
| 8 | 7 | ||
| 9 | import java.util.concurrent.TimeUnit; | 8 | import java.util.concurrent.TimeUnit; |
| 10 | 9 | ||
| 11 | /** | 10 | /** |
| 12 | * 项目启动成功后，提供文档相关的地址 | 11 | * 项目启动成功后，提供文档相关的地址 |
| 12 | + * | ||
| 13 | + * @author 芋道源码 | ||
| 13 | */ | 14 | */ |
| 14 | -@Component | ||
| 15 | @Slf4j | 15 | @Slf4j |
| 16 | -public class TipApplicationRunner implements ApplicationRunner { | 16 | +public class BannerApplicationRunner implements ApplicationRunner { |
| 17 | 17 | ||
| 18 | @Override | 18 | @Override |
| 19 | public void run(ApplicationArguments args) throws Exception { | 19 | public void run(ApplicationArguments args) throws Exception { |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/package-info.java
yudao-framework/yudao-spring-boot-starter-banner/src/main/resources/META-INF/spring.factories
0 → 100644
yudao-server/src/main/resources/banner.txt renamed to yudao-framework/yudao-spring-boot-starter-banner/src/main/resources/banner.txt
yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/config/YudaoDataPermissionAutoConfiguration.java
| @@ -13,7 +13,7 @@ import org.springframework.context.annotation.Configuration; | @@ -13,7 +13,7 @@ import org.springframework.context.annotation.Configuration; | ||
| 13 | import java.util.List; | 13 | import java.util.List; |
| 14 | 14 | ||
| 15 | /** | 15 | /** |
| 16 | - * 数据全新啊的自动配置类 | 16 | + * 数据权限的自动配置类 |
| 17 | * | 17 | * |
| 18 | * @author 芋道源码 | 18 | * @author 芋道源码 |
| 19 | */ | 19 | */ |
yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/db/DataPermissionDatabaseInterceptorTest.java
| @@ -62,7 +62,7 @@ public class DataPermissionDatabaseInterceptorTest extends BaseMockitoUnitTest { | @@ -62,7 +62,7 @@ public class DataPermissionDatabaseInterceptorTest extends BaseMockitoUnitTest { | ||
| 62 | // 调用 | 62 | // 调用 |
| 63 | interceptor.beforeQuery(null, mappedStatement, null, null, null, boundSql); | 63 | interceptor.beforeQuery(null, mappedStatement, null, null, null, boundSql); |
| 64 | // 断言 | 64 | // 断言 |
| 65 | - pluginUtilsMock.verify(never(), () -> PluginUtils.mpBoundSql(boundSql)); | 65 | + pluginUtilsMock.verify(() -> PluginUtils.mpBoundSql(boundSql), never()); |
| 66 | } | 66 | } |
| 67 | } | 67 | } |
| 68 | 68 |
yudao-framework/yudao-spring-boot-starter-biz-dict/pom.xml
| @@ -26,5 +26,18 @@ | @@ -26,5 +26,18 @@ | ||
| 26 | <groupId>org.springframework.boot</groupId> | 26 | <groupId>org.springframework.boot</groupId> |
| 27 | <artifactId>spring-boot-starter</artifactId> | 27 | <artifactId>spring-boot-starter</artifactId> |
| 28 | </dependency> | 28 | </dependency> |
| 29 | + | ||
| 30 | + <!-- 业务组件 --> | ||
| 31 | + <dependency> | ||
| 32 | + <groupId>cn.iocoder.boot</groupId> | ||
| 33 | + <artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它，进行 Token 的校验 --> | ||
| 34 | + <version>${revision}</version> | ||
| 35 | + </dependency> | ||
| 36 | + | ||
| 37 | + <!-- 工具类相关 --> | ||
| 38 | + <dependency> | ||
| 39 | + <groupId>com.google.guava</groupId> | ||
| 40 | + <artifactId>guava</artifactId> | ||
| 41 | + </dependency> | ||
| 29 | </dependencies> | 42 | </dependencies> |
| 30 | </project> | 43 | </project> |
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/config/YudaoDictAutoConfiguration.java
| 1 | package cn.iocoder.yudao.framework.dict.config; | 1 | package cn.iocoder.yudao.framework.dict.config; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.dict.core.service.DictDataFrameworkService; | ||
| 4 | import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | 3 | import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; |
| 4 | +import cn.iocoder.yudao.module.system.api.dict.DictDataApi; | ||
| 5 | import org.springframework.context.annotation.Bean; | 5 | import org.springframework.context.annotation.Bean; |
| 6 | import org.springframework.context.annotation.Configuration; | 6 | import org.springframework.context.annotation.Configuration; |
| 7 | 7 | ||
| @@ -10,8 +10,8 @@ public class YudaoDictAutoConfiguration { | @@ -10,8 +10,8 @@ public class YudaoDictAutoConfiguration { | ||
| 10 | 10 | ||
| 11 | @Bean | 11 | @Bean |
| 12 | @SuppressWarnings("InstantiationOfUtilityClass") | 12 | @SuppressWarnings("InstantiationOfUtilityClass") |
| 13 | - public DictFrameworkUtils dictUtils(DictDataFrameworkService service) { | ||
| 14 | - DictFrameworkUtils.init(service); | 13 | + public DictFrameworkUtils dictUtils(DictDataApi dictDataApi) { |
| 14 | + DictFrameworkUtils.init(dictDataApi); | ||
| 15 | return new DictFrameworkUtils(); | 15 | return new DictFrameworkUtils(); |
| 16 | } | 16 | } |
| 17 | 17 |
yudao-server/src/main/java/cn/iocoder/yudao/server/framework/tip/package-info.java renamed to yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/package-info.java
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/service/DictDataFrameworkService.java deleted
| 1 | -package cn.iocoder.yudao.framework.dict.core.service; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO; | ||
| 4 | - | ||
| 5 | -import java.util.List; | ||
| 6 | - | ||
| 7 | -public interface DictDataFrameworkService { | ||
| 8 | - | ||
| 9 | - /** | ||
| 10 | - * 获得指定的字典数据，从缓存中 | ||
| 11 | - * | ||
| 12 | - * @param type 字典类型 | ||
| 13 | - * @param value 字典数据值 | ||
| 14 | - * @return 字典数据 | ||
| 15 | - */ | ||
| 16 | - DictDataRespDTO getDictDataFromCache(String type, String value); | ||
| 17 | - | ||
| 18 | - /** | ||
| 19 | - * 解析获得指定的字典数据，从缓存中 | ||
| 20 | - * | ||
| 21 | - * @param type 字典类型 | ||
| 22 | - * @param label 字典数据标签 | ||
| 23 | - * @return 字典数据 | ||
| 24 | - */ | ||
| 25 | - DictDataRespDTO parseDictDataFromCache(String type, String label); | ||
| 26 | - | ||
| 27 | - /** | ||
| 28 | - * 获得指定类型的字典数据，从缓存中 | ||
| 29 | - * | ||
| 30 | - * @param type 字典类型 | ||
| 31 | - * @return 字典数据列表 | ||
| 32 | - */ | ||
| 33 | - List<DictDataRespDTO> listDictDatasFromCache(String type); | ||
| 34 | - | ||
| 35 | -} |
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtils.java
| 1 | package cn.iocoder.yudao.framework.dict.core.util; | 1 | package cn.iocoder.yudao.framework.dict.core.util; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO; | ||
| 4 | -import cn.iocoder.yudao.framework.dict.core.service.DictDataFrameworkService; | 3 | +import cn.hutool.core.util.ObjectUtil; |
| 4 | +import cn.iocoder.yudao.framework.common.core.KeyValue; | ||
| 5 | +import cn.iocoder.yudao.framework.common.util.cache.CacheUtils; | ||
| 6 | +import cn.iocoder.yudao.module.system.api.dict.DictDataApi; | ||
| 7 | +import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO; | ||
| 8 | +import com.google.common.cache.CacheLoader; | ||
| 9 | +import com.google.common.cache.LoadingCache; | ||
| 10 | +import lombok.SneakyThrows; | ||
| 5 | import lombok.extern.slf4j.Slf4j; | 11 | import lombok.extern.slf4j.Slf4j; |
| 6 | 12 | ||
| 13 | +import java.time.Duration; | ||
| 14 | + | ||
| 7 | /** | 15 | /** |
| 8 | * 字典工具类 | 16 | * 字典工具类 |
| 17 | + * | ||
| 18 | + * @author 芋道源码 | ||
| 9 | */ | 19 | */ |
| 10 | @Slf4j | 20 | @Slf4j |
| 11 | public class DictFrameworkUtils { | 21 | public class DictFrameworkUtils { |
| 12 | 22 | ||
| 13 | - private static DictDataFrameworkService service; | 23 | + private static DictDataApi dictDataApi; |
| 24 | + | ||
| 25 | + private static final DictDataRespDTO DICT_DATA_NULL = new DictDataRespDTO(); | ||
| 26 | + | ||
| 27 | + /** | ||
| 28 | + * 针对 {@link #getDictDataLabel(String, String)} 的缓存 | ||
| 29 | + */ | ||
| 30 | + private static final LoadingCache<KeyValue<String, String>, DictDataRespDTO> getDictDataCache = CacheUtils.buildAsyncReloadingCache( | ||
| 31 | + Duration.ofMinutes(1L), // 过期时间 1 分钟 | ||
| 32 | + new CacheLoader<KeyValue<String, String>, DictDataRespDTO>() { | ||
| 33 | + | ||
| 34 | + @Override | ||
| 35 | + public DictDataRespDTO load(KeyValue<String, String> key) { | ||
| 36 | + return ObjectUtil.defaultIfNull(dictDataApi.getDictData(key.getKey(), key.getValue()), DICT_DATA_NULL); | ||
| 37 | + } | ||
| 38 | + | ||
| 39 | + }); | ||
| 40 | + | ||
| 41 | + /** | ||
| 42 | + * 针对 {@link #parseDictDataValue(String, String)} 的缓存 | ||
| 43 | + */ | ||
| 44 | + private static final LoadingCache<KeyValue<String, String>, DictDataRespDTO> parseDictDataCache = CacheUtils.buildAsyncReloadingCache( | ||
| 45 | + Duration.ofMinutes(1L), // 过期时间 1 分钟 | ||
| 46 | + new CacheLoader<KeyValue<String, String>, DictDataRespDTO>() { | ||
| 47 | + | ||
| 48 | + @Override | ||
| 49 | + public DictDataRespDTO load(KeyValue<String, String> key) { | ||
| 50 | + return ObjectUtil.defaultIfNull(dictDataApi.parseDictData(key.getKey(), key.getValue()), DICT_DATA_NULL); | ||
| 51 | + } | ||
| 52 | + | ||
| 53 | + }); | ||
| 14 | 54 | ||
| 15 | - public static void init(DictDataFrameworkService service) { | ||
| 16 | - DictFrameworkUtils.service = service; | 55 | + public static void init(DictDataApi dictDataApi) { |
| 56 | + DictFrameworkUtils.dictDataApi = dictDataApi; | ||
| 17 | log.info("[init][初始化 DictFrameworkUtils 成功]"); | 57 | log.info("[init][初始化 DictFrameworkUtils 成功]"); |
| 18 | } | 58 | } |
| 19 | 59 | ||
| 20 | - public static DictDataRespDTO getDictDataFromCache(String type, String value) { | ||
| 21 | - return service.getDictDataFromCache(type, value); | 60 | + @SneakyThrows |
| 61 | + public static String getDictDataLabel(String dictType, String value) { | ||
| 62 | + return getDictDataCache.get(new KeyValue<>(dictType, value)).getLabel(); | ||
| 22 | } | 63 | } |
| 23 | 64 | ||
| 24 | - public static DictDataRespDTO parseDictDataFromCache(String type, String label) { | ||
| 25 | - return service.parseDictDataFromCache(type, label); | 65 | + @SneakyThrows |
| 66 | + public static String parseDictDataValue(String dictType, String label) { | ||
| 67 | + return parseDictDataCache.get(new KeyValue<>(dictType, label)).getValue(); | ||
| 26 | } | 68 | } |
| 27 | 69 | ||
| 28 | } | 70 | } |
yudao-framework/yudao-spring-boot-starter-extension/pom.xml renamed to yudao-framework/yudao-spring-boot-starter-biz-error-code/pom.xml
| @@ -8,18 +8,18 @@ | @@ -8,18 +8,18 @@ | ||
| 8 | <version>${revision}</version> | 8 | <version>${revision}</version> |
| 9 | </parent> | 9 | </parent> |
| 10 | <modelVersion>4.0.0</modelVersion> | 10 | <modelVersion>4.0.0</modelVersion> |
| 11 | - | ||
| 12 | - <artifactId>yudao-spring-boot-starter-extension</artifactId> | 11 | + <artifactId>yudao-spring-boot-starter-biz-error-code</artifactId> |
| 13 | <packaging>jar</packaging> | 12 | <packaging>jar</packaging> |
| 14 | 13 | ||
| 15 | <name>${project.artifactId}</name> | 14 | <name>${project.artifactId}</name> |
| 16 | - <description>扩展点组件</description> | 15 | + <description> |
| 16 | + 错误码 ErrorCode 的自动配置功能，提供如下功能： | ||
| 17 | + 1. 远程读取：项目启动时，从 system-server 服务，读取数据库中的 ErrorCode 错误码，实现错误码的提水可配置； | ||
| 18 | + 2. 自动更新：管理员在管理后台修数据库中的 ErrorCode 错误码时，项目自动从 system-server 服务加载最新的 ErrorCode 错误码； | ||
| 19 | + 3. 自动写入：项目启动时，将项目本地的错误码写到 system-server 服务中，方便管理员在管理后台编辑； | ||
| 20 | + </description> | ||
| 17 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> | 21 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> |
| 18 | 22 | ||
| 19 | - <properties> | ||
| 20 | - | ||
| 21 | - </properties> | ||
| 22 | - | ||
| 23 | <dependencies> | 23 | <dependencies> |
| 24 | <dependency> | 24 | <dependency> |
| 25 | <groupId>cn.iocoder.boot</groupId> | 25 | <groupId>cn.iocoder.boot</groupId> |
| @@ -28,41 +28,22 @@ | @@ -28,41 +28,22 @@ | ||
| 28 | 28 | ||
| 29 | <!-- Spring 核心 --> | 29 | <!-- Spring 核心 --> |
| 30 | <dependency> | 30 | <dependency> |
| 31 | - <groupId>org.springframework</groupId> | ||
| 32 | - <artifactId>spring-context</artifactId> | ||
| 33 | - <scope>provided</scope> | ||
| 34 | - </dependency> | ||
| 35 | - | ||
| 36 | - <dependency> | ||
| 37 | - <groupId>org.springframework</groupId> | ||
| 38 | - <artifactId>spring-beans</artifactId> | ||
| 39 | - <scope>provided</scope> | ||
| 40 | - </dependency> | ||
| 41 | - | ||
| 42 | - <!-- Spring 核心 --> | ||
| 43 | - <dependency> | ||
| 44 | - <groupId>org.springframework.boot</groupId> | ||
| 45 | - <artifactId>spring-boot-starter-aop</artifactId> | ||
| 46 | - </dependency> | ||
| 47 | - | ||
| 48 | - <!-- 测试包 --> | ||
| 49 | - <dependency> | ||
| 50 | <groupId>org.springframework.boot</groupId> | 31 | <groupId>org.springframework.boot</groupId> |
| 51 | - <artifactId>spring-boot-starter-test</artifactId> | ||
| 52 | - <scope>test</scope> | 32 | + <artifactId>spring-boot-starter</artifactId> |
| 53 | </dependency> | 33 | </dependency> |
| 54 | 34 | ||
| 55 | - <!-- 测试包 --> | 35 | + <!-- 业务组件 --> |
| 56 | <dependency> | 36 | <dependency> |
| 57 | - <groupId>junit</groupId> | ||
| 58 | - <artifactId>junit</artifactId> | ||
| 59 | - <scope>test</scope> | 37 | + <groupId>cn.iocoder.boot</groupId> |
| 38 | + <artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它，进行操作日志的记录 --> | ||
| 39 | + <version>${revision}</version> | ||
| 60 | </dependency> | 40 | </dependency> |
| 61 | 41 | ||
| 62 | - <!-- 工具类相关 --> | ||
| 63 | <dependency> | 42 | <dependency> |
| 64 | <groupId>jakarta.validation</groupId> | 43 | <groupId>jakarta.validation</groupId> |
| 65 | <artifactId>jakarta.validation-api</artifactId> | 44 | <artifactId>jakarta.validation-api</artifactId> |
| 45 | + <scope>provided</scope> <!-- 设置为 provided，主要是 ErrorCodeProperties 使用到 --> | ||
| 66 | </dependency> | 46 | </dependency> |
| 67 | </dependencies> | 47 | </dependencies> |
| 68 | -</project> | ||
| 69 | \ No newline at end of file | 48 | \ No newline at end of file |
| 49 | + | ||
| 50 | +</project> |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/config/ErrorCodeProperties.java renamed to yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java
| 1 | -package cn.iocoder.yudao.module.system.framework.errorcode.config; | 1 | +package cn.iocoder.yudao.framework.errorcode.config; |
| 2 | 2 | ||
| 3 | import lombok.Data; | 3 | import lombok.Data; |
| 4 | import org.springframework.boot.context.properties.ConfigurationProperties; | 4 | import org.springframework.boot.context.properties.ConfigurationProperties; |
| @@ -18,6 +18,10 @@ import java.util.List; | @@ -18,6 +18,10 @@ import java.util.List; | ||
| 18 | public class ErrorCodeProperties { | 18 | public class ErrorCodeProperties { |
| 19 | 19 | ||
| 20 | /** | 20 | /** |
| 21 | + * 是否开启 | ||
| 22 | + */ | ||
| 23 | + private Boolean enable = true; | ||
| 24 | + /** | ||
| 21 | * 错误码枚举类 | 25 | * 错误码枚举类 |
| 22 | */ | 26 | */ |
| 23 | @NotNull(message = "错误码枚举类不能为空") | 27 | @NotNull(message = "错误码枚举类不能为空") |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/config/ErrorCodeConfiguration.java renamed to yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeConfiguration.java
| 1 | -package cn.iocoder.yudao.module.system.framework.errorcode.config; | 1 | +package cn.iocoder.yudao.framework.errorcode.config; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.generator.ErrorCodeAutoGenerator; | ||
| 4 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.loader.ErrorCodeLoader; | ||
| 5 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.service.ErrorCodeFrameworkService; | ||
| 6 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.loader.ErrorCodeLoaderImpl; | ||
| 7 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.generator.ErrorCodeAutoGeneratorImpl; | 3 | +import cn.iocoder.yudao.framework.errorcode.core.generator.ErrorCodeAutoGenerator; |
| 4 | +import cn.iocoder.yudao.framework.errorcode.core.generator.ErrorCodeAutoGeneratorImpl; | ||
| 5 | +import cn.iocoder.yudao.framework.errorcode.core.loader.ErrorCodeLoader; | ||
| 6 | +import cn.iocoder.yudao.framework.errorcode.core.loader.ErrorCodeLoaderImpl; | ||
| 7 | +import cn.iocoder.yudao.module.system.api.errorcode.ErrorCodeApi; | ||
| 8 | import org.springframework.beans.factory.annotation.Value; | 8 | import org.springframework.beans.factory.annotation.Value; |
| 9 | +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | ||
| 9 | import org.springframework.boot.context.properties.EnableConfigurationProperties; | 10 | import org.springframework.boot.context.properties.EnableConfigurationProperties; |
| 10 | import org.springframework.context.annotation.Bean; | 11 | import org.springframework.context.annotation.Bean; |
| 11 | import org.springframework.context.annotation.Configuration; | 12 | import org.springframework.context.annotation.Configuration; |
| 12 | import org.springframework.scheduling.annotation.EnableScheduling; | 13 | import org.springframework.scheduling.annotation.EnableScheduling; |
| 13 | 14 | ||
| 14 | -// TODO 芋艿：貌似放的位置有问题 | ||
| 15 | /** | 15 | /** |
| 16 | * 错误码配置类 | 16 | * 错误码配置类 |
| 17 | + * | ||
| 18 | + * @author 芋道源码 | ||
| 17 | */ | 19 | */ |
| 18 | @Configuration | 20 | @Configuration |
| 21 | +@ConditionalOnProperty(prefix = "yudao.error-code", value = "enable", matchIfMissing = true) // 允许使用 yudao.error-code.enable=false 禁用访问日志 | ||
| 19 | @EnableConfigurationProperties(ErrorCodeProperties.class) | 22 | @EnableConfigurationProperties(ErrorCodeProperties.class) |
| 20 | @EnableScheduling // 开启调度任务的功能，因为 ErrorCodeRemoteLoader 通过定时刷新错误码 | 23 | @EnableScheduling // 开启调度任务的功能，因为 ErrorCodeRemoteLoader 通过定时刷新错误码 |
| 21 | -public class ErrorCodeConfiguration { | 24 | +public class YudaoErrorCodeConfiguration { |
| 22 | 25 | ||
| 23 | @Bean | 26 | @Bean |
| 24 | public ErrorCodeAutoGenerator errorCodeAutoGenerator(@Value("${spring.application.name}") String applicationName, | 27 | public ErrorCodeAutoGenerator errorCodeAutoGenerator(@Value("${spring.application.name}") String applicationName, |
| 25 | ErrorCodeProperties errorCodeProperties, | 28 | ErrorCodeProperties errorCodeProperties, |
| 26 | - ErrorCodeFrameworkService errorCodeFrameworkService) { | ||
| 27 | - return new ErrorCodeAutoGeneratorImpl(applicationName, errorCodeProperties.getConstantsClassList(), | ||
| 28 | - errorCodeFrameworkService); | 29 | + ErrorCodeApi errorCodeApi) { |
| 30 | + return new ErrorCodeAutoGeneratorImpl(applicationName, errorCodeProperties.getConstantsClassList(), errorCodeApi); | ||
| 29 | } | 31 | } |
| 30 | 32 | ||
| 31 | @Bean | 33 | @Bean |
| 32 | public ErrorCodeLoader errorCodeLoader(@Value("${spring.application.name}") String applicationName, | 34 | public ErrorCodeLoader errorCodeLoader(@Value("${spring.application.name}") String applicationName, |
| 33 | - ErrorCodeFrameworkService errorCodeFrameworkService) { | ||
| 34 | - return new ErrorCodeLoaderImpl(applicationName, errorCodeFrameworkService); | 35 | + ErrorCodeApi errorCodeApi) { |
| 36 | + return new ErrorCodeLoaderImpl(applicationName, errorCodeApi); | ||
| 35 | } | 37 | } |
| 36 | 38 | ||
| 37 | } | 39 | } |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java renamed to yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/generator/ErrorCodeAutoGenerator.java
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java renamed to yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java
| 1 | -package cn.iocoder.yudao.module.system.framework.errorcode.core.generator; | 1 | +package cn.iocoder.yudao.framework.errorcode.core.generator; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | import cn.hutool.core.exceptions.ExceptionUtil; | 4 | import cn.hutool.core.exceptions.ExceptionUtil; |
| 5 | import cn.hutool.core.util.ClassUtil; | 5 | import cn.hutool.core.util.ClassUtil; |
| 6 | import cn.hutool.core.util.ReflectUtil; | 6 | import cn.hutool.core.util.ReflectUtil; |
| 7 | import cn.iocoder.yudao.framework.common.exception.ErrorCode; | 7 | import cn.iocoder.yudao.framework.common.exception.ErrorCode; |
| 8 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; | ||
| 9 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.service.ErrorCodeFrameworkService; | 8 | +import cn.iocoder.yudao.module.system.api.errorcode.ErrorCodeApi; |
| 9 | +import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; | ||
| 10 | import lombok.RequiredArgsConstructor; | 10 | import lombok.RequiredArgsConstructor; |
| 11 | import lombok.extern.slf4j.Slf4j; | 11 | import lombok.extern.slf4j.Slf4j; |
| 12 | import org.springframework.boot.context.event.ApplicationReadyEvent; | 12 | import org.springframework.boot.context.event.ApplicationReadyEvent; |
| @@ -36,9 +36,9 @@ public class ErrorCodeAutoGeneratorImpl implements ErrorCodeAutoGenerator { | @@ -36,9 +36,9 @@ public class ErrorCodeAutoGeneratorImpl implements ErrorCodeAutoGenerator { | ||
| 36 | */ | 36 | */ |
| 37 | private final List<String> constantsClassList; | 37 | private final List<String> constantsClassList; |
| 38 | /** | 38 | /** |
| 39 | - * 错误码 Service | 39 | + * 错误码 Api |
| 40 | */ | 40 | */ |
| 41 | - private final ErrorCodeFrameworkService errorCodeService; | 41 | + private final ErrorCodeApi errorCodeApi; |
| 42 | 42 | ||
| 43 | @Override | 43 | @Override |
| 44 | @EventListener(ApplicationReadyEvent.class) | 44 | @EventListener(ApplicationReadyEvent.class) |
| @@ -49,7 +49,7 @@ public class ErrorCodeAutoGeneratorImpl implements ErrorCodeAutoGenerator { | @@ -49,7 +49,7 @@ public class ErrorCodeAutoGeneratorImpl implements ErrorCodeAutoGenerator { | ||
| 49 | log.info("[execute][解析到错误码数量为 ({}) 个]", autoGenerateDTOs.size()); | 49 | log.info("[execute][解析到错误码数量为 ({}) 个]", autoGenerateDTOs.size()); |
| 50 | 50 | ||
| 51 | // 第二步，写入到 system 服务 | 51 | // 第二步，写入到 system 服务 |
| 52 | - errorCodeService.autoGenerateErrorCodes(autoGenerateDTOs); | 52 | + errorCodeApi.autoGenerateErrorCodes(autoGenerateDTOs); |
| 53 | log.info("[execute][写入到 system 组件完成]"); | 53 | log.info("[execute][写入到 system 组件完成]"); |
| 54 | } | 54 | } |
| 55 | 55 |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/loader/ErrorCodeLoader.java renamed to yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/loader/ErrorCodeLoader.java
| 1 | -package cn.iocoder.yudao.module.system.framework.errorcode.core.loader; | 1 | +package cn.iocoder.yudao.framework.errorcode.core.loader; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | 3 | import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; |
| 4 | 4 |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java renamed to yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java
| 1 | -package cn.iocoder.yudao.module.system.framework.errorcode.core.loader; | 1 | +package cn.iocoder.yudao.framework.errorcode.core.loader; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.dto.ErrorCodeRespDTO; | ||
| 5 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.service.ErrorCodeFrameworkService; | ||
| 6 | import cn.iocoder.yudao.framework.common.util.date.DateUtils; | 4 | import cn.iocoder.yudao.framework.common.util.date.DateUtils; |
| 5 | +import cn.iocoder.yudao.module.system.api.errorcode.ErrorCodeApi; | ||
| 6 | +import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeRespDTO; | ||
| 7 | import lombok.RequiredArgsConstructor; | 7 | import lombok.RequiredArgsConstructor; |
| 8 | import lombok.extern.slf4j.Slf4j; | 8 | import lombok.extern.slf4j.Slf4j; |
| 9 | import org.springframework.boot.context.event.ApplicationReadyEvent; | 9 | import org.springframework.boot.context.event.ApplicationReadyEvent; |
| @@ -34,9 +34,9 @@ public class ErrorCodeLoaderImpl implements ErrorCodeLoader { | @@ -34,9 +34,9 @@ public class ErrorCodeLoaderImpl implements ErrorCodeLoader { | ||
| 34 | */ | 34 | */ |
| 35 | private final String applicationName; | 35 | private final String applicationName; |
| 36 | /** | 36 | /** |
| 37 | - * 错误码 Service | 37 | + * 错误码 Api |
| 38 | */ | 38 | */ |
| 39 | - private final ErrorCodeFrameworkService errorCodeService; | 39 | + private final ErrorCodeApi errorCodeApi; |
| 40 | 40 | ||
| 41 | /** | 41 | /** |
| 42 | * 缓存错误码的最大更新时间，用于后续的增量轮询，判断是否有更新 | 42 | * 缓存错误码的最大更新时间，用于后续的增量轮询，判断是否有更新 |
| @@ -55,7 +55,7 @@ public class ErrorCodeLoaderImpl implements ErrorCodeLoader { | @@ -55,7 +55,7 @@ public class ErrorCodeLoaderImpl implements ErrorCodeLoader { | ||
| 55 | 55 | ||
| 56 | private void loadErrorCodes0() { | 56 | private void loadErrorCodes0() { |
| 57 | // 加载错误码 | 57 | // 加载错误码 |
| 58 | - List<ErrorCodeRespDTO> errorCodeRespDTOs = errorCodeService.getErrorCodeList(applicationName, maxUpdateTime); | 58 | + List<ErrorCodeRespDTO> errorCodeRespDTOs = errorCodeApi.getErrorCodeList(applicationName, maxUpdateTime); |
| 59 | if (CollUtil.isEmpty(errorCodeRespDTOs)) { | 59 | if (CollUtil.isEmpty(errorCodeRespDTOs)) { |
| 60 | return; | 60 | return; |
| 61 | } | 61 | } |
yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/package-info.java
0 → 100644
| 1 | +/** | ||
| 2 | + * 错误码 ErrorCode 的自动配置功能，提供如下功能： | ||
| 3 | + * | ||
| 4 | + * 1. 远程读取：项目启动时，从 system-service 服务，读取数据库中的 ErrorCode 错误码，实现错误码的提水可配置； | ||
| 5 | + * 2. 自动更新：管理员在管理后台修数据库中的 ErrorCode 错误码时，项目自动从 system-service 服务加载最新的 ErrorCode 错误码； | ||
| 6 | + * 3. 自动写入：项目启动时，将项目本地的错误码写到 system-server 服务中，方便管理员在管理后台编辑； | ||
| 7 | + * | ||
| 8 | + * @author 芋道源码 | ||
| 9 | + */ | ||
| 10 | +package cn.iocoder.yudao.framework.errorcode; |
yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/resources/META-INF/spring.factories
0 → 100644
yudao-framework/yudao-spring-boot-starter-biz-operatelog/pom.xml
| @@ -34,6 +34,13 @@ | @@ -34,6 +34,13 @@ | ||
| 34 | <scope>provided</scope> | 34 | <scope>provided</scope> |
| 35 | </dependency> | 35 | </dependency> |
| 36 | 36 | ||
| 37 | + <!-- 业务组件 --> | ||
| 38 | + <dependency> | ||
| 39 | + <groupId>cn.iocoder.boot</groupId> | ||
| 40 | + <artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它，进行操作日志的记录 --> | ||
| 41 | + <version>${revision}</version> | ||
| 42 | + </dependency> | ||
| 43 | + | ||
| 37 | <!-- 工具类相关 --> | 44 | <!-- 工具类相关 --> |
| 38 | <dependency> | 45 | <dependency> |
| 39 | <groupId>com.google.guava</groupId> | 46 | <groupId>com.google.guava</groupId> |
yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/config/YudaoOperateLogAutoConfiguration.java
| 1 | package cn.iocoder.yudao.framework.operatelog.config; | 1 | package cn.iocoder.yudao.framework.operatelog.config; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.operatelog.core.aop.OperateLogAspect; | 3 | import cn.iocoder.yudao.framework.operatelog.core.aop.OperateLogAspect; |
| 4 | +import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkService; | ||
| 5 | +import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkServiceImpl; | ||
| 6 | +import cn.iocoder.yudao.module.system.api.logger.OperateLogApi; | ||
| 4 | import org.springframework.context.annotation.Bean; | 7 | import org.springframework.context.annotation.Bean; |
| 5 | import org.springframework.context.annotation.Configuration; | 8 | import org.springframework.context.annotation.Configuration; |
| 6 | 9 | ||
| @@ -12,4 +15,9 @@ public class YudaoOperateLogAutoConfiguration { | @@ -12,4 +15,9 @@ public class YudaoOperateLogAutoConfiguration { | ||
| 12 | return new OperateLogAspect(); | 15 | return new OperateLogAspect(); |
| 13 | } | 16 | } |
| 14 | 17 | ||
| 18 | + @Bean | ||
| 19 | + public OperateLogFrameworkService operateLogFrameworkService(OperateLogApi operateLogApi) { | ||
| 20 | + return new OperateLogFrameworkServiceImpl(operateLogApi); | ||
| 21 | + } | ||
| 22 | + | ||
| 15 | } | 23 | } |
yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
| @@ -9,9 +9,8 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; | @@ -9,9 +9,8 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; | ||
| 9 | import cn.iocoder.yudao.framework.common.util.json.JsonUtils; | 9 | import cn.iocoder.yudao.framework.common.util.json.JsonUtils; |
| 10 | import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils; | 10 | import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils; |
| 11 | import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; | 11 | import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; |
| 12 | -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; | ||
| 13 | -import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO; | ||
| 14 | import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; | 12 | import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; |
| 13 | +import cn.iocoder.yudao.framework.operatelog.core.service.OperateLog; | ||
| 15 | import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkService; | 14 | import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkService; |
| 16 | import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; | 15 | import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; |
| 17 | import com.google.common.collect.Maps; | 16 | import com.google.common.collect.Maps; |
| @@ -45,7 +44,7 @@ import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeC | @@ -45,7 +44,7 @@ import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeC | ||
| 45 | * 满足如下任一条件，则会进行记录： | 44 | * 满足如下任一条件，则会进行记录： |
| 46 | * 1. 使用 @ApiOperation + 非 @GetMapping | 45 | * 1. 使用 @ApiOperation + 非 @GetMapping |
| 47 | * 2. 使用 @OperateLog 注解 | 46 | * 2. 使用 @OperateLog 注解 |
| 48 | - * | 47 | + * <p> |
| 49 | * 但是，如果声明 @OperateLog 注解时，将 enable 属性设置为 false 时，强制不记录。 | 48 | * 但是，如果声明 @OperateLog 注解时，将 enable 属性设置为 false 时，强制不记录。 |
| 50 | * | 49 | * |
| 51 | * @author 芋道源码 | 50 | * @author 芋道源码 |
| @@ -57,13 +56,13 @@ public class OperateLogAspect { | @@ -57,13 +56,13 @@ public class OperateLogAspect { | ||
| 57 | /** | 56 | /** |
| 58 | * 用于记录操作内容的上下文 | 57 | * 用于记录操作内容的上下文 |
| 59 | * | 58 | * |
| 60 | - * @see OperateLogCreateReqDTO#getContent() | 59 | + * @see OperateLog#getContent() |
| 61 | */ | 60 | */ |
| 62 | private static final ThreadLocal<String> CONTENT = new ThreadLocal<>(); | 61 | private static final ThreadLocal<String> CONTENT = new ThreadLocal<>(); |
| 63 | /** | 62 | /** |
| 64 | * 用于记录拓展字段的上下文 | 63 | * 用于记录拓展字段的上下文 |
| 65 | * | 64 | * |
| 66 | - * @see OperateLogCreateReqDTO#getExts() | 65 | + * @see OperateLog#getExts() |
| 67 | */ | 66 | */ |
| 68 | private static final ThreadLocal<Map<String, Object>> EXTS = new ThreadLocal<>(); | 67 | private static final ThreadLocal<Map<String, Object>> EXTS = new ThreadLocal<>(); |
| 69 | 68 | ||
| @@ -73,16 +72,21 @@ public class OperateLogAspect { | @@ -73,16 +72,21 @@ public class OperateLogAspect { | ||
| 73 | @Around("@annotation(apiOperation)") | 72 | @Around("@annotation(apiOperation)") |
| 74 | public Object around(ProceedingJoinPoint joinPoint, ApiOperation apiOperation) throws Throwable { | 73 | public Object around(ProceedingJoinPoint joinPoint, ApiOperation apiOperation) throws Throwable { |
| 75 | // 可能也添加了 @ApiOperation 注解 | 74 | // 可能也添加了 @ApiOperation 注解 |
| 76 | - OperateLog operateLog = getMethodAnnotation(joinPoint, OperateLog.class); | 75 | + cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog = getMethodAnnotation(joinPoint, |
| 76 | + cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog.class); | ||
| 77 | return around0(joinPoint, operateLog, apiOperation); | 77 | return around0(joinPoint, operateLog, apiOperation); |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | - @Around("!@annotation(io.swagger.annotations.ApiOperation) && @annotation(operateLog)") // 兼容处理，只添加 @OperateLog 注解的情况 | ||
| 81 | - public Object around(ProceedingJoinPoint joinPoint, OperateLog operateLog) throws Throwable { | 80 | + @Around("!@annotation(io.swagger.annotations.ApiOperation) && @annotation(operateLog)") |
| 81 | + // 兼容处理，只添加 @OperateLog 注解的情况 | ||
| 82 | + public Object around(ProceedingJoinPoint joinPoint, | ||
| 83 | + cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog) throws Throwable { | ||
| 82 | return around0(joinPoint, operateLog, null); | 84 | return around0(joinPoint, operateLog, null); |
| 83 | } | 85 | } |
| 84 | 86 | ||
| 85 | - private Object around0(ProceedingJoinPoint joinPoint, OperateLog operateLog, ApiOperation apiOperation) throws Throwable { | 87 | + private Object around0(ProceedingJoinPoint joinPoint, |
| 88 | + cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog, | ||
| 89 | + ApiOperation apiOperation) throws Throwable { | ||
| 86 | // 目前，只有管理员，才记录操作日志！所以非管理员，直接调用，不进行记录 | 90 | // 目前，只有管理员，才记录操作日志！所以非管理员，直接调用，不进行记录 |
| 87 | Integer userType = WebFrameworkUtils.getLoginUserType(); | 91 | Integer userType = WebFrameworkUtils.getLoginUserType(); |
| 88 | if (!Objects.equals(userType, UserTypeEnum.ADMIN.getValue())) { | 92 | if (!Objects.equals(userType, UserTypeEnum.ADMIN.getValue())) { |
| @@ -121,7 +125,9 @@ public class OperateLogAspect { | @@ -121,7 +125,9 @@ public class OperateLogAspect { | ||
| 121 | EXTS.remove(); | 125 | EXTS.remove(); |
| 122 | } | 126 | } |
| 123 | 127 | ||
| 124 | - private void log(ProceedingJoinPoint joinPoint, OperateLog operateLog, ApiOperation apiOperation, | 128 | + private void log(ProceedingJoinPoint joinPoint, |
| 129 | + cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog, | ||
| 130 | + ApiOperation apiOperation, | ||
| 125 | Date startTime, Object result, Throwable exception) { | 131 | Date startTime, Object result, Throwable exception) { |
| 126 | try { | 132 | try { |
| 127 | // 判断不记录的情况 | 133 | // 判断不记录的情况 |
| @@ -136,113 +142,117 @@ public class OperateLogAspect { | @@ -136,113 +142,117 @@ public class OperateLogAspect { | ||
| 136 | } | 142 | } |
| 137 | } | 143 | } |
| 138 | 144 | ||
| 139 | - private void log0(ProceedingJoinPoint joinPoint, OperateLog operateLog, ApiOperation apiOperation, | 145 | + private void log0(ProceedingJoinPoint joinPoint, |
| 146 | + cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog, | ||
| 147 | + ApiOperation apiOperation, | ||
| 140 | Date startTime, Object result, Throwable exception) { | 148 | Date startTime, Object result, Throwable exception) { |
| 141 | - OperateLogCreateReqDTO operateLogDTO = new OperateLogCreateReqDTO(); | 149 | + OperateLog operateLogObj = new OperateLog(); |
| 142 | // 补全通用字段 | 150 | // 补全通用字段 |
| 143 | - operateLogDTO.setTraceId(TracerUtils.getTraceId()); | ||
| 144 | - operateLogDTO.setStartTime(startTime); | 151 | + operateLogObj.setTraceId(TracerUtils.getTraceId()); |
| 152 | + operateLogObj.setStartTime(startTime); | ||
| 145 | // 补充用户信息 | 153 | // 补充用户信息 |
| 146 | - fillUserFields(operateLogDTO); | 154 | + fillUserFields(operateLogObj); |
| 147 | // 补全模块信息 | 155 | // 补全模块信息 |
| 148 | - fillModuleFields(operateLogDTO, joinPoint, operateLog, apiOperation); | 156 | + fillModuleFields(operateLogObj, joinPoint, operateLog, apiOperation); |
| 149 | // 补全请求信息 | 157 | // 补全请求信息 |
| 150 | - fillRequestFields(operateLogDTO); | 158 | + fillRequestFields(operateLogObj); |
| 151 | // 补全方法信息 | 159 | // 补全方法信息 |
| 152 | - fillMethodFields(operateLogDTO, joinPoint, operateLog, startTime, result, exception); | 160 | + fillMethodFields(operateLogObj, joinPoint, operateLog, startTime, result, exception); |
| 153 | 161 | ||
| 154 | // 异步记录日志 | 162 | // 异步记录日志 |
| 155 | - operateLogFrameworkService.createOperateLogAsync(operateLogDTO); | 163 | + operateLogFrameworkService.createOperateLog(operateLogObj); |
| 156 | } | 164 | } |
| 157 | 165 | ||
| 158 | - private static void fillUserFields(OperateLogCreateReqDTO operateLogDTO) { | ||
| 159 | - operateLogDTO.setUserId(WebFrameworkUtils.getLoginUserId()); | ||
| 160 | - operateLogDTO.setUserType(WebFrameworkUtils.getLoginUserType()); | 166 | + private static void fillUserFields(OperateLog operateLogObj) { |
| 167 | + operateLogObj.setUserId(WebFrameworkUtils.getLoginUserId()); | ||
| 168 | + operateLogObj.setUserType(WebFrameworkUtils.getLoginUserType()); | ||
| 161 | } | 169 | } |
| 162 | 170 | ||
| 163 | - private static void fillModuleFields(OperateLogCreateReqDTO operateLogDTO, | ||
| 164 | - ProceedingJoinPoint joinPoint, OperateLog operateLog, ApiOperation apiOperation) { | 171 | + private static void fillModuleFields(OperateLog operateLogObj, |
| 172 | + ProceedingJoinPoint joinPoint, | ||
| 173 | + cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog, | ||
| 174 | + ApiOperation apiOperation) { | ||
| 165 | // module 属性 | 175 | // module 属性 |
| 166 | if (operateLog != null) { | 176 | if (operateLog != null) { |
| 167 | - operateLogDTO.setModule(operateLog.module()); | 177 | + operateLogObj.setModule(operateLog.module()); |
| 168 | } | 178 | } |
| 169 | - if (StrUtil.isEmpty(operateLogDTO.getModule())) { | 179 | + if (StrUtil.isEmpty(operateLogObj.getModule())) { |
| 170 | Api api = getClassAnnotation(joinPoint, Api.class); | 180 | Api api = getClassAnnotation(joinPoint, Api.class); |
| 171 | if (api != null) { | 181 | if (api != null) { |
| 172 | // 优先读取 @API 的 name 属性 | 182 | // 优先读取 @API 的 name 属性 |
| 173 | if (StrUtil.isNotEmpty(api.value())) { | 183 | if (StrUtil.isNotEmpty(api.value())) { |
| 174 | - operateLogDTO.setModule(api.value()); | 184 | + operateLogObj.setModule(api.value()); |
| 175 | } | 185 | } |
| 176 | // 没有的话，读取 @API 的 tags 属性 | 186 | // 没有的话，读取 @API 的 tags 属性 |
| 177 | - if (StrUtil.isEmpty(operateLogDTO.getModule()) && ArrayUtil.isNotEmpty(api.tags())) { | ||
| 178 | - operateLogDTO.setModule(api.tags()[0]); | 187 | + if (StrUtil.isEmpty(operateLogObj.getModule()) && ArrayUtil.isNotEmpty(api.tags())) { |
| 188 | + operateLogObj.setModule(api.tags()[0]); | ||
| 179 | } | 189 | } |
| 180 | } | 190 | } |
| 181 | } | 191 | } |
| 182 | // name 属性 | 192 | // name 属性 |
| 183 | if (operateLog != null) { | 193 | if (operateLog != null) { |
| 184 | - operateLogDTO.setName(operateLog.name()); | 194 | + operateLogObj.setName(operateLog.name()); |
| 185 | } | 195 | } |
| 186 | - if (StrUtil.isEmpty(operateLogDTO.getName()) && apiOperation != null) { | ||
| 187 | - operateLogDTO.setName(apiOperation.value()); | 196 | + if (StrUtil.isEmpty(operateLogObj.getName()) && apiOperation != null) { |
| 197 | + operateLogObj.setName(apiOperation.value()); | ||
| 188 | } | 198 | } |
| 189 | // type 属性 | 199 | // type 属性 |
| 190 | if (operateLog != null && ArrayUtil.isNotEmpty(operateLog.type())) { | 200 | if (operateLog != null && ArrayUtil.isNotEmpty(operateLog.type())) { |
| 191 | - operateLogDTO.setType(operateLog.type()[0].getType()); | 201 | + operateLogObj.setType(operateLog.type()[0].getType()); |
| 192 | } | 202 | } |
| 193 | - if (operateLogDTO.getType() == null) { | 203 | + if (operateLogObj.getType() == null) { |
| 194 | RequestMethod requestMethod = obtainFirstMatchRequestMethod(obtainRequestMethod(joinPoint)); | 204 | RequestMethod requestMethod = obtainFirstMatchRequestMethod(obtainRequestMethod(joinPoint)); |
| 195 | OperateTypeEnum operateLogType = convertOperateLogType(requestMethod); | 205 | OperateTypeEnum operateLogType = convertOperateLogType(requestMethod); |
| 196 | - operateLogDTO.setType(operateLogType != null ? operateLogType.getType() : null); | 206 | + operateLogObj.setType(operateLogType != null ? operateLogType.getType() : null); |
| 197 | } | 207 | } |
| 198 | // content 和 exts 属性 | 208 | // content 和 exts 属性 |
| 199 | - operateLogDTO.setContent(CONTENT.get()); | ||
| 200 | - operateLogDTO.setExts(EXTS.get()); | 209 | + operateLogObj.setContent(CONTENT.get()); |
| 210 | + operateLogObj.setExts(EXTS.get()); | ||
| 201 | } | 211 | } |
| 202 | 212 | ||
| 203 | - private static void fillRequestFields(OperateLogCreateReqDTO operateLogDTO) { | 213 | + private static void fillRequestFields(OperateLog operateLogObj) { |
| 204 | // 获得 Request 对象 | 214 | // 获得 Request 对象 |
| 205 | HttpServletRequest request = ServletUtils.getRequest(); | 215 | HttpServletRequest request = ServletUtils.getRequest(); |
| 206 | if (request == null) { | 216 | if (request == null) { |
| 207 | return; | 217 | return; |
| 208 | } | 218 | } |
| 209 | // 补全请求信息 | 219 | // 补全请求信息 |
| 210 | - operateLogDTO.setRequestMethod(request.getMethod()); | ||
| 211 | - operateLogDTO.setRequestUrl(request.getRequestURI()); | ||
| 212 | - operateLogDTO.setUserIp(ServletUtil.getClientIP(request)); | ||
| 213 | - operateLogDTO.setUserAgent(ServletUtils.getUserAgent(request)); | 220 | + operateLogObj.setRequestMethod(request.getMethod()); |
| 221 | + operateLogObj.setRequestUrl(request.getRequestURI()); | ||
| 222 | + operateLogObj.setUserIp(ServletUtil.getClientIP(request)); | ||
| 223 | + operateLogObj.setUserAgent(ServletUtils.getUserAgent(request)); | ||
| 214 | } | 224 | } |
| 215 | 225 | ||
| 216 | - private static void fillMethodFields(OperateLogCreateReqDTO operateLogDTO, | ||
| 217 | - ProceedingJoinPoint joinPoint, OperateLog operateLog, | 226 | + private static void fillMethodFields(OperateLog operateLogObj, |
| 227 | + ProceedingJoinPoint joinPoint, | ||
| 228 | + cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog, | ||
| 218 | Date startTime, Object result, Throwable exception) { | 229 | Date startTime, Object result, Throwable exception) { |
| 219 | MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature(); | 230 | MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature(); |
| 220 | - operateLogDTO.setJavaMethod(methodSignature.toString()); | 231 | + operateLogObj.setJavaMethod(methodSignature.toString()); |
| 221 | if (operateLog == null || operateLog.logArgs()) { | 232 | if (operateLog == null || operateLog.logArgs()) { |
| 222 | - operateLogDTO.setJavaMethodArgs(obtainMethodArgs(joinPoint)); | 233 | + operateLogObj.setJavaMethodArgs(obtainMethodArgs(joinPoint)); |
| 223 | } | 234 | } |
| 224 | if (operateLog == null || operateLog.logResultData()) { | 235 | if (operateLog == null || operateLog.logResultData()) { |
| 225 | - operateLogDTO.setResultData(obtainResultData(result)); | 236 | + operateLogObj.setResultData(obtainResultData(result)); |
| 226 | } | 237 | } |
| 227 | - operateLogDTO.setDuration((int) (System.currentTimeMillis() - startTime.getTime())); | 238 | + operateLogObj.setDuration((int) (System.currentTimeMillis() - startTime.getTime())); |
| 228 | // （正常）处理 resultCode 和 resultMsg 字段 | 239 | // （正常）处理 resultCode 和 resultMsg 字段 |
| 229 | - if (result != null) { | ||
| 230 | - if (result instanceof CommonResult) { | ||
| 231 | - CommonResult<?> commonResult = (CommonResult<?>) result; | ||
| 232 | - operateLogDTO.setResultCode(commonResult.getCode()); | ||
| 233 | - operateLogDTO.setResultMsg(commonResult.getMsg()); | ||
| 234 | - } else { | ||
| 235 | - operateLogDTO.setResultCode(SUCCESS.getCode()); | ||
| 236 | - } | 240 | + if (result instanceof CommonResult) { |
| 241 | + CommonResult<?> commonResult = (CommonResult<?>) result; | ||
| 242 | + operateLogObj.setResultCode(commonResult.getCode()); | ||
| 243 | + operateLogObj.setResultMsg(commonResult.getMsg()); | ||
| 244 | + } else { | ||
| 245 | + operateLogObj.setResultCode(SUCCESS.getCode()); | ||
| 237 | } | 246 | } |
| 238 | // （异常）处理 resultCode 和 resultMsg 字段 | 247 | // （异常）处理 resultCode 和 resultMsg 字段 |
| 239 | if (exception != null) { | 248 | if (exception != null) { |
| 240 | - operateLogDTO.setResultCode(INTERNAL_SERVER_ERROR.getCode()); | ||
| 241 | - operateLogDTO.setResultMsg(ExceptionUtil.getRootCauseMessage(exception)); | 249 | + operateLogObj.setResultCode(INTERNAL_SERVER_ERROR.getCode()); |
| 250 | + operateLogObj.setResultMsg(ExceptionUtil.getRootCauseMessage(exception)); | ||
| 242 | } | 251 | } |
| 243 | } | 252 | } |
| 244 | 253 | ||
| 245 | - private static boolean isLogEnable(ProceedingJoinPoint joinPoint, OperateLog operateLog) { | 254 | + private static boolean isLogEnable(ProceedingJoinPoint joinPoint, |
| 255 | + cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog operateLog) { | ||
| 246 | // 有 @OperateLog 注解的情况下 | 256 | // 有 @OperateLog 注解的情况下 |
| 247 | if (operateLog != null) { | 257 | if (operateLog != null) { |
| 248 | return operateLog.enable(); | 258 | return operateLog.enable(); |
| @@ -256,7 +266,7 @@ public class OperateLogAspect { | @@ -256,7 +266,7 @@ public class OperateLogAspect { | ||
| 256 | return null; | 266 | return null; |
| 257 | } | 267 | } |
| 258 | return Arrays.stream(requestMethods).filter(requestMethod -> | 268 | return Arrays.stream(requestMethods).filter(requestMethod -> |
| 259 | - requestMethod == RequestMethod.POST | 269 | + requestMethod == RequestMethod.POST |
| 260 | || requestMethod == RequestMethod.PUT | 270 | || requestMethod == RequestMethod.PUT |
| 261 | || requestMethod == RequestMethod.DELETE) | 271 | || requestMethod == RequestMethod.DELETE) |
| 262 | .findFirst().orElse(null); | 272 | .findFirst().orElse(null); |
yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/dto/OperateLogCreateReqDTO.java deleted
| 1 | -package cn.iocoder.yudao.framework.operatelog.core.dto; | ||
| 2 | - | ||
| 3 | -import io.swagger.annotations.ApiModelProperty; | ||
| 4 | -import lombok.Data; | ||
| 5 | - | ||
| 6 | -import javax.validation.constraints.NotEmpty; | ||
| 7 | -import javax.validation.constraints.NotNull; | ||
| 8 | -import java.util.Date; | ||
| 9 | -import java.util.Map; | ||
| 10 | - | ||
| 11 | -/** | ||
| 12 | - * 操作日志创建 Request DTO | ||
| 13 | - */ | ||
| 14 | -@Data | ||
| 15 | -public class OperateLogCreateReqDTO { | ||
| 16 | - | ||
| 17 | - @ApiModelProperty(value = "链路追踪编号", required = true, example = "89aca178-a370-411c-ae02-3f0d672be4ab") | ||
| 18 | - @NotEmpty(message = "链路追踪编号不能为空") | ||
| 19 | - private String traceId; | ||
| 20 | - | ||
| 21 | - @ApiModelProperty(value = "用户编号", required = true, example = "1024") | ||
| 22 | - @NotNull(message = "用户编号不能为空") | ||
| 23 | - private Long userId; | ||
| 24 | - @ApiModelProperty(value = "用户类型", required = true, example = "1") | ||
| 25 | - @NotNull(message = "用户类型不能为空") | ||
| 26 | - private Integer userType; | ||
| 27 | - | ||
| 28 | - @ApiModelProperty(value = "操作模块", required = true, example = "订单") | ||
| 29 | - @NotEmpty(message = "操作模块不能为空") | ||
| 30 | - private String module; | ||
| 31 | - | ||
| 32 | - @ApiModelProperty(value = "操作名", required = true, example = "创建订单") | ||
| 33 | - @NotEmpty(message = "操作名") | ||
| 34 | - private String name; | ||
| 35 | - | ||
| 36 | - @ApiModelProperty(value = "操作分类", required = true, example = "1", notes = "参见 SysOperateLogTypeEnum 枚举类") | ||
| 37 | - @NotNull(message = "操作分类不能为空") | ||
| 38 | - private Integer type; | ||
| 39 | - | ||
| 40 | - @ApiModelProperty(value = "操作明细", example = "修改编号为 1 的用户信息，将性别从男改成女，将姓名从芋道改成源码。") | ||
| 41 | - private String content; | ||
| 42 | - | ||
| 43 | - @ApiModelProperty(value = "拓展字段", example = "{'orderId': 1}") | ||
| 44 | - private Map<String, Object> exts; | ||
| 45 | - | ||
| 46 | - @ApiModelProperty(value = "请求方法名", required = true, example = "GET") | ||
| 47 | - @NotEmpty(message = "请求方法名不能为空") | ||
| 48 | - private String requestMethod; | ||
| 49 | - | ||
| 50 | - @ApiModelProperty(value = "请求地址", required = true, example = "/xxx/yyy") | ||
| 51 | - @NotEmpty(message = "请求地址不能为空") | ||
| 52 | - private String requestUrl; | ||
| 53 | - | ||
| 54 | - @ApiModelProperty(value = "用户 IP", required = true, example = "127.0.0.1") | ||
| 55 | - @NotEmpty(message = "用户 IP 不能为空") | ||
| 56 | - private String userIp; | ||
| 57 | - | ||
| 58 | - @ApiModelProperty(value = "浏览器 UserAgent", required = true, example = "Mozilla/5.0") | ||
| 59 | - @NotEmpty(message = "浏览器 UserAgent 不能为空") | ||
| 60 | - private String userAgent; | ||
| 61 | - | ||
| 62 | - @ApiModelProperty(value = "Java 方法名", required = true, example = "cn.iocoder.yudao.UserController.save(...)") | ||
| 63 | - @NotEmpty(message = "Java 方法名不能为空") | ||
| 64 | - private String javaMethod; | ||
| 65 | - | ||
| 66 | - @ApiModelProperty(value = "Java 方法的参数") | ||
| 67 | - private String javaMethodArgs; | ||
| 68 | - | ||
| 69 | - @ApiModelProperty(value = "开始时间", required = true) | ||
| 70 | - @NotNull(message = "开始时间不能为空") | ||
| 71 | - private Date startTime; | ||
| 72 | - | ||
| 73 | - @ApiModelProperty(value = "执行时长，单位：毫秒", required = true) | ||
| 74 | - @NotNull(message = "执行时长不能为空") | ||
| 75 | - private Integer duration; | ||
| 76 | - | ||
| 77 | - @ApiModelProperty(value = "结果码", required = true) | ||
| 78 | - @NotNull(message = "结果码不能为空") | ||
| 79 | - private Integer resultCode; | ||
| 80 | - | ||
| 81 | - @ApiModelProperty(value = "结果提示") | ||
| 82 | - private String resultMsg; | ||
| 83 | - | ||
| 84 | - @ApiModelProperty(value = "结果数据") | ||
| 85 | - private String resultData; | ||
| 86 | - | ||
| 87 | -} |
yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/OperateLog.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework.operatelog.core.service; | ||
| 2 | + | ||
| 3 | +import lombok.Data; | ||
| 4 | + | ||
| 5 | +import java.util.Date; | ||
| 6 | +import java.util.Map; | ||
| 7 | + | ||
| 8 | +/** | ||
| 9 | + * 操作日志 | ||
| 10 | + * | ||
| 11 | + * @author 芋道源码 | ||
| 12 | + */ | ||
| 13 | +@Data | ||
| 14 | +public class OperateLog { | ||
| 15 | + | ||
| 16 | + /** | ||
| 17 | + * 链路追踪编号 | ||
| 18 | + */ | ||
| 19 | + private String traceId; | ||
| 20 | + | ||
| 21 | + /** | ||
| 22 | + * 用户编号 | ||
| 23 | + */ | ||
| 24 | + private Long userId; | ||
| 25 | + /** | ||
| 26 | + * 用户类型 | ||
| 27 | + */ | ||
| 28 | + private Integer userType; | ||
| 29 | + | ||
| 30 | + /** | ||
| 31 | + * 操作模块 | ||
| 32 | + */ | ||
| 33 | + private String module; | ||
| 34 | + | ||
| 35 | + /** | ||
| 36 | + * 操作名 | ||
| 37 | + */ | ||
| 38 | + private String name; | ||
| 39 | + | ||
| 40 | + /** | ||
| 41 | + * 操作分类 | ||
| 42 | + */ | ||
| 43 | + private Integer type; | ||
| 44 | + | ||
| 45 | + /** | ||
| 46 | + * 操作明细 | ||
| 47 | + */ | ||
| 48 | + private String content; | ||
| 49 | + | ||
| 50 | + /** | ||
| 51 | + * 拓展字段 | ||
| 52 | + */ | ||
| 53 | + private Map<String, Object> exts; | ||
| 54 | + | ||
| 55 | + /** | ||
| 56 | + * 请求方法名 | ||
| 57 | + */ | ||
| 58 | + private String requestMethod; | ||
| 59 | + | ||
| 60 | + /** | ||
| 61 | + * 请求地址 | ||
| 62 | + */ | ||
| 63 | + private String requestUrl; | ||
| 64 | + | ||
| 65 | + /** | ||
| 66 | + * 用户 IP | ||
| 67 | + */ | ||
| 68 | + private String userIp; | ||
| 69 | + | ||
| 70 | + /** | ||
| 71 | + * 浏览器 UserAgent | ||
| 72 | + */ | ||
| 73 | + private String userAgent; | ||
| 74 | + | ||
| 75 | + /** | ||
| 76 | + * Java 方法名 | ||
| 77 | + */ | ||
| 78 | + private String javaMethod; | ||
| 79 | + | ||
| 80 | + /** | ||
| 81 | + * Java 方法的参数 | ||
| 82 | + */ | ||
| 83 | + private String javaMethodArgs; | ||
| 84 | + | ||
| 85 | + /** | ||
| 86 | + * 开始时间 | ||
| 87 | + */ | ||
| 88 | + private Date startTime; | ||
| 89 | + | ||
| 90 | + /** | ||
| 91 | + * 执行时长，单位：毫秒 | ||
| 92 | + */ | ||
| 93 | + private Integer duration; | ||
| 94 | + | ||
| 95 | + /** | ||
| 96 | + * 结果码 | ||
| 97 | + */ | ||
| 98 | + private Integer resultCode; | ||
| 99 | + | ||
| 100 | + /** | ||
| 101 | + * 结果提示 | ||
| 102 | + */ | ||
| 103 | + private String resultMsg; | ||
| 104 | + | ||
| 105 | + /** | ||
| 106 | + * 结果数据 | ||
| 107 | + */ | ||
| 108 | + private String resultData; | ||
| 109 | + | ||
| 110 | +} |
yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/OperateLogFrameworkService.java
| 1 | package cn.iocoder.yudao.framework.operatelog.core.service; | 1 | package cn.iocoder.yudao.framework.operatelog.core.service; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO; | ||
| 4 | - | ||
| 5 | -import java.util.concurrent.Future; | ||
| 6 | - | 3 | +/** |
| 4 | + * 操作日志 Framework Service 接口 | ||
| 5 | + * | ||
| 6 | + * @author 芋道源码 | ||
| 7 | + */ | ||
| 7 | public interface OperateLogFrameworkService { | 8 | public interface OperateLogFrameworkService { |
| 8 | 9 | ||
| 9 | /** | 10 | /** |
| 10 | - * 异步记录操作日志 | 11 | + * 记录操作日志 |
| 11 | * | 12 | * |
| 12 | - * @param reqVO 操作日志请求 | ||
| 13 | - * @return true: 记录成功,false: 记录失败 | 13 | + * @param operateLog 操作日志请求 |
| 14 | */ | 14 | */ |
| 15 | - Future<Boolean> createOperateLogAsync(OperateLogCreateReqDTO reqVO); | 15 | + void createOperateLog(OperateLog operateLog); |
| 16 | 16 | ||
| 17 | } | 17 | } |
yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/service/OperateLogFrameworkServiceImpl.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework.operatelog.core.service; | ||
| 2 | + | ||
| 3 | +import cn.hutool.core.bean.BeanUtil; | ||
| 4 | +import cn.iocoder.yudao.module.system.api.logger.OperateLogApi; | ||
| 5 | +import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO; | ||
| 6 | +import lombok.RequiredArgsConstructor; | ||
| 7 | +import org.springframework.scheduling.annotation.Async; | ||
| 8 | + | ||
| 9 | +/** | ||
| 10 | + * 操作日志 Framework Service 实现类 | ||
| 11 | + * | ||
| 12 | + * 基于 {@link OperateLogApi} 实现，记录操作日志 | ||
| 13 | + * | ||
| 14 | + * @author 芋道源码 | ||
| 15 | + */ | ||
| 16 | +@RequiredArgsConstructor | ||
| 17 | +public class OperateLogFrameworkServiceImpl implements OperateLogFrameworkService { | ||
| 18 | + | ||
| 19 | + private final OperateLogApi operateLogApi; | ||
| 20 | + | ||
| 21 | + @Override | ||
| 22 | + @Async | ||
| 23 | + public void createOperateLog(OperateLog operateLog) { | ||
| 24 | + OperateLogCreateReqDTO reqDTO = BeanUtil.copyProperties(operateLog, OperateLogCreateReqDTO.class); | ||
| 25 | + operateLogApi.createOperateLog(reqDTO); | ||
| 26 | + } | ||
| 27 | + | ||
| 28 | +} |
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/PayClientFactoryImpl.java
| @@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory; | @@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory; | ||
| 7 | import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig; | 7 | import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig; |
| 8 | import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayQrPayClient; | 8 | import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayQrPayClient; |
| 9 | import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayWapPayClient; | 9 | import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayWapPayClient; |
| 10 | +import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXLitePayClient; | ||
| 10 | import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXNativePayClient; | 11 | import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXNativePayClient; |
| 11 | import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPayClientConfig; | 12 | import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPayClientConfig; |
| 12 | import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPubPayClient; | 13 | import cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXPubPayClient; |
| @@ -62,7 +63,7 @@ public class PayClientFactoryImpl implements PayClientFactory { | @@ -62,7 +63,7 @@ public class PayClientFactoryImpl implements PayClientFactory { | ||
| 62 | // TODO @芋艿 WX_LITE WX_APP 如果不添加在 项目启动的时候去初始化会报错无法启动。所以我手动加了两个，具体需要你来配 | 63 | // TODO @芋艿 WX_LITE WX_APP 如果不添加在 项目启动的时候去初始化会报错无法启动。所以我手动加了两个，具体需要你来配 |
| 63 | switch (channelEnum) { | 64 | switch (channelEnum) { |
| 64 | case WX_PUB: return (AbstractPayClient<Config>) new WXPubPayClient(channelId, (WXPayClientConfig) config); | 65 | case WX_PUB: return (AbstractPayClient<Config>) new WXPubPayClient(channelId, (WXPayClientConfig) config); |
| 65 | - case WX_LITE: return (AbstractPayClient<Config>) new WXPubPayClient(channelId, (WXPayClientConfig) config); | 66 | + case WX_LITE: return (AbstractPayClient<Config>) new WXLitePayClient(channelId, (WXPayClientConfig) config); //微信小程序请求支付 |
| 66 | case WX_APP: return (AbstractPayClient<Config>) new WXPubPayClient(channelId, (WXPayClientConfig) config); | 67 | case WX_APP: return (AbstractPayClient<Config>) new WXPubPayClient(channelId, (WXPayClientConfig) config); |
| 67 | case WX_NATIVE: return (AbstractPayClient<Config>) new WXNativePayClient(channelId, (WXPayClientConfig) config); | 68 | case WX_NATIVE: return (AbstractPayClient<Config>) new WXNativePayClient(channelId, (WXPayClientConfig) config); |
| 68 | case ALIPAY_WAP: return (AbstractPayClient<Config>) new AlipayWapPayClient(channelId, (AlipayPayClientConfig) config); | 69 | case ALIPAY_WAP: return (AbstractPayClient<Config>) new AlipayWapPayClient(channelId, (AlipayPayClientConfig) config); |
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayClient.java
| @@ -2,6 +2,7 @@ package cn.iocoder.yudao.framework.pay.core.client.impl.alipay; | @@ -2,6 +2,7 @@ package cn.iocoder.yudao.framework.pay.core.client.impl.alipay; | ||
| 2 | 2 | ||
| 3 | import cn.hutool.core.bean.BeanUtil; | 3 | import cn.hutool.core.bean.BeanUtil; |
| 4 | import cn.hutool.core.date.DateUtil; | 4 | import cn.hutool.core.date.DateUtil; |
| 5 | +import cn.hutool.http.HttpUtil; | ||
| 5 | import cn.iocoder.yudao.framework.pay.core.client.AbstractPayCodeMapping; | 6 | import cn.iocoder.yudao.framework.pay.core.client.AbstractPayCodeMapping; |
| 6 | import cn.iocoder.yudao.framework.pay.core.client.PayCommonResult; | 7 | import cn.iocoder.yudao.framework.pay.core.client.PayCommonResult; |
| 7 | import cn.iocoder.yudao.framework.pay.core.client.dto.*; | 8 | import cn.iocoder.yudao.framework.pay.core.client.dto.*; |
| @@ -130,11 +131,20 @@ public abstract class AbstractAlipayClient extends AbstractPayClient<AlipayPayCl | @@ -130,11 +131,20 @@ public abstract class AbstractAlipayClient extends AbstractPayClient<AlipayPayCl | ||
| 130 | } | 131 | } |
| 131 | } | 132 | } |
| 132 | 133 | ||
| 134 | + | ||
| 135 | + | ||
| 136 | + /** | ||
| 137 | + * 支付宝统一回调参数 str 转 map | ||
| 138 | + * | ||
| 139 | + * @param s 支付宝支付通知回调参数 | ||
| 140 | + * @return map 支付宝集合 | ||
| 141 | + */ | ||
| 133 | public static Map<String, String> strToMap(String s) { | 142 | public static Map<String, String> strToMap(String s) { |
| 143 | + // TODO @zxy：这个可以使用 hutool 的 HttpUtil decodeParams 方法么？ | ||
| 134 | Map<String, String> stringStringMap = new HashMap<>(); | 144 | Map<String, String> stringStringMap = new HashMap<>(); |
| 135 | - //调整时间格式 | 145 | + // 调整时间格式 |
| 136 | String s3 = s.replaceAll("%3A", ":"); | 146 | String s3 = s.replaceAll("%3A", ":"); |
| 137 | - //获取map | 147 | + // 获取 map |
| 138 | String s4 = s3.replace("+", " "); | 148 | String s4 = s3.replace("+", " "); |
| 139 | String[] split = s4.split("&"); | 149 | String[] split = s4.split("&"); |
| 140 | for (String s1 : split) { | 150 | for (String s1 : split) { |
| @@ -143,4 +153,5 @@ public abstract class AbstractAlipayClient extends AbstractPayClient<AlipayPayCl | @@ -143,4 +153,5 @@ public abstract class AbstractAlipayClient extends AbstractPayClient<AlipayPayCl | ||
| 143 | } | 153 | } |
| 144 | return stringStringMap; | 154 | return stringStringMap; |
| 145 | } | 155 | } |
| 156 | + | ||
| 146 | } | 157 | } |
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXLitePayClient.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework.pay.core.client.impl.wx; | ||
| 2 | + | ||
| 3 | +import cn.hutool.core.bean.BeanUtil; | ||
| 4 | +import cn.hutool.core.date.DateUtil; | ||
| 5 | +import cn.hutool.core.lang.Assert; | ||
| 6 | +import cn.hutool.core.map.MapUtil; | ||
| 7 | +import cn.hutool.core.util.StrUtil; | ||
| 8 | +import cn.iocoder.yudao.framework.common.util.io.FileUtils; | ||
| 9 | +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; | ||
| 10 | +import cn.iocoder.yudao.framework.pay.core.client.PayCommonResult; | ||
| 11 | +import cn.iocoder.yudao.framework.pay.core.client.dto.*; | ||
| 12 | +import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient; | ||
| 13 | +import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum; | ||
| 14 | +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; | ||
| 15 | +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result; | ||
| 16 | +import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; | ||
| 17 | +import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; | ||
| 18 | +import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request; | ||
| 19 | +import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result; | ||
| 20 | +import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum; | ||
| 21 | +import com.github.binarywang.wxpay.config.WxPayConfig; | ||
| 22 | +import com.github.binarywang.wxpay.constant.WxPayConstants; | ||
| 23 | +import com.github.binarywang.wxpay.exception.WxPayException; | ||
| 24 | +import com.github.binarywang.wxpay.service.WxPayService; | ||
| 25 | +import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl; | ||
| 26 | +import lombok.extern.slf4j.Slf4j; | ||
| 27 | + | ||
| 28 | +import java.util.Objects; | ||
| 29 | + | ||
| 30 | +import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString; | ||
| 31 | +import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.CODE_SUCCESS; | ||
| 32 | +import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.MESSAGE_SUCCESS; | ||
| 33 | + | ||
| 34 | + | ||
| 35 | +/** | ||
| 36 | + * 微信小程序下支付 | ||
| 37 | + * | ||
| 38 | + * @author zwy | ||
| 39 | + */ | ||
| 40 | +@Slf4j | ||
| 41 | +public class WXLitePayClient extends AbstractPayClient<WXPayClientConfig> { | ||
| 42 | + | ||
| 43 | + private WxPayService client; | ||
| 44 | + | ||
| 45 | + public WXLitePayClient(Long channelId, WXPayClientConfig config) { | ||
| 46 | + super(channelId, PayChannelEnum.WX_LITE.getCode(), config, new WXCodeMapping()); | ||
| 47 | + } | ||
| 48 | + | ||
| 49 | + @Override | ||
| 50 | + protected void doInit() { | ||
| 51 | + WxPayConfig payConfig = new WxPayConfig(); | ||
| 52 | + BeanUtil.copyProperties(config, payConfig, "keyContent"); | ||
| 53 | + payConfig.setTradeType(WxPayConstants.TradeType.JSAPI); // 设置使用 JS API 支付方式 | ||
| 54 | +// if (StrUtil.isNotEmpty(config.getKeyContent())) { | ||
| 55 | +// payConfig.setKeyContent(config.getKeyContent().getBytes(StandardCharsets.UTF_8)); | ||
| 56 | +// } | ||
| 57 | + if (StrUtil.isNotEmpty(config.getPrivateKeyContent())) { | ||
| 58 | + // weixin-pay-java 存在 BUG，无法直接设置内容，所以创建临时文件来解决 | ||
| 59 | + payConfig.setPrivateKeyPath(FileUtils.createTempFile(config.getPrivateKeyContent()).getPath()); | ||
| 60 | + } | ||
| 61 | + if (StrUtil.isNotEmpty(config.getPrivateCertContent())) { | ||
| 62 | + // weixin-pay-java 存在 BUG，无法直接设置内容，所以创建临时文件来解决 | ||
| 63 | + payConfig.setPrivateCertPath(FileUtils.createTempFile(config.getPrivateCertContent()).getPath()); | ||
| 64 | + } | ||
| 65 | + // 真实客户端 | ||
| 66 | + this.client = new WxPayServiceImpl(); | ||
| 67 | + client.setConfig(payConfig); | ||
| 68 | + } | ||
| 69 | + | ||
| 70 | + @Override | ||
| 71 | + public PayCommonResult<WxPayMpOrderResult> doUnifiedOrder(PayOrderUnifiedReqDTO reqDTO) { | ||
| 72 | + WxPayMpOrderResult response; | ||
| 73 | + try { | ||
| 74 | + switch (config.getApiVersion()) { | ||
| 75 | + case WXPayClientConfig.API_VERSION_V2: | ||
| 76 | + response = this.unifiedOrderV2(reqDTO); | ||
| 77 | + break; | ||
| 78 | + case WXPayClientConfig.API_VERSION_V3: | ||
| 79 | + WxPayUnifiedOrderV3Result.JsapiResult responseV3 = this.unifiedOrderV3(reqDTO); | ||
| 80 | + // 将 V3 的结果，统一转换成 V2。返回的字段是一致的 | ||
| 81 | + response = new WxPayMpOrderResult(); | ||
| 82 | + BeanUtil.copyProperties(responseV3, response, true); | ||
| 83 | + break; | ||
| 84 | + default: | ||
| 85 | + throw new IllegalArgumentException(String.format("未知的 API 版本(%s)", config.getApiVersion())); | ||
| 86 | + } | ||
| 87 | + } catch (WxPayException e) { | ||
| 88 | + log.error("[unifiedOrder][request({}) 发起支付失败，原因({})]", toJsonString(reqDTO), e); | ||
| 89 | + return PayCommonResult.build(ObjectUtils.defaultIfNull(e.getErrCode(), e.getReturnCode(), "CustomErrorCode"), | ||
| 90 | + ObjectUtils.defaultIfNull(e.getErrCodeDes(), e.getCustomErrorMsg()), null, codeMapping); | ||
| 91 | + } | ||
| 92 | + return PayCommonResult.build(CODE_SUCCESS, MESSAGE_SUCCESS, response, codeMapping); | ||
| 93 | + } | ||
| 94 | + | ||
| 95 | + private WxPayMpOrderResult unifiedOrderV2(PayOrderUnifiedReqDTO reqDTO) throws WxPayException { | ||
| 96 | + // 构建 WxPayUnifiedOrderRequest 对象 | ||
| 97 | + WxPayUnifiedOrderRequest request = WxPayUnifiedOrderRequest.newBuilder() | ||
| 98 | + .outTradeNo(reqDTO.getMerchantOrderId()) | ||
| 99 | + .body(reqDTO.getBody()) | ||
| 100 | + .totalFee(reqDTO.getAmount().intValue()) // 单位分 | ||
| 101 | + .timeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyyMMddHHmmss")) // v2的时间格式 | ||
| 102 | + .spbillCreateIp(reqDTO.getUserIp()) | ||
| 103 | + .openid(getOpenid(reqDTO)) | ||
| 104 | + .notifyUrl(reqDTO.getNotifyUrl()) | ||
| 105 | + .build(); | ||
| 106 | + // 执行请求 | ||
| 107 | + return client.createOrder(request); | ||
| 108 | + } | ||
| 109 | + | ||
| 110 | + private WxPayUnifiedOrderV3Result.JsapiResult unifiedOrderV3(PayOrderUnifiedReqDTO reqDTO) throws WxPayException { | ||
| 111 | + // 构建 WxPayUnifiedOrderRequest 对象 | ||
| 112 | + WxPayUnifiedOrderV3Request request = new WxPayUnifiedOrderV3Request(); | ||
| 113 | + request.setOutTradeNo(reqDTO.getMerchantOrderId()); | ||
| 114 | + | ||
| 115 | + request.setDescription(reqDTO.getBody()); | ||
| 116 | + request.setAmount(new WxPayUnifiedOrderV3Request | ||
| 117 | + .Amount() | ||
| 118 | + .setTotal(reqDTO | ||
| 119 | + .getAmount() | ||
| 120 | + .intValue())); // 单位分 | ||
| 121 | + request.setTimeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyy-MM-dd'T'HH:mm:ssXXX")); // v3的时间格式 | ||
| 122 | + request.setPayer(new WxPayUnifiedOrderV3Request.Payer().setOpenid(getOpenid(reqDTO))); | ||
| 123 | + request.setSceneInfo(new WxPayUnifiedOrderV3Request.SceneInfo().setPayerClientIp(reqDTO.getUserIp())); | ||
| 124 | + request.setNotifyUrl(reqDTO.getNotifyUrl()); | ||
| 125 | + // 执行请求 | ||
| 126 | + return client.createOrderV3(TradeTypeEnum.JSAPI, request); | ||
| 127 | + } | ||
| 128 | + | ||
| 129 | + private static String getOpenid(PayOrderUnifiedReqDTO reqDTO) { | ||
| 130 | + String openid = MapUtil.getStr(reqDTO.getChannelExtras(), "openid"); | ||
| 131 | + if (StrUtil.isEmpty(openid)) { | ||
| 132 | + throw new IllegalArgumentException("支付请求的 openid 不能为空！"); | ||
| 133 | + } | ||
| 134 | + return openid; | ||
| 135 | + } | ||
| 136 | + | ||
| 137 | + /** | ||
| 138 | + * | ||
| 139 | + * 微信支付回调 分 v2 和v3 的处理方式 | ||
| 140 | + * | ||
| 141 | + * @param data 通知结果 | ||
| 142 | + * @return 支付回调对象 | ||
| 143 | + * @throws WxPayException 微信异常类 | ||
| 144 | + */ | ||
| 145 | + @Override | ||
| 146 | + public PayOrderNotifyRespDTO parseOrderNotify(PayNotifyDataDTO data) throws WxPayException { | ||
| 147 | + log.info("[parseOrderNotify][微信支付回调data数据:{}]", data.getBody()); | ||
| 148 | + // 微信支付 v2 回调结果处理 | ||
| 149 | + switch (config.getApiVersion()) { | ||
| 150 | + case WXPayClientConfig.API_VERSION_V2: | ||
| 151 | + return parseOrderNotifyV2(data); | ||
| 152 | + case WXPayClientConfig.API_VERSION_V3: | ||
| 153 | + return parseOrderNotifyV3(data); | ||
| 154 | + default: | ||
| 155 | + throw new IllegalArgumentException(String.format("未知的 API 版本(%s)", config.getApiVersion())); | ||
| 156 | + } | ||
| 157 | + } | ||
| 158 | + | ||
| 159 | + private PayOrderNotifyRespDTO parseOrderNotifyV3(PayNotifyDataDTO data) throws WxPayException { | ||
| 160 | + WxPayOrderNotifyV3Result wxPayOrderNotifyV3Result = client.parseOrderNotifyV3Result(data.getBody(), null); | ||
| 161 | + WxPayOrderNotifyV3Result.DecryptNotifyResult result = wxPayOrderNotifyV3Result.getResult(); | ||
| 162 | + // 转换结果 | ||
| 163 | + Assert.isTrue(Objects.equals(wxPayOrderNotifyV3Result.getResult().getTradeState(), "SUCCESS"), | ||
| 164 | + "支付结果非 SUCCESS"); | ||
| 165 | + | ||
| 166 | + return PayOrderNotifyRespDTO | ||
| 167 | + .builder() | ||
| 168 | + .orderExtensionNo(result.getOutTradeNo()) | ||
| 169 | + .channelOrderNo(result.getTradeState()) | ||
| 170 | + .successTime(DateUtil.parse(result.getSuccessTime(), "yyyy-MM-dd'T'HH:mm:ssXXX")) | ||
| 171 | + .data(data.getBody()) | ||
| 172 | + .build(); | ||
| 173 | + } | ||
| 174 | + | ||
| 175 | + private PayOrderNotifyRespDTO parseOrderNotifyV2(PayNotifyDataDTO data) throws WxPayException { | ||
| 176 | + WxPayOrderNotifyResult notifyResult = client.parseOrderNotifyResult(data.getBody()); | ||
| 177 | + Assert.isTrue(Objects.equals(notifyResult.getResultCode(), "SUCCESS"), "支付结果非 SUCCESS"); | ||
| 178 | + // 转换结果 | ||
| 179 | + return PayOrderNotifyRespDTO | ||
| 180 | + .builder() | ||
| 181 | + .orderExtensionNo(notifyResult.getOutTradeNo()) | ||
| 182 | + .channelOrderNo(notifyResult.getTransactionId()) | ||
| 183 | + .channelUserId(notifyResult.getOpenid()) | ||
| 184 | + .successTime(DateUtil.parse(notifyResult.getTimeEnd(), "yyyyMMddHHmmss")) | ||
| 185 | + .data(data.getBody()) | ||
| 186 | + .build(); | ||
| 187 | + | ||
| 188 | + } | ||
| 189 | + | ||
| 190 | + @Override | ||
| 191 | + public PayRefundNotifyDTO parseRefundNotify(PayNotifyDataDTO notifyData) { | ||
| 192 | + //TODO 需要实现 | ||
| 193 | + throw new UnsupportedOperationException("需要实现"); | ||
| 194 | + } | ||
| 195 | + | ||
| 196 | + | ||
| 197 | + @Override | ||
| 198 | + protected PayCommonResult<PayRefundUnifiedRespDTO> doUnifiedRefund(PayRefundUnifiedReqDTO reqDTO) throws Throwable { | ||
| 199 | + //TODO 需要实现 | ||
| 200 | + throw new UnsupportedOperationException(); | ||
| 201 | + } | ||
| 202 | + | ||
| 203 | +} |
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXNativePayClient.java
| @@ -11,6 +11,7 @@ import cn.iocoder.yudao.framework.pay.core.client.dto.*; | @@ -11,6 +11,7 @@ import cn.iocoder.yudao.framework.pay.core.client.dto.*; | ||
| 11 | import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient; | 11 | import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient; |
| 12 | import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum; | 12 | import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum; |
| 13 | import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; | 13 | import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; |
| 14 | +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result; | ||
| 14 | import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult; | 15 | import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult; |
| 15 | import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; | 16 | import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; |
| 16 | import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request; | 17 | import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request; |
| @@ -28,9 +29,14 @@ import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString | @@ -28,9 +29,14 @@ import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString | ||
| 28 | import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.CODE_SUCCESS; | 29 | import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.CODE_SUCCESS; |
| 29 | import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.MESSAGE_SUCCESS; | 30 | import static cn.iocoder.yudao.framework.pay.core.client.impl.wx.WXCodeMapping.MESSAGE_SUCCESS; |
| 30 | 31 | ||
| 31 | - | 32 | +/** |
| 33 | + * 微信 App 支付 | ||
| 34 | + * | ||
| 35 | + * @author zwy | ||
| 36 | + */ | ||
| 32 | @Slf4j | 37 | @Slf4j |
| 33 | public class WXNativePayClient extends AbstractPayClient<WXPayClientConfig> { | 38 | public class WXNativePayClient extends AbstractPayClient<WXPayClientConfig> { |
| 39 | + | ||
| 34 | private WxPayService client; | 40 | private WxPayService client; |
| 35 | 41 | ||
| 36 | public WXNativePayClient(Long channelId, WXPayClientConfig config) { | 42 | public WXNativePayClient(Long channelId, WXPayClientConfig config) { |
| @@ -61,7 +67,7 @@ public class WXNativePayClient extends AbstractPayClient<WXPayClientConfig> { | @@ -61,7 +67,7 @@ public class WXNativePayClient extends AbstractPayClient<WXPayClientConfig> { | ||
| 61 | @Override | 67 | @Override |
| 62 | public PayCommonResult<String> doUnifiedOrder(PayOrderUnifiedReqDTO reqDTO) { | 68 | public PayCommonResult<String> doUnifiedOrder(PayOrderUnifiedReqDTO reqDTO) { |
| 63 | // 这里原生的返回的是支付的 url 所以直接使用string接收 | 69 | // 这里原生的返回的是支付的 url 所以直接使用string接收 |
| 64 | - //"invokeResponse": "weixin://wxpay/bizpayurl?pr=EGYAem7zz" | 70 | + // "invokeResponse": "weixin://wxpay/bizpayurl?pr=EGYAem7zz" |
| 65 | String responseV3; | 71 | String responseV3; |
| 66 | try { | 72 | try { |
| 67 | switch (config.getApiVersion()) { | 73 | switch (config.getApiVersion()) { |
| @@ -84,7 +90,7 @@ public class WXNativePayClient extends AbstractPayClient<WXPayClientConfig> { | @@ -84,7 +90,7 @@ public class WXNativePayClient extends AbstractPayClient<WXPayClientConfig> { | ||
| 84 | 90 | ||
| 85 | private WxPayNativeOrderResult unifiedOrderV2(PayOrderUnifiedReqDTO reqDTO) throws WxPayException { | 91 | private WxPayNativeOrderResult unifiedOrderV2(PayOrderUnifiedReqDTO reqDTO) throws WxPayException { |
| 86 | //前端 | 92 | //前端 |
| 87 | - String trade_type = reqDTO.getChannelExtras().get("trade_type"); | 93 | + String tradeType = reqDTO.getChannelExtras().get("trade_type"); |
| 88 | // 构建 WxPayUnifiedOrderRequest 对象 | 94 | // 构建 WxPayUnifiedOrderRequest 对象 |
| 89 | WxPayUnifiedOrderRequest request = WxPayUnifiedOrderRequest | 95 | WxPayUnifiedOrderRequest request = WxPayUnifiedOrderRequest |
| 90 | .newBuilder() | 96 | .newBuilder() |
| @@ -94,7 +100,7 @@ public class WXNativePayClient extends AbstractPayClient<WXPayClientConfig> { | @@ -94,7 +100,7 @@ public class WXNativePayClient extends AbstractPayClient<WXPayClientConfig> { | ||
| 94 | .timeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyy-MM-dd'T'HH:mm:ssXXX")) | 100 | .timeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyy-MM-dd'T'HH:mm:ssXXX")) |
| 95 | .spbillCreateIp(reqDTO.getUserIp()) | 101 | .spbillCreateIp(reqDTO.getUserIp()) |
| 96 | .notifyUrl(reqDTO.getNotifyUrl()) | 102 | .notifyUrl(reqDTO.getNotifyUrl()) |
| 97 | - .productId(trade_type) | 103 | + .productId(tradeType) |
| 98 | .build(); | 104 | .build(); |
| 99 | // 执行请求 | 105 | // 执行请求 |
| 100 | return client.createOrder(request); | 106 | return client.createOrder(request); |
| @@ -109,33 +115,72 @@ public class WXNativePayClient extends AbstractPayClient<WXPayClientConfig> { | @@ -109,33 +115,72 @@ public class WXNativePayClient extends AbstractPayClient<WXPayClientConfig> { | ||
| 109 | request.setSceneInfo(new WxPayUnifiedOrderV3Request.SceneInfo().setPayerClientIp(reqDTO.getUserIp())); | 115 | request.setSceneInfo(new WxPayUnifiedOrderV3Request.SceneInfo().setPayerClientIp(reqDTO.getUserIp())); |
| 110 | request.setNotifyUrl(reqDTO.getNotifyUrl()); | 116 | request.setNotifyUrl(reqDTO.getNotifyUrl()); |
| 111 | // 执行请求 | 117 | // 执行请求 |
| 112 | -// log.info("支付字段request:{}",request.getTimeExpire()); | ||
| 113 | - | ||
| 114 | return client.createOrderV3(TradeTypeEnum.NATIVE, request); | 118 | return client.createOrderV3(TradeTypeEnum.NATIVE, request); |
| 115 | } | 119 | } |
| 116 | 120 | ||
| 117 | - | 121 | + /** |
| 122 | + * | ||
| 123 | + * 微信支付回调 分v2 和v3 的处理方式 | ||
| 124 | + * | ||
| 125 | + * @param data 通知结果 | ||
| 126 | + * @return 支付回调对象 | ||
| 127 | + * @throws WxPayException 微信异常类 | ||
| 128 | + */ | ||
| 118 | @Override | 129 | @Override |
| 119 | public PayOrderNotifyRespDTO parseOrderNotify(PayNotifyDataDTO data) throws WxPayException { | 130 | public PayOrderNotifyRespDTO parseOrderNotify(PayNotifyDataDTO data) throws WxPayException { |
| 131 | + log.info("微信支付回调data数据:{}", data.getBody()); | ||
| 132 | + // 微信支付 v2 回调结果处理 | ||
| 133 | + switch (config.getApiVersion()) { | ||
| 134 | + case WXPayClientConfig.API_VERSION_V2: | ||
| 135 | + return parseOrderNotifyV2(data); | ||
| 136 | + case WXPayClientConfig.API_VERSION_V3: | ||
| 137 | + return parseOrderNotifyV3(data); | ||
| 138 | + default: | ||
| 139 | + throw new IllegalArgumentException(String.format("未知的 API 版本(%s)", config.getApiVersion())); | ||
| 140 | + } | ||
| 141 | + } | ||
| 142 | + | ||
| 143 | + private PayOrderNotifyRespDTO parseOrderNotifyV3(PayNotifyDataDTO data) throws WxPayException { | ||
| 144 | + WxPayOrderNotifyV3Result wxPayOrderNotifyV3Result = client.parseOrderNotifyV3Result(data.getBody(), null); | ||
| 145 | + WxPayOrderNotifyV3Result.DecryptNotifyResult result = wxPayOrderNotifyV3Result.getResult(); | ||
| 146 | + // 转换结果 | ||
| 147 | + Assert.isTrue(Objects.equals(wxPayOrderNotifyV3Result.getResult().getTradeState(), "SUCCESS"), | ||
| 148 | + "支付结果非 SUCCESS"); | ||
| 149 | + return PayOrderNotifyRespDTO | ||
| 150 | + .builder() | ||
| 151 | + .orderExtensionNo(result.getOutTradeNo()) | ||
| 152 | + .channelOrderNo(result.getTradeState()) | ||
| 153 | + .successTime(DateUtil.parse(result.getSuccessTime(), "yyyy-MM-dd'T'HH:mm:ssXXX")) | ||
| 154 | + .data(data.getBody()) | ||
| 155 | + .build(); | ||
| 156 | + } | ||
| 157 | + | ||
| 158 | + private PayOrderNotifyRespDTO parseOrderNotifyV2(PayNotifyDataDTO data) throws WxPayException { | ||
| 120 | WxPayOrderNotifyResult notifyResult = client.parseOrderNotifyResult(data.getBody()); | 159 | WxPayOrderNotifyResult notifyResult = client.parseOrderNotifyResult(data.getBody()); |
| 121 | Assert.isTrue(Objects.equals(notifyResult.getResultCode(), "SUCCESS"), "支付结果非 SUCCESS"); | 160 | Assert.isTrue(Objects.equals(notifyResult.getResultCode(), "SUCCESS"), "支付结果非 SUCCESS"); |
| 122 | // 转换结果 | 161 | // 转换结果 |
| 123 | - return PayOrderNotifyRespDTO.builder().orderExtensionNo(notifyResult.getOutTradeNo()) | ||
| 124 | - .channelOrderNo(notifyResult.getTransactionId()).channelUserId(notifyResult.getOpenid()) | ||
| 125 | - .successTime(DateUtil.parse(notifyResult.getTimeEnd(), "yyyy-MM-dd'T'HH:mm:ssXXX")) | ||
| 126 | - .data(data.getBody()).build(); | 162 | + return PayOrderNotifyRespDTO |
| 163 | + .builder() | ||
| 164 | + .orderExtensionNo(notifyResult.getOutTradeNo()) | ||
| 165 | + .channelOrderNo(notifyResult.getTransactionId()) | ||
| 166 | + .channelUserId(notifyResult.getOpenid()) | ||
| 167 | + .successTime(DateUtil.parse(notifyResult.getTimeEnd(), "yyyyMMddHHmmss")) | ||
| 168 | + .data(data.getBody()) | ||
| 169 | + .build(); | ||
| 170 | + | ||
| 127 | } | 171 | } |
| 128 | 172 | ||
| 129 | @Override | 173 | @Override |
| 130 | public PayRefundNotifyDTO parseRefundNotify(PayNotifyDataDTO notifyData) { | 174 | public PayRefundNotifyDTO parseRefundNotify(PayNotifyDataDTO notifyData) { |
| 131 | - //TODO 需要实现 | 175 | + // TODO 需要实现 |
| 132 | throw new UnsupportedOperationException("需要实现"); | 176 | throw new UnsupportedOperationException("需要实现"); |
| 133 | } | 177 | } |
| 134 | 178 | ||
| 135 | 179 | ||
| 136 | @Override | 180 | @Override |
| 137 | protected PayCommonResult<PayRefundUnifiedRespDTO> doUnifiedRefund(PayRefundUnifiedReqDTO reqDTO) throws Throwable { | 181 | protected PayCommonResult<PayRefundUnifiedRespDTO> doUnifiedRefund(PayRefundUnifiedReqDTO reqDTO) throws Throwable { |
| 138 | - //TODO 需要实现 | 182 | + // TODO 需要实现 |
| 139 | throw new UnsupportedOperationException(); | 183 | throw new UnsupportedOperationException(); |
| 140 | } | 184 | } |
| 185 | + | ||
| 141 | } | 186 | } |
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXPayClientConfig.java
| @@ -11,8 +11,6 @@ import java.io.FileInputStream; | @@ -11,8 +11,6 @@ import java.io.FileInputStream; | ||
| 11 | import java.io.FileNotFoundException; | 11 | import java.io.FileNotFoundException; |
| 12 | import java.util.Set; | 12 | import java.util.Set; |
| 13 | 13 | ||
| 14 | -// TODO 芋艿：参数校验 | ||
| 15 | - | ||
| 16 | /** | 14 | /** |
| 17 | * 微信支付的 PayClientConfig 实现类 | 15 | * 微信支付的 PayClientConfig 实现类 |
| 18 | * 属性主要来自 {@link com.github.binarywang.wxpay.config.WxPayConfig} 的必要属性 | 16 | * 属性主要来自 {@link com.github.binarywang.wxpay.config.WxPayConfig} 的必要属性 |
| @@ -22,7 +20,6 @@ import java.util.Set; | @@ -22,7 +20,6 @@ import java.util.Set; | ||
| 22 | @Data | 20 | @Data |
| 23 | public class WXPayClientConfig implements PayClientConfig { | 21 | public class WXPayClientConfig implements PayClientConfig { |
| 24 | 22 | ||
| 25 | - // TODO 芋艿：V2 or V3 客户端 | ||
| 26 | /** | 23 | /** |
| 27 | * API 版本 - V2 | 24 | * API 版本 - V2 |
| 28 | * https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=4_1 | 25 | * https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=4_1 |
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/wx/WXPubPayClient.java
| @@ -12,6 +12,7 @@ import cn.iocoder.yudao.framework.pay.core.client.dto.*; | @@ -12,6 +12,7 @@ import cn.iocoder.yudao.framework.pay.core.client.dto.*; | ||
| 12 | import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient; | 12 | import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient; |
| 13 | import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum; | 13 | import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum; |
| 14 | import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; | 14 | import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; |
| 15 | +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result; | ||
| 15 | import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; | 16 | import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; |
| 16 | import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; | 17 | import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; |
| 17 | import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request; | 18 | import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request; |
| @@ -95,7 +96,6 @@ public class WXPubPayClient extends AbstractPayClient<WXPayClientConfig> { | @@ -95,7 +96,6 @@ public class WXPubPayClient extends AbstractPayClient<WXPayClientConfig> { | ||
| 95 | // 构建 WxPayUnifiedOrderRequest 对象 | 96 | // 构建 WxPayUnifiedOrderRequest 对象 |
| 96 | WxPayUnifiedOrderRequest request = WxPayUnifiedOrderRequest.newBuilder() | 97 | WxPayUnifiedOrderRequest request = WxPayUnifiedOrderRequest.newBuilder() |
| 97 | .outTradeNo(reqDTO.getMerchantOrderId()) | 98 | .outTradeNo(reqDTO.getMerchantOrderId()) |
| 98 | - // TODO 芋艿：貌似没 title？ | ||
| 99 | .body(reqDTO.getBody()) | 99 | .body(reqDTO.getBody()) |
| 100 | .totalFee(reqDTO.getAmount().intValue()) // 单位分 | 100 | .totalFee(reqDTO.getAmount().intValue()) // 单位分 |
| 101 | .timeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyy-MM-dd'T'HH:mm:ssXXX")) | 101 | .timeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyy-MM-dd'T'HH:mm:ssXXX")) |
| @@ -111,7 +111,6 @@ public class WXPubPayClient extends AbstractPayClient<WXPayClientConfig> { | @@ -111,7 +111,6 @@ public class WXPubPayClient extends AbstractPayClient<WXPayClientConfig> { | ||
| 111 | // 构建 WxPayUnifiedOrderRequest 对象 | 111 | // 构建 WxPayUnifiedOrderRequest 对象 |
| 112 | WxPayUnifiedOrderV3Request request = new WxPayUnifiedOrderV3Request(); | 112 | WxPayUnifiedOrderV3Request request = new WxPayUnifiedOrderV3Request(); |
| 113 | request.setOutTradeNo(reqDTO.getMerchantOrderId()); | 113 | request.setOutTradeNo(reqDTO.getMerchantOrderId()); |
| 114 | - // TODO 芋艿：貌似没 title？ | ||
| 115 | request.setDescription(reqDTO.getBody()); | 114 | request.setDescription(reqDTO.getBody()); |
| 116 | request.setAmount(new WxPayUnifiedOrderV3Request.Amount().setTotal(reqDTO.getAmount().intValue())); // 单位分 | 115 | request.setAmount(new WxPayUnifiedOrderV3Request.Amount().setTotal(reqDTO.getAmount().intValue())); // 单位分 |
| 117 | request.setTimeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyy-MM-dd'T'HH:mm:ssXXX")); | 116 | request.setTimeExpire(DateUtil.format(reqDTO.getExpireTime(), "yyyy-MM-dd'T'HH:mm:ssXXX")); |
| @@ -130,27 +129,67 @@ public class WXPubPayClient extends AbstractPayClient<WXPayClientConfig> { | @@ -130,27 +129,67 @@ public class WXPubPayClient extends AbstractPayClient<WXPayClientConfig> { | ||
| 130 | return openid; | 129 | return openid; |
| 131 | } | 130 | } |
| 132 | 131 | ||
| 132 | + /** | ||
| 133 | + * | ||
| 134 | + * 微信支付回调 分v2 和v3 的处理方式 | ||
| 135 | + * | ||
| 136 | + * @param data 通知结果 | ||
| 137 | + * @return 支付回调对象 | ||
| 138 | + * @throws WxPayException 微信异常类 | ||
| 139 | + */ | ||
| 133 | @Override | 140 | @Override |
| 134 | public PayOrderNotifyRespDTO parseOrderNotify(PayNotifyDataDTO data) throws WxPayException { | 141 | public PayOrderNotifyRespDTO parseOrderNotify(PayNotifyDataDTO data) throws WxPayException { |
| 142 | + log.info("[parseOrderNotify][微信支付回调data数据: {}]", data.getBody()); | ||
| 143 | + // 微信支付 v2 回调结果处理 | ||
| 144 | + switch (config.getApiVersion()) { | ||
| 145 | + case WXPayClientConfig.API_VERSION_V2: | ||
| 146 | + return parseOrderNotifyV2(data); | ||
| 147 | + case WXPayClientConfig.API_VERSION_V3: | ||
| 148 | + return parseOrderNotifyV3(data); | ||
| 149 | + default: | ||
| 150 | + throw new IllegalArgumentException(String.format("未知的 API 版本(%s)", config.getApiVersion())); | ||
| 151 | + } | ||
| 152 | + } | ||
| 153 | + | ||
| 154 | + private PayOrderNotifyRespDTO parseOrderNotifyV3(PayNotifyDataDTO data) throws WxPayException { | ||
| 155 | + WxPayOrderNotifyV3Result wxPayOrderNotifyV3Result = client.parseOrderNotifyV3Result(data.getBody(), null); | ||
| 156 | + WxPayOrderNotifyV3Result.DecryptNotifyResult result = wxPayOrderNotifyV3Result.getResult(); | ||
| 157 | + // 转换结果 | ||
| 158 | + Assert.isTrue(Objects.equals(wxPayOrderNotifyV3Result.getResult().getTradeState(), "SUCCESS"), | ||
| 159 | + "支付结果非 SUCCESS"); | ||
| 160 | + return PayOrderNotifyRespDTO | ||
| 161 | + .builder() | ||
| 162 | + .orderExtensionNo(result.getOutTradeNo()) | ||
| 163 | + .channelOrderNo(result.getTradeState()) | ||
| 164 | + .successTime(DateUtil.parse(result.getSuccessTime(), "yyyy-MM-dd'T'HH:mm:ssXXX")) | ||
| 165 | + .data(data.getBody()) | ||
| 166 | + .build(); | ||
| 167 | + } | ||
| 168 | + | ||
| 169 | + private PayOrderNotifyRespDTO parseOrderNotifyV2(PayNotifyDataDTO data) throws WxPayException { | ||
| 135 | WxPayOrderNotifyResult notifyResult = client.parseOrderNotifyResult(data.getBody()); | 170 | WxPayOrderNotifyResult notifyResult = client.parseOrderNotifyResult(data.getBody()); |
| 136 | Assert.isTrue(Objects.equals(notifyResult.getResultCode(), "SUCCESS"), "支付结果非 SUCCESS"); | 171 | Assert.isTrue(Objects.equals(notifyResult.getResultCode(), "SUCCESS"), "支付结果非 SUCCESS"); |
| 137 | // 转换结果 | 172 | // 转换结果 |
| 138 | - return PayOrderNotifyRespDTO.builder().orderExtensionNo(notifyResult.getOutTradeNo()) | ||
| 139 | - .channelOrderNo(notifyResult.getTransactionId()).channelUserId(notifyResult.getOpenid()) | 173 | + return PayOrderNotifyRespDTO |
| 174 | + .builder() | ||
| 175 | + .orderExtensionNo(notifyResult.getOutTradeNo()) | ||
| 176 | + .channelOrderNo(notifyResult.getTransactionId()) | ||
| 177 | + .channelUserId(notifyResult.getOpenid()) | ||
| 140 | .successTime(DateUtil.parse(notifyResult.getTimeEnd(), "yyyyMMddHHmmss")) | 178 | .successTime(DateUtil.parse(notifyResult.getTimeEnd(), "yyyyMMddHHmmss")) |
| 141 | - .data(data.getBody()).build(); | 179 | + .data(data.getBody()) |
| 180 | + .build(); | ||
| 181 | + | ||
| 142 | } | 182 | } |
| 143 | 183 | ||
| 144 | @Override | 184 | @Override |
| 145 | public PayRefundNotifyDTO parseRefundNotify(PayNotifyDataDTO notifyData) { | 185 | public PayRefundNotifyDTO parseRefundNotify(PayNotifyDataDTO notifyData) { |
| 146 | - //TODO 需要实现 | 186 | + // TODO 需要实现 |
| 147 | throw new UnsupportedOperationException("需要实现"); | 187 | throw new UnsupportedOperationException("需要实现"); |
| 148 | } | 188 | } |
| 149 | 189 | ||
| 150 | - | ||
| 151 | @Override | 190 | @Override |
| 152 | protected PayCommonResult<PayRefundUnifiedRespDTO> doUnifiedRefund(PayRefundUnifiedReqDTO reqDTO) throws Throwable { | 191 | protected PayCommonResult<PayRefundUnifiedRespDTO> doUnifiedRefund(PayRefundUnifiedReqDTO reqDTO) throws Throwable { |
| 153 | - //TODO 需要实现 | 192 | + // TODO 需要实现 |
| 154 | throw new UnsupportedOperationException(); | 193 | throw new UnsupportedOperationException(); |
| 155 | } | 194 | } |
| 156 | 195 |
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/PayChannelEnum.java
| @@ -22,7 +22,6 @@ public enum PayChannelEnum { | @@ -22,7 +22,6 @@ public enum PayChannelEnum { | ||
| 22 | WX_APP("wx_app", "微信 App 支付", WXPayClientConfig.class), | 22 | WX_APP("wx_app", "微信 App 支付", WXPayClientConfig.class), |
| 23 | WX_NATIVE("wx_native", "微信 native 支付", WXPayClientConfig.class), | 23 | WX_NATIVE("wx_native", "微信 native 支付", WXPayClientConfig.class), |
| 24 | 24 | ||
| 25 | - | ||
| 26 | ALIPAY_PC("alipay_pc", "支付宝 PC 网站支付", AlipayPayClientConfig.class), | 25 | ALIPAY_PC("alipay_pc", "支付宝 PC 网站支付", AlipayPayClientConfig.class), |
| 27 | ALIPAY_WAP("alipay_wap", "支付宝 Wap 网站支付", AlipayPayClientConfig.class), | 26 | ALIPAY_WAP("alipay_wap", "支付宝 Wap 网站支付", AlipayPayClientConfig.class), |
| 28 | ALIPAY_APP("alipay_app", "支付宝App 支付", AlipayPayClientConfig.class), | 27 | ALIPAY_APP("alipay_app", "支付宝App 支付", AlipayPayClientConfig.class), |
yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml
| @@ -56,6 +56,12 @@ | @@ -56,6 +56,12 @@ | ||
| 56 | <artifactId>spring-boot-starter-test</artifactId> | 56 | <artifactId>spring-boot-starter-test</artifactId> |
| 57 | <scope>test</scope> | 57 | <scope>test</scope> |
| 58 | </dependency> | 58 | </dependency> |
| 59 | + | ||
| 60 | + <!-- 工具类相关 --> | ||
| 61 | + <dependency> | ||
| 62 | + <groupId>com.google.guava</groupId> | ||
| 63 | + <artifactId>guava</artifactId> | ||
| 64 | + </dependency> | ||
| 59 | </dependencies> | 65 | </dependencies> |
| 60 | 66 | ||
| 61 | </project> | 67 | </project> |
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
| @@ -11,9 +11,11 @@ import cn.iocoder.yudao.framework.tenant.core.job.TenantJobHandlerDecorator; | @@ -11,9 +11,11 @@ import cn.iocoder.yudao.framework.tenant.core.job.TenantJobHandlerDecorator; | ||
| 11 | import cn.iocoder.yudao.framework.tenant.core.mq.TenantRedisMessageInterceptor; | 11 | import cn.iocoder.yudao.framework.tenant.core.mq.TenantRedisMessageInterceptor; |
| 12 | import cn.iocoder.yudao.framework.tenant.core.security.TenantSecurityWebFilter; | 12 | import cn.iocoder.yudao.framework.tenant.core.security.TenantSecurityWebFilter; |
| 13 | import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkService; | 13 | import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkService; |
| 14 | +import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkServiceImpl; | ||
| 14 | import cn.iocoder.yudao.framework.tenant.core.web.TenantContextWebFilter; | 15 | import cn.iocoder.yudao.framework.tenant.core.web.TenantContextWebFilter; |
| 15 | import cn.iocoder.yudao.framework.web.config.WebProperties; | 16 | import cn.iocoder.yudao.framework.web.config.WebProperties; |
| 16 | import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler; | 17 | import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler; |
| 18 | +import cn.iocoder.yudao.module.system.api.tenant.TenantApi; | ||
| 17 | import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; | 19 | import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; |
| 18 | import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; | 20 | import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; |
| 19 | import org.springframework.beans.BeansException; | 21 | import org.springframework.beans.BeansException; |
| @@ -29,6 +31,11 @@ import org.springframework.context.annotation.Configuration; | @@ -29,6 +31,11 @@ import org.springframework.context.annotation.Configuration; | ||
| 29 | @EnableConfigurationProperties(TenantProperties.class) | 31 | @EnableConfigurationProperties(TenantProperties.class) |
| 30 | public class YudaoTenantAutoConfiguration { | 32 | public class YudaoTenantAutoConfiguration { |
| 31 | 33 | ||
| 34 | + @Bean | ||
| 35 | + public TenantFrameworkService tenantFrameworkService(TenantApi tenantApi) { | ||
| 36 | + return new TenantFrameworkServiceImpl(tenantApi); | ||
| 37 | + } | ||
| 38 | + | ||
| 32 | // ========== AOP ========== | 39 | // ========== AOP ========== |
| 33 | 40 | ||
| 34 | @Bean | 41 | @Bean |
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/mq/TenantRedisMessageInterceptor.java
| @@ -5,6 +5,8 @@ import cn.iocoder.yudao.framework.mq.core.interceptor.RedisMessageInterceptor; | @@ -5,6 +5,8 @@ import cn.iocoder.yudao.framework.mq.core.interceptor.RedisMessageInterceptor; | ||
| 5 | import cn.iocoder.yudao.framework.mq.core.message.AbstractRedisMessage; | 5 | import cn.iocoder.yudao.framework.mq.core.message.AbstractRedisMessage; |
| 6 | import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; | 6 | import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; |
| 7 | 7 | ||
| 8 | +import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; | ||
| 9 | + | ||
| 8 | /** | 10 | /** |
| 9 | * 多租户 {@link AbstractRedisMessage} 拦截器 | 11 | * 多租户 {@link AbstractRedisMessage} 拦截器 |
| 10 | * | 12 | * |
| @@ -15,8 +17,6 @@ import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; | @@ -15,8 +17,6 @@ import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; | ||
| 15 | */ | 17 | */ |
| 16 | public class TenantRedisMessageInterceptor implements RedisMessageInterceptor { | 18 | public class TenantRedisMessageInterceptor implements RedisMessageInterceptor { |
| 17 | 19 | ||
| 18 | - private static final String HEADER_TENANT_ID = "tenant-id"; | ||
| 19 | - | ||
| 20 | @Override | 20 | @Override |
| 21 | public void sendMessageBefore(AbstractRedisMessage message) { | 21 | public void sendMessageBefore(AbstractRedisMessage message) { |
| 22 | Long tenantId = TenantContextHolder.getTenantId(); | 22 | Long tenantId = TenantContextHolder.getTenantId(); |
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/service/TenantFrameworkServiceImpl.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework.tenant.core.service; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.framework.common.exception.ServiceException; | ||
| 4 | +import cn.iocoder.yudao.framework.common.util.cache.CacheUtils; | ||
| 5 | +import cn.iocoder.yudao.module.system.api.tenant.TenantApi; | ||
| 6 | +import com.google.common.cache.CacheLoader; | ||
| 7 | +import com.google.common.cache.LoadingCache; | ||
| 8 | +import lombok.RequiredArgsConstructor; | ||
| 9 | +import lombok.SneakyThrows; | ||
| 10 | + | ||
| 11 | +import java.time.Duration; | ||
| 12 | +import java.util.List; | ||
| 13 | + | ||
| 14 | +/** | ||
| 15 | + * Tenant 框架 Service 实现类 | ||
| 16 | + * | ||
| 17 | + * @author 芋道源码 | ||
| 18 | + */ | ||
| 19 | +@RequiredArgsConstructor | ||
| 20 | +public class TenantFrameworkServiceImpl implements TenantFrameworkService { | ||
| 21 | + | ||
| 22 | + private static final ServiceException SERVICE_EXCEPTION_NULL = new ServiceException(); | ||
| 23 | + | ||
| 24 | + private final TenantApi tenantApi; | ||
| 25 | + | ||
| 26 | + /** | ||
| 27 | + * 针对 {@link #getTenantIds()} 的缓存 | ||
| 28 | + */ | ||
| 29 | + private final LoadingCache<Object, List<Long>> getTenantIdsCache = CacheUtils.buildAsyncReloadingCache( | ||
| 30 | + Duration.ofMinutes(1L), // 过期时间 1 分钟 | ||
| 31 | + new CacheLoader<Object, List<Long>>() { | ||
| 32 | + | ||
| 33 | + @Override | ||
| 34 | + public List<Long> load(Object key) { | ||
| 35 | + return tenantApi.getTenantIds(); | ||
| 36 | + } | ||
| 37 | + | ||
| 38 | + }); | ||
| 39 | + | ||
| 40 | + /** | ||
| 41 | + * 针对 {@link #validTenant(Long)} 的缓存 | ||
| 42 | + */ | ||
| 43 | + private final LoadingCache<Long, ServiceException> validTenantCache = CacheUtils.buildAsyncReloadingCache( | ||
| 44 | + Duration.ofMinutes(1L), // 过期时间 1 分钟 | ||
| 45 | + new CacheLoader<Long, ServiceException>() { | ||
| 46 | + | ||
| 47 | + @Override | ||
| 48 | + public ServiceException load(Long id) { | ||
| 49 | + try { | ||
| 50 | + tenantApi.validTenant(id); | ||
| 51 | + return SERVICE_EXCEPTION_NULL; | ||
| 52 | + } catch (ServiceException ex) { | ||
| 53 | + return ex; | ||
| 54 | + } | ||
| 55 | + } | ||
| 56 | + | ||
| 57 | + }); | ||
| 58 | + | ||
| 59 | + @Override | ||
| 60 | + @SneakyThrows | ||
| 61 | + public List<Long> getTenantIds() { | ||
| 62 | + return getTenantIdsCache.get(Boolean.TRUE); | ||
| 63 | + } | ||
| 64 | + | ||
| 65 | + @Override | ||
| 66 | + public void validTenant(Long id) { | ||
| 67 | + ServiceException serviceException = validTenantCache.getUnchecked(id); | ||
| 68 | + if (serviceException != SERVICE_EXCEPTION_NULL) { | ||
| 69 | + throw serviceException; | ||
| 70 | + } | ||
| 71 | + } | ||
| 72 | + | ||
| 73 | +} |
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/web/TenantContextWebFilter.java
| @@ -18,8 +18,6 @@ import java.io.IOException; | @@ -18,8 +18,6 @@ import java.io.IOException; | ||
| 18 | */ | 18 | */ |
| 19 | public class TenantContextWebFilter extends OncePerRequestFilter { | 19 | public class TenantContextWebFilter extends OncePerRequestFilter { |
| 20 | 20 | ||
| 21 | - private static final String HEADER_TENANT_ID = "tenant-id"; | ||
| 22 | - | ||
| 23 | @Override | 21 | @Override |
| 24 | protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) | 22 | protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) |
| 25 | throws ServletException, IOException { | 23 | throws ServletException, IOException { |
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/convert/DictConvert.java
| 1 | package cn.iocoder.yudao.framework.excel.core.convert; | 1 | package cn.iocoder.yudao.framework.excel.core.convert; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.convert.Convert; | 3 | import cn.hutool.core.convert.Convert; |
| 4 | -import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO; | ||
| 5 | import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; | 4 | import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils; |
| 6 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 5 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 7 | import com.alibaba.excel.converters.Converter; | 6 | import com.alibaba.excel.converters.Converter; |
| @@ -12,7 +11,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty; | @@ -12,7 +11,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty; | ||
| 12 | import lombok.extern.slf4j.Slf4j; | 11 | import lombok.extern.slf4j.Slf4j; |
| 13 | 12 | ||
| 14 | /** | 13 | /** |
| 15 | - * Excel {@link DictDataRespDTO} 数据字典转换器 | 14 | + * Excel 数据字典转换器 |
| 16 | * | 15 | * |
| 17 | * @author 芋道源码 | 16 | * @author 芋道源码 |
| 18 | */ | 17 | */ |
| @@ -35,14 +34,14 @@ public class DictConvert implements Converter<Object> { | @@ -35,14 +34,14 @@ public class DictConvert implements Converter<Object> { | ||
| 35 | // 使用字典解析 | 34 | // 使用字典解析 |
| 36 | String type = getType(contentProperty); | 35 | String type = getType(contentProperty); |
| 37 | String label = cellData.getStringValue(); | 36 | String label = cellData.getStringValue(); |
| 38 | - DictDataRespDTO dictData = DictFrameworkUtils.parseDictDataFromCache(type, label); | ||
| 39 | - if (dictData == null) { | 37 | + String value = DictFrameworkUtils.parseDictDataValue(type, label); |
| 38 | + if (value == null) { | ||
| 40 | log.error("[convertToJavaData][type({}) 解析不掉 label({})]", type, label); | 39 | log.error("[convertToJavaData][type({}) 解析不掉 label({})]", type, label); |
| 41 | return null; | 40 | return null; |
| 42 | } | 41 | } |
| 43 | // 将 String 的 value 转换成对应的属性 | 42 | // 将 String 的 value 转换成对应的属性 |
| 44 | Class<?> fieldClazz = contentProperty.getField().getType(); | 43 | Class<?> fieldClazz = contentProperty.getField().getType(); |
| 45 | - return Convert.convert(fieldClazz, dictData.getValue()); | 44 | + return Convert.convert(fieldClazz, value); |
| 46 | } | 45 | } |
| 47 | 46 | ||
| 48 | @Override | 47 | @Override |
| @@ -56,13 +55,13 @@ public class DictConvert implements Converter<Object> { | @@ -56,13 +55,13 @@ public class DictConvert implements Converter<Object> { | ||
| 56 | // 使用字典格式化 | 55 | // 使用字典格式化 |
| 57 | String type = getType(contentProperty); | 56 | String type = getType(contentProperty); |
| 58 | String value = String.valueOf(object); | 57 | String value = String.valueOf(object); |
| 59 | - DictDataRespDTO dictData = DictFrameworkUtils.getDictDataFromCache(type, value); | ||
| 60 | - if (dictData == null) { | 58 | + String label = DictFrameworkUtils.getDictDataLabel(type, value); |
| 59 | + if (label == null) { | ||
| 61 | log.error("[convertToExcelData][type({}) 转换不了 label({})]", type, value); | 60 | log.error("[convertToExcelData][type({}) 转换不了 label({})]", type, value); |
| 62 | return new CellData<>(""); | 61 | return new CellData<>(""); |
| 63 | } | 62 | } |
| 64 | // 生成 Excel 小表格 | 63 | // 生成 Excel 小表格 |
| 65 | - return new CellData<>(dictData.getLabel()); | 64 | + return new CellData<>(label); |
| 66 | } | 65 | } |
| 67 | 66 | ||
| 68 | private static String getType(ExcelContentProperty contentProperty) { | 67 | private static String getType(ExcelContentProperty contentProperty) { |
yudao-framework/yudao-spring-boot-starter-extension/src/main/java/cn/iocoder/yudao/framework/extension/config/YudaoExtensionAutoConfiguration.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.config; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.extension.core.ExtensionBootstrap; | ||
| 4 | -import cn.iocoder.yudao.framework.extension.core.context.ExtensionContext; | ||
| 5 | -import cn.iocoder.yudao.framework.extension.core.context.ExtensionContextHolder; | ||
| 6 | -import cn.iocoder.yudao.framework.extension.core.context.ExtensionExecutor; | ||
| 7 | -import cn.iocoder.yudao.framework.extension.core.factory.ExtensionFactory; | ||
| 8 | -import cn.iocoder.yudao.framework.extension.core.factory.ExtensionRegisterFactory; | ||
| 9 | -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; | ||
| 10 | -import org.springframework.context.annotation.Bean; | ||
| 11 | -import org.springframework.context.annotation.Configuration; | ||
| 12 | - | ||
| 13 | -/** | ||
| 14 | - * @description 扩展点组件自动装配 | ||
| 15 | - * @author Qingchen | ||
| 16 | - * @version 1.0.0 | ||
| 17 | - * @date 2021-08-28 21:50 | ||
| 18 | - * @class cn.iocoder.yudao.framework.extension.config.YudaoExtensionAutoConfiguration.java | ||
| 19 | - */ | ||
| 20 | -@Configuration | ||
| 21 | -public class YudaoExtensionAutoConfiguration { | ||
| 22 | - | ||
| 23 | - /** | ||
| 24 | - * 组件初始化 | ||
| 25 | - * @return | ||
| 26 | - */ | ||
| 27 | - @Bean(initMethod = "init") | ||
| 28 | - @ConditionalOnMissingBean(ExtensionBootstrap.class) | ||
| 29 | - public ExtensionBootstrap bootstrap() { | ||
| 30 | - return new ExtensionBootstrap(); | ||
| 31 | - } | ||
| 32 | - | ||
| 33 | - /** | ||
| 34 | - * 扩展点工厂 | ||
| 35 | - * @return | ||
| 36 | - */ | ||
| 37 | - @Bean | ||
| 38 | - @ConditionalOnMissingBean({ExtensionRegisterFactory.class, ExtensionFactory.class}) | ||
| 39 | - public ExtensionRegisterFactory registerFactory() { | ||
| 40 | - return new ExtensionRegisterFactory(); | ||
| 41 | - } | ||
| 42 | - | ||
| 43 | - /** | ||
| 44 | - * 扩展组件上下文对象 | ||
| 45 | - * @return | ||
| 46 | - */ | ||
| 47 | - @Bean | ||
| 48 | - @ConditionalOnMissingBean({ExtensionContextHolder.class, ExtensionContext.class}) | ||
| 49 | - public ExtensionContextHolder context() { | ||
| 50 | - return new ExtensionContextHolder(); | ||
| 51 | - } | ||
| 52 | - | ||
| 53 | - /** | ||
| 54 | - * 扩展组件执行器 | ||
| 55 | - * @return | ||
| 56 | - */ | ||
| 57 | - @Bean | ||
| 58 | - @ConditionalOnMissingBean(ExtensionExecutor.class) | ||
| 59 | - public ExtensionExecutor executor() { | ||
| 60 | - return new ExtensionExecutor(); | ||
| 61 | - } | ||
| 62 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/main/java/cn/iocoder/yudao/framework/extension/core/BusinessScenario.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.core; | ||
| 2 | - | ||
| 3 | -import javax.validation.constraints.NotNull; | ||
| 4 | -import java.io.Serializable; | ||
| 5 | -import java.util.StringJoiner; | ||
| 6 | - | ||
| 7 | -/** | ||
| 8 | - * @description 业务场景 = businessId + useCase + scenario, 用来标识系统中唯一的一个场景<br/> | ||
| 9 | - * @author Qingchen | ||
| 10 | - * @version 1.0.0 | ||
| 11 | - * @date 2021-08-28 22:19 | ||
| 12 | - * @class cn.iocoder.yudao.framework.extension.core.BusinessScenario.java | ||
| 13 | - */ | ||
| 14 | -public class BusinessScenario implements Serializable { | ||
| 15 | - | ||
| 16 | - /** | ||
| 17 | - * 默认业务id | ||
| 18 | - */ | ||
| 19 | - public final static String DEFAULT_BUSINESS_ID = "#defaultBusinessId#"; | ||
| 20 | - | ||
| 21 | - /** | ||
| 22 | - * 默认用例 | ||
| 23 | - */ | ||
| 24 | - public final static String DEFAULT_USECASE = "#defaultUseCase#"; | ||
| 25 | - | ||
| 26 | - /** | ||
| 27 | - * 默认场景 | ||
| 28 | - */ | ||
| 29 | - public final static String DEFAULT_SCENARIO = "#defaultScenario#"; | ||
| 30 | - | ||
| 31 | - /** | ||
| 32 | - * 分隔符 | ||
| 33 | - */ | ||
| 34 | - private final static String DOT_SEPARATOR = "."; | ||
| 35 | - | ||
| 36 | - /** | ||
| 37 | - * 业务Id | ||
| 38 | - */ | ||
| 39 | - private String businessId; | ||
| 40 | - | ||
| 41 | - /** | ||
| 42 | - * 用例 | ||
| 43 | - */ | ||
| 44 | - private String useCase; | ||
| 45 | - | ||
| 46 | - /** | ||
| 47 | - * 场景 | ||
| 48 | - */ | ||
| 49 | - private String scenario; | ||
| 50 | - | ||
| 51 | - public BusinessScenario() { | ||
| 52 | - this.businessId = DEFAULT_BUSINESS_ID; | ||
| 53 | - this.useCase = DEFAULT_USECASE; | ||
| 54 | - this.scenario = DEFAULT_SCENARIO; | ||
| 55 | - } | ||
| 56 | - | ||
| 57 | - public BusinessScenario(@NotNull String businessId, @NotNull String useCase, @NotNull String scenario) { | ||
| 58 | - this.businessId = businessId; | ||
| 59 | - this.useCase = useCase; | ||
| 60 | - this.scenario = scenario; | ||
| 61 | - } | ||
| 62 | - | ||
| 63 | - public BusinessScenario(@NotNull String scenario) { | ||
| 64 | - this(); | ||
| 65 | - this.scenario = scenario; | ||
| 66 | - } | ||
| 67 | - | ||
| 68 | - public BusinessScenario(@NotNull String useCase, @NotNull String scenario) { | ||
| 69 | - this(DEFAULT_BUSINESS_ID, useCase, scenario); | ||
| 70 | - } | ||
| 71 | - | ||
| 72 | - public String getBusinessId() { | ||
| 73 | - return businessId; | ||
| 74 | - } | ||
| 75 | - | ||
| 76 | - public void setBusinessId(String businessId) { | ||
| 77 | - this.businessId = businessId; | ||
| 78 | - } | ||
| 79 | - | ||
| 80 | - public String getUseCase() { | ||
| 81 | - return useCase; | ||
| 82 | - } | ||
| 83 | - | ||
| 84 | - public void setUseCase(String useCase) { | ||
| 85 | - this.useCase = useCase; | ||
| 86 | - } | ||
| 87 | - | ||
| 88 | - public String getScenario() { | ||
| 89 | - return scenario; | ||
| 90 | - } | ||
| 91 | - | ||
| 92 | - public void setScenario(String scenario) { | ||
| 93 | - this.scenario = scenario; | ||
| 94 | - } | ||
| 95 | - | ||
| 96 | - /** | ||
| 97 | - * 构建业务场景 | ||
| 98 | - * @param businessId | ||
| 99 | - * @param useCase | ||
| 100 | - * @param scenario | ||
| 101 | - * @return | ||
| 102 | - */ | ||
| 103 | - public static BusinessScenario valueOf(@NotNull String businessId, @NotNull String useCase, @NotNull String scenario) { | ||
| 104 | - return new BusinessScenario(businessId, useCase, scenario); | ||
| 105 | - } | ||
| 106 | - | ||
| 107 | - /** | ||
| 108 | - * 构建业务场景 | ||
| 109 | - * @param useCase | ||
| 110 | - * @param scenario | ||
| 111 | - * @return | ||
| 112 | - */ | ||
| 113 | - public static BusinessScenario valueOf(@NotNull String useCase, @NotNull String scenario) { | ||
| 114 | - return new BusinessScenario(useCase, scenario); | ||
| 115 | - } | ||
| 116 | - | ||
| 117 | - /** | ||
| 118 | - * 构建业务场景 | ||
| 119 | - * @param scenario | ||
| 120 | - * @return | ||
| 121 | - */ | ||
| 122 | - public static BusinessScenario valueOf(@NotNull String scenario) { | ||
| 123 | - return new BusinessScenario(scenario); | ||
| 124 | - } | ||
| 125 | - | ||
| 126 | - /** | ||
| 127 | - * 业务场景唯一标识 | ||
| 128 | - * @return | ||
| 129 | - */ | ||
| 130 | - public String getUniqueIdentity(){ | ||
| 131 | - return new StringJoiner(DOT_SEPARATOR).add(businessId).add(useCase).add(scenario).toString(); | ||
| 132 | - } | ||
| 133 | - | ||
| 134 | - @Override | ||
| 135 | - public String toString() { | ||
| 136 | - return "BusinessScenario{" + | ||
| 137 | - "businessId='" + businessId + '\'' + | ||
| 138 | - ", useCase='" + useCase + '\'' + | ||
| 139 | - ", scenario='" + scenario + '\'' + | ||
| 140 | - '}'; | ||
| 141 | - } | ||
| 142 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/main/java/cn/iocoder/yudao/framework/extension/core/ExtensionBootstrap.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.core; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.extension.core.factory.ExtensionRegisterFactory; | ||
| 4 | -import org.springframework.beans.BeansException; | ||
| 5 | -import org.springframework.beans.factory.annotation.Autowired; | ||
| 6 | -import org.springframework.context.ApplicationContext; | ||
| 7 | -import org.springframework.context.ApplicationContextAware; | ||
| 8 | - | ||
| 9 | -import javax.annotation.PostConstruct; | ||
| 10 | - | ||
| 11 | -/** | ||
| 12 | - * @description | ||
| 13 | - * @author Qingchen | ||
| 14 | - * @version 1.0.0 | ||
| 15 | - * @date 2021-08-29 00:18 | ||
| 16 | - * @class cn.iocoder.yudao.framework.extension.core.ExtensionBootstrap.java | ||
| 17 | - */ | ||
| 18 | -public class ExtensionBootstrap implements ApplicationContextAware { | ||
| 19 | - | ||
| 20 | - /** | ||
| 21 | - * spring 容器 | ||
| 22 | - */ | ||
| 23 | - private ApplicationContext applicationContext; | ||
| 24 | - | ||
| 25 | - @Autowired | ||
| 26 | - private ExtensionRegisterFactory registerFactory; | ||
| 27 | - | ||
| 28 | - /** | ||
| 29 | - * 初始化 | ||
| 30 | - */ | ||
| 31 | - @PostConstruct | ||
| 32 | - public void init() { | ||
| 33 | - registerFactory.setApplicationContext(applicationContext); | ||
| 34 | - registerFactory.register(null); | ||
| 35 | - } | ||
| 36 | - | ||
| 37 | - @Override | ||
| 38 | - public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { | ||
| 39 | - this.applicationContext = applicationContext; | ||
| 40 | - } | ||
| 41 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/main/java/cn/iocoder/yudao/framework/extension/core/context/AbstractComponentExecutor.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.core.context; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.extension.core.BusinessScenario; | ||
| 4 | -import cn.iocoder.yudao.framework.extension.core.point.ExtensionPoint; | ||
| 5 | - | ||
| 6 | -import java.util.function.Consumer; | ||
| 7 | -import java.util.function.Function; | ||
| 8 | - | ||
| 9 | -/** | ||
| 10 | - * @description 执行器通用方法 | ||
| 11 | - * @author Qingchen | ||
| 12 | - * @version 1.0.0 | ||
| 13 | - * @date 2021-08-29 00:38 | ||
| 14 | - * @class cn.iocoder.yudao.framework.extension.core.context.AbstractComponentExecutor.java | ||
| 15 | - */ | ||
| 16 | -public abstract class AbstractComponentExecutor { | ||
| 17 | - | ||
| 18 | - /** | ||
| 19 | - * （"业务" + "用例" + "场景"）执行扩展组件，并返回执行结果 | ||
| 20 | - * @param targetClazz | ||
| 21 | - * @param businessId | ||
| 22 | - * @param useCase | ||
| 23 | - * @param scenario | ||
| 24 | - * @param function | ||
| 25 | - * @param <R> | ||
| 26 | - * @param <T> | ||
| 27 | - * @return | ||
| 28 | - */ | ||
| 29 | - public <R, T extends ExtensionPoint> R execute(Class<T> targetClazz, String businessId, String useCase, String scenario, Function<T, R> function) { | ||
| 30 | - return execute(targetClazz, BusinessScenario.valueOf(businessId, useCase, scenario), function); | ||
| 31 | - } | ||
| 32 | - | ||
| 33 | - | ||
| 34 | - /** | ||
| 35 | - * （"用例" + "场景"）执行扩展组件，并返回执行结果 | ||
| 36 | - * @param targetClazz | ||
| 37 | - * @param useCase | ||
| 38 | - * @param scenario | ||
| 39 | - * @param function | ||
| 40 | - * @param <R> | ||
| 41 | - * @param <T> | ||
| 42 | - * @return | ||
| 43 | - */ | ||
| 44 | - public <R, T extends ExtensionPoint> R execute(Class<T> targetClazz, String useCase, String scenario, Function<T, R> function) { | ||
| 45 | - return execute(targetClazz, BusinessScenario.valueOf(useCase, scenario), function); | ||
| 46 | - } | ||
| 47 | - | ||
| 48 | - /** | ||
| 49 | - * （"场景"）执行扩展组件，并返回执行结果 | ||
| 50 | - * @param targetClazz | ||
| 51 | - * @param scenario | ||
| 52 | - * @param function | ||
| 53 | - * @param <R> | ||
| 54 | - * @param <T> | ||
| 55 | - * @return | ||
| 56 | - */ | ||
| 57 | - public <R, T extends ExtensionPoint> R execute(Class<T> targetClazz, String scenario, Function<T, R> function) { | ||
| 58 | - return execute(targetClazz, BusinessScenario.valueOf(scenario), function); | ||
| 59 | - } | ||
| 60 | - | ||
| 61 | - /** | ||
| 62 | - * 执行扩展组件，并返回执行结果 | ||
| 63 | - * @param targetClazz | ||
| 64 | - * @param businessScenario | ||
| 65 | - * @param function | ||
| 66 | - * @param <R> Response Type | ||
| 67 | - * @param <T> Parameter Type | ||
| 68 | - * @return | ||
| 69 | - */ | ||
| 70 | - public <R, T extends ExtensionPoint> R execute(Class<T> targetClazz, BusinessScenario businessScenario, Function<T, R> function) { | ||
| 71 | - T component = locateComponent(targetClazz, businessScenario); | ||
| 72 | - return function.apply(component); | ||
| 73 | - } | ||
| 74 | - | ||
| 75 | - /** | ||
| 76 | - * （"业务" + "用例" + "场景"）执行扩展组件，适用于无返回值的业务 | ||
| 77 | - * @param targetClazz | ||
| 78 | - * @param businessId | ||
| 79 | - * @param useCase | ||
| 80 | - * @param scenario | ||
| 81 | - * @param consumer | ||
| 82 | - * @param <T> | ||
| 83 | - */ | ||
| 84 | - public <T extends ExtensionPoint> void accept(Class<T> targetClazz, String businessId, String useCase, String scenario, Consumer<T> consumer) { | ||
| 85 | - accept(targetClazz, BusinessScenario.valueOf(businessId, useCase, scenario), consumer); | ||
| 86 | - } | ||
| 87 | - | ||
| 88 | - /** | ||
| 89 | - * （"场景"）执行扩展组件，适用于无返回值的业务 | ||
| 90 | - * @param targetClazz | ||
| 91 | - * @param useCase | ||
| 92 | - * @param scenario | ||
| 93 | - * @param consumer | ||
| 94 | - * @param <T> | ||
| 95 | - */ | ||
| 96 | - public <T extends ExtensionPoint> void accept(Class<T> targetClazz, String useCase, String scenario, Consumer<T> consumer) { | ||
| 97 | - accept(targetClazz, BusinessScenario.valueOf(useCase, scenario), consumer); | ||
| 98 | - } | ||
| 99 | - | ||
| 100 | - /** | ||
| 101 | - * （"场景"）执行扩展组件，适用于无返回值的业务 | ||
| 102 | - * @param targetClazz | ||
| 103 | - * @param scenario | ||
| 104 | - * @param consumer | ||
| 105 | - * @param <T> | ||
| 106 | - */ | ||
| 107 | - public <T extends ExtensionPoint> void accept(Class<T> targetClazz, String scenario, Consumer<T> consumer) { | ||
| 108 | - accept(targetClazz, BusinessScenario.valueOf(scenario), consumer); | ||
| 109 | - } | ||
| 110 | - | ||
| 111 | - /** | ||
| 112 | - * 执行扩展组件，适用于无返回值的业务 | ||
| 113 | - * @param targetClazz | ||
| 114 | - * @param businessScenario | ||
| 115 | - * @param consumer | ||
| 116 | - * @param <T> Parameter Type | ||
| 117 | - */ | ||
| 118 | - public <T extends ExtensionPoint> void accept(Class<T> targetClazz, BusinessScenario businessScenario, Consumer<T> consumer) { | ||
| 119 | - T component = locateComponent(targetClazz, businessScenario); | ||
| 120 | - consumer.accept(component); | ||
| 121 | - } | ||
| 122 | - | ||
| 123 | - /** | ||
| 124 | - * 获取/定位扩展点组件 | ||
| 125 | - * @param targetClazz | ||
| 126 | - * @param businessScenario | ||
| 127 | - * @param <C> | ||
| 128 | - * @return | ||
| 129 | - */ | ||
| 130 | - protected abstract <C extends ExtensionPoint> C locateComponent(Class<C> targetClazz, BusinessScenario businessScenario); | ||
| 131 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/main/java/cn/iocoder/yudao/framework/extension/core/context/ExtensionContext.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.core.context; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.extension.core.BusinessScenario; | ||
| 4 | -import cn.iocoder.yudao.framework.extension.core.point.ExtensionPoint; | ||
| 5 | - | ||
| 6 | -/** | ||
| 7 | - * @description 上下文，包含各个扩展点的相关操作 | ||
| 8 | - * @author Qingchen | ||
| 9 | - * @version 1.0.0 | ||
| 10 | - * @date 2021-08-28 22:15 | ||
| 11 | - * @class cn.iocoder.yudao.framework.extension.core.context.ExtensionContext.java | ||
| 12 | - */ | ||
| 13 | -public interface ExtensionContext { | ||
| 14 | - | ||
| 15 | - /** | ||
| 16 | - * 根据业务场景唯一标识获取扩展点组件实现类 | ||
| 17 | - * @param businessId | ||
| 18 | - * @param useCase | ||
| 19 | - * @param scenario | ||
| 20 | - * @param clazz | ||
| 21 | - * @param <T> | ||
| 22 | - * @return | ||
| 23 | - */ | ||
| 24 | - <T extends ExtensionPoint> T getPoint(String businessId, String useCase, String scenario, Class<T> clazz); | ||
| 25 | - | ||
| 26 | - /** | ||
| 27 | - * 根据（"实例" + "场景"）获取扩展点组件实现类，其中：业务id（businessId）= {@linkplain cn.iocoder.yudao.framework.extension.core.BusinessScenario.DEFAULT_BUSINESS_ID} | ||
| 28 | - * @param useCase | ||
| 29 | - * @param scenario | ||
| 30 | - * @param clazz | ||
| 31 | - * @param <T> | ||
| 32 | - * @return | ||
| 33 | - */ | ||
| 34 | - <T extends ExtensionPoint> T getPoint(String useCase, String scenario, Class<T> clazz); | ||
| 35 | - | ||
| 36 | - /** | ||
| 37 | - * 根据（"场景"）获取扩展点组件实现类 <br/> | ||
| 38 | - * 其中： | ||
| 39 | - * 业务id（businessId）= {@linkplain cn.iocoder.yudao.framework.extension.core.BusinessScenario.DEFAULT_BUSINESS_ID} | ||
| 40 | - * 实例（useCase）= {@linkplain cn.iocoder.yudao.framework.extension.core.BusinessScenario.DEFAULT_USECASE} | ||
| 41 | - * @param scenario | ||
| 42 | - * @param clazz | ||
| 43 | - * @param <T> | ||
| 44 | - * @return | ||
| 45 | - */ | ||
| 46 | - <T extends ExtensionPoint> T getPoint(String scenario, Class<T> clazz); | ||
| 47 | - | ||
| 48 | - /** | ||
| 49 | - * 根据业务场景唯一标识获取扩展点组件实现类 | ||
| 50 | - * @param businessScenario | ||
| 51 | - * @param clazz | ||
| 52 | - * @param <T> | ||
| 53 | - * @return | ||
| 54 | - */ | ||
| 55 | - <T extends ExtensionPoint> T getPoint(BusinessScenario businessScenario, Class<T> clazz); | ||
| 56 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/main/java/cn/iocoder/yudao/framework/extension/core/context/ExtensionContextHolder.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.core.context; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.extension.core.BusinessScenario; | ||
| 4 | -import cn.iocoder.yudao.framework.extension.core.factory.ExtensionFactory; | ||
| 5 | -import cn.iocoder.yudao.framework.extension.core.point.ExtensionPoint; | ||
| 6 | -import lombok.extern.slf4j.Slf4j; | ||
| 7 | -import org.springframework.beans.factory.annotation.Autowired; | ||
| 8 | -import org.springframework.stereotype.Component; | ||
| 9 | - | ||
| 10 | -import javax.validation.constraints.NotNull; | ||
| 11 | - | ||
| 12 | -/** | ||
| 13 | - * @description 上下文及扩展点组件工厂的持有类 | ||
| 14 | - * @author Qingchen | ||
| 15 | - * @version 1.0.0 | ||
| 16 | - * @date 2021-08-29 00:29 | ||
| 17 | - * @class cn.iocoder.yudao.framework.extension.core.context.ExtensionContextHolder.java | ||
| 18 | - */ | ||
| 19 | -@Component | ||
| 20 | -@Slf4j | ||
| 21 | -public class ExtensionContextHolder implements ExtensionContext{ | ||
| 22 | - | ||
| 23 | - @Autowired | ||
| 24 | - private ExtensionFactory factory; | ||
| 25 | - | ||
| 26 | - @Override | ||
| 27 | - public <T extends ExtensionPoint> T getPoint(@NotNull String businessId, @NotNull String useCase, @NotNull String scenario, Class<T> clazz) { | ||
| 28 | - return getPoint(BusinessScenario.valueOf(businessId, useCase, scenario), clazz); | ||
| 29 | - } | ||
| 30 | - | ||
| 31 | - @Override | ||
| 32 | - public <T extends ExtensionPoint> T getPoint(@NotNull String useCase, String scenario, Class<T> clazz) { | ||
| 33 | - return getPoint(BusinessScenario.valueOf(useCase, scenario), clazz); | ||
| 34 | - } | ||
| 35 | - | ||
| 36 | - @Override | ||
| 37 | - public <T extends ExtensionPoint> T getPoint(@NotNull String scenario, Class<T> clazz) { | ||
| 38 | - return getPoint(BusinessScenario.valueOf(scenario), clazz); | ||
| 39 | - } | ||
| 40 | - | ||
| 41 | - @Override | ||
| 42 | - public <T extends ExtensionPoint> T getPoint(@NotNull BusinessScenario businessScenario, Class<T> clazz) { | ||
| 43 | - return factory.get(businessScenario, clazz); | ||
| 44 | - } | ||
| 45 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/main/java/cn/iocoder/yudao/framework/extension/core/context/ExtensionExecutor.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.core.context; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.extension.core.BusinessScenario; | ||
| 4 | -import cn.iocoder.yudao.framework.extension.core.point.ExtensionPoint; | ||
| 5 | -import lombok.extern.slf4j.Slf4j; | ||
| 6 | -import org.springframework.beans.factory.annotation.Autowired; | ||
| 7 | -import org.springframework.stereotype.Component; | ||
| 8 | - | ||
| 9 | -/** | ||
| 10 | - * @description 扩展组件执行器 | ||
| 11 | - * @author Qingchen | ||
| 12 | - * @version 1.0.0 | ||
| 13 | - * @date 2021-08-29 00:32 | ||
| 14 | - * @class cn.iocoder.yudao.framework.extension.core.context.ExtensionExecutor.java | ||
| 15 | - */ | ||
| 16 | -@Component | ||
| 17 | -@Slf4j | ||
| 18 | -public class ExtensionExecutor extends AbstractComponentExecutor{ | ||
| 19 | - | ||
| 20 | - @Autowired | ||
| 21 | - private ExtensionContextHolder contextHolder; | ||
| 22 | - | ||
| 23 | - | ||
| 24 | - @Override | ||
| 25 | - protected <C extends ExtensionPoint> C locateComponent(Class<C> targetClazz, BusinessScenario businessScenario) { | ||
| 26 | - return contextHolder.getPoint(businessScenario, targetClazz); | ||
| 27 | - } | ||
| 28 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/main/java/cn/iocoder/yudao/framework/extension/core/factory/ExtensionDefinition.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.core.factory; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.extension.core.BusinessScenario; | ||
| 4 | -import cn.iocoder.yudao.framework.extension.core.point.ExtensionPoint; | ||
| 5 | -import lombok.Getter; | ||
| 6 | -import lombok.Setter; | ||
| 7 | - | ||
| 8 | -import javax.validation.constraints.NotNull; | ||
| 9 | -import java.io.Serializable; | ||
| 10 | -import java.util.Objects; | ||
| 11 | - | ||
| 12 | -/** | ||
| 13 | - * @description 扩展定义（扩展坐标），标识唯一一个业务场景实现 | ||
| 14 | - * @author Qingchen | ||
| 15 | - * @version 1.0.0 | ||
| 16 | - * @date 2021-08-28 23:14 | ||
| 17 | - * @class cn.iocoder.yudao.framework.extension.core.factory.ExtensionDefinition.java | ||
| 18 | - */ | ||
| 19 | -@Setter | ||
| 20 | -@Getter | ||
| 21 | -public class ExtensionDefinition implements Serializable { | ||
| 22 | - | ||
| 23 | - /** | ||
| 24 | - * 业务场景唯一标识(id) | ||
| 25 | - */ | ||
| 26 | - private String uniqueIdentify; | ||
| 27 | - | ||
| 28 | - /** | ||
| 29 | - * 扩展点实现类名称 | ||
| 30 | - */ | ||
| 31 | - private String extensionPointName; | ||
| 32 | - | ||
| 33 | - /** | ||
| 34 | - * 业务场景 | ||
| 35 | - */ | ||
| 36 | - private BusinessScenario businessScenario; | ||
| 37 | - | ||
| 38 | - /** | ||
| 39 | - * 扩展点实现类 | ||
| 40 | - */ | ||
| 41 | - private ExtensionPoint extensionPoint; | ||
| 42 | - | ||
| 43 | - /** | ||
| 44 | - * class | ||
| 45 | - */ | ||
| 46 | - private Class extensionPointClass; | ||
| 47 | - | ||
| 48 | - public ExtensionDefinition() { | ||
| 49 | - } | ||
| 50 | - | ||
| 51 | - public ExtensionDefinition(@NotNull BusinessScenario businessScenario, @NotNull ExtensionPoint extensionPoint) { | ||
| 52 | - this.businessScenario = businessScenario; | ||
| 53 | - this.extensionPoint = extensionPoint; | ||
| 54 | - this.uniqueIdentify = this.businessScenario.getUniqueIdentity(); | ||
| 55 | - this.extensionPointClass = this.extensionPoint.getClass(); | ||
| 56 | - } | ||
| 57 | - | ||
| 58 | - /** | ||
| 59 | - * 构建definition | ||
| 60 | - * @param businessScenario | ||
| 61 | - * @param point | ||
| 62 | - * @return | ||
| 63 | - */ | ||
| 64 | - public static ExtensionDefinition valueOf(@NotNull BusinessScenario businessScenario, @NotNull ExtensionPoint point) { | ||
| 65 | - return new ExtensionDefinition(businessScenario, point); | ||
| 66 | - } | ||
| 67 | - | ||
| 68 | - @Override | ||
| 69 | - public boolean equals(Object o) { | ||
| 70 | - if (this == o) { | ||
| 71 | - return true; | ||
| 72 | - } | ||
| 73 | - if (o == null || getClass() != o.getClass()) { | ||
| 74 | - return false; | ||
| 75 | - } | ||
| 76 | - ExtensionDefinition that = (ExtensionDefinition) o; | ||
| 77 | - return Objects.equals(uniqueIdentify, that.uniqueIdentify) && Objects.equals(extensionPointName, that.extensionPointName); | ||
| 78 | - } | ||
| 79 | - | ||
| 80 | - @Override | ||
| 81 | - public int hashCode() { | ||
| 82 | - final int prime = 31; | ||
| 83 | - int result = 1; | ||
| 84 | - result = prime * result + ((uniqueIdentify == null) ? 0 : uniqueIdentify.hashCode()); | ||
| 85 | - result = prime * result + ((extensionPointName == null) ? 0 : extensionPointName.hashCode()); | ||
| 86 | - return result; | ||
| 87 | - } | ||
| 88 | - | ||
| 89 | - @Override | ||
| 90 | - public String toString() { | ||
| 91 | - return "ExtensionDefinition{" + | ||
| 92 | - "uniqueIdentify='" + uniqueIdentify + '\'' + | ||
| 93 | - ", extensionPointName='" + extensionPointName + '\'' + | ||
| 94 | - '}'; | ||
| 95 | - } | ||
| 96 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/main/java/cn/iocoder/yudao/framework/extension/core/factory/ExtensionFactory.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.core.factory; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.extension.core.BusinessScenario; | ||
| 4 | -import cn.iocoder.yudao.framework.extension.core.point.ExtensionPoint; | ||
| 5 | - | ||
| 6 | -/** | ||
| 7 | - * @description 扩展点工厂 | ||
| 8 | - * @author Qingchen | ||
| 9 | - * @version 1.0.0 | ||
| 10 | - * @date 2021-08-28 23:04 | ||
| 11 | - * @class cn.iocoder.yudao.framework.extension.core.factory.ExtensionFactory.java | ||
| 12 | - */ | ||
| 13 | -public interface ExtensionFactory { | ||
| 14 | - | ||
| 15 | - /** | ||
| 16 | - * 注册所有扩展点实现类 | ||
| 17 | - * @param basePackage | ||
| 18 | - */ | ||
| 19 | - void register(String basePackage); | ||
| 20 | - | ||
| 21 | - /** | ||
| 22 | - * 根据业务场景获取指定类型的扩展点 | ||
| 23 | - * @param businessScenario | ||
| 24 | - * @param clazz | ||
| 25 | - * @param <T> | ||
| 26 | - * @return | ||
| 27 | - */ | ||
| 28 | - <T extends ExtensionPoint> T get(BusinessScenario businessScenario, Class<T> clazz); | ||
| 29 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/main/java/cn/iocoder/yudao/framework/extension/core/factory/ExtensionRegisterFactory.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.core.factory; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.extension.core.BusinessScenario; | ||
| 4 | -import cn.iocoder.yudao.framework.extension.core.point.ExtensionPoint; | ||
| 5 | -import cn.iocoder.yudao.framework.extension.core.stereotype.Extension; | ||
| 6 | -import lombok.extern.slf4j.Slf4j; | ||
| 7 | -import org.springframework.aop.support.AopUtils; | ||
| 8 | -import org.springframework.context.ApplicationContext; | ||
| 9 | -import org.springframework.core.annotation.AnnotationUtils; | ||
| 10 | -import org.springframework.stereotype.Component; | ||
| 11 | -import org.springframework.util.ClassUtils; | ||
| 12 | - | ||
| 13 | -import javax.validation.constraints.NotNull; | ||
| 14 | -import java.util.Map; | ||
| 15 | -import java.util.concurrent.ConcurrentHashMap; | ||
| 16 | - | ||
| 17 | -/** | ||
| 18 | - * @description 注册工厂 | ||
| 19 | - * @author Qingchen | ||
| 20 | - * @version 1.0.0 | ||
| 21 | - * @date 2021-08-28 23:07 | ||
| 22 | - * @class cn.iocoder.yudao.framework.extension.core.factory.ExtensionRegisterFactory.java | ||
| 23 | - */ | ||
| 24 | -@Component | ||
| 25 | -@Slf4j | ||
| 26 | -public class ExtensionRegisterFactory implements ExtensionFactory { | ||
| 27 | - | ||
| 28 | - /** | ||
| 29 | - * spring ApplicationContext | ||
| 30 | - */ | ||
| 31 | - private ApplicationContext applicationContext; | ||
| 32 | - | ||
| 33 | - /** | ||
| 34 | - * 扩展点实现类集合 | ||
| 35 | - */ | ||
| 36 | - private Map<String, ExtensionDefinition> registerExtensionBeans = new ConcurrentHashMap<>(); | ||
| 37 | - | ||
| 38 | - @Override | ||
| 39 | - public void register(String basePackage) { | ||
| 40 | - final Map<String, Object> beans = applicationContext.getBeansWithAnnotation(Extension.class); | ||
| 41 | - if(beans == null || beans.isEmpty()) { | ||
| 42 | - return; | ||
| 43 | - } | ||
| 44 | - | ||
| 45 | - beans.values().forEach(point -> doRegister((ExtensionPoint) point)); | ||
| 46 | - log.info("业务场景相关扩展点注册完成，注册数量: {}", registerExtensionBeans.size()); | ||
| 47 | - } | ||
| 48 | - | ||
| 49 | - @Override | ||
| 50 | - public <T extends ExtensionPoint> T get(BusinessScenario businessScenario, Class<T> clazz) { | ||
| 51 | - | ||
| 52 | - final ExtensionDefinition definition = registerExtensionBeans.get(businessScenario.getUniqueIdentity()); | ||
| 53 | - if(definition == null) { | ||
| 54 | - log.error("获取业务场景扩展点实现失败，失败原因：尚未定义该业务场景相关扩展点。{}", businessScenario); | ||
| 55 | - throw new RuntimeException("尚未定义该业务场景相关扩展点 [" + businessScenario + "]"); | ||
| 56 | - } | ||
| 57 | - | ||
| 58 | - return (T) definition.getExtensionPoint(); | ||
| 59 | - } | ||
| 60 | - | ||
| 61 | - /** | ||
| 62 | - * 注册扩展点 | ||
| 63 | - * @param point | ||
| 64 | - */ | ||
| 65 | - private void doRegister(@NotNull ExtensionPoint point) { | ||
| 66 | - Class<?> extensionClazz = point.getClass(); | ||
| 67 | - | ||
| 68 | - if (AopUtils.isAopProxy(point)) { | ||
| 69 | - extensionClazz = ClassUtils.getUserClass(point); | ||
| 70 | - } | ||
| 71 | - | ||
| 72 | - Extension extension = AnnotationUtils.findAnnotation(extensionClazz, Extension.class); | ||
| 73 | - final BusinessScenario businessScenario = BusinessScenario.valueOf(extension.businessId(), extension.useCase(), extension.scenario()); | ||
| 74 | - final ExtensionDefinition definition = ExtensionDefinition.valueOf(businessScenario, point); | ||
| 75 | - final ExtensionDefinition exist = registerExtensionBeans.get(businessScenario.getUniqueIdentity()); | ||
| 76 | - if(exist != null && !exist.equals(definition)) { | ||
| 77 | - throw new RuntimeException("相同的业务场景重复注册了不同类型的扩展点实现 :【" + definition + "】【" + exist + "】"); | ||
| 78 | - } | ||
| 79 | - | ||
| 80 | - registerExtensionBeans.put(businessScenario.getUniqueIdentity(), definition); | ||
| 81 | - } | ||
| 82 | - | ||
| 83 | - public void setApplicationContext(ApplicationContext applicationContext) { | ||
| 84 | - this.applicationContext = applicationContext; | ||
| 85 | - } | ||
| 86 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/main/java/cn/iocoder/yudao/framework/extension/core/package-info.java deleted
| 1 | -/** | ||
| 2 | - * @description core 核心 | ||
| 3 | - * @author Qingchen | ||
| 4 | - * @version 1.0.0 | ||
| 5 | - * @date 2021-08-28 21:54 | ||
| 6 | - * @class cn.iocoder.yudao.framework.extension.core.package-info.java | ||
| 7 | - */ | ||
| 8 | -package cn.iocoder.yudao.framework.extension.core; | ||
| 9 | \ No newline at end of file | 0 | \ No newline at end of file |
yudao-framework/yudao-spring-boot-starter-extension/src/main/java/cn/iocoder/yudao/framework/extension/core/point/ExtensionPoint.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.core.point; | ||
| 2 | -/** | ||
| 3 | - * @description 扩展点 <br/> | ||
| 4 | - * 表示一块逻辑在不同的业务有不同的实现，使用扩展点做接口申明，然后用{@linkplain cn.iocoder.yudao.framework.extension.core.stereotype.Extension}（扩展）去实现扩展点。 | ||
| 5 | - * @author Qingchen | ||
| 6 | - * @version 1.0.0 | ||
| 7 | - * @date 2021-08-28 22:06 | ||
| 8 | - * @class cn.iocoder.yudao.framework.extension.core.point.ExtensionPoint.java | ||
| 9 | - */ | ||
| 10 | -public interface ExtensionPoint { | ||
| 11 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/main/java/cn/iocoder/yudao/framework/extension/core/stereotype/Extension.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.core.stereotype; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.extension.core.BusinessScenario; | ||
| 4 | -import org.springframework.stereotype.Component; | ||
| 5 | - | ||
| 6 | -import java.lang.annotation.*; | ||
| 7 | - | ||
| 8 | -/** | ||
| 9 | - * @description 表示带注释的类是“扩展组件” | ||
| 10 | - * @author Qingchen | ||
| 11 | - * @version 1.0.0 | ||
| 12 | - * @date 2021-08-28 21:59 | ||
| 13 | - * @class cn.iocoder.yudao.framework.extension.core.stereotype.Extension.java | ||
| 14 | - */ | ||
| 15 | -@Inherited | ||
| 16 | -@Retention(RetentionPolicy.RUNTIME) | ||
| 17 | -@Target({ElementType.TYPE}) | ||
| 18 | -@Component | ||
| 19 | -public @interface Extension { | ||
| 20 | - | ||
| 21 | - /** | ||
| 22 | - * 业务 <br/> | ||
| 23 | - * 一个自负盈亏的财务主体，比如tmall、淘宝和零售通就是三个不同的业务 | ||
| 24 | - * @return | ||
| 25 | - */ | ||
| 26 | - String businessId() default BusinessScenario.DEFAULT_BUSINESS_ID; | ||
| 27 | - | ||
| 28 | - /** | ||
| 29 | - * 用例 <br/> | ||
| 30 | - * 描述了用户和系统之间的互动，每个用例提供了一个或多个场景。比如，支付订单就是一个典型的用例。 | ||
| 31 | - * @return | ||
| 32 | - */ | ||
| 33 | - String useCase() default BusinessScenario.DEFAULT_USECASE; | ||
| 34 | - | ||
| 35 | - /** | ||
| 36 | - * 场景 <br/> | ||
| 37 | - * 场景也被称为用例的实例（Instance），包括用例所有的可能情况（正常的和异常的）。比如对于"订单支付"这个用例，就有“支付宝支付”、“银行卡支付”、"微信支付"等多个场景 | ||
| 38 | - * @return | ||
| 39 | - */ | ||
| 40 | - String scenario() default BusinessScenario.DEFAULT_SCENARIO; | ||
| 41 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/main/java/cn/iocoder/yudao/framework/extension/package-info.java deleted
yudao-framework/yudao-spring-boot-starter-extension/src/main/resources/META-INF/spring.factories deleted
yudao-framework/yudao-spring-boot-starter-extension/src/test/java/cn/iocoder/yudao/framework/extension/Application.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension; | ||
| 2 | - | ||
| 3 | -import org.springframework.boot.SpringApplication; | ||
| 4 | -import org.springframework.boot.autoconfigure.SpringBootApplication; | ||
| 5 | - | ||
| 6 | -/** | ||
| 7 | - * @description Application | ||
| 8 | - * @author Qingchen | ||
| 9 | - * @version 1.0.0 | ||
| 10 | - * @date 2021-08-30 10:32 | ||
| 11 | - * @class cn.iocoder.yudao.framework.extension.Application.java | ||
| 12 | - */ | ||
| 13 | -@SpringBootApplication | ||
| 14 | -public class Application { | ||
| 15 | - | ||
| 16 | - public static void main(String[] args) { | ||
| 17 | - SpringApplication.run(Application.class, args); | ||
| 18 | - } | ||
| 19 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/test/java/cn/iocoder/yudao/framework/extension/ExtensionTest.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension; | ||
| 2 | - | ||
| 3 | -import cn.hutool.core.util.IdUtil; | ||
| 4 | -import cn.hutool.json.JSONUtil; | ||
| 5 | -import cn.iocoder.yudao.framework.extension.core.BusinessScenario; | ||
| 6 | -import cn.iocoder.yudao.framework.extension.core.context.ExtensionExecutor; | ||
| 7 | -import cn.iocoder.yudao.framework.extension.pay.PayExtensionPoint; | ||
| 8 | -import cn.iocoder.yudao.framework.extension.pay.command.TransactionsCommand; | ||
| 9 | -import cn.iocoder.yudao.framework.extension.pay.domain.TransactionsResult; | ||
| 10 | -import lombok.extern.slf4j.Slf4j; | ||
| 11 | -import org.junit.Assert; | ||
| 12 | -import org.junit.Test; | ||
| 13 | -import org.junit.runner.RunWith; | ||
| 14 | -import org.springframework.beans.factory.annotation.Autowired; | ||
| 15 | -import org.springframework.boot.test.context.SpringBootTest; | ||
| 16 | -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; | ||
| 17 | - | ||
| 18 | -import java.math.BigDecimal; | ||
| 19 | - | ||
| 20 | -/** | ||
| 21 | - * @description | ||
| 22 | - * @author Qingchen | ||
| 23 | - * @version 1.0.0 | ||
| 24 | - * @date 2021-08-30 10:30 | ||
| 25 | - * @class cn.iocoder.yudao.framework.extension.ExtensionTest.java | ||
| 26 | - */ | ||
| 27 | -@RunWith(SpringJUnit4ClassRunner.class) | ||
| 28 | -@SpringBootTest(classes = Application.class) | ||
| 29 | -@Slf4j | ||
| 30 | -public class ExtensionTest { | ||
| 31 | - | ||
| 32 | - @Autowired | ||
| 33 | - private ExtensionExecutor extensionExecutor; | ||
| 34 | - | ||
| 35 | - @Test | ||
| 36 | - public void unifiedOrder() { | ||
| 37 | - final BusinessScenario scenario = BusinessScenario.valueOf("pay", "jsapi", "wechat"); | ||
| 38 | - final TransactionsCommand command = new TransactionsCommand(IdUtil.objectId(), new BigDecimal(105), "Image形象店-深圳腾大-QQ公仔", "https://www.weixin.qq.com/wxpay/pay.php"); | ||
| 39 | - final TransactionsResult result = extensionExecutor.execute(PayExtensionPoint.class, scenario, extension -> extension.unifiedOrder(command)); | ||
| 40 | - log.info("result is: {}", JSONUtil.toJsonStr(result)); | ||
| 41 | - Assert.assertSame("wechat", result.getChannel()); | ||
| 42 | - } | ||
| 43 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/test/java/cn/iocoder/yudao/framework/extension/package-info.java deleted
yudao-framework/yudao-spring-boot-starter-extension/src/test/java/cn/iocoder/yudao/framework/extension/pay/PayExtensionPoint.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.pay; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.extension.core.point.ExtensionPoint; | ||
| 4 | -import cn.iocoder.yudao.framework.extension.pay.command.TransactionsCommand; | ||
| 5 | -import cn.iocoder.yudao.framework.extension.pay.domain.TransactionsResult; | ||
| 6 | - | ||
| 7 | -/** | ||
| 8 | - * @description 支付操作接口 | ||
| 9 | - * @author Qingchen | ||
| 10 | - * @version 1.0.0 | ||
| 11 | - * @date 2021-08-30 10:35 | ||
| 12 | - * @class cn.iocoder.yudao.framework.extension.pay.PayExtensionPoint.java | ||
| 13 | - */ | ||
| 14 | -public interface PayExtensionPoint extends ExtensionPoint { | ||
| 15 | - | ||
| 16 | - /** | ||
| 17 | - * 统一下单：获取"预支付交易会话标识" | ||
| 18 | - * @param command | ||
| 19 | - * @return | ||
| 20 | - */ | ||
| 21 | - TransactionsResult unifiedOrder(TransactionsCommand command); | ||
| 22 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/test/java/cn/iocoder/yudao/framework/extension/pay/command/TransactionsCommand.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.pay.command; | ||
| 2 | - | ||
| 3 | -import lombok.AllArgsConstructor; | ||
| 4 | -import lombok.Data; | ||
| 5 | -import lombok.NoArgsConstructor; | ||
| 6 | - | ||
| 7 | -import java.io.Serializable; | ||
| 8 | -import java.math.BigDecimal; | ||
| 9 | - | ||
| 10 | -/** | ||
| 11 | - * @description 下单请求 | ||
| 12 | - * @author Qingchen | ||
| 13 | - * @version 1.0.0 | ||
| 14 | - * @date 2021-08-30 10:48 | ||
| 15 | - * @class cn.iocoder.yudao.framework.extension.pay.command.TransactionsCommand.java | ||
| 16 | - */ | ||
| 17 | -@Data | ||
| 18 | -@NoArgsConstructor | ||
| 19 | -@AllArgsConstructor | ||
| 20 | -public class TransactionsCommand implements Serializable { | ||
| 21 | - /** | ||
| 22 | - * 订单编号 | ||
| 23 | - */ | ||
| 24 | - private String orderNo; | ||
| 25 | - | ||
| 26 | - /** | ||
| 27 | - * 支付金额 | ||
| 28 | - */ | ||
| 29 | - private BigDecimal amount; | ||
| 30 | - | ||
| 31 | - /** | ||
| 32 | - * 商品描述 | ||
| 33 | - */ | ||
| 34 | - private String productDescription; | ||
| 35 | - | ||
| 36 | - /** | ||
| 37 | - * 通知地址 | ||
| 38 | - */ | ||
| 39 | - private String notifyUrl; | ||
| 40 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/test/java/cn/iocoder/yudao/framework/extension/pay/domain/TransactionsResult.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.pay.domain; | ||
| 2 | - | ||
| 3 | -import lombok.*; | ||
| 4 | - | ||
| 5 | -import java.io.Serializable; | ||
| 6 | - | ||
| 7 | -/** | ||
| 8 | - * @description 下单: 预支付交易单返回结果 | ||
| 9 | - * @author Qingchen | ||
| 10 | - * @version 1.0.0 | ||
| 11 | - * @date 2021-08-30 10:43 | ||
| 12 | - * @class cn.iocoder.yudao.framework.extension.pay.domain.TransactionsResult.java | ||
| 13 | - */ | ||
| 14 | -@Data | ||
| 15 | -@AllArgsConstructor | ||
| 16 | -public class TransactionsResult implements Serializable { | ||
| 17 | - | ||
| 18 | - /** | ||
| 19 | - * 预支付交易会话标识 | ||
| 20 | - */ | ||
| 21 | - private String prepayId; | ||
| 22 | - | ||
| 23 | - /** | ||
| 24 | - * 订单编号 | ||
| 25 | - */ | ||
| 26 | - private String orderNo; | ||
| 27 | - | ||
| 28 | - /** | ||
| 29 | - * 系统内部支付单号 | ||
| 30 | - */ | ||
| 31 | - private String paymentNo; | ||
| 32 | - | ||
| 33 | - /** | ||
| 34 | - * 支付渠道：微信 or 支付宝 | ||
| 35 | - */ | ||
| 36 | - private String channel; | ||
| 37 | - | ||
| 38 | - | ||
| 39 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/test/java/cn/iocoder/yudao/framework/extension/pay/impl/AlipayService.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.pay.impl; | ||
| 2 | - | ||
| 3 | -import cn.hutool.core.util.IdUtil; | ||
| 4 | -import cn.hutool.json.JSONUtil; | ||
| 5 | -import cn.iocoder.yudao.framework.extension.core.stereotype.Extension; | ||
| 6 | -import cn.iocoder.yudao.framework.extension.pay.PayExtensionPoint; | ||
| 7 | -import cn.iocoder.yudao.framework.extension.pay.command.TransactionsCommand; | ||
| 8 | -import cn.iocoder.yudao.framework.extension.pay.domain.TransactionsResult; | ||
| 9 | -import lombok.extern.slf4j.Slf4j; | ||
| 10 | - | ||
| 11 | -/** | ||
| 12 | - * @description 微信 JSAPI 支付 | ||
| 13 | - * @author Qingchen | ||
| 14 | - * @version 1.0.0 | ||
| 15 | - * @date 2021-08-30 10:38 | ||
| 16 | - * @class cn.iocoder.yudao.framework.extension.pay.impl.AlipayService.java | ||
| 17 | - */ | ||
| 18 | -@Extension(businessId = "pay", useCase = "jsapi", scenario = "alipay") | ||
| 19 | -@Slf4j | ||
| 20 | -public class AlipayService implements PayExtensionPoint { | ||
| 21 | - @Override | ||
| 22 | - public TransactionsResult unifiedOrder(TransactionsCommand command) { | ||
| 23 | - log.info("微信 JSAPI 支付：{}", JSONUtil.toJsonStr(command)); | ||
| 24 | - return new TransactionsResult("alipay26112221580621e9b071c00d9e093b0000", command.getOrderNo(), IdUtil.objectId(), "alipay"); | ||
| 25 | - } | ||
| 26 | -} |
yudao-framework/yudao-spring-boot-starter-extension/src/test/java/cn/iocoder/yudao/framework/extension/pay/impl/WechatPayService.java deleted
| 1 | -package cn.iocoder.yudao.framework.extension.pay.impl; | ||
| 2 | - | ||
| 3 | -import cn.hutool.core.util.IdUtil; | ||
| 4 | -import cn.hutool.json.JSONUtil; | ||
| 5 | -import cn.iocoder.yudao.framework.extension.core.stereotype.Extension; | ||
| 6 | -import cn.iocoder.yudao.framework.extension.pay.PayExtensionPoint; | ||
| 7 | -import cn.iocoder.yudao.framework.extension.pay.command.TransactionsCommand; | ||
| 8 | -import cn.iocoder.yudao.framework.extension.pay.domain.TransactionsResult; | ||
| 9 | -import lombok.extern.slf4j.Slf4j; | ||
| 10 | - | ||
| 11 | -/** | ||
| 12 | - * @description 微信 JSAPI 支付 | ||
| 13 | - * @author Qingchen | ||
| 14 | - * @version 1.0.0 | ||
| 15 | - * @date 2021-08-30 10:37 | ||
| 16 | - * @class cn.iocoder.yudao.framework.extension.pay.impl.WechatPayService.java | ||
| 17 | - */ | ||
| 18 | -@Extension(businessId = "pay", useCase = "jsapi", scenario = "wechat") | ||
| 19 | -@Slf4j | ||
| 20 | -public class WechatPayService implements PayExtensionPoint { | ||
| 21 | - @Override | ||
| 22 | - public TransactionsResult unifiedOrder(TransactionsCommand command) { | ||
| 23 | - log.info("微信 JSAPI 支付：{}", JSONUtil.toJsonStr(command)); | ||
| 24 | - return new TransactionsResult("wx26112221580621e9b071c00d9e093b0000", command.getOrderNo(), IdUtil.objectId(), "wechat"); | ||
| 25 | - } | ||
| 26 | -} |
yudao-framework/yudao-spring-boot-starter-extension/《芋道 Spring Boot 扩展点组件》.md deleted
| 1 | -### 作用 | ||
| 2 | - | ||
| 3 | - 为了解决同一个流程不同业务有不同处理逻辑而产生，减少代码中 if else 逻辑，降低代码的耦合性，通过统一的扩展形式来支撑业务的变化。 | ||
| 4 | - | ||
| 5 | -### 原理 | ||
| 6 | - | ||
| 7 | - https://blog.csdn.net/significantfrank/article/details/100074716 | ||
| 8 | - | ||
| 9 | - | ||
| 10 | - | ||
| 11 | -### 使用介绍 | ||
| 12 | - | ||
| 13 | -参考测试代码 `cn.iocoder.yudao.framework.extension.ExtensionTest` | ||
| 14 | - | ||
| 15 | - | ||
| 16 | - | ||
| 17 | - | ||
| 18 | - | ||
| 19 | - |
yudao-framework/yudao-spring-boot-starter-monitor/pom.xml
| @@ -58,6 +58,12 @@ | @@ -58,6 +58,12 @@ | ||
| 58 | <artifactId>apm-toolkit-opentracing</artifactId> | 58 | <artifactId>apm-toolkit-opentracing</artifactId> |
| 59 | </dependency> | 59 | </dependency> |
| 60 | 60 | ||
| 61 | + <!-- Micrometer 对 Prometheus 的支持 --> | ||
| 62 | + <dependency> | ||
| 63 | + <groupId>io.micrometer</groupId> | ||
| 64 | + <artifactId>micrometer-registry-prometheus</artifactId> | ||
| 65 | + </dependency> | ||
| 66 | + | ||
| 61 | <dependency> | 67 | <dependency> |
| 62 | <groupId>de.codecentric</groupId> | 68 | <groupId>de.codecentric</groupId> |
| 63 | <artifactId>spring-boot-admin-starter-client</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 --> | 69 | <artifactId>spring-boot-admin-starter-client</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 --> |
yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoMetricsAutoConfiguration.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework.tracer.config; | ||
| 2 | + | ||
| 3 | +import io.micrometer.core.instrument.MeterRegistry; | ||
| 4 | +import org.springframework.beans.factory.annotation.Value; | ||
| 5 | +import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer; | ||
| 6 | +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; | ||
| 7 | +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | ||
| 8 | +import org.springframework.context.annotation.Bean; | ||
| 9 | +import org.springframework.context.annotation.Configuration; | ||
| 10 | + | ||
| 11 | +/** | ||
| 12 | + * Metrics 配置类 | ||
| 13 | + * | ||
| 14 | + * @author 芋道源码 | ||
| 15 | + */ | ||
| 16 | +@Configuration | ||
| 17 | +@ConditionalOnClass({MeterRegistryCustomizer.class}) | ||
| 18 | +@ConditionalOnProperty(prefix = "yudao.metrics", value = "enable", matchIfMissing = true) // 允许使用 yudao.metrics.enable=false 禁用 Metrics | ||
| 19 | +public class YudaoMetricsAutoConfiguration { | ||
| 20 | + | ||
| 21 | + @Bean | ||
| 22 | + public MeterRegistryCustomizer<MeterRegistry> metricsCommonTags( | ||
| 23 | + @Value("${spring.application.name}") String applicationName) { | ||
| 24 | + return registry -> registry.config().commonTags("application", applicationName); | ||
| 25 | + } | ||
| 26 | + | ||
| 27 | +} |
yudao-framework/yudao-spring-boot-starter-monitor/src/main/resources/META-INF/spring.factories
| 1 | org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ | 1 | org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ |
| 2 | - cn.iocoder.yudao.framework.tracer.config.YudaoTracerAutoConfiguration | 2 | + cn.iocoder.yudao.framework.tracer.config.YudaoTracerAutoConfiguration,\ |
| 3 | + cn.iocoder.yudao.framework.tracer.config.YudaoMetricsAutoConfiguration |
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/SecurityProperties.java
| @@ -16,18 +16,18 @@ public class SecurityProperties { | @@ -16,18 +16,18 @@ public class SecurityProperties { | ||
| 16 | * HTTP 请求时，访问令牌的请求 Header | 16 | * HTTP 请求时，访问令牌的请求 Header |
| 17 | */ | 17 | */ |
| 18 | @NotEmpty(message = "Token Header 不能为空") | 18 | @NotEmpty(message = "Token Header 不能为空") |
| 19 | - private String tokenHeader; | 19 | + private String tokenHeader = "Authorization"; |
| 20 | 20 | ||
| 21 | /** | 21 | /** |
| 22 | * mock 模式的开关 | 22 | * mock 模式的开关 |
| 23 | */ | 23 | */ |
| 24 | @NotNull(message = "mock 模式的开关不能为空") | 24 | @NotNull(message = "mock 模式的开关不能为空") |
| 25 | - private Boolean mockEnable; | 25 | + private Boolean mockEnable = false; |
| 26 | /** | 26 | /** |
| 27 | * mock 模式的密钥 | 27 | * mock 模式的密钥 |
| 28 | * 一定要配置密钥，保证安全性 | 28 | * 一定要配置密钥，保证安全性 |
| 29 | */ | 29 | */ |
| 30 | @NotEmpty(message = "mock 模式的密钥不能为空") // 这里设置了一个默认值，因为实际上只有 mockEnable 为 true 时才需要配置。 | 30 | @NotEmpty(message = "mock 模式的密钥不能为空") // 这里设置了一个默认值，因为实际上只有 mockEnable 为 true 时才需要配置。 |
| 31 | - private String mockSecret = "yudaoyuanma"; | 31 | + private String mockSecret = "test"; |
| 32 | 32 | ||
| 33 | } | 33 | } |
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
| @@ -8,7 +8,7 @@ import cn.iocoder.yudao.framework.security.core.handler.AuthenticationEntryPoint | @@ -8,7 +8,7 @@ import cn.iocoder.yudao.framework.security.core.handler.AuthenticationEntryPoint | ||
| 8 | import cn.iocoder.yudao.framework.security.core.service.SecurityFrameworkService; | 8 | import cn.iocoder.yudao.framework.security.core.service.SecurityFrameworkService; |
| 9 | import cn.iocoder.yudao.framework.security.core.service.SecurityFrameworkServiceImpl; | 9 | import cn.iocoder.yudao.framework.security.core.service.SecurityFrameworkServiceImpl; |
| 10 | import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler; | 10 | import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler; |
| 11 | -import cn.iocoder.yudao.module.system.api.auth.OAuth2TokenApi; | 11 | +import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi; |
| 12 | import cn.iocoder.yudao.module.system.api.permission.PermissionApi; | 12 | import cn.iocoder.yudao.module.system.api.permission.PermissionApi; |
| 13 | import org.springframework.beans.factory.config.MethodInvokingFactoryBean; | 13 | import org.springframework.beans.factory.config.MethodInvokingFactoryBean; |
| 14 | import org.springframework.boot.context.properties.EnableConfigurationProperties; | 14 | import org.springframework.boot.context.properties.EnableConfigurationProperties; |
| @@ -81,7 +81,7 @@ public class YudaoSecurityAutoConfiguration { | @@ -81,7 +81,7 @@ public class YudaoSecurityAutoConfiguration { | ||
| 81 | return new TokenAuthenticationFilter(securityProperties, globalExceptionHandler, oauth2TokenApi); | 81 | return new TokenAuthenticationFilter(securityProperties, globalExceptionHandler, oauth2TokenApi); |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | - @Bean("ss") // 使用 Spring Security 的缩写，方便食用 | 84 | + @Bean("ss") // 使用 Spring Security 的缩写，方便使用 |
| 85 | public SecurityFrameworkService securityFrameworkService(PermissionApi permissionApi) { | 85 | public SecurityFrameworkService securityFrameworkService(PermissionApi permissionApi) { |
| 86 | return new SecurityFrameworkServiceImpl(permissionApi); | 86 | return new SecurityFrameworkServiceImpl(permissionApi); |
| 87 | } | 87 | } |
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/TokenAuthenticationFilter.java
| @@ -10,8 +10,8 @@ import cn.iocoder.yudao.framework.security.core.LoginUser; | @@ -10,8 +10,8 @@ import cn.iocoder.yudao.framework.security.core.LoginUser; | ||
| 10 | import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; | 10 | import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; |
| 11 | import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler; | 11 | import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler; |
| 12 | import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; | 12 | import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; |
| 13 | -import cn.iocoder.yudao.module.system.api.auth.OAuth2TokenApi; | ||
| 14 | -import cn.iocoder.yudao.module.system.api.auth.dto.OAuth2AccessTokenCheckRespDTO; | 13 | +import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi; |
| 14 | +import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; | ||
| 15 | import lombok.RequiredArgsConstructor; | 15 | import lombok.RequiredArgsConstructor; |
| 16 | import org.springframework.security.access.AccessDeniedException; | 16 | import org.springframework.security.access.AccessDeniedException; |
| 17 | import org.springframework.web.filter.OncePerRequestFilter; | 17 | import org.springframework.web.filter.OncePerRequestFilter; |
yudao-framework/yudao-spring-boot-starter-web/pom.xml
| @@ -53,6 +53,13 @@ | @@ -53,6 +53,13 @@ | ||
| 53 | <scope>provided</scope> <!-- 设置为 provided，主要是 GlobalExceptionHandler 使用 --> | 53 | <scope>provided</scope> <!-- 设置为 provided，主要是 GlobalExceptionHandler 使用 --> |
| 54 | </dependency> | 54 | </dependency> |
| 55 | 55 | ||
| 56 | + <!-- 业务组件 --> | ||
| 57 | + <dependency> | ||
| 58 | + <groupId>cn.iocoder.boot</groupId> | ||
| 59 | + <artifactId>yudao-module-infra-api</artifactId> <!-- 需要使用它，进行操作日志的记录 --> | ||
| 60 | + <version>${revision}</version> | ||
| 61 | + </dependency> | ||
| 62 | + | ||
| 56 | <!-- 服务保障相关 --> | 63 | <!-- 服务保障相关 --> |
| 57 | <dependency> | 64 | <dependency> |
| 58 | <groupId>io.github.resilience4j</groupId> | 65 | <groupId>io.github.resilience4j</groupId> |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
| @@ -2,11 +2,17 @@ package cn.iocoder.yudao.framework.apilog.config; | @@ -2,11 +2,17 @@ package cn.iocoder.yudao.framework.apilog.config; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.apilog.core.filter.ApiAccessLogFilter; | 3 | import cn.iocoder.yudao.framework.apilog.core.filter.ApiAccessLogFilter; |
| 4 | import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService; | 4 | import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService; |
| 5 | +import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkServiceImpl; | ||
| 6 | +import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService; | ||
| 7 | +import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkServiceImpl; | ||
| 8 | +import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; | ||
| 5 | import cn.iocoder.yudao.framework.web.config.WebProperties; | 9 | import cn.iocoder.yudao.framework.web.config.WebProperties; |
| 6 | import cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration; | 10 | import cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration; |
| 7 | -import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum; | 11 | +import cn.iocoder.yudao.module.infra.api.logger.ApiAccessLogApi; |
| 12 | +import cn.iocoder.yudao.module.infra.api.logger.ApiErrorLogApi; | ||
| 8 | import org.springframework.beans.factory.annotation.Value; | 13 | import org.springframework.beans.factory.annotation.Value; |
| 9 | import org.springframework.boot.autoconfigure.AutoConfigureAfter; | 14 | import org.springframework.boot.autoconfigure.AutoConfigureAfter; |
| 15 | +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | ||
| 10 | import org.springframework.boot.web.servlet.FilterRegistrationBean; | 16 | import org.springframework.boot.web.servlet.FilterRegistrationBean; |
| 11 | import org.springframework.context.annotation.Bean; | 17 | import org.springframework.context.annotation.Bean; |
| 12 | import org.springframework.context.annotation.Configuration; | 18 | import org.springframework.context.annotation.Configuration; |
| @@ -17,10 +23,21 @@ import javax.servlet.Filter; | @@ -17,10 +23,21 @@ import javax.servlet.Filter; | ||
| 17 | @AutoConfigureAfter(YudaoWebAutoConfiguration.class) | 23 | @AutoConfigureAfter(YudaoWebAutoConfiguration.class) |
| 18 | public class YudaoApiLogAutoConfiguration { | 24 | public class YudaoApiLogAutoConfiguration { |
| 19 | 25 | ||
| 26 | + @Bean | ||
| 27 | + public ApiAccessLogFrameworkService apiAccessLogFrameworkService(ApiAccessLogApi apiAccessLogApi) { | ||
| 28 | + return new ApiAccessLogFrameworkServiceImpl(apiAccessLogApi); | ||
| 29 | + } | ||
| 30 | + | ||
| 31 | + @Bean | ||
| 32 | + public ApiErrorLogFrameworkService apiErrorLogFrameworkService(ApiErrorLogApi apiErrorLogApi) { | ||
| 33 | + return new ApiErrorLogFrameworkServiceImpl(apiErrorLogApi); | ||
| 34 | + } | ||
| 35 | + | ||
| 20 | /** | 36 | /** |
| 21 | * 创建 ApiAccessLogFilter Bean，记录 API 请求日志 | 37 | * 创建 ApiAccessLogFilter Bean，记录 API 请求日志 |
| 22 | */ | 38 | */ |
| 23 | @Bean | 39 | @Bean |
| 40 | + @ConditionalOnProperty(prefix = "yudao.access-log", value = "enable", matchIfMissing = true) // 允许使用 yudao.access-log.enable=false 禁用访问日志 | ||
| 24 | public FilterRegistrationBean<ApiAccessLogFilter> apiAccessLogFilter(WebProperties webProperties, | 41 | public FilterRegistrationBean<ApiAccessLogFilter> apiAccessLogFilter(WebProperties webProperties, |
| 25 | @Value("${spring.application.name}") String applicationName, | 42 | @Value("${spring.application.name}") String applicationName, |
| 26 | ApiAccessLogFrameworkService apiAccessLogFrameworkService) { | 43 | ApiAccessLogFrameworkService apiAccessLogFrameworkService) { |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/filter/ApiAccessLogFilter.java
| @@ -3,8 +3,8 @@ package cn.iocoder.yudao.framework.apilog.core.filter; | @@ -3,8 +3,8 @@ package cn.iocoder.yudao.framework.apilog.core.filter; | ||
| 3 | import cn.hutool.core.exceptions.ExceptionUtil; | 3 | import cn.hutool.core.exceptions.ExceptionUtil; |
| 4 | import cn.hutool.core.map.MapUtil; | 4 | import cn.hutool.core.map.MapUtil; |
| 5 | import cn.hutool.extra.servlet.ServletUtil; | 5 | import cn.hutool.extra.servlet.ServletUtil; |
| 6 | +import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLog; | ||
| 6 | import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService; | 7 | import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService; |
| 7 | -import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateReqDTO; | ||
| 8 | import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; | 8 | import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; |
| 9 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 9 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 10 | import cn.iocoder.yudao.framework.common.util.date.DateUtils; | 10 | import cn.iocoder.yudao.framework.common.util.date.DateUtils; |
| @@ -66,16 +66,16 @@ public class ApiAccessLogFilter extends ApiRequestFilter { | @@ -66,16 +66,16 @@ public class ApiAccessLogFilter extends ApiRequestFilter { | ||
| 66 | 66 | ||
| 67 | private void createApiAccessLog(HttpServletRequest request, Date beginTime, | 67 | private void createApiAccessLog(HttpServletRequest request, Date beginTime, |
| 68 | Map<String, String> queryString, String requestBody, Exception ex) { | 68 | Map<String, String> queryString, String requestBody, Exception ex) { |
| 69 | - ApiAccessLogCreateReqDTO accessLog = new ApiAccessLogCreateReqDTO(); | 69 | + ApiAccessLog accessLog = new ApiAccessLog(); |
| 70 | try { | 70 | try { |
| 71 | this.buildApiAccessLogDTO(accessLog, request, beginTime, queryString, requestBody, ex); | 71 | this.buildApiAccessLogDTO(accessLog, request, beginTime, queryString, requestBody, ex); |
| 72 | - apiAccessLogFrameworkService.createApiAccessLogAsync(accessLog); | 72 | + apiAccessLogFrameworkService.createApiAccessLog(accessLog); |
| 73 | } catch (Throwable th) { | 73 | } catch (Throwable th) { |
| 74 | log.error("[createApiAccessLog][url({}) log({}) 发生异常]", request.getRequestURI(), toJsonString(accessLog), th); | 74 | log.error("[createApiAccessLog][url({}) log({}) 发生异常]", request.getRequestURI(), toJsonString(accessLog), th); |
| 75 | } | 75 | } |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | - private void buildApiAccessLogDTO(ApiAccessLogCreateReqDTO accessLog, HttpServletRequest request, Date beginTime, | 78 | + private void buildApiAccessLogDTO(ApiAccessLog accessLog, HttpServletRequest request, Date beginTime, |
| 79 | Map<String, String> queryString, String requestBody, Exception ex) { | 79 | Map<String, String> queryString, String requestBody, Exception ex) { |
| 80 | // 处理用户信息 | 80 | // 处理用户信息 |
| 81 | accessLog.setUserId(WebFrameworkUtils.getLoginUserId(request)); | 81 | accessLog.setUserId(WebFrameworkUtils.getLoginUserId(request)); |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLog.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework.apilog.core.service; | ||
| 2 | + | ||
| 3 | +import lombok.Data; | ||
| 4 | + | ||
| 5 | +import javax.validation.constraints.NotNull; | ||
| 6 | +import java.util.Date; | ||
| 7 | + | ||
| 8 | +/** | ||
| 9 | + * API 访问日志 | ||
| 10 | + * | ||
| 11 | + * @author 芋道源码 | ||
| 12 | + */ | ||
| 13 | +@Data | ||
| 14 | +public class ApiAccessLog { | ||
| 15 | + | ||
| 16 | + /** | ||
| 17 | + * 链路追踪编号 | ||
| 18 | + */ | ||
| 19 | + private String traceId; | ||
| 20 | + /** | ||
| 21 | + * 用户编号 | ||
| 22 | + */ | ||
| 23 | + private Long userId; | ||
| 24 | + /** | ||
| 25 | + * 用户类型 | ||
| 26 | + */ | ||
| 27 | + private Integer userType; | ||
| 28 | + /** | ||
| 29 | + * 应用名 | ||
| 30 | + */ | ||
| 31 | + @NotNull(message = "应用名不能为空") | ||
| 32 | + private String applicationName; | ||
| 33 | + | ||
| 34 | + /** | ||
| 35 | + * 请求方法名 | ||
| 36 | + */ | ||
| 37 | + @NotNull(message = "http 请求方法不能为空") | ||
| 38 | + private String requestMethod; | ||
| 39 | + /** | ||
| 40 | + * 访问地址 | ||
| 41 | + */ | ||
| 42 | + @NotNull(message = "访问地址不能为空") | ||
| 43 | + private String requestUrl; | ||
| 44 | + /** | ||
| 45 | + * 请求参数 | ||
| 46 | + */ | ||
| 47 | + @NotNull(message = "请求参数不能为空") | ||
| 48 | + private String requestParams; | ||
| 49 | + /** | ||
| 50 | + * 用户 IP | ||
| 51 | + */ | ||
| 52 | + @NotNull(message = "ip 不能为空") | ||
| 53 | + private String userIp; | ||
| 54 | + /** | ||
| 55 | + * 浏览器 UA | ||
| 56 | + */ | ||
| 57 | + @NotNull(message = "User-Agent 不能为空") | ||
| 58 | + private String userAgent; | ||
| 59 | + | ||
| 60 | + /** | ||
| 61 | + * 开始请求时间 | ||
| 62 | + */ | ||
| 63 | + @NotNull(message = "开始请求时间不能为空") | ||
| 64 | + private Date beginTime; | ||
| 65 | + /** | ||
| 66 | + * 结束请求时间 | ||
| 67 | + */ | ||
| 68 | + @NotNull(message = "结束请求时间不能为空") | ||
| 69 | + private Date endTime; | ||
| 70 | + /** | ||
| 71 | + * 执行时长，单位：毫秒 | ||
| 72 | + */ | ||
| 73 | + @NotNull(message = "执行时长不能为空") | ||
| 74 | + private Integer duration; | ||
| 75 | + /** | ||
| 76 | + * 结果码 | ||
| 77 | + */ | ||
| 78 | + @NotNull(message = "错误码不能为空") | ||
| 79 | + private Integer resultCode; | ||
| 80 | + /** | ||
| 81 | + * 结果提示 | ||
| 82 | + */ | ||
| 83 | + private String resultMsg; | ||
| 84 | + | ||
| 85 | +} |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLogFrameworkService.java
| 1 | package cn.iocoder.yudao.framework.apilog.core.service; | 1 | package cn.iocoder.yudao.framework.apilog.core.service; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateReqDTO; | ||
| 4 | - | ||
| 5 | -import javax.validation.Valid; | ||
| 6 | - | ||
| 7 | /** | 3 | /** |
| 8 | * API 访问日志 Framework Service 接口 | 4 | * API 访问日志 Framework Service 接口 |
| 9 | * | 5 | * |
| @@ -14,8 +10,8 @@ public interface ApiAccessLogFrameworkService { | @@ -14,8 +10,8 @@ public interface ApiAccessLogFrameworkService { | ||
| 14 | /** | 10 | /** |
| 15 | * 创建 API 访问日志 | 11 | * 创建 API 访问日志 |
| 16 | * | 12 | * |
| 17 | - * @param createDTO 创建信息 | 13 | + * @param apiAccessLog API 访问日志 |
| 18 | */ | 14 | */ |
| 19 | - void createApiAccessLogAsync(@Valid ApiAccessLogCreateReqDTO createDTO); | 15 | + void createApiAccessLog(ApiAccessLog apiAccessLog); |
| 20 | 16 | ||
| 21 | } | 17 | } |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiAccessLogFrameworkServiceImpl.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework.apilog.core.service; | ||
| 2 | + | ||
| 3 | +import cn.hutool.core.bean.BeanUtil; | ||
| 4 | +import cn.iocoder.yudao.module.infra.api.logger.ApiAccessLogApi; | ||
| 5 | +import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; | ||
| 6 | +import lombok.RequiredArgsConstructor; | ||
| 7 | +import org.springframework.scheduling.annotation.Async; | ||
| 8 | + | ||
| 9 | +/** | ||
| 10 | + * API 访问日志 Framework Service 实现类 | ||
| 11 | + * | ||
| 12 | + * 基于 {@link ApiAccessLogApi} 服务，记录访问日志 | ||
| 13 | + * | ||
| 14 | + * @author 芋道源码 | ||
| 15 | + */ | ||
| 16 | +@RequiredArgsConstructor | ||
| 17 | +public class ApiAccessLogFrameworkServiceImpl implements ApiAccessLogFrameworkService { | ||
| 18 | + | ||
| 19 | + private final ApiAccessLogApi apiAccessLogApi; | ||
| 20 | + | ||
| 21 | + @Override | ||
| 22 | + @Async | ||
| 23 | + public void createApiAccessLog(ApiAccessLog apiAccessLog) { | ||
| 24 | + ApiAccessLogCreateReqDTO reqDTO = BeanUtil.copyProperties(apiAccessLog, ApiAccessLogCreateReqDTO.class); | ||
| 25 | + apiAccessLogApi.createApiAccessLog(reqDTO); | ||
| 26 | + } | ||
| 27 | + | ||
| 28 | +} |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLog.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework.apilog.core.service; | ||
| 2 | + | ||
| 3 | +import lombok.Data; | ||
| 4 | + | ||
| 5 | +import javax.validation.constraints.NotNull; | ||
| 6 | +import java.util.Date; | ||
| 7 | + | ||
| 8 | +/** | ||
| 9 | + * API 错误日志 | ||
| 10 | + * | ||
| 11 | + * @author 芋道源码 | ||
| 12 | + */ | ||
| 13 | +@Data | ||
| 14 | +public class ApiErrorLog { | ||
| 15 | + | ||
| 16 | + /** | ||
| 17 | + * 链路编号 | ||
| 18 | + */ | ||
| 19 | + private String traceId; | ||
| 20 | + /** | ||
| 21 | + * 账号编号 | ||
| 22 | + */ | ||
| 23 | + private Long userId; | ||
| 24 | + /** | ||
| 25 | + * 用户类型 | ||
| 26 | + */ | ||
| 27 | + private Integer userType; | ||
| 28 | + /** | ||
| 29 | + * 应用名 | ||
| 30 | + */ | ||
| 31 | + @NotNull(message = "应用名不能为空") | ||
| 32 | + private String applicationName; | ||
| 33 | + | ||
| 34 | + /** | ||
| 35 | + * 请求方法名 | ||
| 36 | + */ | ||
| 37 | + @NotNull(message = "http 请求方法不能为空") | ||
| 38 | + private String requestMethod; | ||
| 39 | + /** | ||
| 40 | + * 访问地址 | ||
| 41 | + */ | ||
| 42 | + @NotNull(message = "访问地址不能为空") | ||
| 43 | + private String requestUrl; | ||
| 44 | + /** | ||
| 45 | + * 请求参数 | ||
| 46 | + */ | ||
| 47 | + @NotNull(message = "请求参数不能为空") | ||
| 48 | + private String requestParams; | ||
| 49 | + /** | ||
| 50 | + * 用户 IP | ||
| 51 | + */ | ||
| 52 | + @NotNull(message = "ip 不能为空") | ||
| 53 | + private String userIp; | ||
| 54 | + /** | ||
| 55 | + * 浏览器 UA | ||
| 56 | + */ | ||
| 57 | + @NotNull(message = "User-Agent 不能为空") | ||
| 58 | + private String userAgent; | ||
| 59 | + | ||
| 60 | + /** | ||
| 61 | + * 异常时间 | ||
| 62 | + */ | ||
| 63 | + @NotNull(message = "异常时间不能为空") | ||
| 64 | + private Date exceptionTime; | ||
| 65 | + /** | ||
| 66 | + * 异常名 | ||
| 67 | + */ | ||
| 68 | + @NotNull(message = "异常名不能为空") | ||
| 69 | + private String exceptionName; | ||
| 70 | + /** | ||
| 71 | + * 异常发生的类全名 | ||
| 72 | + */ | ||
| 73 | + @NotNull(message = "异常发生的类全名不能为空") | ||
| 74 | + private String exceptionClassName; | ||
| 75 | + /** | ||
| 76 | + * 异常发生的类文件 | ||
| 77 | + */ | ||
| 78 | + @NotNull(message = "异常发生的类文件不能为空") | ||
| 79 | + private String exceptionFileName; | ||
| 80 | + /** | ||
| 81 | + * 异常发生的方法名 | ||
| 82 | + */ | ||
| 83 | + @NotNull(message = "异常发生的方法名不能为空") | ||
| 84 | + private String exceptionMethodName; | ||
| 85 | + /** | ||
| 86 | + * 异常发生的方法所在行 | ||
| 87 | + */ | ||
| 88 | + @NotNull(message = "异常发生的方法所在行不能为空") | ||
| 89 | + private Integer exceptionLineNumber; | ||
| 90 | + /** | ||
| 91 | + * 异常的栈轨迹异常的栈轨迹 | ||
| 92 | + */ | ||
| 93 | + @NotNull(message = "异常的栈轨迹不能为空") | ||
| 94 | + private String exceptionStackTrace; | ||
| 95 | + /** | ||
| 96 | + * 异常导致的根消息 | ||
| 97 | + */ | ||
| 98 | + @NotNull(message = "异常导致的根消息不能为空") | ||
| 99 | + private String exceptionRootCauseMessage; | ||
| 100 | + /** | ||
| 101 | + * 异常导致的消息 | ||
| 102 | + */ | ||
| 103 | + @NotNull(message = "异常导致的消息不能为空") | ||
| 104 | + private String exceptionMessage; | ||
| 105 | + | ||
| 106 | + | ||
| 107 | +} |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLogFrameworkService.java
| 1 | package cn.iocoder.yudao.framework.apilog.core.service; | 1 | package cn.iocoder.yudao.framework.apilog.core.service; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateReqDTO; | ||
| 4 | - | ||
| 5 | -import javax.validation.Valid; | ||
| 6 | - | ||
| 7 | /** | 3 | /** |
| 8 | * API 错误日志 Framework Service 接口 | 4 | * API 错误日志 Framework Service 接口 |
| 9 | * | 5 | * |
| @@ -14,8 +10,8 @@ public interface ApiErrorLogFrameworkService { | @@ -14,8 +10,8 @@ public interface ApiErrorLogFrameworkService { | ||
| 14 | /** | 10 | /** |
| 15 | * 创建 API 错误日志 | 11 | * 创建 API 错误日志 |
| 16 | * | 12 | * |
| 17 | - * @param createDTO 创建信息 | 13 | + * @param apiErrorLog API 错误日志 |
| 18 | */ | 14 | */ |
| 19 | - void createApiErrorLogAsync(@Valid ApiErrorLogCreateReqDTO createDTO); | 15 | + void createApiErrorLog(ApiErrorLog apiErrorLog); |
| 20 | 16 | ||
| 21 | } | 17 | } |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/ApiErrorLogFrameworkServiceImpl.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework.apilog.core.service; | ||
| 2 | + | ||
| 3 | +import cn.hutool.core.bean.BeanUtil; | ||
| 4 | +import cn.iocoder.yudao.module.infra.api.logger.ApiErrorLogApi; | ||
| 5 | +import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; | ||
| 6 | +import lombok.RequiredArgsConstructor; | ||
| 7 | +import org.springframework.scheduling.annotation.Async; | ||
| 8 | + | ||
| 9 | +/** | ||
| 10 | + * API 错误日志 Framework Service 实现类 | ||
| 11 | + * | ||
| 12 | + * 基于 {@link ApiErrorLogApi} 服务，记录错误日志 | ||
| 13 | + * | ||
| 14 | + * @author 芋道源码 | ||
| 15 | + */ | ||
| 16 | +@RequiredArgsConstructor | ||
| 17 | +public class ApiErrorLogFrameworkServiceImpl implements ApiErrorLogFrameworkService { | ||
| 18 | + | ||
| 19 | + private final ApiErrorLogApi apiErrorLogApi; | ||
| 20 | + | ||
| 21 | + @Override | ||
| 22 | + @Async | ||
| 23 | + public void createApiErrorLog(ApiErrorLog apiErrorLog) { | ||
| 24 | + ApiErrorLogCreateReqDTO reqDTO = BeanUtil.copyProperties(apiErrorLog, ApiErrorLogCreateReqDTO.class); | ||
| 25 | + apiErrorLogApi.createApiErrorLog(reqDTO); | ||
| 26 | + } | ||
| 27 | + | ||
| 28 | +} |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
| 1 | package cn.iocoder.yudao.framework.swagger.config; | 1 | package cn.iocoder.yudao.framework.swagger.config; |
| 2 | 2 | ||
| 3 | +import cn.iocoder.yudao.framework.swagger.core.SpringFoxHandlerProviderBeanPostProcessor; | ||
| 3 | import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; | 4 | import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; |
| 4 | import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; | 5 | import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; |
| 5 | -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; | ||
| 6 | import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | 6 | import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; |
| 7 | import org.springframework.boot.context.properties.EnableConfigurationProperties; | 7 | import org.springframework.boot.context.properties.EnableConfigurationProperties; |
| 8 | import org.springframework.context.annotation.Bean; | 8 | import org.springframework.context.annotation.Bean; |
| @@ -21,6 +21,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; | @@ -21,6 +21,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; | ||
| 21 | import java.util.Collections; | 21 | import java.util.Collections; |
| 22 | import java.util.List; | 22 | import java.util.List; |
| 23 | 23 | ||
| 24 | +import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID; | ||
| 24 | import static springfox.documentation.builders.RequestHandlerSelectors.basePackage; | 25 | import static springfox.documentation.builders.RequestHandlerSelectors.basePackage; |
| 25 | 26 | ||
| 26 | /** | 27 | /** |
| @@ -38,27 +39,27 @@ import static springfox.documentation.builders.RequestHandlerSelectors.basePacka | @@ -38,27 +39,27 @@ import static springfox.documentation.builders.RequestHandlerSelectors.basePacka | ||
| 38 | public class YudaoSwaggerAutoConfiguration { | 39 | public class YudaoSwaggerAutoConfiguration { |
| 39 | 40 | ||
| 40 | @Bean | 41 | @Bean |
| 41 | - @ConditionalOnMissingBean | ||
| 42 | - public SwaggerProperties swaggerProperties() { | ||
| 43 | - return new SwaggerProperties(); | 42 | + public SpringFoxHandlerProviderBeanPostProcessor springFoxHandlerProviderBeanPostProcessor() { |
| 43 | + return new SpringFoxHandlerProviderBeanPostProcessor(); | ||
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | @Bean | 46 | @Bean |
| 47 | - public Docket createRestApi() { | ||
| 48 | - SwaggerProperties properties = swaggerProperties(); | 47 | + public Docket createRestApi(SwaggerProperties properties) { |
| 49 | // 创建 Docket 对象 | 48 | // 创建 Docket 对象 |
| 50 | return new Docket(DocumentationType.SWAGGER_2) | 49 | return new Docket(DocumentationType.SWAGGER_2) |
| 51 | - // 用来创建该 API 的基本信息，展示在文档的页面中（自定义展示的信息） | 50 | + // ① 用来创建该 API 的基本信息，展示在文档的页面中（自定义展示的信息） |
| 52 | .apiInfo(apiInfo(properties)) | 51 | .apiInfo(apiInfo(properties)) |
| 53 | - // 设置扫描指定 package 包下的 | 52 | + // ② 设置扫描指定 package 包下的 |
| 54 | .select() | 53 | .select() |
| 55 | .apis(basePackage(properties.getBasePackage())) | 54 | .apis(basePackage(properties.getBasePackage())) |
| 56 | -// .apis(basePackage("cn.iocoder.yudao.module.infra")) // 可用于 swagger 无法展示时使用 | 55 | +// .apis(basePackage("cn.iocoder.yudao.module.system")) // 可用于 swagger 无法展示时使用 |
| 57 | .paths(PathSelectors.any()) | 56 | .paths(PathSelectors.any()) |
| 58 | .build() | 57 | .build() |
| 58 | + // ③ 安全上下文（认证） | ||
| 59 | .securitySchemes(securitySchemes()) | 59 | .securitySchemes(securitySchemes()) |
| 60 | - .globalRequestParameters(globalRequestParameters()) | ||
| 61 | - .securityContexts(securityContexts()); | 60 | + .securityContexts(securityContexts()) |
| 61 | + // ④ 全局参数（多租户 header） | ||
| 62 | + .globalRequestParameters(globalRequestParameters()); | ||
| 62 | } | 63 | } |
| 63 | 64 | ||
| 64 | // ========== apiInfo ========== | 65 | // ========== apiInfo ========== |
| @@ -93,6 +94,7 @@ public class YudaoSwaggerAutoConfiguration { | @@ -93,6 +94,7 @@ public class YudaoSwaggerAutoConfiguration { | ||
| 93 | private static List<SecurityContext> securityContexts() { | 94 | private static List<SecurityContext> securityContexts() { |
| 94 | return Collections.singletonList(SecurityContext.builder() | 95 | return Collections.singletonList(SecurityContext.builder() |
| 95 | .securityReferences(securityReferences()) | 96 | .securityReferences(securityReferences()) |
| 97 | + // 通过 PathSelectors.regex("^(?!auth).*$")，排除包含 "auth" 的接口不需要使用securitySchemes | ||
| 96 | .forPaths(PathSelectors.regex("^(?!auth).*$")) | 98 | .forPaths(PathSelectors.regex("^(?!auth).*$")) |
| 97 | .build()); | 99 | .build()); |
| 98 | } | 100 | } |
| @@ -108,7 +110,8 @@ public class YudaoSwaggerAutoConfiguration { | @@ -108,7 +110,8 @@ public class YudaoSwaggerAutoConfiguration { | ||
| 108 | // ========== globalRequestParameters ========== | 110 | // ========== globalRequestParameters ========== |
| 109 | 111 | ||
| 110 | private static List<RequestParameter> globalRequestParameters() { | 112 | private static List<RequestParameter> globalRequestParameters() { |
| 111 | - RequestParameterBuilder tenantParameter = new RequestParameterBuilder().name("tenant-id").description("租户编号") | 113 | + RequestParameterBuilder tenantParameter = new RequestParameterBuilder() |
| 114 | + .name(HEADER_TENANT_ID).description("租户编号") | ||
| 112 | .in(ParameterType.HEADER).example(new ExampleBuilder().value(1L).build()); | 115 | .in(ParameterType.HEADER).example(new ExampleBuilder().value(1L).build()); |
| 113 | return Collections.singletonList(tenantParameter.build()); | 116 | return Collections.singletonList(tenantParameter.build()); |
| 114 | } | 117 | } |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java
0 → 100644
| 1 | +package cn.iocoder.yudao.framework.swagger.core; | ||
| 2 | + | ||
| 3 | +import cn.hutool.core.util.ReflectUtil; | ||
| 4 | +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; | ||
| 5 | +import org.springframework.beans.BeansException; | ||
| 6 | +import org.springframework.beans.factory.config.BeanPostProcessor; | ||
| 7 | +import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping; | ||
| 8 | +import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider; | ||
| 9 | +import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider; | ||
| 10 | + | ||
| 11 | +import java.util.List; | ||
| 12 | + | ||
| 13 | +/** | ||
| 14 | + * 解决 SpringFox 与 SpringBoot 2.6.x 不兼容的问题 | ||
| 15 | + * 该问题对应的 issue 为 https://github.com/springfox/springfox/issues/3462 | ||
| 16 | + * | ||
| 17 | + * @author 芋道源码 | ||
| 18 | + */ | ||
| 19 | +public class SpringFoxHandlerProviderBeanPostProcessor implements BeanPostProcessor { | ||
| 20 | + | ||
| 21 | + @Override | ||
| 22 | + public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { | ||
| 23 | + if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider) { | ||
| 24 | + customizeSpringfoxHandlerMappings(getHandlerMappings(bean)); | ||
| 25 | + } | ||
| 26 | + return bean; | ||
| 27 | + } | ||
| 28 | + | ||
| 29 | + private <T extends RequestMappingInfoHandlerMapping> void customizeSpringfoxHandlerMappings(List<T> mappings) { | ||
| 30 | + // 移除，只保留 patternParser | ||
| 31 | + List<T> copy = CollectionUtils.filterList(mappings, mapping -> mapping.getPatternParser() == null); | ||
| 32 | + // 添加到 mappings 中 | ||
| 33 | + mappings.clear(); | ||
| 34 | + mappings.addAll(copy); | ||
| 35 | + } | ||
| 36 | + | ||
| 37 | + @SuppressWarnings("unchecked") | ||
| 38 | + private List<RequestMappingInfoHandlerMapping> getHandlerMappings(Object bean) { | ||
| 39 | + return (List<RequestMappingInfoHandlerMapping>) | ||
| 40 | + ReflectUtil.getFieldValue(bean, "handlerMappings"); | ||
| 41 | + } | ||
| 42 | + | ||
| 43 | +} |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/WebProperties.java
| 1 | package cn.iocoder.yudao.framework.web.config; | 1 | package cn.iocoder.yudao.framework.web.config; |
| 2 | 2 | ||
| 3 | +import lombok.AllArgsConstructor; | ||
| 3 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | +import lombok.NoArgsConstructor; | ||
| 4 | import org.springframework.boot.context.properties.ConfigurationProperties; | 6 | import org.springframework.boot.context.properties.ConfigurationProperties; |
| 5 | import org.springframework.validation.annotation.Validated; | 7 | import org.springframework.validation.annotation.Validated; |
| 6 | import org.springframework.web.servlet.config.annotation.PathMatchConfigurer; | 8 | import org.springframework.web.servlet.config.annotation.PathMatchConfigurer; |
| @@ -15,14 +17,16 @@ import javax.validation.constraints.NotNull; | @@ -15,14 +17,16 @@ import javax.validation.constraints.NotNull; | ||
| 15 | public class WebProperties { | 17 | public class WebProperties { |
| 16 | 18 | ||
| 17 | @NotNull(message = "APP API 不能为空") | 19 | @NotNull(message = "APP API 不能为空") |
| 18 | - private Api appApi; | 20 | + private Api appApi = new Api("/app-api", "**.controller.app.**"); |
| 19 | @NotNull(message = "Admin API 不能为空") | 21 | @NotNull(message = "Admin API 不能为空") |
| 20 | - private Api adminApi; | 22 | + private Api adminApi = new Api("/admin-api", "**.controller.admin.**"); |
| 21 | 23 | ||
| 22 | @NotNull(message = "Admin UI 不能为空") | 24 | @NotNull(message = "Admin UI 不能为空") |
| 23 | private Ui adminUi; | 25 | private Ui adminUi; |
| 24 | 26 | ||
| 25 | @Data | 27 | @Data |
| 28 | + @AllArgsConstructor | ||
| 29 | + @NoArgsConstructor | ||
| 26 | @Valid | 30 | @Valid |
| 27 | public static class Api { | 31 | public static class Api { |
| 28 | 32 |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
| @@ -3,14 +3,14 @@ package cn.iocoder.yudao.framework.web.core.handler; | @@ -3,14 +3,14 @@ package cn.iocoder.yudao.framework.web.core.handler; | ||
| 3 | import cn.hutool.core.exceptions.ExceptionUtil; | 3 | import cn.hutool.core.exceptions.ExceptionUtil; |
| 4 | import cn.hutool.core.map.MapUtil; | 4 | import cn.hutool.core.map.MapUtil; |
| 5 | import cn.hutool.extra.servlet.ServletUtil; | 5 | import cn.hutool.extra.servlet.ServletUtil; |
| 6 | +import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLog; | ||
| 7 | +import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService; | ||
| 6 | import cn.iocoder.yudao.framework.common.exception.ServiceException; | 8 | import cn.iocoder.yudao.framework.common.exception.ServiceException; |
| 7 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 9 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 8 | -import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService; | ||
| 9 | -import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateReqDTO; | ||
| 10 | -import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils; | ||
| 11 | -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; | ||
| 12 | import cn.iocoder.yudao.framework.common.util.json.JsonUtils; | 10 | import cn.iocoder.yudao.framework.common.util.json.JsonUtils; |
| 11 | +import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils; | ||
| 13 | import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; | 12 | import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils; |
| 13 | +import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; | ||
| 14 | import io.github.resilience4j.ratelimiter.RequestNotPermitted; | 14 | import io.github.resilience4j.ratelimiter.RequestNotPermitted; |
| 15 | import lombok.AllArgsConstructor; | 15 | import lombok.AllArgsConstructor; |
| 16 | import lombok.extern.slf4j.Slf4j; | 16 | import lombok.extern.slf4j.Slf4j; |
| @@ -229,18 +229,18 @@ public class GlobalExceptionHandler { | @@ -229,18 +229,18 @@ public class GlobalExceptionHandler { | ||
| 229 | 229 | ||
| 230 | private void createExceptionLog(HttpServletRequest req, Throwable e) { | 230 | private void createExceptionLog(HttpServletRequest req, Throwable e) { |
| 231 | // 插入错误日志 | 231 | // 插入错误日志 |
| 232 | - ApiErrorLogCreateReqDTO errorLog = new ApiErrorLogCreateReqDTO(); | 232 | + ApiErrorLog errorLog = new ApiErrorLog(); |
| 233 | try { | 233 | try { |
| 234 | // 初始化 errorLog | 234 | // 初始化 errorLog |
| 235 | initExceptionLog(errorLog, req, e); | 235 | initExceptionLog(errorLog, req, e); |
| 236 | // 执行插入 errorLog | 236 | // 执行插入 errorLog |
| 237 | - apiErrorLogFrameworkService.createApiErrorLogAsync(errorLog); | 237 | + apiErrorLogFrameworkService.createApiErrorLog(errorLog); |
| 238 | } catch (Throwable th) { | 238 | } catch (Throwable th) { |
| 239 | log.error("[createExceptionLog][url({}) log({}) 发生异常]", req.getRequestURI(), JsonUtils.toJsonString(errorLog), th); | 239 | log.error("[createExceptionLog][url({}) log({}) 发生异常]", req.getRequestURI(), JsonUtils.toJsonString(errorLog), th); |
| 240 | } | 240 | } |
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | - private void initExceptionLog(ApiErrorLogCreateReqDTO errorLog, HttpServletRequest request, Throwable e) { | 243 | + private void initExceptionLog(ApiErrorLog errorLog, HttpServletRequest request, Throwable e) { |
| 244 | // 处理用户信息 | 244 | // 处理用户信息 |
| 245 | errorLog.setUserId(WebFrameworkUtils.getLoginUserId(request)); | 245 | errorLog.setUserId(WebFrameworkUtils.getLoginUserId(request)); |
| 246 | errorLog.setUserType(WebFrameworkUtils.getLoginUserType(request)); | 246 | errorLog.setUserType(WebFrameworkUtils.getLoginUserType(request)); |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/util/WebFrameworkUtils.java
| @@ -23,7 +23,7 @@ public class WebFrameworkUtils { | @@ -23,7 +23,7 @@ public class WebFrameworkUtils { | ||
| 23 | 23 | ||
| 24 | private static final String REQUEST_ATTRIBUTE_COMMON_RESULT = "common_result"; | 24 | private static final String REQUEST_ATTRIBUTE_COMMON_RESULT = "common_result"; |
| 25 | 25 | ||
| 26 | - private static final String HEADER_TENANT_ID = "tenant-id"; | 26 | + public static final String HEADER_TENANT_ID = "tenant-id"; |
| 27 | 27 | ||
| 28 | private static WebProperties properties; | 28 | private static WebProperties properties; |
| 29 | 29 |
yudao-module-infra/yudao-module-infra-api/pom.xml
| @@ -21,6 +21,13 @@ | @@ -21,6 +21,13 @@ | ||
| 21 | <groupId>cn.iocoder.boot</groupId> | 21 | <groupId>cn.iocoder.boot</groupId> |
| 22 | <artifactId>yudao-common</artifactId> | 22 | <artifactId>yudao-common</artifactId> |
| 23 | </dependency> | 23 | </dependency> |
| 24 | + | ||
| 25 | + <!-- 参数校验 --> | ||
| 26 | + <dependency> | ||
| 27 | + <groupId>org.springframework.boot</groupId> | ||
| 28 | + <artifactId>spring-boot-starter-validation</artifactId> | ||
| 29 | + <optional>true</optional> | ||
| 30 | + </dependency> | ||
| 24 | </dependencies> | 31 | </dependencies> |
| 25 | 32 | ||
| 26 | </project> | 33 | </project> |
yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApi.java
| 1 | package cn.iocoder.yudao.module.infra.api.file; | 1 | package cn.iocoder.yudao.module.infra.api.file; |
| 2 | 2 | ||
| 3 | -import cn.hutool.core.util.IdUtil; | ||
| 4 | - | ||
| 5 | /** | 3 | /** |
| 6 | * 文件 API 接口 | 4 | * 文件 API 接口 |
| 7 | * | 5 | * |
| @@ -15,17 +13,29 @@ public interface FileApi { | @@ -15,17 +13,29 @@ public interface FileApi { | ||
| 15 | * @param content 文件内容 | 13 | * @param content 文件内容 |
| 16 | * @return 文件路径 | 14 | * @return 文件路径 |
| 17 | */ | 15 | */ |
| 18 | - default String createFile(byte[] content) throws Exception { | ||
| 19 | - return createFile(IdUtil.fastUUID(), content); | ||
| 20 | - } | 16 | + default String createFile(byte[] content) { |
| 17 | + return createFile(null, null, content); | ||
| 18 | + } | ||
| 19 | + | ||
| 20 | + /** | ||
| 21 | + * 保存文件，并返回文件的访问路径 | ||
| 22 | + * | ||
| 23 | + * @param path 文件路径 | ||
| 24 | + * @param content 文件内容 | ||
| 25 | + * @return 文件路径 | ||
| 26 | + */ | ||
| 27 | + default String createFile(String path, byte[] content) { | ||
| 28 | + return createFile(null, path, content); | ||
| 29 | + } | ||
| 21 | 30 | ||
| 22 | /** | 31 | /** |
| 23 | * 保存文件，并返回文件的访问路径 | 32 | * 保存文件，并返回文件的访问路径 |
| 24 | * | 33 | * |
| 34 | + * @param name 文件名称 | ||
| 25 | * @param path 文件路径 | 35 | * @param path 文件路径 |
| 26 | * @param content 文件内容 | 36 | * @param content 文件内容 |
| 27 | * @return 文件路径 | 37 | * @return 文件路径 |
| 28 | */ | 38 | */ |
| 29 | - String createFile(String path, byte[] content) throws Exception; | 39 | + String createFile(String name, String path, byte[] content); |
| 30 | 40 | ||
| 31 | } | 41 | } |
yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApi.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.infra.api.logger; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; | ||
| 4 | + | ||
| 5 | +import javax.validation.Valid; | ||
| 6 | + | ||
| 7 | +/** | ||
| 8 | + * API 访问日志的 API 接口 | ||
| 9 | + * | ||
| 10 | + * @author 芋道源码 | ||
| 11 | + */ | ||
| 12 | +public interface ApiAccessLogApi { | ||
| 13 | + | ||
| 14 | + /** | ||
| 15 | + * 创建 API 访问日志 | ||
| 16 | + * | ||
| 17 | + * @param createDTO 创建信息 | ||
| 18 | + */ | ||
| 19 | + void createApiAccessLog(@Valid ApiAccessLogCreateReqDTO createDTO); | ||
| 20 | + | ||
| 21 | +} |
yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiErrorLogApi.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.infra.api.logger; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; | ||
| 4 | + | ||
| 5 | +import javax.validation.Valid; | ||
| 6 | + | ||
| 7 | +/** | ||
| 8 | + * API 错误日志的 API 接口 | ||
| 9 | + * | ||
| 10 | + * @author 芋道源码 | ||
| 11 | + */ | ||
| 12 | +public interface ApiErrorLogApi { | ||
| 13 | + | ||
| 14 | + /** | ||
| 15 | + * 创建 API 错误日志 | ||
| 16 | + * | ||
| 17 | + * @param createDTO 创建信息 | ||
| 18 | + */ | ||
| 19 | + void createApiErrorLog(@Valid ApiErrorLogCreateReqDTO createDTO); | ||
| 20 | + | ||
| 21 | +} |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/dto/ApiAccessLogCreateReqDTO.java renamed to yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/dto/ApiAccessLogCreateReqDTO.java
| 1 | -package cn.iocoder.yudao.framework.apilog.core.service.dto; | 1 | +package cn.iocoder.yudao.module.infra.api.logger.dto; |
| 2 | 2 | ||
| 3 | import lombok.Data; | 3 | import lombok.Data; |
| 4 | 4 | ||
| @@ -6,7 +6,7 @@ import javax.validation.constraints.NotNull; | @@ -6,7 +6,7 @@ import javax.validation.constraints.NotNull; | ||
| 6 | import java.util.Date; | 6 | import java.util.Date; |
| 7 | 7 | ||
| 8 | /** | 8 | /** |
| 9 | - * API 访问日志创建 DTO | 9 | + * API 访问日志 |
| 10 | * | 10 | * |
| 11 | * @author 芋道源码 | 11 | * @author 芋道源码 |
| 12 | */ | 12 | */ |
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/service/dto/ApiErrorLogCreateReqDTO.java renamed to yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/logger/dto/ApiErrorLogCreateReqDTO.java
| 1 | -package cn.iocoder.yudao.framework.apilog.core.service.dto; | 1 | +package cn.iocoder.yudao.module.infra.api.logger.dto; |
| 2 | 2 | ||
| 3 | import lombok.Data; | 3 | import lombok.Data; |
| 4 | -import lombok.experimental.Accessors; | ||
| 5 | 4 | ||
| 6 | import javax.validation.constraints.NotNull; | 5 | import javax.validation.constraints.NotNull; |
| 7 | import java.util.Date; | 6 | import java.util.Date; |
| 8 | 7 | ||
| 9 | /** | 8 | /** |
| 10 | - * API 错误日志创建 DTO | 9 | + * API 错误日志 |
| 11 | * | 10 | * |
| 12 | * @author 芋道源码 | 11 | * @author 芋道源码 |
| 13 | */ | 12 | */ |
| 14 | @Data | 13 | @Data |
| 15 | -@Accessors(chain = true) | ||
| 16 | public class ApiErrorLogCreateReqDTO { | 14 | public class ApiErrorLogCreateReqDTO { |
| 17 | 15 | ||
| 18 | /** | 16 | /** |
| @@ -105,4 +103,5 @@ public class ApiErrorLogCreateReqDTO { | @@ -105,4 +103,5 @@ public class ApiErrorLogCreateReqDTO { | ||
| 105 | @NotNull(message = "异常导致的消息不能为空") | 103 | @NotNull(message = "异常导致的消息不能为空") |
| 106 | private String exceptionMessage; | 104 | private String exceptionMessage; |
| 107 | 105 | ||
| 106 | + | ||
| 108 | } | 107 | } |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApiImpl.java
| @@ -19,8 +19,8 @@ public class FileApiImpl implements FileApi { | @@ -19,8 +19,8 @@ public class FileApiImpl implements FileApi { | ||
| 19 | private FileService fileService; | 19 | private FileService fileService; |
| 20 | 20 | ||
| 21 | @Override | 21 | @Override |
| 22 | - public String createFile(String path, byte[] content) throws Exception { | ||
| 23 | - return fileService.createFile(path, content); | 22 | + public String createFile(String name, String path, byte[] content) { |
| 23 | + return fileService.createFile(name, path, content); | ||
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | } | 26 | } |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApiImpl.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.infra.api.logger; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; | ||
| 4 | +import cn.iocoder.yudao.module.infra.service.logger.ApiAccessLogService; | ||
| 5 | +import org.springframework.stereotype.Service; | ||
| 6 | +import org.springframework.validation.annotation.Validated; | ||
| 7 | + | ||
| 8 | +import javax.annotation.Resource; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * API 访问日志的 API 实现类 | ||
| 12 | + * | ||
| 13 | + * @author 芋道源码 | ||
| 14 | + */ | ||
| 15 | +@Service | ||
| 16 | +@Validated | ||
| 17 | +public class ApiAccessLogApiImpl implements ApiAccessLogApi { | ||
| 18 | + | ||
| 19 | + @Resource | ||
| 20 | + private ApiAccessLogService apiAccessLogService; | ||
| 21 | + | ||
| 22 | + @Override | ||
| 23 | + public void createApiAccessLog(ApiAccessLogCreateReqDTO createDTO) { | ||
| 24 | + apiAccessLogService.createApiAccessLog(createDTO); | ||
| 25 | + } | ||
| 26 | + | ||
| 27 | +} |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiErrorLogApiImpl.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.infra.api.logger; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; | ||
| 4 | +import cn.iocoder.yudao.module.infra.service.logger.ApiErrorLogService; | ||
| 5 | +import org.springframework.stereotype.Service; | ||
| 6 | +import org.springframework.validation.annotation.Validated; | ||
| 7 | + | ||
| 8 | +import javax.annotation.Resource; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * API 访问日志的 API 接口 | ||
| 12 | + * | ||
| 13 | + * @author 芋道源码 | ||
| 14 | + */ | ||
| 15 | +@Service | ||
| 16 | +@Validated | ||
| 17 | +public class ApiErrorLogApiImpl implements ApiErrorLogApi { | ||
| 18 | + | ||
| 19 | + @Resource | ||
| 20 | + private ApiErrorLogService apiErrorLogService; | ||
| 21 | + | ||
| 22 | + @Override | ||
| 23 | + public void createApiErrorLog(ApiErrorLogCreateReqDTO createDTO) { | ||
| 24 | + apiErrorLogService.createApiErrorLog(createDTO); | ||
| 25 | + } | ||
| 26 | + | ||
| 27 | +} |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
| @@ -46,7 +46,7 @@ public class FileController { | @@ -46,7 +46,7 @@ public class FileController { | ||
| 46 | @OperateLog(logArgs = false) // 上传文件，没有记录操作日志的必要 | 46 | @OperateLog(logArgs = false) // 上传文件，没有记录操作日志的必要 |
| 47 | public CommonResult<String> uploadFile(@RequestParam("file") MultipartFile file, | 47 | public CommonResult<String> uploadFile(@RequestParam("file") MultipartFile file, |
| 48 | @RequestParam(value = "path", required = false) String path) throws Exception { | 48 | @RequestParam(value = "path", required = false) String path) throws Exception { |
| 49 | - return success(fileService.createFile(path, IoUtil.readBytes(file.getInputStream()))); | 49 | + return success(fileService.createFile(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream()))); |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | @DeleteMapping("/delete") | 52 | @DeleteMapping("/delete") |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileRespVO.java
| @@ -16,6 +16,9 @@ public class FileRespVO { | @@ -16,6 +16,9 @@ public class FileRespVO { | ||
| 16 | @ApiModelProperty(value = "文件路径", required = true, example = "yudao.jpg") | 16 | @ApiModelProperty(value = "文件路径", required = true, example = "yudao.jpg") |
| 17 | private String path; | 17 | private String path; |
| 18 | 18 | ||
| 19 | + @ApiModelProperty(value = "原文件名", required = true, example = "yudao.jpg") | ||
| 20 | + private String name; | ||
| 21 | + | ||
| 19 | @ApiModelProperty(value = "文件 URL", required = true, example = "https://www.iocoder.cn/yudao.jpg") | 22 | @ApiModelProperty(value = "文件 URL", required = true, example = "https://www.iocoder.cn/yudao.jpg") |
| 20 | private String url; | 23 | private String url; |
| 21 | 24 |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/logger/ApiAccessLogConvert.java
| 1 | package cn.iocoder.yudao.module.infra.convert.logger; | 1 | package cn.iocoder.yudao.module.infra.convert.logger; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateReqDTO; | ||
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | +import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; | ||
| 5 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExcelVO; | 5 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExcelVO; |
| 6 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogRespVO; | 6 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogRespVO; |
| 7 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiAccessLogDO; | 7 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiAccessLogDO; |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/logger/ApiErrorLogConvert.java
| 1 | package cn.iocoder.yudao.module.infra.convert.logger; | 1 | package cn.iocoder.yudao.module.infra.convert.logger; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateReqDTO; | ||
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | +import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; | ||
| 5 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExcelVO; | 5 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExcelVO; |
| 6 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogRespVO; | 6 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogRespVO; |
| 7 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO; | 7 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO; |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileDO.java
| @@ -34,6 +34,10 @@ public class FileDO extends BaseDO { | @@ -34,6 +34,10 @@ public class FileDO extends BaseDO { | ||
| 34 | */ | 34 | */ |
| 35 | private Long configId; | 35 | private Long configId; |
| 36 | /** | 36 | /** |
| 37 | + * 原文件名 | ||
| 38 | + */ | ||
| 39 | + private String name; | ||
| 40 | + /** | ||
| 37 | * 路径，即文件名 | 41 | * 路径，即文件名 |
| 38 | */ | 42 | */ |
| 39 | private String path; | 43 | private String path; |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java
| @@ -22,11 +22,12 @@ public interface FileService { | @@ -22,11 +22,12 @@ public interface FileService { | ||
| 22 | /** | 22 | /** |
| 23 | * 保存文件，并返回文件的访问路径 | 23 | * 保存文件，并返回文件的访问路径 |
| 24 | * | 24 | * |
| 25 | + * @param name 文件名称 | ||
| 25 | * @param path 文件路径 | 26 | * @param path 文件路径 |
| 26 | * @param content 文件内容 | 27 | * @param content 文件内容 |
| 27 | * @return 文件路径 | 28 | * @return 文件路径 |
| 28 | */ | 29 | */ |
| 29 | - String createFile(String path, byte[] content) throws Exception; | 30 | + String createFile(String name, String path, byte[] content); |
| 30 | 31 | ||
| 31 | /** | 32 | /** |
| 32 | * 删除文件 | 33 | * 删除文件 |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
| @@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.file.core.client.FileClient; | @@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.file.core.client.FileClient; | ||
| 9 | import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePageReqVO; | 9 | import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePageReqVO; |
| 10 | import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; | 10 | import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; |
| 11 | import cn.iocoder.yudao.module.infra.dal.mysql.file.FileMapper; | 11 | import cn.iocoder.yudao.module.infra.dal.mysql.file.FileMapper; |
| 12 | +import lombok.SneakyThrows; | ||
| 12 | import org.springframework.stereotype.Service; | 13 | import org.springframework.stereotype.Service; |
| 13 | 14 | ||
| 14 | import javax.annotation.Resource; | 15 | import javax.annotation.Resource; |
| @@ -37,12 +38,17 @@ public class FileServiceImpl implements FileService { | @@ -37,12 +38,17 @@ public class FileServiceImpl implements FileService { | ||
| 37 | } | 38 | } |
| 38 | 39 | ||
| 39 | @Override | 40 | @Override |
| 40 | - public String createFile(String path, byte[] content) throws Exception { | 41 | + @SneakyThrows |
| 42 | + public String createFile(String name, String path, byte[] content) { | ||
| 41 | // 计算默认的 path 名 | 43 | // 计算默认的 path 名 |
| 42 | - String type = FileTypeUtil.getType(new ByteArrayInputStream(content), path); | 44 | + String type = FileTypeUtil.getType(new ByteArrayInputStream(content), name); |
| 43 | if (StrUtil.isEmpty(path)) { | 45 | if (StrUtil.isEmpty(path)) { |
| 44 | path = DigestUtil.md5Hex(content) + '.' + type; | 46 | path = DigestUtil.md5Hex(content) + '.' + type; |
| 45 | } | 47 | } |
| 48 | + // 如果 name 为空，则使用 path 填充 | ||
| 49 | + if (StrUtil.isEmpty(name)) { | ||
| 50 | + name = path; | ||
| 51 | + } | ||
| 46 | 52 | ||
| 47 | // 上传到文件存储器 | 53 | // 上传到文件存储器 |
| 48 | FileClient client = fileConfigService.getMasterFileClient(); | 54 | FileClient client = fileConfigService.getMasterFileClient(); |
| @@ -52,6 +58,7 @@ public class FileServiceImpl implements FileService { | @@ -52,6 +58,7 @@ public class FileServiceImpl implements FileService { | ||
| 52 | // 保存到数据库 | 58 | // 保存到数据库 |
| 53 | FileDO file = new FileDO(); | 59 | FileDO file = new FileDO(); |
| 54 | file.setConfigId(client.getId()); | 60 | file.setConfigId(client.getId()); |
| 61 | + file.setName(name); | ||
| 55 | file.setPath(path); | 62 | file.setPath(path); |
| 56 | file.setUrl(url); | 63 | file.setUrl(url); |
| 57 | file.setType(type); | 64 | file.setType(type); |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogService.java
| 1 | package cn.iocoder.yudao.module.infra.service.logger; | 1 | package cn.iocoder.yudao.module.infra.service.logger; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService; | 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | +import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; | ||
| 4 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO; | 5 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO; |
| 5 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; | 6 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; |
| 6 | -import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 7 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiAccessLogDO; | 7 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiAccessLogDO; |
| 8 | 8 | ||
| 9 | import java.util.List; | 9 | import java.util.List; |
| @@ -13,7 +13,14 @@ import java.util.List; | @@ -13,7 +13,14 @@ import java.util.List; | ||
| 13 | * | 13 | * |
| 14 | * @author 芋道源码 | 14 | * @author 芋道源码 |
| 15 | */ | 15 | */ |
| 16 | -public interface ApiAccessLogService extends ApiAccessLogFrameworkService { | 16 | +public interface ApiAccessLogService { |
| 17 | + | ||
| 18 | + /** | ||
| 19 | + * 创建 API 访问日志 | ||
| 20 | + * | ||
| 21 | + * @param createReqDTO API 访问日志 | ||
| 22 | + */ | ||
| 23 | + void createApiAccessLog(ApiAccessLogCreateReqDTO createReqDTO); | ||
| 17 | 24 | ||
| 18 | /** | 25 | /** |
| 19 | * 获得 API 访问日志分页 | 26 | * 获得 API 访问日志分页 |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImpl.java
| 1 | package cn.iocoder.yudao.module.infra.service.logger; | 1 | package cn.iocoder.yudao.module.infra.service.logger; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateReqDTO; | 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | +import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; | ||
| 4 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO; | 5 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO; |
| 5 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; | 6 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; |
| 6 | import cn.iocoder.yudao.module.infra.convert.logger.ApiAccessLogConvert; | 7 | import cn.iocoder.yudao.module.infra.convert.logger.ApiAccessLogConvert; |
| 7 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiAccessLogDO; | 8 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiAccessLogDO; |
| 8 | import cn.iocoder.yudao.module.infra.dal.mysql.logger.ApiAccessLogMapper; | 9 | import cn.iocoder.yudao.module.infra.dal.mysql.logger.ApiAccessLogMapper; |
| 9 | -import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 10 | -import org.springframework.scheduling.annotation.Async; | ||
| 11 | import org.springframework.stereotype.Service; | 10 | import org.springframework.stereotype.Service; |
| 12 | import org.springframework.validation.annotation.Validated; | 11 | import org.springframework.validation.annotation.Validated; |
| 13 | 12 | ||
| @@ -27,6 +26,12 @@ public class ApiAccessLogServiceImpl implements ApiAccessLogService { | @@ -27,6 +26,12 @@ public class ApiAccessLogServiceImpl implements ApiAccessLogService { | ||
| 27 | private ApiAccessLogMapper apiAccessLogMapper; | 26 | private ApiAccessLogMapper apiAccessLogMapper; |
| 28 | 27 | ||
| 29 | @Override | 28 | @Override |
| 29 | + public void createApiAccessLog(ApiAccessLogCreateReqDTO createDTO) { | ||
| 30 | + ApiAccessLogDO apiAccessLog = ApiAccessLogConvert.INSTANCE.convert(createDTO); | ||
| 31 | + apiAccessLogMapper.insert(apiAccessLog); | ||
| 32 | + } | ||
| 33 | + | ||
| 34 | + @Override | ||
| 30 | public PageResult<ApiAccessLogDO> getApiAccessLogPage(ApiAccessLogPageReqVO pageReqVO) { | 35 | public PageResult<ApiAccessLogDO> getApiAccessLogPage(ApiAccessLogPageReqVO pageReqVO) { |
| 31 | return apiAccessLogMapper.selectPage(pageReqVO); | 36 | return apiAccessLogMapper.selectPage(pageReqVO); |
| 32 | } | 37 | } |
| @@ -36,11 +41,4 @@ public class ApiAccessLogServiceImpl implements ApiAccessLogService { | @@ -36,11 +41,4 @@ public class ApiAccessLogServiceImpl implements ApiAccessLogService { | ||
| 36 | return apiAccessLogMapper.selectList(exportReqVO); | 41 | return apiAccessLogMapper.selectList(exportReqVO); |
| 37 | } | 42 | } |
| 38 | 43 | ||
| 39 | - @Override | ||
| 40 | - @Async | ||
| 41 | - public void createApiAccessLogAsync(ApiAccessLogCreateReqDTO createDTO) { | ||
| 42 | - ApiAccessLogDO apiAccessLog = ApiAccessLogConvert.INSTANCE.convert(createDTO); | ||
| 43 | - apiAccessLogMapper.insert(apiAccessLog); | ||
| 44 | - } | ||
| 45 | - | ||
| 46 | } | 44 | } |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogService.java
| 1 | package cn.iocoder.yudao.module.infra.service.logger; | 1 | package cn.iocoder.yudao.module.infra.service.logger; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService; | ||
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | +import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; | ||
| 5 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO; | 5 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO; |
| 6 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; | 6 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; |
| 7 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO; | 7 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO; |
| @@ -13,7 +13,14 @@ import java.util.List; | @@ -13,7 +13,14 @@ import java.util.List; | ||
| 13 | * | 13 | * |
| 14 | * @author 芋道源码 | 14 | * @author 芋道源码 |
| 15 | */ | 15 | */ |
| 16 | -public interface ApiErrorLogService extends ApiErrorLogFrameworkService { | 16 | +public interface ApiErrorLogService { |
| 17 | + | ||
| 18 | + /** | ||
| 19 | + * 创建 API 错误日志 | ||
| 20 | + * | ||
| 21 | + * @param createReqDTO API 错误日志 | ||
| 22 | + */ | ||
| 23 | + void createApiErrorLog(ApiErrorLogCreateReqDTO createReqDTO); | ||
| 17 | 24 | ||
| 18 | /** | 25 | /** |
| 19 | * 获得 API 错误日志分页 | 26 | * 获得 API 错误日志分页 |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java
| 1 | package cn.iocoder.yudao.module.infra.service.logger; | 1 | package cn.iocoder.yudao.module.infra.service.logger; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateReqDTO; | 3 | +import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 5 | +import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; | ||
| 4 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO; | 6 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO; |
| 5 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; | 7 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; |
| 6 | import cn.iocoder.yudao.module.infra.convert.logger.ApiErrorLogConvert; | 8 | import cn.iocoder.yudao.module.infra.convert.logger.ApiErrorLogConvert; |
| 7 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO; | 9 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO; |
| 8 | import cn.iocoder.yudao.module.infra.dal.mysql.logger.ApiErrorLogMapper; | 10 | import cn.iocoder.yudao.module.infra.dal.mysql.logger.ApiErrorLogMapper; |
| 9 | -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | ||
| 10 | -import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 11 | import cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants; | 11 | import cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants; |
| 12 | import cn.iocoder.yudao.module.infra.enums.logger.ApiErrorLogProcessStatusEnum; | 12 | import cn.iocoder.yudao.module.infra.enums.logger.ApiErrorLogProcessStatusEnum; |
| 13 | -import org.springframework.scheduling.annotation.Async; | ||
| 14 | import org.springframework.stereotype.Service; | 13 | import org.springframework.stereotype.Service; |
| 15 | import org.springframework.validation.annotation.Validated; | 14 | import org.springframework.validation.annotation.Validated; |
| 16 | 15 | ||
| @@ -31,6 +30,13 @@ public class ApiErrorLogServiceImpl implements ApiErrorLogService { | @@ -31,6 +30,13 @@ public class ApiErrorLogServiceImpl implements ApiErrorLogService { | ||
| 31 | private ApiErrorLogMapper apiErrorLogMapper; | 30 | private ApiErrorLogMapper apiErrorLogMapper; |
| 32 | 31 | ||
| 33 | @Override | 32 | @Override |
| 33 | + public void createApiErrorLog(ApiErrorLogCreateReqDTO createDTO) { | ||
| 34 | + ApiErrorLogDO apiErrorLog = ApiErrorLogConvert.INSTANCE.convert(createDTO); | ||
| 35 | + apiErrorLog.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus()); | ||
| 36 | + apiErrorLogMapper.insert(apiErrorLog); | ||
| 37 | + } | ||
| 38 | + | ||
| 39 | + @Override | ||
| 34 | public PageResult<ApiErrorLogDO> getApiErrorLogPage(ApiErrorLogPageReqVO pageReqVO) { | 40 | public PageResult<ApiErrorLogDO> getApiErrorLogPage(ApiErrorLogPageReqVO pageReqVO) { |
| 35 | return apiErrorLogMapper.selectPage(pageReqVO); | 41 | return apiErrorLogMapper.selectPage(pageReqVO); |
| 36 | } | 42 | } |
| @@ -54,12 +60,4 @@ public class ApiErrorLogServiceImpl implements ApiErrorLogService { | @@ -54,12 +60,4 @@ public class ApiErrorLogServiceImpl implements ApiErrorLogService { | ||
| 54 | .processUserId(processUserId).processTime(new Date()).build()); | 60 | .processUserId(processUserId).processTime(new Date()).build()); |
| 55 | } | 61 | } |
| 56 | 62 | ||
| 57 | - @Override | ||
| 58 | - @Async | ||
| 59 | - public void createApiErrorLogAsync(ApiErrorLogCreateReqDTO createDTO) { | ||
| 60 | - ApiErrorLogDO apiErrorLog = ApiErrorLogConvert.INSTANCE.convert(createDTO); | ||
| 61 | - apiErrorLog.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus()); | ||
| 62 | - apiErrorLogMapper.insert(apiErrorLog); | ||
| 63 | - } | ||
| 64 | - | ||
| 65 | } | 63 | } |
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/baseVO.vm
| @@ -2,6 +2,12 @@ package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePac | @@ -2,6 +2,12 @@ package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePac | ||
| 2 | 2 | ||
| 3 | import lombok.*; | 3 | import lombok.*; |
| 4 | import java.util.*; | 4 | import java.util.*; |
| 5 | +#foreach ($column in $columns) | ||
| 6 | +#if (${column.javaType} == "BigDecimal") | ||
| 7 | +import java.math.BigDecimal; | ||
| 8 | +#break | ||
| 9 | +#end | ||
| 10 | +#end | ||
| 5 | import io.swagger.annotations.*; | 11 | import io.swagger.annotations.*; |
| 6 | import javax.validation.constraints.*; | 12 | import javax.validation.constraints.*; |
| 7 | ## 处理 Date 字段的引入 | 13 | ## 处理 Date 字段的引入 |
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/controller/vo/excelVO.vm
| @@ -2,6 +2,12 @@ package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePac | @@ -2,6 +2,12 @@ package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePac | ||
| 2 | 2 | ||
| 3 | import lombok.*; | 3 | import lombok.*; |
| 4 | import java.util.*; | 4 | import java.util.*; |
| 5 | +#foreach ($column in $columns) | ||
| 6 | +#if (${column.javaType} == "BigDecimal") | ||
| 7 | +import java.math.BigDecimal; | ||
| 8 | +#break | ||
| 9 | +#end | ||
| 10 | +#end | ||
| 5 | import io.swagger.annotations.*; | 11 | import io.swagger.annotations.*; |
| 6 | 12 | ||
| 7 | import com.alibaba.excel.annotation.ExcelProperty; | 13 | import com.alibaba.excel.annotation.ExcelProperty; |
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/do.vm
| @@ -2,6 +2,12 @@ package ${basePackage}.module.${table.moduleName}.dal.dataobject.${table.busines | @@ -2,6 +2,12 @@ package ${basePackage}.module.${table.moduleName}.dal.dataobject.${table.busines | ||
| 2 | 2 | ||
| 3 | import lombok.*; | 3 | import lombok.*; |
| 4 | import java.util.*; | 4 | import java.util.*; |
| 5 | +#foreach ($column in $columns) | ||
| 6 | +#if (${column.javaType} == "BigDecimal") | ||
| 7 | +import java.math.BigDecimal; | ||
| 8 | +#break | ||
| 9 | +#end | ||
| 10 | +#end | ||
| 5 | import com.baomidou.mybatisplus.annotation.*; | 11 | import com.baomidou.mybatisplus.annotation.*; |
| 6 | import ${BaseDOClassName}; | 12 | import ${BaseDOClassName}; |
| 7 | 13 |
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceTest.java
| @@ -80,9 +80,9 @@ public class FileServiceTest extends BaseDbUnitTest { | @@ -80,9 +80,9 @@ public class FileServiceTest extends BaseDbUnitTest { | ||
| 80 | String url = randomString(); | 80 | String url = randomString(); |
| 81 | when(client.upload(same(content), same(path))).thenReturn(url); | 81 | when(client.upload(same(content), same(path))).thenReturn(url); |
| 82 | when(client.getId()).thenReturn(10L); | 82 | when(client.getId()).thenReturn(10L); |
| 83 | - | 83 | + String name = "单测文件名"; |
| 84 | // 调用 | 84 | // 调用 |
| 85 | - String result = fileService.createFile(path, content); | 85 | + String result = fileService.createFile(name, path, content); |
| 86 | // 断言 | 86 | // 断言 |
| 87 | assertEquals(result, url); | 87 | assertEquals(result, url); |
| 88 | // 校验数据 | 88 | // 校验数据 |
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java
| 1 | package cn.iocoder.yudao.module.infra.service.logger; | 1 | package cn.iocoder.yudao.module.infra.service.logger; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.util.RandomUtil; | 3 | import cn.hutool.core.util.RandomUtil; |
| 4 | -import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateReqDTO; | ||
| 5 | import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | 4 | import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; |
| 6 | import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; | 5 | import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants; |
| 7 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 8 | import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; | 7 | import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; |
| 9 | import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; | 8 | import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; |
| 10 | import cn.iocoder.yudao.framework.test.core.util.RandomUtils; | 9 | import cn.iocoder.yudao.framework.test.core.util.RandomUtils; |
| 10 | +import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; | ||
| 11 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO; | 11 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO; |
| 12 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; | 12 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; |
| 13 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiAccessLogDO; | 13 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiAccessLogDO; |
| @@ -155,7 +155,7 @@ public class ApiAccessLogServiceImplTest extends BaseDbUnitTest { | @@ -155,7 +155,7 @@ public class ApiAccessLogServiceImplTest extends BaseDbUnitTest { | ||
| 155 | dto -> dto.setUserType(RandomUtil.randomEle(UserTypeEnum.values()).getValue())); | 155 | dto -> dto.setUserType(RandomUtil.randomEle(UserTypeEnum.values()).getValue())); |
| 156 | 156 | ||
| 157 | // 调用 | 157 | // 调用 |
| 158 | - apiAccessLogService.createApiAccessLogAsync(createDTO); | 158 | + apiAccessLogService.createApiAccessLog(createDTO); |
| 159 | // 断言 | 159 | // 断言 |
| 160 | ApiAccessLogDO infApiAccessLogDO = apiAccessLogMapper.selectOne(null); | 160 | ApiAccessLogDO infApiAccessLogDO = apiAccessLogMapper.selectOne(null); |
| 161 | assertNotNull(infApiAccessLogDO); | 161 | assertNotNull(infApiAccessLogDO); |
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImplTest.java
| 1 | package cn.iocoder.yudao.module.infra.service.logger; | 1 | package cn.iocoder.yudao.module.infra.service.logger; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.util.RandomUtil; | 3 | import cn.hutool.core.util.RandomUtil; |
| 4 | -import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateReqDTO; | ||
| 5 | import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | 4 | import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; |
| 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 7 | import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; | 6 | import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; |
| 8 | import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; | 7 | import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; |
| 9 | import cn.iocoder.yudao.framework.test.core.util.RandomUtils; | 8 | import cn.iocoder.yudao.framework.test.core.util.RandomUtils; |
| 9 | +import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; | ||
| 10 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO; | 10 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO; |
| 11 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; | 11 | import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO; |
| 12 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO; | 12 | import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO; |
| @@ -187,7 +187,7 @@ public class ApiErrorLogServiceImplTest extends BaseDbUnitTest { | @@ -187,7 +187,7 @@ public class ApiErrorLogServiceImplTest extends BaseDbUnitTest { | ||
| 187 | dto -> dto.setUserType(RandomUtil.randomEle(UserTypeEnum.values()).getValue())); | 187 | dto -> dto.setUserType(RandomUtil.randomEle(UserTypeEnum.values()).getValue())); |
| 188 | 188 | ||
| 189 | // 调用 | 189 | // 调用 |
| 190 | - apiErrorLogService.createApiErrorLogAsync(createDTO); | 190 | + apiErrorLogService.createApiErrorLog(createDTO); |
| 191 | // 断言 | 191 | // 断言 |
| 192 | ApiErrorLogDO infApiErrorLogDO = infApiErrorLogMapper.selectOne(null); | 192 | ApiErrorLogDO infApiErrorLogDO = infApiErrorLogMapper.selectOne(null); |
| 193 | assertNotNull(infApiErrorLogDO); | 193 | assertNotNull(infApiErrorLogDO); |
yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/convert/banner/BannerConvert.java
| @@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; | @@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 4 | import cn.iocoder.yudao.module.market.controller.admin.banner.vo.BannerCreateReqVO; | 4 | import cn.iocoder.yudao.module.market.controller.admin.banner.vo.BannerCreateReqVO; |
| 5 | import cn.iocoder.yudao.module.market.controller.admin.banner.vo.BannerRespVO; | 5 | import cn.iocoder.yudao.module.market.controller.admin.banner.vo.BannerRespVO; |
| 6 | import cn.iocoder.yudao.module.market.controller.admin.banner.vo.BannerUpdateReqVO; | 6 | import cn.iocoder.yudao.module.market.controller.admin.banner.vo.BannerUpdateReqVO; |
| 7 | -import cn.iocoder.yudao.module.market.controller.admin.banner.vo.BannerUpdateStatusReqVO; | ||
| 8 | import cn.iocoder.yudao.module.market.dal.dataobject.banner.BannerDO; | 7 | import cn.iocoder.yudao.module.market.dal.dataobject.banner.BannerDO; |
| 9 | import org.mapstruct.Mapper; | 8 | import org.mapstruct.Mapper; |
| 10 | import org.mapstruct.factory.Mappers; | 9 | import org.mapstruct.factory.Mappers; |
| @@ -32,5 +31,4 @@ public interface BannerConvert { | @@ -32,5 +31,4 @@ public interface BannerConvert { | ||
| 32 | 31 | ||
| 33 | BannerDO convert(BannerUpdateReqVO updateReqVO); | 32 | BannerDO convert(BannerUpdateReqVO updateReqVO); |
| 34 | 33 | ||
| 35 | - BannerDO convert(BannerUpdateStatusReqVO updateStatusReqVO); | ||
| 36 | } | 34 | } |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/auth/AuthConvert.java
| @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.member.convert.auth; | @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.member.convert.auth; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.module.member.controller.app.auth.vo.*; | 3 | import cn.iocoder.yudao.module.member.controller.app.auth.vo.*; |
| 4 | import cn.iocoder.yudao.module.member.controller.app.social.vo.AppSocialUserUnbindReqVO; | 4 | import cn.iocoder.yudao.module.member.controller.app.social.vo.AppSocialUserUnbindReqVO; |
| 5 | -import cn.iocoder.yudao.module.system.api.auth.dto.OAuth2AccessTokenRespDTO; | 5 | +import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO; |
| 6 | import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeSendReqDTO; | 6 | import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeSendReqDTO; |
| 7 | import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO; | 7 | import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO; |
| 8 | import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; | 8 | import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
| @@ -13,17 +13,17 @@ import cn.iocoder.yudao.module.member.convert.auth.AuthConvert; | @@ -13,17 +13,17 @@ import cn.iocoder.yudao.module.member.convert.auth.AuthConvert; | ||
| 13 | import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; | 13 | import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; |
| 14 | import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper; | 14 | import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper; |
| 15 | import cn.iocoder.yudao.module.member.service.user.MemberUserService; | 15 | import cn.iocoder.yudao.module.member.service.user.MemberUserService; |
| 16 | -import cn.iocoder.yudao.module.system.api.auth.OAuth2TokenApi; | ||
| 17 | -import cn.iocoder.yudao.module.system.api.auth.dto.OAuth2AccessTokenCreateReqDTO; | ||
| 18 | -import cn.iocoder.yudao.module.system.api.auth.dto.OAuth2AccessTokenRespDTO; | ||
| 19 | import cn.iocoder.yudao.module.system.api.logger.LoginLogApi; | 16 | import cn.iocoder.yudao.module.system.api.logger.LoginLogApi; |
| 20 | import cn.iocoder.yudao.module.system.api.logger.dto.LoginLogCreateReqDTO; | 17 | import cn.iocoder.yudao.module.system.api.logger.dto.LoginLogCreateReqDTO; |
| 18 | +import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi; | ||
| 19 | +import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCreateReqDTO; | ||
| 20 | +import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO; | ||
| 21 | import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi; | 21 | import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi; |
| 22 | import cn.iocoder.yudao.module.system.api.social.SocialUserApi; | 22 | import cn.iocoder.yudao.module.system.api.social.SocialUserApi; |
| 23 | import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; | 23 | import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO; |
| 24 | -import cn.iocoder.yudao.module.system.enums.auth.OAuth2ClientConstants; | ||
| 25 | import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; | 24 | import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; |
| 26 | import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum; | 25 | import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum; |
| 26 | +import cn.iocoder.yudao.module.system.enums.oauth2.OAuth2ClientConstants; | ||
| 27 | import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; | 27 | import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; |
| 28 | import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; | 28 | import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; |
| 29 | import com.google.common.annotations.VisibleForTesting; | 29 | import com.google.common.annotations.VisibleForTesting; |
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java
| @@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.member.controller.app.auth.vo.AppAuthUpdatePasswo | @@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.member.controller.app.auth.vo.AppAuthUpdatePasswo | ||
| 9 | import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; | 9 | import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; |
| 10 | import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper; | 10 | import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper; |
| 11 | import cn.iocoder.yudao.module.member.service.user.MemberUserService; | 11 | import cn.iocoder.yudao.module.member.service.user.MemberUserService; |
| 12 | -import cn.iocoder.yudao.module.system.api.auth.OAuth2TokenApi; | 12 | +import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi; |
| 13 | import cn.iocoder.yudao.module.system.api.logger.LoginLogApi; | 13 | import cn.iocoder.yudao.module.system.api.logger.LoginLogApi; |
| 14 | import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi; | 14 | import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi; |
| 15 | import cn.iocoder.yudao.module.system.api.social.SocialUserApi; | 15 | import cn.iocoder.yudao.module.system.api.social.SocialUserApi; |
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java
| 1 | package cn.iocoder.yudao.module.system.api.dept; | 1 | package cn.iocoder.yudao.module.system.api.dept; |
| 2 | 2 | ||
| 3 | +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; | ||
| 3 | import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; | 4 | import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; |
| 4 | 5 | ||
| 5 | import java.util.Collection; | 6 | import java.util.Collection; |
| @@ -45,6 +46,9 @@ public interface DeptApi { | @@ -45,6 +46,9 @@ public interface DeptApi { | ||
| 45 | * @param ids 部门编号数组 | 46 | * @param ids 部门编号数组 |
| 46 | * @return 部门 Map | 47 | * @return 部门 Map |
| 47 | */ | 48 | */ |
| 48 | - Map<Long, DeptRespDTO> getDeptMap(Set<Long> ids); | 49 | + default Map<Long, DeptRespDTO> getDeptMap(Set<Long> ids) { |
| 50 | + List<DeptRespDTO> list = getDepts(ids); | ||
| 51 | + return CollectionUtils.convertMap(list, DeptRespDTO::getId); | ||
| 52 | + } | ||
| 49 | 53 | ||
| 50 | } | 54 | } |
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java
| 1 | package cn.iocoder.yudao.module.system.api.dict; | 1 | package cn.iocoder.yudao.module.system.api.dict; |
| 2 | 2 | ||
| 3 | +import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO; | ||
| 4 | + | ||
| 3 | import java.util.Collection; | 5 | import java.util.Collection; |
| 4 | 6 | ||
| 5 | /** | 7 | /** |
| @@ -19,4 +21,22 @@ public interface DictDataApi { | @@ -19,4 +21,22 @@ public interface DictDataApi { | ||
| 19 | */ | 21 | */ |
| 20 | void validDictDatas(String dictType, Collection<String> values); | 22 | void validDictDatas(String dictType, Collection<String> values); |
| 21 | 23 | ||
| 24 | + /** | ||
| 25 | + * 获得指定的字典数据，从缓存中 | ||
| 26 | + * | ||
| 27 | + * @param type 字典类型 | ||
| 28 | + * @param value 字典数据值 | ||
| 29 | + * @return 字典数据 | ||
| 30 | + */ | ||
| 31 | + DictDataRespDTO getDictData(String type, String value); | ||
| 32 | + | ||
| 33 | + /** | ||
| 34 | + * 解析获得指定的字典数据，从缓存中 | ||
| 35 | + * | ||
| 36 | + * @param type 字典类型 | ||
| 37 | + * @param label 字典数据标签 | ||
| 38 | + * @return 字典数据 | ||
| 39 | + */ | ||
| 40 | + DictDataRespDTO parseDictData(String type, String label); | ||
| 41 | + | ||
| 22 | } | 42 | } |
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/core/dto/DictDataRespDTO.java renamed to yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/dto/DictDataRespDTO.java
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/service/ErrorCodeFrameworkService.java renamed to yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java
| 1 | -package cn.iocoder.yudao.module.system.framework.errorcode.core.service; | 1 | +package cn.iocoder.yudao.module.system.api.errorcode; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; | ||
| 4 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.dto.ErrorCodeRespDTO; | 3 | +import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; |
| 4 | +import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeRespDTO; | ||
| 5 | 5 | ||
| 6 | import javax.validation.Valid; | 6 | import javax.validation.Valid; |
| 7 | import java.util.Date; | 7 | import java.util.Date; |
| 8 | import java.util.List; | 8 | import java.util.List; |
| 9 | 9 | ||
| 10 | /** | 10 | /** |
| 11 | - * 错误码 Framework Service 接口 | 11 | + * 错误码 Api 接口 |
| 12 | * | 12 | * |
| 13 | * @author 芋道源码 | 13 | * @author 芋道源码 |
| 14 | */ | 14 | */ |
| 15 | -public interface ErrorCodeFrameworkService { | 15 | +public interface ErrorCodeApi { |
| 16 | 16 | ||
| 17 | /** | 17 | /** |
| 18 | * 自动创建错误码 | 18 | * 自动创建错误码 |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/dto/ErrorCodeAutoGenerateReqDTO.java renamed to yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeAutoGenerateReqDTO.java
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/errorcode/core/dto/ErrorCodeRespDTO.java renamed to yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeRespDTO.java
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.system.api.logger; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO; | ||
| 4 | + | ||
| 5 | +import javax.validation.Valid; | ||
| 6 | + | ||
| 7 | +/** | ||
| 8 | + * 操作日志 API 接口 | ||
| 9 | + * | ||
| 10 | + * @author 芋道源码 | ||
| 11 | + */ | ||
| 12 | +public interface OperateLogApi { | ||
| 13 | + | ||
| 14 | + /** | ||
| 15 | + * 创建操作日志 | ||
| 16 | + * | ||
| 17 | + * @param createReqDTO 请求 | ||
| 18 | + */ | ||
| 19 | + void createOperateLog(@Valid OperateLogCreateReqDTO createReqDTO); | ||
| 20 | + | ||
| 21 | +} |
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogCreateReqDTO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.system.api.logger.dto; | ||
| 2 | + | ||
| 3 | +import lombok.Data; | ||
| 4 | + | ||
| 5 | +import javax.validation.constraints.NotEmpty; | ||
| 6 | +import javax.validation.constraints.NotNull; | ||
| 7 | +import java.util.Date; | ||
| 8 | +import java.util.Map; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * 操作日志创建 Request DTO | ||
| 12 | + */ | ||
| 13 | +@Data | ||
| 14 | +public class OperateLogCreateReqDTO { | ||
| 15 | + | ||
| 16 | + /** | ||
| 17 | + * 链路追踪编号 | ||
| 18 | + */ | ||
| 19 | + private String traceId; | ||
| 20 | + | ||
| 21 | + /** | ||
| 22 | + * 用户编号 | ||
| 23 | + */ | ||
| 24 | + @NotNull(message = "用户编号不能为空") | ||
| 25 | + private Long userId; | ||
| 26 | + /** | ||
| 27 | + * 用户类型 | ||
| 28 | + */ | ||
| 29 | + @NotNull(message = "用户类型不能为空") | ||
| 30 | + private Integer userType; | ||
| 31 | + | ||
| 32 | + /** | ||
| 33 | + * 操作模块 | ||
| 34 | + */ | ||
| 35 | + @NotEmpty(message = "操作模块不能为空") | ||
| 36 | + private String module; | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 操作名 | ||
| 40 | + */ | ||
| 41 | + @NotEmpty(message = "操作名") | ||
| 42 | + private String name; | ||
| 43 | + | ||
| 44 | + /** | ||
| 45 | + * 操作分类 | ||
| 46 | + */ | ||
| 47 | + @NotNull(message = "操作分类不能为空") | ||
| 48 | + private Integer type; | ||
| 49 | + | ||
| 50 | + /** | ||
| 51 | + * 操作明细 | ||
| 52 | + */ | ||
| 53 | + private String content; | ||
| 54 | + | ||
| 55 | + /** | ||
| 56 | + * 拓展字段 | ||
| 57 | + */ | ||
| 58 | + private Map<String, Object> exts; | ||
| 59 | + | ||
| 60 | + /** | ||
| 61 | + * 请求方法名 | ||
| 62 | + */ | ||
| 63 | + @NotEmpty(message = "请求方法名不能为空") | ||
| 64 | + private String requestMethod; | ||
| 65 | + | ||
| 66 | + /** | ||
| 67 | + * 请求地址 | ||
| 68 | + */ | ||
| 69 | + @NotEmpty(message = "请求地址不能为空") | ||
| 70 | + private String requestUrl; | ||
| 71 | + | ||
| 72 | + /** | ||
| 73 | + * 用户 IP | ||
| 74 | + */ | ||
| 75 | + @NotEmpty(message = "用户 IP 不能为空") | ||
| 76 | + private String userIp; | ||
| 77 | + | ||
| 78 | + /** | ||
| 79 | + * 浏览器 UserAgent | ||
| 80 | + */ | ||
| 81 | + @NotEmpty(message = "浏览器 UserAgent 不能为空") | ||
| 82 | + private String userAgent; | ||
| 83 | + | ||
| 84 | + /** | ||
| 85 | + * Java 方法名 | ||
| 86 | + */ | ||
| 87 | + @NotEmpty(message = "Java 方法名不能为空") | ||
| 88 | + private String javaMethod; | ||
| 89 | + | ||
| 90 | + /** | ||
| 91 | + * Java 方法的参数 | ||
| 92 | + */ | ||
| 93 | + private String javaMethodArgs; | ||
| 94 | + | ||
| 95 | + /** | ||
| 96 | + * 开始时间 | ||
| 97 | + */ | ||
| 98 | + @NotNull(message = "开始时间不能为空") | ||
| 99 | + private Date startTime; | ||
| 100 | + | ||
| 101 | + /** | ||
| 102 | + * 执行时长，单位：毫秒 | ||
| 103 | + */ | ||
| 104 | + @NotNull(message = "执行时长不能为空") | ||
| 105 | + private Integer duration; | ||
| 106 | + | ||
| 107 | + /** | ||
| 108 | + * 结果码 | ||
| 109 | + */ | ||
| 110 | + @NotNull(message = "结果码不能为空") | ||
| 111 | + private Integer resultCode; | ||
| 112 | + | ||
| 113 | + /** | ||
| 114 | + * 结果提示 | ||
| 115 | + */ | ||
| 116 | + private String resultMsg; | ||
| 117 | + | ||
| 118 | + /** | ||
| 119 | + * 结果数据 | ||
| 120 | + */ | ||
| 121 | + private String resultData; | ||
| 122 | + | ||
| 123 | +} |
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/auth/OAuth2TokenApi.java renamed to yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/OAuth2TokenApi.java
| 1 | -package cn.iocoder.yudao.module.system.api.auth; | 1 | +package cn.iocoder.yudao.module.system.api.oauth2; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.module.system.api.auth.dto.OAuth2AccessTokenCheckRespDTO; | ||
| 4 | -import cn.iocoder.yudao.module.system.api.auth.dto.OAuth2AccessTokenCreateReqDTO; | ||
| 5 | -import cn.iocoder.yudao.module.system.api.auth.dto.OAuth2AccessTokenRespDTO; | 3 | +import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; |
| 4 | +import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCreateReqDTO; | ||
| 5 | +import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO; | ||
| 6 | 6 | ||
| 7 | import javax.validation.Valid; | 7 | import javax.validation.Valid; |
| 8 | 8 |
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/auth/dto/OAuth2AccessTokenCheckRespDTO.java renamed to yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.java
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/auth/dto/OAuth2AccessTokenCreateReqDTO.java renamed to yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.java
| 1 | -package cn.iocoder.yudao.module.system.api.auth.dto; | 1 | +package cn.iocoder.yudao.module.system.api.oauth2.dto; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | 3 | import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; |
| 4 | import cn.iocoder.yudao.framework.common.validation.InEnum; | 4 | import cn.iocoder.yudao.framework.common.validation.InEnum; |
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/auth/dto/OAuth2AccessTokenRespDTO.java renamed to yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/dto/OAuth2AccessTokenRespDTO.java
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApi.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.system.api.tenant; | ||
| 2 | + | ||
| 3 | +import java.util.List; | ||
| 4 | + | ||
| 5 | +/** | ||
| 6 | + * 多租户的 API 接口 | ||
| 7 | + * | ||
| 8 | + * @author 芋道源码 | ||
| 9 | + */ | ||
| 10 | +public interface TenantApi { | ||
| 11 | + | ||
| 12 | + /** | ||
| 13 | + * 获得所有租户 | ||
| 14 | + * | ||
| 15 | + * @return 租户编号数组 | ||
| 16 | + */ | ||
| 17 | + List<Long> getTenantIds(); | ||
| 18 | + | ||
| 19 | + /** | ||
| 20 | + * 校验租户是否合法 | ||
| 21 | + * | ||
| 22 | + * @param id 租户编号 | ||
| 23 | + */ | ||
| 24 | + void validTenant(Long id); | ||
| 25 | + | ||
| 26 | +} |
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
| 1 | package cn.iocoder.yudao.module.system.api.user; | 1 | package cn.iocoder.yudao.module.system.api.user; |
| 2 | 2 | ||
| 3 | +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; | ||
| 3 | import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; | 4 | import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; |
| 4 | 5 | ||
| 5 | import java.util.Collection; | 6 | import java.util.Collection; |
| @@ -23,6 +24,14 @@ public interface AdminUserApi { | @@ -23,6 +24,14 @@ public interface AdminUserApi { | ||
| 23 | AdminUserRespDTO getUser(Long id); | 24 | AdminUserRespDTO getUser(Long id); |
| 24 | 25 | ||
| 25 | /** | 26 | /** |
| 27 | + * 通过用户 ID 查询用户们 | ||
| 28 | + * | ||
| 29 | + * @param ids 用户 ID 们 | ||
| 30 | + * @return 用户对象信息 | ||
| 31 | + */ | ||
| 32 | + List<AdminUserRespDTO> getUsers(Collection<Long> ids); | ||
| 33 | + | ||
| 34 | + /** | ||
| 26 | * 获得指定部门的用户数组 | 35 | * 获得指定部门的用户数组 |
| 27 | * | 36 | * |
| 28 | * @param deptIds 部门数组 | 37 | * @param deptIds 部门数组 |
| @@ -44,7 +53,10 @@ public interface AdminUserApi { | @@ -44,7 +53,10 @@ public interface AdminUserApi { | ||
| 44 | * @param ids 用户编号数组 | 53 | * @param ids 用户编号数组 |
| 45 | * @return 用户 Map | 54 | * @return 用户 Map |
| 46 | */ | 55 | */ |
| 47 | - Map<Long, AdminUserRespDTO> getUserMap(Collection<Long> ids); | 56 | + default Map<Long, AdminUserRespDTO> getUserMap(Collection<Long> ids) { |
| 57 | + List<AdminUserRespDTO> users = getUsers(ids); | ||
| 58 | + return CollectionUtils.convertMap(users, AdminUserRespDTO::getId); | ||
| 59 | + } | ||
| 48 | 60 | ||
| 49 | /** | 61 | /** |
| 50 | * 校验用户们是否有效。如下情况，视为无效： | 62 | * 校验用户们是否有效。如下情况，视为无效： |
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/auth/OAuth2ClientConstants.java renamed to yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/oauth2/OAuth2ClientConstants.java
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/auth/OAuth2GrantTypeEnum.java renamed to yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/oauth2/OAuth2GrantTypeEnum.java
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java
| @@ -9,8 +9,6 @@ import org.springframework.stereotype.Service; | @@ -9,8 +9,6 @@ import org.springframework.stereotype.Service; | ||
| 9 | import javax.annotation.Resource; | 9 | import javax.annotation.Resource; |
| 10 | import java.util.Collection; | 10 | import java.util.Collection; |
| 11 | import java.util.List; | 11 | import java.util.List; |
| 12 | -import java.util.Map; | ||
| 13 | -import java.util.Set; | ||
| 14 | 12 | ||
| 15 | /** | 13 | /** |
| 16 | * 部门 API 实现类 | 14 | * 部门 API 实现类 |
| @@ -40,10 +38,4 @@ public class DeptApiImpl implements DeptApi { | @@ -40,10 +38,4 @@ public class DeptApiImpl implements DeptApi { | ||
| 40 | deptService.validDepts(ids); | 38 | deptService.validDepts(ids); |
| 41 | } | 39 | } |
| 42 | 40 | ||
| 43 | - @Override | ||
| 44 | - public Map<Long, DeptRespDTO> getDeptMap(Set<Long> ids) { | ||
| 45 | - Map<Long, DeptDO> depts = deptService.getDeptMap(ids); | ||
| 46 | - return DeptConvert.INSTANCE.convertMap(depts); | ||
| 47 | - } | ||
| 48 | - | ||
| 49 | } | 41 | } |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApiImpl.java
| 1 | package cn.iocoder.yudao.module.system.api.dict; | 1 | package cn.iocoder.yudao.module.system.api.dict; |
| 2 | 2 | ||
| 3 | +import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO; | ||
| 4 | +import cn.iocoder.yudao.module.system.convert.dict.DictDataConvert; | ||
| 5 | +import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; | ||
| 3 | import cn.iocoder.yudao.module.system.service.dict.DictDataService; | 6 | import cn.iocoder.yudao.module.system.service.dict.DictDataService; |
| 4 | import org.springframework.stereotype.Service; | 7 | import org.springframework.stereotype.Service; |
| 5 | 8 | ||
| @@ -22,4 +25,16 @@ public class DictDataApiImpl implements DictDataApi { | @@ -22,4 +25,16 @@ public class DictDataApiImpl implements DictDataApi { | ||
| 22 | dictDataService.validDictDatas(dictType, values); | 25 | dictDataService.validDictDatas(dictType, values); |
| 23 | } | 26 | } |
| 24 | 27 | ||
| 28 | + @Override | ||
| 29 | + public DictDataRespDTO getDictData(String dictType, String value) { | ||
| 30 | + DictDataDO dictData = dictDataService.getDictData(dictType, value); | ||
| 31 | + return DictDataConvert.INSTANCE.convert02(dictData); | ||
| 32 | + } | ||
| 33 | + | ||
| 34 | + @Override | ||
| 35 | + public DictDataRespDTO parseDictData(String dictType, String label) { | ||
| 36 | + DictDataDO dictData = dictDataService.parseDictData(dictType, label); | ||
| 37 | + return DictDataConvert.INSTANCE.convert02(dictData); | ||
| 38 | + } | ||
| 39 | + | ||
| 25 | } | 40 | } |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApiImpl.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.system.api.errorcode; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; | ||
| 4 | +import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeRespDTO; | ||
| 5 | +import cn.iocoder.yudao.module.system.service.errorcode.ErrorCodeService; | ||
| 6 | +import org.springframework.stereotype.Service; | ||
| 7 | + | ||
| 8 | +import javax.annotation.Resource; | ||
| 9 | +import java.util.Date; | ||
| 10 | +import java.util.List; | ||
| 11 | + | ||
| 12 | +/** | ||
| 13 | + * 错误码 Api 实现类 | ||
| 14 | + * | ||
| 15 | + * @author 芋道源码 | ||
| 16 | + */ | ||
| 17 | +@Service | ||
| 18 | +public class ErrorCodeApiImpl implements ErrorCodeApi { | ||
| 19 | + | ||
| 20 | + @Resource | ||
| 21 | + private ErrorCodeService errorCodeService; | ||
| 22 | + | ||
| 23 | + @Override | ||
| 24 | + public void autoGenerateErrorCodes(List<ErrorCodeAutoGenerateReqDTO> autoGenerateDTOs) { | ||
| 25 | + errorCodeService.autoGenerateErrorCodes(autoGenerateDTOs); | ||
| 26 | + } | ||
| 27 | + | ||
| 28 | + @Override | ||
| 29 | + public List<ErrorCodeRespDTO> getErrorCodeList(String applicationName, Date minUpdateTime) { | ||
| 30 | + return errorCodeService.getErrorCodeList(applicationName, minUpdateTime); | ||
| 31 | + } | ||
| 32 | + | ||
| 33 | +} |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.system.api.logger; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO; | ||
| 4 | +import cn.iocoder.yudao.module.system.service.logger.OperateLogService; | ||
| 5 | +import org.springframework.stereotype.Service; | ||
| 6 | +import org.springframework.validation.annotation.Validated; | ||
| 7 | + | ||
| 8 | +import javax.annotation.Resource; | ||
| 9 | + | ||
| 10 | +/** | ||
| 11 | + * 操作日志 API 实现类 | ||
| 12 | + * | ||
| 13 | + * @author 芋道源码 | ||
| 14 | + */ | ||
| 15 | +@Service | ||
| 16 | +@Validated | ||
| 17 | +public class OperateLogApiImpl implements OperateLogApi { | ||
| 18 | + | ||
| 19 | + @Resource | ||
| 20 | + private OperateLogService operateLogService; | ||
| 21 | + | ||
| 22 | + @Override | ||
| 23 | + public void createOperateLog(OperateLogCreateReqDTO createReqDTO) { | ||
| 24 | + operateLogService.createOperateLog(createReqDTO); | ||
| 25 | + } | ||
| 26 | + | ||
| 27 | +} |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/auth/OAuth2TokenApiImpl.java renamed to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/OAuth2TokenApiImpl.java
| 1 | -package cn.iocoder.yudao.module.system.api.auth; | 1 | +package cn.iocoder.yudao.module.system.api.oauth2; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.module.system.api.auth.dto.OAuth2AccessTokenCheckRespDTO; | ||
| 4 | -import cn.iocoder.yudao.module.system.api.auth.dto.OAuth2AccessTokenCreateReqDTO; | ||
| 5 | -import cn.iocoder.yudao.module.system.api.auth.dto.OAuth2AccessTokenRespDTO; | 3 | +import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; |
| 4 | +import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCreateReqDTO; | ||
| 5 | +import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO; | ||
| 6 | import cn.iocoder.yudao.module.system.convert.auth.OAuth2TokenConvert; | 6 | import cn.iocoder.yudao.module.system.convert.auth.OAuth2TokenConvert; |
| 7 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; | 7 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; |
| 8 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService; | 8 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService; |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/tenant/TenantApiImpl.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.system.api.tenant; | ||
| 2 | + | ||
| 3 | +import cn.iocoder.yudao.module.system.service.tenant.TenantService; | ||
| 4 | +import org.springframework.stereotype.Service; | ||
| 5 | + | ||
| 6 | +import javax.annotation.Resource; | ||
| 7 | +import java.util.List; | ||
| 8 | + | ||
| 9 | +/** | ||
| 10 | + * 多租户的 API 实现类 | ||
| 11 | + * | ||
| 12 | + * @author 芋道源码 | ||
| 13 | + */ | ||
| 14 | +@Service | ||
| 15 | +public class TenantApiImpl implements TenantApi { | ||
| 16 | + | ||
| 17 | + @Resource | ||
| 18 | + private TenantService tenantService; | ||
| 19 | + | ||
| 20 | + @Override | ||
| 21 | + public List<Long> getTenantIds() { | ||
| 22 | + return tenantService.getTenantIds(); | ||
| 23 | + } | ||
| 24 | + | ||
| 25 | + @Override | ||
| 26 | + public void validTenant(Long id) { | ||
| 27 | + tenantService.validTenant(id); | ||
| 28 | + } | ||
| 29 | + | ||
| 30 | +} |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
| @@ -9,7 +9,6 @@ import org.springframework.stereotype.Service; | @@ -9,7 +9,6 @@ import org.springframework.stereotype.Service; | ||
| 9 | import javax.annotation.Resource; | 9 | import javax.annotation.Resource; |
| 10 | import java.util.Collection; | 10 | import java.util.Collection; |
| 11 | import java.util.List; | 11 | import java.util.List; |
| 12 | -import java.util.Map; | ||
| 13 | import java.util.Set; | 12 | import java.util.Set; |
| 14 | 13 | ||
| 15 | /** | 14 | /** |
| @@ -30,6 +29,12 @@ public class AdminUserApiImpl implements AdminUserApi { | @@ -30,6 +29,12 @@ public class AdminUserApiImpl implements AdminUserApi { | ||
| 30 | } | 29 | } |
| 31 | 30 | ||
| 32 | @Override | 31 | @Override |
| 32 | + public List<AdminUserRespDTO> getUsers(Collection<Long> ids) { | ||
| 33 | + List<AdminUserDO> users = userService.getUsers(ids); | ||
| 34 | + return UserConvert.INSTANCE.convertList4(users); | ||
| 35 | + } | ||
| 36 | + | ||
| 37 | + @Override | ||
| 33 | public List<AdminUserRespDTO> getUsersByDeptIds(Collection<Long> deptIds) { | 38 | public List<AdminUserRespDTO> getUsersByDeptIds(Collection<Long> deptIds) { |
| 34 | List<AdminUserDO> users = userService.getUsersByDeptIds(deptIds); | 39 | List<AdminUserDO> users = userService.getUsersByDeptIds(deptIds); |
| 35 | return UserConvert.INSTANCE.convertList4(users); | 40 | return UserConvert.INSTANCE.convertList4(users); |
| @@ -42,12 +47,6 @@ public class AdminUserApiImpl implements AdminUserApi { | @@ -42,12 +47,6 @@ public class AdminUserApiImpl implements AdminUserApi { | ||
| 42 | } | 47 | } |
| 43 | 48 | ||
| 44 | @Override | 49 | @Override |
| 45 | - public Map<Long, AdminUserRespDTO> getUserMap(Collection<Long> ids) { | ||
| 46 | - Map<Long, AdminUserDO> userMap = userService.getUserMap(ids); | ||
| 47 | - return UserConvert.INSTANCE.convertMap4(userMap); | ||
| 48 | - } | ||
| 49 | - | ||
| 50 | - @Override | ||
| 51 | public void validUsers(Set<Long> ids) { | 50 | public void validUsers(Set<Long> ids) { |
| 52 | userService.validUsers(ids); | 51 | userService.validUsers(ids); |
| 53 | } | 52 | } |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogBaseVO.java
| @@ -19,7 +19,7 @@ public class LoginLogBaseVO { | @@ -19,7 +19,7 @@ public class LoginLogBaseVO { | ||
| 19 | @NotNull(message = "日志类型不能为空") | 19 | @NotNull(message = "日志类型不能为空") |
| 20 | private Integer logType; | 20 | private Integer logType; |
| 21 | 21 | ||
| 22 | - @ApiModelProperty(value = "链路追踪编号", required = true, example = "89aca178-a370-411c-ae02-3f0d672be4ab") | 22 | + @ApiModelProperty(value = "链路追踪编号", example = "89aca178-a370-411c-ae02-3f0d672be4ab") |
| 23 | @NotEmpty(message = "链路追踪编号不能为空") | 23 | @NotEmpty(message = "链路追踪编号不能为空") |
| 24 | private String traceId; | 24 | private String traceId; |
| 25 | 25 | ||
| @@ -36,8 +36,7 @@ public class LoginLogBaseVO { | @@ -36,8 +36,7 @@ public class LoginLogBaseVO { | ||
| 36 | @NotEmpty(message = "用户 IP 不能为空") | 36 | @NotEmpty(message = "用户 IP 不能为空") |
| 37 | private String userIp; | 37 | private String userIp; |
| 38 | 38 | ||
| 39 | - @ApiModelProperty(value = "浏览器 UserAgent", required = true, example = "Mozilla/5.0") | ||
| 40 | - @NotEmpty(message = "浏览器 UserAgent 不能为空") | 39 | + @ApiModelProperty(value = "浏览器 UserAgent", example = "Mozilla/5.0") |
| 41 | private String userAgent; | 40 | private String userAgent; |
| 42 | 41 | ||
| 43 | } | 42 | } |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java
| @@ -18,8 +18,7 @@ public class LoginLogRespVO extends LoginLogBaseVO { | @@ -18,8 +18,7 @@ public class LoginLogRespVO extends LoginLogBaseVO { | ||
| 18 | @ApiModelProperty(value = "日志编号", required = true, example = "1024") | 18 | @ApiModelProperty(value = "日志编号", required = true, example = "1024") |
| 19 | private Long id; | 19 | private Long id; |
| 20 | 20 | ||
| 21 | - @ApiModelProperty(value = "用户编号", required = true, example = "666") | ||
| 22 | - @NotNull(message = "用户编号不能为空") | 21 | + @ApiModelProperty(value = "用户编号", example = "666") |
| 23 | private Long userId; | 22 | private Long userId; |
| 24 | 23 | ||
| 25 | @ApiModelProperty(value = "用户类型", required = true, example = "2", notes = "参见 UserTypeEnum 枚举") | 24 | @ApiModelProperty(value = "用户类型", required = true, example = "2", notes = "参见 UserTypeEnum 枚举") |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenController.java
| @@ -16,7 +16,7 @@ import cn.iocoder.yudao.module.system.convert.oauth2.OAuth2OpenConvert; | @@ -16,7 +16,7 @@ import cn.iocoder.yudao.module.system.convert.oauth2.OAuth2OpenConvert; | ||
| 16 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; | 16 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; |
| 17 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; | 17 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; |
| 18 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; | 18 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; |
| 19 | -import cn.iocoder.yudao.module.system.enums.auth.OAuth2GrantTypeEnum; | 19 | +import cn.iocoder.yudao.module.system.enums.oauth2.OAuth2GrantTypeEnum; |
| 20 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2ApproveService; | 20 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2ApproveService; |
| 21 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2ClientService; | 21 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2ClientService; |
| 22 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2GrantService; | 22 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2GrantService; |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java
| @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; | @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; | ||
| 8 | 8 | ||
| 9 | import java.util.List; | 9 | import java.util.List; |
| 10 | 10 | ||
| 11 | -@ApiModel("管理后台 - OAuth2.0 获得用户基本信息 Response VO") | 11 | +@ApiModel("管理后台 - OAuth2 获得用户基本信息 Response VO") |
| 12 | @Data | 12 | @Data |
| 13 | @NoArgsConstructor | 13 | @NoArgsConstructor |
| 14 | @AllArgsConstructor | 14 | @AllArgsConstructor |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/vo/user/OAuth2UserUpdateReqVO.java
| @@ -10,7 +10,7 @@ import org.hibernate.validator.constraints.Length; | @@ -10,7 +10,7 @@ import org.hibernate.validator.constraints.Length; | ||
| 10 | import javax.validation.constraints.Email; | 10 | import javax.validation.constraints.Email; |
| 11 | import javax.validation.constraints.Size; | 11 | import javax.validation.constraints.Size; |
| 12 | 12 | ||
| 13 | -@ApiModel("管理后台 - OAuth2.0 更新用户基本信息 Request VO") | 13 | +@ApiModel("管理后台 - OAuth2 更新用户基本信息 Request VO") |
| 14 | @Data | 14 | @Data |
| 15 | @NoArgsConstructor | 15 | @NoArgsConstructor |
| 16 | @AllArgsConstructor | 16 | @AllArgsConstructor |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.http
| @@ -5,7 +5,8 @@ Content-Type: application/json | @@ -5,7 +5,8 @@ Content-Type: application/json | ||
| 5 | tenant-id: {{adminTenentId}} | 5 | tenant-id: {{adminTenentId}} |
| 6 | 6 | ||
| 7 | { | 7 | { |
| 8 | - "code": "test_01", | 8 | + "templateCode": "test_01", |
| 9 | + "mobile": "156016913900", | ||
| 9 | "params": { | 10 | "params": { |
| 10 | "key01": "value01", | 11 | "key01": "value01", |
| 11 | "key02": "value02" | 12 | "key02": "value02" |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/OAuth2TokenConvert.java
| 1 | package cn.iocoder.yudao.module.system.convert.auth; | 1 | package cn.iocoder.yudao.module.system.convert.auth; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.yudao.module.system.api.auth.dto.OAuth2AccessTokenCheckRespDTO; | ||
| 5 | -import cn.iocoder.yudao.module.system.api.auth.dto.OAuth2AccessTokenRespDTO; | 4 | +import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenCheckRespDTO; |
| 5 | +import cn.iocoder.yudao.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO; | ||
| 6 | import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenRespVO; | 6 | import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.token.OAuth2AccessTokenRespVO; |
| 7 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; | 7 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; |
| 8 | import org.mapstruct.Mapper; | 8 | import org.mapstruct.Mapper; |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/DeptConvert.java
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dict/DictDataConvert.java
| 1 | package cn.iocoder.yudao.module.system.convert.dict; | 1 | package cn.iocoder.yudao.module.system.convert.dict; |
| 2 | 2 | ||
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 4 | +import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO; | ||
| 3 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.*; | 5 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.*; |
| 4 | import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; | 6 | import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; |
| 5 | -import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 6 | -import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO; | ||
| 7 | import org.mapstruct.Mapper; | 7 | import org.mapstruct.Mapper; |
| 8 | import org.mapstruct.factory.Mappers; | 8 | import org.mapstruct.factory.Mappers; |
| 9 | 9 | ||
| @@ -29,6 +29,4 @@ public interface DictDataConvert { | @@ -29,6 +29,4 @@ public interface DictDataConvert { | ||
| 29 | 29 | ||
| 30 | DictDataRespDTO convert02(DictDataDO bean); | 30 | DictDataRespDTO convert02(DictDataDO bean); |
| 31 | 31 | ||
| 32 | - List<DictDataRespDTO> convertList03(Collection<DictDataDO> list); | ||
| 33 | - | ||
| 34 | } | 32 | } |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/errorcode/ErrorCodeConvert.java
| 1 | package cn.iocoder.yudao.module.system.convert.errorcode; | 1 | package cn.iocoder.yudao.module.system.convert.errorcode; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | +import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; | ||
| 5 | +import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeRespDTO; | ||
| 4 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; | 6 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; |
| 5 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeExcelVO; | 7 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeExcelVO; |
| 6 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeRespVO; | 8 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeRespVO; |
| 7 | -import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; | ||
| 8 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; | ||
| 9 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.dto.ErrorCodeRespDTO; | ||
| 10 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; | 9 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; |
| 10 | +import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; | ||
| 11 | import org.mapstruct.Mapper; | 11 | import org.mapstruct.Mapper; |
| 12 | import org.mapstruct.factory.Mappers; | 12 | import org.mapstruct.factory.Mappers; |
| 13 | 13 |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/logger/OperateLogConvert.java
| @@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO; | @@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO; | ||
| 6 | import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; | 6 | import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; |
| 7 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 7 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 8 | import cn.iocoder.yudao.framework.common.util.collection.MapUtils; | 8 | import cn.iocoder.yudao.framework.common.util.collection.MapUtils; |
| 9 | -import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO; | 9 | +import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO; |
| 10 | import org.mapstruct.Mapper; | 10 | import org.mapstruct.Mapper; |
| 11 | import org.mapstruct.factory.Mappers; | 11 | import org.mapstruct.factory.Mappers; |
| 12 | 12 |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/user/UserConvert.java
| @@ -14,7 +14,6 @@ import org.mapstruct.Mapper; | @@ -14,7 +14,6 @@ import org.mapstruct.Mapper; | ||
| 14 | import org.mapstruct.factory.Mappers; | 14 | import org.mapstruct.factory.Mappers; |
| 15 | 15 | ||
| 16 | import java.util.List; | 16 | import java.util.List; |
| 17 | -import java.util.Map; | ||
| 18 | 17 | ||
| 19 | @Mapper | 18 | @Mapper |
| 20 | public interface UserConvert { | 19 | public interface UserConvert { |
| @@ -53,6 +52,4 @@ public interface UserConvert { | @@ -53,6 +52,4 @@ public interface UserConvert { | ||
| 53 | 52 | ||
| 54 | List<AdminUserRespDTO> convertList4(List<AdminUserDO> users); | 53 | List<AdminUserRespDTO> convertList4(List<AdminUserDO> users); |
| 55 | 54 | ||
| 56 | - Map<Long, AdminUserRespDTO> convertMap4(Map<Long, AdminUserDO> map); | ||
| 57 | - | ||
| 58 | } | 55 | } |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/oauth2/OAuth2ClientDO.java
| @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.system.dal.dataobject.oauth2; | @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.system.dal.dataobject.oauth2; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 4 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | 4 | import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; |
| 5 | -import cn.iocoder.yudao.module.system.enums.auth.OAuth2GrantTypeEnum; | 5 | +import cn.iocoder.yudao.module.system.enums.oauth2.OAuth2GrantTypeEnum; |
| 6 | import com.baomidou.mybatisplus.annotation.KeySequence; | 6 | import com.baomidou.mybatisplus.annotation.KeySequence; |
| 7 | import com.baomidou.mybatisplus.annotation.TableField; | 7 | import com.baomidou.mybatisplus.annotation.TableField; |
| 8 | import com.baomidou.mybatisplus.annotation.TableId; | 8 | import com.baomidou.mybatisplus.annotation.TableId; |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java
| @@ -8,11 +8,9 @@ import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPage | @@ -8,11 +8,9 @@ import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPage | ||
| 8 | import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; | 8 | import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; |
| 9 | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | 9 | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
| 10 | import org.apache.ibatis.annotations.Mapper; | 10 | import org.apache.ibatis.annotations.Mapper; |
| 11 | -import org.apache.ibatis.annotations.Select; | ||
| 12 | 11 | ||
| 13 | import java.util.Arrays; | 12 | import java.util.Arrays; |
| 14 | import java.util.Collection; | 13 | import java.util.Collection; |
| 15 | -import java.util.Date; | ||
| 16 | import java.util.List; | 14 | import java.util.List; |
| 17 | 15 | ||
| 18 | @Mapper | 16 | @Mapper |
| @@ -23,6 +21,11 @@ public interface DictDataMapper extends BaseMapperX<DictDataDO> { | @@ -23,6 +21,11 @@ public interface DictDataMapper extends BaseMapperX<DictDataDO> { | ||
| 23 | .eq(DictDataDO::getValue, value)); | 21 | .eq(DictDataDO::getValue, value)); |
| 24 | } | 22 | } |
| 25 | 23 | ||
| 24 | + default DictDataDO selectByDictTypeAndLabel(String dictType, String label) { | ||
| 25 | + return selectOne(new LambdaQueryWrapper<DictDataDO>().eq(DictDataDO::getDictType, dictType) | ||
| 26 | + .eq(DictDataDO::getLabel, label)); | ||
| 27 | + } | ||
| 28 | + | ||
| 26 | default List<DictDataDO> selectByDictTypeAndValues(String dictType, Collection<String> values) { | 29 | default List<DictDataDO> selectByDictTypeAndValues(String dictType, Collection<String> values) { |
| 27 | return selectList(new LambdaQueryWrapper<DictDataDO>().eq(DictDataDO::getDictType, dictType) | 30 | return selectList(new LambdaQueryWrapper<DictDataDO>().eq(DictDataDO::getDictType, dictType) |
| 28 | .in(DictDataDO::getValue, values)); | 31 | .in(DictDataDO::getValue, values)); |
| @@ -46,7 +49,4 @@ public interface DictDataMapper extends BaseMapperX<DictDataDO> { | @@ -46,7 +49,4 @@ public interface DictDataMapper extends BaseMapperX<DictDataDO> { | ||
| 46 | .eqIfPresent(DictDataDO::getStatus, reqVO.getStatus())); | 49 | .eqIfPresent(DictDataDO::getStatus, reqVO.getStatus())); |
| 47 | } | 50 | } |
| 48 | 51 | ||
| 49 | - @Select("SELECT COUNT(*) FROM system_dict_data WHERE update_time > #{maxUpdateTime}") | ||
| 50 | - Long selectCountByUpdateTimeGt(Date maxUpdateTime); | ||
| 51 | - | ||
| 52 | } | 52 | } |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/dict/DictDataRefreshConsumer.java deleted
| 1 | -package cn.iocoder.yudao.module.system.mq.consumer.dict; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessageListener; | ||
| 4 | -import cn.iocoder.yudao.module.system.mq.message.dict.DictDataRefreshMessage; | ||
| 5 | -import cn.iocoder.yudao.module.system.service.dict.DictDataService; | ||
| 6 | -import lombok.extern.slf4j.Slf4j; | ||
| 7 | -import org.springframework.stereotype.Component; | ||
| 8 | - | ||
| 9 | -import javax.annotation.Resource; | ||
| 10 | - | ||
| 11 | -/** | ||
| 12 | - * 针对 {@link DictDataRefreshMessage} 的消费者 | ||
| 13 | - * | ||
| 14 | - * @author 芋道源码 | ||
| 15 | - */ | ||
| 16 | -@Component | ||
| 17 | -@Slf4j | ||
| 18 | -public class DictDataRefreshConsumer extends AbstractChannelMessageListener<DictDataRefreshMessage> { | ||
| 19 | - | ||
| 20 | - @Resource | ||
| 21 | - private DictDataService dictDataService; | ||
| 22 | - | ||
| 23 | - @Override | ||
| 24 | - public void onMessage(DictDataRefreshMessage message) { | ||
| 25 | - log.info("[onMessage][收到 DictData 刷新消息]"); | ||
| 26 | - dictDataService.initLocalCache(); | ||
| 27 | - } | ||
| 28 | - | ||
| 29 | -} |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/tenant/TenantRefreshConsumer.java deleted
| 1 | -package cn.iocoder.yudao.module.system.mq.consumer.tenant; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessageListener; | ||
| 4 | -import cn.iocoder.yudao.module.system.mq.message.tenant.TenantRefreshMessage; | ||
| 5 | -import cn.iocoder.yudao.module.system.service.tenant.TenantService; | ||
| 6 | -import lombok.extern.slf4j.Slf4j; | ||
| 7 | -import org.springframework.stereotype.Component; | ||
| 8 | - | ||
| 9 | -import javax.annotation.Resource; | ||
| 10 | - | ||
| 11 | -/** | ||
| 12 | - * 针对 {@link cn.iocoder.yudao.module.system.mq.message.tenant.TenantRefreshMessage} 的消费者 | ||
| 13 | - * | ||
| 14 | - * @author 芋道源码 | ||
| 15 | - */ | ||
| 16 | -@Component | ||
| 17 | -@Slf4j | ||
| 18 | -public class TenantRefreshConsumer extends AbstractChannelMessageListener<TenantRefreshMessage> { | ||
| 19 | - | ||
| 20 | - @Resource | ||
| 21 | - private TenantService tenantService; | ||
| 22 | - | ||
| 23 | - @Override | ||
| 24 | - public void onMessage(TenantRefreshMessage message) { | ||
| 25 | - log.info("[onMessage][收到 Tenant 刷新消息]"); | ||
| 26 | - tenantService.initLocalCache(); | ||
| 27 | - } | ||
| 28 | - | ||
| 29 | -} |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/dict/DictDataRefreshMessage.java deleted
| 1 | -package cn.iocoder.yudao.module.system.mq.message.dict; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessage; | ||
| 4 | -import lombok.Data; | ||
| 5 | -import lombok.EqualsAndHashCode; | ||
| 6 | - | ||
| 7 | -/** | ||
| 8 | - * 字典数据数据刷新 Message | ||
| 9 | - */ | ||
| 10 | -@Data | ||
| 11 | -@EqualsAndHashCode(callSuper = true) | ||
| 12 | -public class DictDataRefreshMessage extends AbstractChannelMessage { | ||
| 13 | - | ||
| 14 | - @Override | ||
| 15 | - public String getChannel() { | ||
| 16 | - return "system.dict-data.refresh"; | ||
| 17 | - } | ||
| 18 | - | ||
| 19 | -} |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/tenant/TenantRefreshMessage.java deleted
| 1 | -package cn.iocoder.yudao.module.system.mq.message.tenant; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessage; | ||
| 4 | -import lombok.Data; | ||
| 5 | -import lombok.EqualsAndHashCode; | ||
| 6 | - | ||
| 7 | -/** | ||
| 8 | - * 租户数据刷新 Message | ||
| 9 | - * | ||
| 10 | - * @author 芋道源码 | ||
| 11 | - */ | ||
| 12 | -@Data | ||
| 13 | -@EqualsAndHashCode(callSuper = true) | ||
| 14 | -public class TenantRefreshMessage extends AbstractChannelMessage { | ||
| 15 | - | ||
| 16 | - @Override | ||
| 17 | - public String getChannel() { | ||
| 18 | - return "system.tenant.refresh"; | ||
| 19 | - } | ||
| 20 | - | ||
| 21 | -} |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/dict/DictDataProducer.java deleted
| 1 | -package cn.iocoder.yudao.module.system.mq.producer.dict; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.module.system.mq.message.dict.DictDataRefreshMessage; | ||
| 4 | -import cn.iocoder.yudao.framework.mq.core.RedisMQTemplate; | ||
| 5 | -import org.springframework.stereotype.Component; | ||
| 6 | - | ||
| 7 | -import javax.annotation.Resource; | ||
| 8 | - | ||
| 9 | -/** | ||
| 10 | - * DictData 字典数据相关消息的 Producer | ||
| 11 | - */ | ||
| 12 | -@Component | ||
| 13 | -public class DictDataProducer { | ||
| 14 | - | ||
| 15 | - @Resource | ||
| 16 | - private RedisMQTemplate redisMQTemplate; | ||
| 17 | - | ||
| 18 | - /** | ||
| 19 | - * 发送 {@link DictDataRefreshMessage} 消息 | ||
| 20 | - */ | ||
| 21 | - public void sendDictDataRefreshMessage() { | ||
| 22 | - DictDataRefreshMessage message = new DictDataRefreshMessage(); | ||
| 23 | - redisMQTemplate.send(message); | ||
| 24 | - } | ||
| 25 | - | ||
| 26 | -} |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/tenant/TenantProducer.java deleted
| 1 | -package cn.iocoder.yudao.module.system.mq.producer.tenant; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.mq.core.RedisMQTemplate; | ||
| 4 | -import cn.iocoder.yudao.module.system.mq.message.permission.RoleRefreshMessage; | ||
| 5 | -import cn.iocoder.yudao.module.system.mq.message.tenant.TenantRefreshMessage; | ||
| 6 | -import org.springframework.stereotype.Component; | ||
| 7 | - | ||
| 8 | -import javax.annotation.Resource; | ||
| 9 | - | ||
| 10 | -/** | ||
| 11 | - * Tenant 租户相关消息的 Producer | ||
| 12 | - * | ||
| 13 | - * @author 芋道源码 | ||
| 14 | - */ | ||
| 15 | -@Component | ||
| 16 | -public class TenantProducer { | ||
| 17 | - | ||
| 18 | - @Resource | ||
| 19 | - private RedisMQTemplate redisMQTemplate; | ||
| 20 | - | ||
| 21 | - /** | ||
| 22 | - * 发送 {@link RoleRefreshMessage} 消息 | ||
| 23 | - */ | ||
| 24 | - public void sendTenantRefreshMessage() { | ||
| 25 | - TenantRefreshMessage message = new TenantRefreshMessage(); | ||
| 26 | - redisMQTemplate.send(message); | ||
| 27 | - } | ||
| 28 | - | ||
| 29 | -} |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
| @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.system.controller.admin.auth.vo.*; | @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.system.controller.admin.auth.vo.*; | ||
| 12 | import cn.iocoder.yudao.module.system.convert.auth.AuthConvert; | 12 | import cn.iocoder.yudao.module.system.convert.auth.AuthConvert; |
| 13 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; | 13 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; |
| 14 | import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; | 14 | import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; |
| 15 | -import cn.iocoder.yudao.module.system.enums.auth.OAuth2ClientConstants; | 15 | +import cn.iocoder.yudao.module.system.enums.oauth2.OAuth2ClientConstants; |
| 16 | import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; | 16 | import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; |
| 17 | import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum; | 17 | import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum; |
| 18 | import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; | 18 | import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum; |
| @@ -229,7 +229,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { | @@ -229,7 +229,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { | ||
| 229 | reqDTO.setTraceId(TracerUtils.getTraceId()); | 229 | reqDTO.setTraceId(TracerUtils.getTraceId()); |
| 230 | reqDTO.setUserId(userId); | 230 | reqDTO.setUserId(userId); |
| 231 | reqDTO.setUserType(userType); | 231 | reqDTO.setUserType(userType); |
| 232 | - if (ObjectUtil.notEqual(getUserType(), userType)) { | 232 | + if (ObjectUtil.equal(getUserType().getValue(), userType)) { |
| 233 | reqDTO.setUsername(getUsername(userId)); | 233 | reqDTO.setUsername(getUsername(userId)); |
| 234 | } else { | 234 | } else { |
| 235 | reqDTO.setUsername(memberService.getMemberUserMobile(userId)); | 235 | reqDTO.setUsername(memberService.getMemberUserMobile(userId)); |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java
| 1 | package cn.iocoder.yudao.module.system.service.dict; | 1 | package cn.iocoder.yudao.module.system.service.dict; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.dict.core.service.DictDataFrameworkService; | ||
| 4 | -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; | ||
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataCreateReqVO; | 4 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataCreateReqVO; |
| 7 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataExportReqVO; | 5 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataExportReqVO; |
| 8 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; | 6 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; |
| 9 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataUpdateReqVO; | 7 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataUpdateReqVO; |
| 8 | +import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; | ||
| 10 | 9 | ||
| 11 | import java.util.Collection; | 10 | import java.util.Collection; |
| 12 | import java.util.List; | 11 | import java.util.List; |
| @@ -16,12 +15,7 @@ import java.util.List; | @@ -16,12 +15,7 @@ import java.util.List; | ||
| 16 | * | 15 | * |
| 17 | * @author ruoyi | 16 | * @author ruoyi |
| 18 | */ | 17 | */ |
| 19 | -public interface DictDataService extends DictDataFrameworkService { | ||
| 20 | - | ||
| 21 | - /** | ||
| 22 | - * 初始化字典数据的本地缓存 | ||
| 23 | - */ | ||
| 24 | - void initLocalCache(); | 18 | +public interface DictDataService { |
| 25 | 19 | ||
| 26 | /** | 20 | /** |
| 27 | * 创建字典数据 | 21 | * 创建字典数据 |
| @@ -94,4 +88,21 @@ public interface DictDataService extends DictDataFrameworkService { | @@ -94,4 +88,21 @@ public interface DictDataService extends DictDataFrameworkService { | ||
| 94 | */ | 88 | */ |
| 95 | void validDictDatas(String dictType, Collection<String> values); | 89 | void validDictDatas(String dictType, Collection<String> values); |
| 96 | 90 | ||
| 91 | + /** | ||
| 92 | + * 获得指定的字典数据 | ||
| 93 | + * | ||
| 94 | + * @param dictType 字典类型 | ||
| 95 | + * @param value 字典数据值 | ||
| 96 | + * @return 字典数据 | ||
| 97 | + */ | ||
| 98 | + DictDataDO getDictData(String dictType, String value); | ||
| 99 | + | ||
| 100 | + /** | ||
| 101 | + * 解析获得指定的字典数据，从缓存中 | ||
| 102 | + * | ||
| 103 | + * @param dictType 字典类型 | ||
| 104 | + * @param label 字典数据标签 | ||
| 105 | + * @return 字典数据 | ||
| 106 | + */ | ||
| 107 | + DictDataDO parseDictData(String dictType, String label); | ||
| 97 | } | 108 | } |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
| @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; | @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; | ||
| 4 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 4 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; | 6 | import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; |
| 7 | -import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO; | ||
| 8 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataCreateReqVO; | 7 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataCreateReqVO; |
| 9 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataExportReqVO; | 8 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataExportReqVO; |
| 10 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; | 9 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; |
| @@ -13,20 +12,15 @@ import cn.iocoder.yudao.module.system.convert.dict.DictDataConvert; | @@ -13,20 +12,15 @@ import cn.iocoder.yudao.module.system.convert.dict.DictDataConvert; | ||
| 13 | import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; | 12 | import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; |
| 14 | import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; | 13 | import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; |
| 15 | import cn.iocoder.yudao.module.system.dal.mysql.dict.DictDataMapper; | 14 | import cn.iocoder.yudao.module.system.dal.mysql.dict.DictDataMapper; |
| 16 | -import cn.iocoder.yudao.module.system.mq.producer.dict.DictDataProducer; | ||
| 17 | import com.google.common.annotations.VisibleForTesting; | 15 | import com.google.common.annotations.VisibleForTesting; |
| 18 | -import com.google.common.collect.ImmutableMap; | ||
| 19 | -import com.google.common.collect.ImmutableTable; | ||
| 20 | import lombok.extern.slf4j.Slf4j; | 16 | import lombok.extern.slf4j.Slf4j; |
| 21 | -import org.springframework.scheduling.annotation.Scheduled; | ||
| 22 | import org.springframework.stereotype.Service; | 17 | import org.springframework.stereotype.Service; |
| 23 | 18 | ||
| 24 | -import javax.annotation.PostConstruct; | ||
| 25 | import javax.annotation.Resource; | 19 | import javax.annotation.Resource; |
| 26 | import java.util.Collection; | 20 | import java.util.Collection; |
| 27 | import java.util.Comparator; | 21 | import java.util.Comparator; |
| 28 | -import java.util.Date; | ||
| 29 | import java.util.List; | 22 | import java.util.List; |
| 23 | +import java.util.Map; | ||
| 30 | 24 | ||
| 31 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | 25 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
| 32 | import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; | 26 | import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; |
| @@ -47,88 +41,12 @@ public class DictDataServiceImpl implements DictDataService { | @@ -47,88 +41,12 @@ public class DictDataServiceImpl implements DictDataService { | ||
| 47 | .comparing(DictDataDO::getDictType) | 41 | .comparing(DictDataDO::getDictType) |
| 48 | .thenComparingInt(DictDataDO::getSort); | 42 | .thenComparingInt(DictDataDO::getSort); |
| 49 | 43 | ||
| 50 | - /** | ||
| 51 | - * 定时执行 {@link #schedulePeriodicRefresh()} 的周期 | ||
| 52 | - * 因为已经通过 Redis Pub/Sub 机制，所以频率不需要高 | ||
| 53 | - */ | ||
| 54 | - private static final long SCHEDULER_PERIOD = 5 * 60 * 1000L; | ||
| 55 | - | ||
| 56 | @Resource | 44 | @Resource |
| 57 | private DictTypeService dictTypeService; | 45 | private DictTypeService dictTypeService; |
| 58 | 46 | ||
| 59 | @Resource | 47 | @Resource |
| 60 | private DictDataMapper dictDataMapper; | 48 | private DictDataMapper dictDataMapper; |
| 61 | 49 | ||
| 62 | - @Resource | ||
| 63 | - private DictDataProducer dictDataProducer; | ||
| 64 | - | ||
| 65 | - /** | ||
| 66 | - * 字典数据缓存，第二个 key 使用 label | ||
| 67 | - * | ||
| 68 | - * key1：字典类型 dictType | ||
| 69 | - * key2：字典标签 label | ||
| 70 | - */ | ||
| 71 | - private ImmutableTable<String, String, DictDataDO> labelDictDataCache; | ||
| 72 | - /** | ||
| 73 | - * 字典数据缓存，第二个 key 使用 value | ||
| 74 | - * | ||
| 75 | - * key1：字典类型 dictType | ||
| 76 | - * key2：字典值 value | ||
| 77 | - */ | ||
| 78 | - private ImmutableTable<String, String, DictDataDO> valueDictDataCache; | ||
| 79 | - /** | ||
| 80 | - * 缓存字典数据的最大更新时间，用于后续的增量轮询，判断是否有更新 | ||
| 81 | - */ | ||
| 82 | - private volatile Date maxUpdateTime; | ||
| 83 | - | ||
| 84 | - @Override | ||
| 85 | - @PostConstruct | ||
| 86 | - public synchronized void initLocalCache() { | ||
| 87 | - // 获取字典数据列表，如果有更新 | ||
| 88 | - List<DictDataDO> dataList = loadDictDataIfUpdate(maxUpdateTime); | ||
| 89 | - if (CollUtil.isEmpty(dataList)) { | ||
| 90 | - return; | ||
| 91 | - } | ||
| 92 | - | ||
| 93 | - // 构建缓存 | ||
| 94 | - ImmutableTable.Builder<String, String, DictDataDO> labelDictDataBuilder = ImmutableTable.builder(); | ||
| 95 | - ImmutableTable.Builder<String, String, DictDataDO> valueDictDataBuilder = ImmutableTable.builder(); | ||
| 96 | - dataList.forEach(dictData -> { | ||
| 97 | - labelDictDataBuilder.put(dictData.getDictType(), dictData.getLabel(), dictData); | ||
| 98 | - valueDictDataBuilder.put(dictData.getDictType(), dictData.getValue(), dictData); | ||
| 99 | - }); | ||
| 100 | - labelDictDataCache = labelDictDataBuilder.build(); | ||
| 101 | - valueDictDataCache = valueDictDataBuilder.build(); | ||
| 102 | - maxUpdateTime = CollectionUtils.getMaxValue(dataList, DictDataDO::getUpdateTime); | ||
| 103 | - log.info("[initLocalCache][缓存字典数据，数量为:{}]", dataList.size()); | ||
| 104 | - } | ||
| 105 | - | ||
| 106 | - /** | ||
| 107 | - * 如果字典数据发生变化，从数据库中获取最新的全量字典数据。 | ||
| 108 | - * 如果未发生变化，则返回空 | ||
| 109 | - * | ||
| 110 | - * @param maxUpdateTime 当前字典数据的最大更新时间 | ||
| 111 | - * @return 字典数据列表 | ||
| 112 | - */ | ||
| 113 | - private List<DictDataDO> loadDictDataIfUpdate(Date maxUpdateTime) { | ||
| 114 | - // 第一步，判断是否要更新。 | ||
| 115 | - if (maxUpdateTime == null) { // 如果更新时间为空，说明 DB 一定有新数据 | ||
| 116 | - log.info("[loadDictDataIfUpdate][首次加载全量字典数据]"); | ||
| 117 | - } else { // 判断数据库中是否有更新的字典数据 | ||
| 118 | - if (dictDataMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) { | ||
| 119 | - return null; | ||
| 120 | - } | ||
| 121 | - log.info("[loadDictDataIfUpdate][增量加载全量字典数据]"); | ||
| 122 | - } | ||
| 123 | - // 第二步，如果有更新，则从数据库加载所有字典数据 | ||
| 124 | - return dictDataMapper.selectList(); | ||
| 125 | - } | ||
| 126 | - | ||
| 127 | - @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD) | ||
| 128 | - public void schedulePeriodicRefresh() { | ||
| 129 | - initLocalCache(); | ||
| 130 | - } | ||
| 131 | - | ||
| 132 | @Override | 50 | @Override |
| 133 | public List<DictDataDO> getDictDatas() { | 51 | public List<DictDataDO> getDictDatas() { |
| 134 | List<DictDataDO> list = dictDataMapper.selectList(); | 52 | List<DictDataDO> list = dictDataMapper.selectList(); |
| @@ -154,21 +72,6 @@ public class DictDataServiceImpl implements DictDataService { | @@ -154,21 +72,6 @@ public class DictDataServiceImpl implements DictDataService { | ||
| 154 | } | 72 | } |
| 155 | 73 | ||
| 156 | @Override | 74 | @Override |
| 157 | - public DictDataRespDTO getDictDataFromCache(String type, String value) { | ||
| 158 | - return DictDataConvert.INSTANCE.convert02(valueDictDataCache.get(type, value)); | ||
| 159 | - } | ||
| 160 | - | ||
| 161 | - @Override | ||
| 162 | - public DictDataRespDTO parseDictDataFromCache(String type, String label) { | ||
| 163 | - return DictDataConvert.INSTANCE.convert02(labelDictDataCache.get(type, label)); | ||
| 164 | - } | ||
| 165 | - | ||
| 166 | - @Override | ||
| 167 | - public List<DictDataRespDTO> listDictDatasFromCache(String type) { | ||
| 168 | - return DictDataConvert.INSTANCE.convertList03(labelDictDataCache.row(type).values()); | ||
| 169 | - } | ||
| 170 | - | ||
| 171 | - @Override | ||
| 172 | public Long createDictData(DictDataCreateReqVO reqVO) { | 75 | public Long createDictData(DictDataCreateReqVO reqVO) { |
| 173 | // 校验正确性 | 76 | // 校验正确性 |
| 174 | checkCreateOrUpdate(null, reqVO.getValue(), reqVO.getDictType()); | 77 | checkCreateOrUpdate(null, reqVO.getValue(), reqVO.getDictType()); |
| @@ -176,9 +79,6 @@ public class DictDataServiceImpl implements DictDataService { | @@ -176,9 +79,6 @@ public class DictDataServiceImpl implements DictDataService { | ||
| 176 | // 插入字典类型 | 79 | // 插入字典类型 |
| 177 | DictDataDO dictData = DictDataConvert.INSTANCE.convert(reqVO); | 80 | DictDataDO dictData = DictDataConvert.INSTANCE.convert(reqVO); |
| 178 | dictDataMapper.insert(dictData); | 81 | dictDataMapper.insert(dictData); |
| 179 | - | ||
| 180 | - // 发送刷新消息 | ||
| 181 | - dictDataProducer.sendDictDataRefreshMessage(); | ||
| 182 | return dictData.getId(); | 82 | return dictData.getId(); |
| 183 | } | 83 | } |
| 184 | 84 | ||
| @@ -190,9 +90,6 @@ public class DictDataServiceImpl implements DictDataService { | @@ -190,9 +90,6 @@ public class DictDataServiceImpl implements DictDataService { | ||
| 190 | // 更新字典类型 | 90 | // 更新字典类型 |
| 191 | DictDataDO updateObj = DictDataConvert.INSTANCE.convert(reqVO); | 91 | DictDataDO updateObj = DictDataConvert.INSTANCE.convert(reqVO); |
| 192 | dictDataMapper.updateById(updateObj); | 92 | dictDataMapper.updateById(updateObj); |
| 193 | - | ||
| 194 | - // 发送刷新消息 | ||
| 195 | - dictDataProducer.sendDictDataRefreshMessage(); | ||
| 196 | } | 93 | } |
| 197 | 94 | ||
| 198 | @Override | 95 | @Override |
| @@ -202,9 +99,6 @@ public class DictDataServiceImpl implements DictDataService { | @@ -202,9 +99,6 @@ public class DictDataServiceImpl implements DictDataService { | ||
| 202 | 99 | ||
| 203 | // 删除字典数据 | 100 | // 删除字典数据 |
| 204 | dictDataMapper.deleteById(id); | 101 | dictDataMapper.deleteById(id); |
| 205 | - | ||
| 206 | - // 发送刷新消息 | ||
| 207 | - dictDataProducer.sendDictDataRefreshMessage(); | ||
| 208 | } | 102 | } |
| 209 | 103 | ||
| 210 | @Override | 104 | @Override |
| @@ -264,7 +158,8 @@ public class DictDataServiceImpl implements DictDataService { | @@ -264,7 +158,8 @@ public class DictDataServiceImpl implements DictDataService { | ||
| 264 | if (CollUtil.isEmpty(values)) { | 158 | if (CollUtil.isEmpty(values)) { |
| 265 | return; | 159 | return; |
| 266 | } | 160 | } |
| 267 | - ImmutableMap<String, DictDataDO> dictDataMap = valueDictDataCache.row(dictType); | 161 | + Map<String, DictDataDO> dictDataMap = CollectionUtils.convertMap( |
| 162 | + dictDataMapper.selectByDictTypeAndValues(dictType, values), DictDataDO::getValue); | ||
| 268 | // 校验 | 163 | // 校验 |
| 269 | values.forEach(value -> { | 164 | values.forEach(value -> { |
| 270 | DictDataDO dictData = dictDataMap.get(value); | 165 | DictDataDO dictData = dictDataMap.get(value); |
| @@ -277,4 +172,14 @@ public class DictDataServiceImpl implements DictDataService { | @@ -277,4 +172,14 @@ public class DictDataServiceImpl implements DictDataService { | ||
| 277 | }); | 172 | }); |
| 278 | } | 173 | } |
| 279 | 174 | ||
| 175 | + @Override | ||
| 176 | + public DictDataDO getDictData(String dictType, String value) { | ||
| 177 | + return dictDataMapper.selectByDictTypeAndValue(dictType, value); | ||
| 178 | + } | ||
| 179 | + | ||
| 180 | + @Override | ||
| 181 | + public DictDataDO parseDictData(String dictType, String label) { | ||
| 182 | + return dictDataMapper.selectByDictTypeAndLabel(dictType, label); | ||
| 183 | + } | ||
| 184 | + | ||
| 280 | } | 185 | } |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeService.java
| 1 | package cn.iocoder.yudao.module.system.service.errorcode; | 1 | package cn.iocoder.yudao.module.system.service.errorcode; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; | ||
| 5 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.service.ErrorCodeFrameworkService; | 4 | +import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; |
| 5 | +import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeRespDTO; | ||
| 6 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; | 6 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; |
| 7 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeExportReqVO; | 7 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeExportReqVO; |
| 8 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodePageReqVO; | 8 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodePageReqVO; |
| 9 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; | 9 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; |
| 10 | +import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; | ||
| 10 | 11 | ||
| 11 | import javax.validation.Valid; | 12 | import javax.validation.Valid; |
| 13 | +import java.util.Date; | ||
| 12 | import java.util.List; | 14 | import java.util.List; |
| 13 | 15 | ||
| 14 | /** | 16 | /** |
| @@ -16,7 +18,25 @@ import java.util.List; | @@ -16,7 +18,25 @@ import java.util.List; | ||
| 16 | * | 18 | * |
| 17 | * @author 芋道源码 | 19 | * @author 芋道源码 |
| 18 | */ | 20 | */ |
| 19 | -public interface ErrorCodeService extends ErrorCodeFrameworkService { | 21 | +public interface ErrorCodeService { |
| 22 | + | ||
| 23 | + /** | ||
| 24 | + * 自动创建错误码 | ||
| 25 | + * | ||
| 26 | + * @param autoGenerateDTOs 错误码信息 | ||
| 27 | + */ | ||
| 28 | + void autoGenerateErrorCodes(@Valid List<ErrorCodeAutoGenerateReqDTO> autoGenerateDTOs); | ||
| 29 | + | ||
| 30 | + /** | ||
| 31 | + * 增量获得错误码数组 | ||
| 32 | + * | ||
| 33 | + * 如果 minUpdateTime 为空时，则获取所有错误码 | ||
| 34 | + * | ||
| 35 | + * @param applicationName 应用名 | ||
| 36 | + * @param minUpdateTime 最小更新时间 | ||
| 37 | + * @return 错误码数组 | ||
| 38 | + */ | ||
| 39 | + List<ErrorCodeRespDTO> getErrorCodeList(String applicationName, Date minUpdateTime); | ||
| 20 | 40 | ||
| 21 | /** | 41 | /** |
| 22 | * 创建错误码 | 42 | * 创建错误码 |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceImpl.java
| @@ -2,14 +2,14 @@ package cn.iocoder.yudao.module.system.service.errorcode; | @@ -2,14 +2,14 @@ package cn.iocoder.yudao.module.system.service.errorcode; | ||
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | +import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; | ||
| 6 | +import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeRespDTO; | ||
| 5 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; | 7 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; |
| 6 | -import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; | ||
| 7 | -import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; | ||
| 8 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; | ||
| 9 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.dto.ErrorCodeRespDTO; | ||
| 10 | -import cn.iocoder.yudao.module.system.convert.errorcode.ErrorCodeConvert; | ||
| 11 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeExportReqVO; | 8 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeExportReqVO; |
| 12 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodePageReqVO; | 9 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodePageReqVO; |
| 10 | +import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; | ||
| 11 | +import cn.iocoder.yudao.module.system.convert.errorcode.ErrorCodeConvert; | ||
| 12 | +import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; | ||
| 13 | import cn.iocoder.yudao.module.system.dal.mysql.errorcode.ErrorCodeMapper; | 13 | import cn.iocoder.yudao.module.system.dal.mysql.errorcode.ErrorCodeMapper; |
| 14 | import cn.iocoder.yudao.module.system.enums.errorcode.ErrorCodeTypeEnum; | 14 | import cn.iocoder.yudao.module.system.enums.errorcode.ErrorCodeTypeEnum; |
| 15 | import com.google.common.annotations.VisibleForTesting; | 15 | import com.google.common.annotations.VisibleForTesting; |
| @@ -24,9 +24,10 @@ import java.util.List; | @@ -24,9 +24,10 @@ import java.util.List; | ||
| 24 | import java.util.Map; | 24 | import java.util.Map; |
| 25 | 25 | ||
| 26 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | 26 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
| 27 | -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; | ||
| 28 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; | 27 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; |
| 29 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; | 28 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; |
| 29 | +import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.ERROR_CODE_DUPLICATE; | ||
| 30 | +import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.ERROR_CODE_NOT_EXISTS; | ||
| 30 | 31 | ||
| 31 | /** | 32 | /** |
| 32 | * 错误码 Service 实现类 | 33 | * 错误码 Service 实现类 |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogService.java
| 1 | package cn.iocoder.yudao.module.system.service.logger; | 1 | package cn.iocoder.yudao.module.system.service.logger; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | +import cn.iocoder.yudao.framework.operatelog.core.service.OperateLog; | ||
| 4 | import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkService; | 5 | import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkService; |
| 6 | +import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO; | ||
| 5 | import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; | 7 | import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; |
| 6 | import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; | 8 | import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; |
| 7 | import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO; | 9 | import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO; |
| @@ -10,8 +12,17 @@ import java.util.List; | @@ -10,8 +12,17 @@ import java.util.List; | ||
| 10 | 12 | ||
| 11 | /** | 13 | /** |
| 12 | * 操作日志 Service 接口 | 14 | * 操作日志 Service 接口 |
| 15 | + * | ||
| 16 | + * @author 芋道源码 | ||
| 13 | */ | 17 | */ |
| 14 | -public interface OperateLogService extends OperateLogFrameworkService { | 18 | +public interface OperateLogService { |
| 19 | + | ||
| 20 | + /** | ||
| 21 | + * 记录操作日志 | ||
| 22 | + * | ||
| 23 | + * @param createReqDTO 操作日志请求 | ||
| 24 | + */ | ||
| 25 | + void createOperateLog(OperateLogCreateReqDTO createReqDTO); | ||
| 15 | 26 | ||
| 16 | /** | 27 | /** |
| 17 | * 获得操作日志分页列表 | 28 | * 获得操作日志分页列表 |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java
| @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; | @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; | ||
| 4 | import cn.hutool.core.util.StrUtil; | 4 | import cn.hutool.core.util.StrUtil; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | import cn.iocoder.yudao.framework.common.util.string.StrUtils; | 6 | import cn.iocoder.yudao.framework.common.util.string.StrUtils; |
| 7 | -import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO; | 7 | +import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO; |
| 8 | import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; | 8 | import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; |
| 9 | import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; | 9 | import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; |
| 10 | import cn.iocoder.yudao.module.system.convert.logger.OperateLogConvert; | 10 | import cn.iocoder.yudao.module.system.convert.logger.OperateLogConvert; |
| @@ -13,8 +13,6 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; | @@ -13,8 +13,6 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; | ||
| 13 | import cn.iocoder.yudao.module.system.dal.mysql.logger.OperateLogMapper; | 13 | import cn.iocoder.yudao.module.system.dal.mysql.logger.OperateLogMapper; |
| 14 | import cn.iocoder.yudao.module.system.service.user.AdminUserService; | 14 | import cn.iocoder.yudao.module.system.service.user.AdminUserService; |
| 15 | import lombok.extern.slf4j.Slf4j; | 15 | import lombok.extern.slf4j.Slf4j; |
| 16 | -import org.springframework.scheduling.annotation.Async; | ||
| 17 | -import org.springframework.scheduling.annotation.AsyncResult; | ||
| 18 | import org.springframework.stereotype.Service; | 16 | import org.springframework.stereotype.Service; |
| 19 | import org.springframework.validation.annotation.Validated; | 17 | import org.springframework.validation.annotation.Validated; |
| 20 | 18 | ||
| @@ -22,7 +20,6 @@ import javax.annotation.Resource; | @@ -22,7 +20,6 @@ import javax.annotation.Resource; | ||
| 22 | import java.util.Collection; | 20 | import java.util.Collection; |
| 23 | import java.util.Collections; | 21 | import java.util.Collections; |
| 24 | import java.util.List; | 22 | import java.util.List; |
| 25 | -import java.util.concurrent.Future; | ||
| 26 | 23 | ||
| 27 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; | 24 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; |
| 28 | import static cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO.JAVA_METHOD_ARGS_MAX_LENGTH; | 25 | import static cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO.JAVA_METHOD_ARGS_MAX_LENGTH; |
| @@ -40,19 +37,11 @@ public class OperateLogServiceImpl implements OperateLogService { | @@ -40,19 +37,11 @@ public class OperateLogServiceImpl implements OperateLogService { | ||
| 40 | private AdminUserService userService; | 37 | private AdminUserService userService; |
| 41 | 38 | ||
| 42 | @Override | 39 | @Override |
| 43 | - @Async | ||
| 44 | - public Future<Boolean> createOperateLogAsync(OperateLogCreateReqDTO reqVO) { | ||
| 45 | - boolean success = false; | ||
| 46 | - try { | ||
| 47 | - OperateLogDO logDO = OperateLogConvert.INSTANCE.convert(reqVO); | ||
| 48 | - logDO.setJavaMethodArgs(StrUtils.maxLength(logDO.getJavaMethodArgs(), JAVA_METHOD_ARGS_MAX_LENGTH)); | ||
| 49 | - logDO.setResultData(StrUtils.maxLength(logDO.getResultData(), RESULT_MAX_LENGTH)); | ||
| 50 | - success = operateLogMapper.insert(logDO) == 1; | ||
| 51 | - } catch (Throwable throwable) { | ||
| 52 | - // 仅仅打印日志，不对外抛出。原因是，还是要保留现场数据。 | ||
| 53 | - log.error("[createOperateLogAsync][记录操作日志异常，日志为 ({})]", reqVO, throwable); | ||
| 54 | - } | ||
| 55 | - return new AsyncResult<>(success); | 40 | + public void createOperateLog(OperateLogCreateReqDTO createReqDTO) { |
| 41 | + OperateLogDO logDO = OperateLogConvert.INSTANCE.convert(createReqDTO); | ||
| 42 | + logDO.setJavaMethodArgs(StrUtils.maxLength(logDO.getJavaMethodArgs(), JAVA_METHOD_ARGS_MAX_LENGTH)); | ||
| 43 | + logDO.setResultData(StrUtils.maxLength(logDO.getResultData(), RESULT_MAX_LENGTH)); | ||
| 44 | + operateLogMapper.insert(logDO); | ||
| 56 | } | 45 | } |
| 57 | 46 | ||
| 58 | @Override | 47 | @Override |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsSendServiceImpl.java
| @@ -11,6 +11,7 @@ import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory; | @@ -11,6 +11,7 @@ import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory; | ||
| 11 | import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; | 11 | import cn.iocoder.yudao.framework.sms.core.client.SmsCommonResult; |
| 12 | import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO; | 12 | import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO; |
| 13 | import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO; | 13 | import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO; |
| 14 | +import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsChannelDO; | ||
| 14 | import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO; | 15 | import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO; |
| 15 | import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; | 16 | import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; |
| 16 | import cn.iocoder.yudao.module.system.mq.message.sms.SmsSendMessage; | 17 | import cn.iocoder.yudao.module.system.mq.message.sms.SmsSendMessage; |
| @@ -40,7 +41,8 @@ public class SmsSendServiceImpl implements SmsSendService { | @@ -40,7 +41,8 @@ public class SmsSendServiceImpl implements SmsSendService { | ||
| 40 | private AdminUserService adminUserService; | 41 | private AdminUserService adminUserService; |
| 41 | @Resource | 42 | @Resource |
| 42 | private MemberService memberService; | 43 | private MemberService memberService; |
| 43 | - | 44 | + @Resource |
| 45 | + private SmsChannelService smsChannelService; | ||
| 44 | @Resource | 46 | @Resource |
| 45 | private SmsTemplateService smsTemplateService; | 47 | private SmsTemplateService smsTemplateService; |
| 46 | @Resource | 48 | @Resource |
| @@ -80,13 +82,18 @@ public class SmsSendServiceImpl implements SmsSendService { | @@ -80,13 +82,18 @@ public class SmsSendServiceImpl implements SmsSendService { | ||
| 80 | String templateCode, Map<String, Object> templateParams) { | 82 | String templateCode, Map<String, Object> templateParams) { |
| 81 | // 校验短信模板是否合法 | 83 | // 校验短信模板是否合法 |
| 82 | SmsTemplateDO template = this.checkSmsTemplateValid(templateCode); | 84 | SmsTemplateDO template = this.checkSmsTemplateValid(templateCode); |
| 85 | + // 校验短信渠道是否合法 | ||
| 86 | + SmsChannelDO smsChannel = this.checkSmsChannelValid(template.getChannelId()); | ||
| 87 | + | ||
| 83 | // 校验手机号码是否存在 | 88 | // 校验手机号码是否存在 |
| 84 | mobile = this.checkMobile(mobile); | 89 | mobile = this.checkMobile(mobile); |
| 85 | // 构建有序的模板参数。为什么放在这个位置，是提前保证模板参数的正确性，而不是到了插入发送日志 | 90 | // 构建有序的模板参数。为什么放在这个位置，是提前保证模板参数的正确性，而不是到了插入发送日志 |
| 86 | List<KeyValue<String, Object>> newTemplateParams = this.buildTemplateParams(template, templateParams); | 91 | List<KeyValue<String, Object>> newTemplateParams = this.buildTemplateParams(template, templateParams); |
| 87 | 92 | ||
| 88 | // 创建发送日志。如果模板被禁用，则不发送短信，只记录日志 | 93 | // 创建发送日志。如果模板被禁用，则不发送短信，只记录日志 |
| 89 | - Boolean isSend = CommonStatusEnum.ENABLE.getStatus().equals(template.getStatus()); | 94 | + Boolean isSend = CommonStatusEnum.ENABLE.getStatus().equals(template.getStatus()) |
| 95 | + && CommonStatusEnum.ENABLE.getStatus().equals(smsChannel.getStatus()); | ||
| 96 | + ; | ||
| 90 | String content = smsTemplateService.formatSmsTemplateContent(template.getContent(), templateParams); | 97 | String content = smsTemplateService.formatSmsTemplateContent(template.getContent(), templateParams); |
| 91 | Long sendLogId = smsLogService.createSmsLog(mobile, userId, userType, isSend, template, content, templateParams); | 98 | Long sendLogId = smsLogService.createSmsLog(mobile, userId, userType, isSend, template, content, templateParams); |
| 92 | 99 | ||
| @@ -98,6 +105,16 @@ public class SmsSendServiceImpl implements SmsSendService { | @@ -98,6 +105,16 @@ public class SmsSendServiceImpl implements SmsSendService { | ||
| 98 | return sendLogId; | 105 | return sendLogId; |
| 99 | } | 106 | } |
| 100 | 107 | ||
| 108 | + @VisibleForTesting | ||
| 109 | + public SmsChannelDO checkSmsChannelValid(Long channelId) { | ||
| 110 | + // 获得短信模板。考虑到效率，从缓存中获取 | ||
| 111 | + SmsChannelDO channelDO = smsChannelService.getSmsChannel(channelId); | ||
| 112 | + // 短信模板不存在 | ||
| 113 | + if (channelDO == null) { | ||
| 114 | + throw exception(SMS_SEND_TEMPLATE_NOT_EXISTS); | ||
| 115 | + } | ||
| 116 | + return channelDO; | ||
| 117 | + } | ||
| 101 | 118 | ||
| 102 | @VisibleForTesting | 119 | @VisibleForTesting |
| 103 | public SmsTemplateDO checkSmsTemplateValid(String templateCode) { | 120 | public SmsTemplateDO checkSmsTemplateValid(String templateCode) { |
| @@ -112,10 +129,10 @@ public class SmsSendServiceImpl implements SmsSendService { | @@ -112,10 +129,10 @@ public class SmsSendServiceImpl implements SmsSendService { | ||
| 112 | 129 | ||
| 113 | /** | 130 | /** |
| 114 | * 将参数模板，处理成有序的 KeyValue 数组 | 131 | * 将参数模板，处理成有序的 KeyValue 数组 |
| 115 | - * | 132 | + * <p> |
| 116 | * 原因是，部分短信平台并不是使用 key 作为参数，而是数组下标，例如说腾讯云 https://cloud.tencent.com/document/product/382/39023 | 133 | * 原因是，部分短信平台并不是使用 key 作为参数，而是数组下标，例如说腾讯云 https://cloud.tencent.com/document/product/382/39023 |
| 117 | * | 134 | * |
| 118 | - * @param template 短信模板 | 135 | + * @param template 短信模板 |
| 119 | * @param templateParams 原始参数 | 136 | * @param templateParams 原始参数 |
| 120 | * @return 处理后的参数 | 137 | * @return 处理后的参数 |
| 121 | */ | 138 | */ |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantService.java
| @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.system.service.tenant; | @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.system.service.tenant; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; | 4 | import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; |
| 5 | -import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkService; | ||
| 6 | import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantCreateReqVO; | 5 | import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantCreateReqVO; |
| 7 | import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantExportReqVO; | 6 | import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantExportReqVO; |
| 8 | import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO; | 7 | import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO; |
| @@ -20,12 +19,7 @@ import java.util.Set; | @@ -20,12 +19,7 @@ import java.util.Set; | ||
| 20 | * | 19 | * |
| 21 | * @author 芋道源码 | 20 | * @author 芋道源码 |
| 22 | */ | 21 | */ |
| 23 | -public interface TenantService extends TenantFrameworkService { | ||
| 24 | - | ||
| 25 | - /** | ||
| 26 | - * 初始化租户的本地缓存 | ||
| 27 | - */ | ||
| 28 | - void initLocalCache(); | 22 | +public interface TenantService { |
| 29 | 23 | ||
| 30 | /** | 24 | /** |
| 31 | * 创建租户 | 25 | * 创建租户 |
| @@ -120,4 +114,18 @@ public interface TenantService extends TenantFrameworkService { | @@ -120,4 +114,18 @@ public interface TenantService extends TenantFrameworkService { | ||
| 120 | * @param handler 处理器 | 114 | * @param handler 处理器 |
| 121 | */ | 115 | */ |
| 122 | void handleTenantMenu(TenantMenuHandler handler); | 116 | void handleTenantMenu(TenantMenuHandler handler); |
| 117 | + | ||
| 118 | + /** | ||
| 119 | + * 获得所有租户 | ||
| 120 | + * | ||
| 121 | + * @return 租户编号数组 | ||
| 122 | + */ | ||
| 123 | + List<Long> getTenantIds(); | ||
| 124 | + | ||
| 125 | + /** | ||
| 126 | + * 校验租户是否合法 | ||
| 127 | + * | ||
| 128 | + * @param id 租户编号 | ||
| 129 | + */ | ||
| 130 | + void validTenant(Long id); | ||
| 123 | } | 131 | } |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
| @@ -23,31 +23,25 @@ import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO; | @@ -23,31 +23,25 @@ import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO; | ||
| 23 | import cn.iocoder.yudao.module.system.dal.mysql.tenant.TenantMapper; | 23 | import cn.iocoder.yudao.module.system.dal.mysql.tenant.TenantMapper; |
| 24 | import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; | 24 | import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; |
| 25 | import cn.iocoder.yudao.module.system.enums.permission.RoleTypeEnum; | 25 | import cn.iocoder.yudao.module.system.enums.permission.RoleTypeEnum; |
| 26 | -import cn.iocoder.yudao.module.system.mq.producer.tenant.TenantProducer; | ||
| 27 | import cn.iocoder.yudao.module.system.service.permission.MenuService; | 26 | import cn.iocoder.yudao.module.system.service.permission.MenuService; |
| 28 | import cn.iocoder.yudao.module.system.service.permission.PermissionService; | 27 | import cn.iocoder.yudao.module.system.service.permission.PermissionService; |
| 29 | import cn.iocoder.yudao.module.system.service.permission.RoleService; | 28 | import cn.iocoder.yudao.module.system.service.permission.RoleService; |
| 30 | import cn.iocoder.yudao.module.system.service.tenant.handler.TenantInfoHandler; | 29 | import cn.iocoder.yudao.module.system.service.tenant.handler.TenantInfoHandler; |
| 31 | import cn.iocoder.yudao.module.system.service.tenant.handler.TenantMenuHandler; | 30 | import cn.iocoder.yudao.module.system.service.tenant.handler.TenantMenuHandler; |
| 32 | import cn.iocoder.yudao.module.system.service.user.AdminUserService; | 31 | import cn.iocoder.yudao.module.system.service.user.AdminUserService; |
| 33 | -import lombok.Getter; | ||
| 34 | import lombok.extern.slf4j.Slf4j; | 32 | import lombok.extern.slf4j.Slf4j; |
| 35 | import org.springframework.beans.factory.annotation.Autowired; | 33 | import org.springframework.beans.factory.annotation.Autowired; |
| 36 | import org.springframework.context.annotation.Lazy; | 34 | import org.springframework.context.annotation.Lazy; |
| 37 | -import org.springframework.scheduling.annotation.Scheduled; | ||
| 38 | import org.springframework.stereotype.Service; | 35 | import org.springframework.stereotype.Service; |
| 39 | import org.springframework.transaction.annotation.Transactional; | 36 | import org.springframework.transaction.annotation.Transactional; |
| 40 | -import org.springframework.transaction.support.TransactionSynchronization; | ||
| 41 | -import org.springframework.transaction.support.TransactionSynchronizationManager; | ||
| 42 | import org.springframework.validation.annotation.Validated; | 37 | import org.springframework.validation.annotation.Validated; |
| 43 | 38 | ||
| 44 | -import javax.annotation.PostConstruct; | ||
| 45 | import javax.annotation.Resource; | 39 | import javax.annotation.Resource; |
| 46 | -import java.util.*; | 40 | +import java.util.List; |
| 41 | +import java.util.Objects; | ||
| 42 | +import java.util.Set; | ||
| 47 | 43 | ||
| 48 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | 44 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
| 49 | -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertImmutableMap; | ||
| 50 | -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.getMaxValue; | ||
| 51 | import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; | 45 | import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; |
| 52 | import static java.util.Collections.singleton; | 46 | import static java.util.Collections.singleton; |
| 53 | 47 | ||
| @@ -61,26 +55,6 @@ import static java.util.Collections.singleton; | @@ -61,26 +55,6 @@ import static java.util.Collections.singleton; | ||
| 61 | @Slf4j | 55 | @Slf4j |
| 62 | public class TenantServiceImpl implements TenantService { | 56 | public class TenantServiceImpl implements TenantService { |
| 63 | 57 | ||
| 64 | - /** | ||
| 65 | - * 定时执行 {@link #schedulePeriodicRefresh()} 的周期 | ||
| 66 | - * 因为已经通过 Redis Pub/Sub 机制，所以频率不需要高 | ||
| 67 | - */ | ||
| 68 | - private static final long SCHEDULER_PERIOD = 5 * 60 * 1000L; | ||
| 69 | - | ||
| 70 | - /** | ||
| 71 | - * 角色缓存 | ||
| 72 | - * key：角色编号 {@link RoleDO#getId()} | ||
| 73 | - * | ||
| 74 | - * 这里声明 volatile 修饰的原因是，每次刷新时，直接修改指向 | ||
| 75 | - */ | ||
| 76 | - @Getter | ||
| 77 | - private volatile Map<Long, TenantDO> tenantCache; | ||
| 78 | - /** | ||
| 79 | - * 缓存角色的最大更新时间，用于后续的增量轮询，判断是否有更新 | ||
| 80 | - */ | ||
| 81 | - @Getter | ||
| 82 | - private volatile Date maxUpdateTime; | ||
| 83 | - | ||
| 84 | @SuppressWarnings("SpringJavaAutowiredFieldsWarningInspection") | 58 | @SuppressWarnings("SpringJavaAutowiredFieldsWarningInspection") |
| 85 | @Autowired(required = false) // 由于 yudao.tenant.enable 配置项，可以关闭多租户的功能，所以这里只能不强制注入 | 59 | @Autowired(required = false) // 由于 yudao.tenant.enable 配置项，可以关闭多租户的功能，所以这里只能不强制注入 |
| 86 | private TenantProperties tenantProperties; | 60 | private TenantProperties tenantProperties; |
| @@ -100,61 +74,15 @@ public class TenantServiceImpl implements TenantService { | @@ -100,61 +74,15 @@ public class TenantServiceImpl implements TenantService { | ||
| 100 | @Resource | 74 | @Resource |
| 101 | private PermissionService permissionService; | 75 | private PermissionService permissionService; |
| 102 | 76 | ||
| 103 | - @Resource | ||
| 104 | - private TenantProducer tenantProducer; | ||
| 105 | - | ||
| 106 | - /** | ||
| 107 | - * 初始化 {@link #tenantCache} 缓存 | ||
| 108 | - */ | ||
| 109 | - @Override | ||
| 110 | - @PostConstruct | ||
| 111 | - public void initLocalCache() { | ||
| 112 | - // 获取租户列表，如果有更新 | ||
| 113 | - List<TenantDO> tenantList = loadTenantIfUpdate(maxUpdateTime); | ||
| 114 | - if (CollUtil.isEmpty(tenantList)) { | ||
| 115 | - return; | ||
| 116 | - } | ||
| 117 | - | ||
| 118 | - // 写入缓存 | ||
| 119 | - tenantCache = convertImmutableMap(tenantList, TenantDO::getId); | ||
| 120 | - maxUpdateTime = getMaxValue(tenantList, TenantDO::getUpdateTime); | ||
| 121 | - log.info("[initLocalCache][初始化 Tenant 数量为 {}]", tenantList.size()); | ||
| 122 | - } | ||
| 123 | - | ||
| 124 | - @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD) | ||
| 125 | - public void schedulePeriodicRefresh() { | ||
| 126 | - initLocalCache(); | ||
| 127 | - } | ||
| 128 | - | ||
| 129 | - /** | ||
| 130 | - * 如果租户发生变化，从数据库中获取最新的全量租户。 | ||
| 131 | - * 如果未发生变化，则返回空 | ||
| 132 | - * | ||
| 133 | - * @param maxUpdateTime 当前租户的最大更新时间 | ||
| 134 | - * @return 租户列表 | ||
| 135 | - */ | ||
| 136 | - private List<TenantDO> loadTenantIfUpdate(Date maxUpdateTime) { | ||
| 137 | - // 第一步，判断是否要更新。 | ||
| 138 | - if (maxUpdateTime == null) { // 如果更新时间为空，说明 DB 一定有新数据 | ||
| 139 | - log.info("[loadTenantIfUpdate][首次加载全量租户]"); | ||
| 140 | - } else { // 判断数据库中是否有更新的租户 | ||
| 141 | - if (tenantMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) { | ||
| 142 | - return null; | ||
| 143 | - } | ||
| 144 | - log.info("[loadTenantIfUpdate][增量加载全量租户]"); | ||
| 145 | - } | ||
| 146 | - // 第二步，如果有更新，则从数据库加载所有租户 | ||
| 147 | - return tenantMapper.selectList(); | ||
| 148 | - } | ||
| 149 | - | ||
| 150 | @Override | 77 | @Override |
| 151 | public List<Long> getTenantIds() { | 78 | public List<Long> getTenantIds() { |
| 152 | - return new ArrayList<>(tenantCache.keySet()); | 79 | + List<TenantDO> tenants = tenantMapper.selectList(); |
| 80 | + return CollectionUtils.convertList(tenants, TenantDO::getId); | ||
| 153 | } | 81 | } |
| 154 | 82 | ||
| 155 | @Override | 83 | @Override |
| 156 | public void validTenant(Long id) { | 84 | public void validTenant(Long id) { |
| 157 | - TenantDO tenant = tenantCache.get(id); | 85 | + TenantDO tenant = getTenant(id); |
| 158 | if (tenant == null) { | 86 | if (tenant == null) { |
| 159 | throw exception(TENANT_NOT_EXISTS); | 87 | throw exception(TENANT_NOT_EXISTS); |
| 160 | } | 88 | } |
| @@ -184,13 +112,6 @@ public class TenantServiceImpl implements TenantService { | @@ -184,13 +112,6 @@ public class TenantServiceImpl implements TenantService { | ||
| 184 | // 修改租户的管理员 | 112 | // 修改租户的管理员 |
| 185 | tenantMapper.updateById(new TenantDO().setId(tenant.getId()).setContactUserId(userId)); | 113 | tenantMapper.updateById(new TenantDO().setId(tenant.getId()).setContactUserId(userId)); |
| 186 | }); | 114 | }); |
| 187 | - // 发送刷新消息 | ||
| 188 | - TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { | ||
| 189 | - @Override | ||
| 190 | - public void afterCommit() { | ||
| 191 | - tenantProducer.sendTenantRefreshMessage(); | ||
| 192 | - } | ||
| 193 | - }); | ||
| 194 | return tenant.getId(); | 115 | return tenant.getId(); |
| 195 | } | 116 | } |
| 196 | 117 | ||
| @@ -228,13 +149,6 @@ public class TenantServiceImpl implements TenantService { | @@ -228,13 +149,6 @@ public class TenantServiceImpl implements TenantService { | ||
| 228 | if (ObjectUtil.notEqual(tenant.getPackageId(), updateReqVO.getPackageId())) { | 149 | if (ObjectUtil.notEqual(tenant.getPackageId(), updateReqVO.getPackageId())) { |
| 229 | updateTenantRoleMenu(tenant.getId(), tenantPackage.getMenuIds()); | 150 | updateTenantRoleMenu(tenant.getId(), tenantPackage.getMenuIds()); |
| 230 | } | 151 | } |
| 231 | - // 发送刷新消息 | ||
| 232 | - TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { | ||
| 233 | - @Override | ||
| 234 | - public void afterCommit() { | ||
| 235 | - tenantProducer.sendTenantRefreshMessage(); | ||
| 236 | - } | ||
| 237 | - }); | ||
| 238 | } | 152 | } |
| 239 | 153 | ||
| 240 | @Override | 154 | @Override |
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2OpenControllerTest.java
| @@ -14,7 +14,7 @@ import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2Open | @@ -14,7 +14,7 @@ import cn.iocoder.yudao.module.system.controller.admin.oauth2.vo.open.OAuth2Open | ||
| 14 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; | 14 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; |
| 15 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; | 15 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ApproveDO; |
| 16 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; | 16 | import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2ClientDO; |
| 17 | -import cn.iocoder.yudao.module.system.enums.auth.OAuth2GrantTypeEnum; | 17 | +import cn.iocoder.yudao.module.system.enums.oauth2.OAuth2GrantTypeEnum; |
| 18 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2ApproveService; | 18 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2ApproveService; |
| 19 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2ClientService; | 19 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2ClientService; |
| 20 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2GrantService; | 20 | import cn.iocoder.yudao.module.system.service.oauth2.OAuth2GrantService; |
| @@ -77,7 +77,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { | @@ -77,7 +77,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { | ||
| 77 | 77 | ||
| 78 | // mock 方法（访问令牌） | 78 | // mock 方法（访问令牌） |
| 79 | OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class) | 79 | OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class) |
| 80 | - .setExpiresTime(addTime(Duration.ofMillis(30010L))); // 多给 10 毫秒，保证可执行完 | 80 | + .setExpiresTime(addTime(Duration.ofMillis(30050L))); // 多给 10 毫秒，保证可执行完 |
| 81 | when(oauth2GrantService.grantAuthorizationCodeForAccessToken(eq("test_client_id"), | 81 | when(oauth2GrantService.grantAuthorizationCodeForAccessToken(eq("test_client_id"), |
| 82 | eq(code), eq(redirectUri), eq(state))).thenReturn(accessTokenDO); | 82 | eq(code), eq(redirectUri), eq(state))).thenReturn(accessTokenDO); |
| 83 | 83 | ||
| @@ -105,7 +105,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { | @@ -105,7 +105,7 @@ public class OAuth2OpenControllerTest extends BaseMockitoUnitTest { | ||
| 105 | 105 | ||
| 106 | // mock 方法（访问令牌） | 106 | // mock 方法（访问令牌） |
| 107 | OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class) | 107 | OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class) |
| 108 | - .setExpiresTime(addTime(Duration.ofMillis(30010L))); // 多给 10 毫秒，保证可执行完 | 108 | + .setExpiresTime(addTime(Duration.ofMillis(30050L))); // 多给 10 毫秒，保证可执行完 |
| 109 | when(oauth2GrantService.grantPassword(eq(username), eq(password), eq("test_client_id"), | 109 | when(oauth2GrantService.grantPassword(eq(username), eq(password), eq("test_client_id"), |
| 110 | eq(Lists.newArrayList("write", "read")))).thenReturn(accessTokenDO); | 110 | eq(Lists.newArrayList("write", "read")))).thenReturn(accessTokenDO); |
| 111 | 111 |
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceTest.java
| 1 | package cn.iocoder.yudao.module.system.service.dict; | 1 | package cn.iocoder.yudao.module.system.service.dict; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; | ||
| 4 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | +import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; | ||
| 6 | +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; | ||
| 7 | +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; | ||
| 6 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataCreateReqVO; | 8 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataCreateReqVO; |
| 7 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataExportReqVO; | 9 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataExportReqVO; |
| 8 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; | 10 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPageReqVO; |
| 9 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataUpdateReqVO; | 11 | import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataUpdateReqVO; |
| 12 | +import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; | ||
| 10 | import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; | 13 | import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; |
| 11 | import cn.iocoder.yudao.module.system.dal.mysql.dict.DictDataMapper; | 14 | import cn.iocoder.yudao.module.system.dal.mysql.dict.DictDataMapper; |
| 12 | -import cn.iocoder.yudao.module.system.mq.producer.dict.DictDataProducer; | ||
| 13 | -import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; | ||
| 14 | -import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; | ||
| 15 | -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; | ||
| 16 | -import com.google.common.collect.ImmutableTable; | ||
| 17 | import org.junit.jupiter.api.Test; | 15 | import org.junit.jupiter.api.Test; |
| 18 | import org.springframework.boot.test.mock.mockito.MockBean; | 16 | import org.springframework.boot.test.mock.mockito.MockBean; |
| 19 | import org.springframework.context.annotation.Import; | 17 | import org.springframework.context.annotation.Import; |
| 20 | 18 | ||
| 21 | import javax.annotation.Resource; | 19 | import javax.annotation.Resource; |
| 22 | -import java.util.Date; | ||
| 23 | import java.util.List; | 20 | import java.util.List; |
| 24 | import java.util.function.Consumer; | 21 | import java.util.function.Consumer; |
| 25 | 22 | ||
| 26 | -import static cn.hutool.core.bean.BeanUtil.getFieldValue; | ||
| 27 | -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; | ||
| 28 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; | 23 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 29 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; | 24 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; |
| 30 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; | 25 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; |
| 26 | +import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; | ||
| 31 | import static org.junit.jupiter.api.Assertions.*; | 27 | import static org.junit.jupiter.api.Assertions.*; |
| 32 | import static org.mockito.ArgumentMatchers.eq; | 28 | import static org.mockito.ArgumentMatchers.eq; |
| 33 | -import static org.mockito.Mockito.*; | 29 | +import static org.mockito.Mockito.when; |
| 34 | 30 | ||
| 35 | @Import(DictDataServiceImpl.class) | 31 | @Import(DictDataServiceImpl.class) |
| 36 | public class DictDataServiceTest extends BaseDbUnitTest { | 32 | public class DictDataServiceTest extends BaseDbUnitTest { |
| @@ -42,39 +38,6 @@ public class DictDataServiceTest extends BaseDbUnitTest { | @@ -42,39 +38,6 @@ public class DictDataServiceTest extends BaseDbUnitTest { | ||
| 42 | private DictDataMapper dictDataMapper; | 38 | private DictDataMapper dictDataMapper; |
| 43 | @MockBean | 39 | @MockBean |
| 44 | private DictTypeService dictTypeService; | 40 | private DictTypeService dictTypeService; |
| 45 | - @MockBean | ||
| 46 | - private DictDataProducer dictDataProducer; | ||
| 47 | - | ||
| 48 | - /** | ||
| 49 | - * 测试加载到新的字典数据的情况 | ||
| 50 | - */ | ||
| 51 | - @Test | ||
| 52 | - @SuppressWarnings("unchecked") | ||
| 53 | - public void testInitLocalCache() { | ||
| 54 | - // mock 数据 | ||
| 55 | - DictDataDO dictData01 = randomDictDataDO(); | ||
| 56 | - dictDataMapper.insert(dictData01); | ||
| 57 | - DictDataDO dictData02 = randomDictDataDO(); | ||
| 58 | - dictDataMapper.insert(dictData02); | ||
| 59 | - | ||
| 60 | - // 调用 | ||
| 61 | - dictDataService.initLocalCache(); | ||
| 62 | - // 断言 labelDictDataCache 缓存 | ||
| 63 | - ImmutableTable<String, String, DictDataDO> labelDictDataCache = | ||
| 64 | - (ImmutableTable<String, String, DictDataDO>) getFieldValue(dictDataService, "labelDictDataCache"); | ||
| 65 | - assertEquals(2, labelDictDataCache.size()); | ||
| 66 | - assertPojoEquals(dictData01, labelDictDataCache.get(dictData01.getDictType(), dictData01.getLabel())); | ||
| 67 | - assertPojoEquals(dictData02, labelDictDataCache.get(dictData02.getDictType(), dictData02.getLabel())); | ||
| 68 | - // 断言 valueDictDataCache 缓存 | ||
| 69 | - ImmutableTable<String, String, DictDataDO> valueDictDataCache = | ||
| 70 | - (ImmutableTable<String, String, DictDataDO>) getFieldValue(dictDataService, "valueDictDataCache"); | ||
| 71 | - assertEquals(2, valueDictDataCache.size()); | ||
| 72 | - assertPojoEquals(dictData01, valueDictDataCache.get(dictData01.getDictType(), dictData01.getValue())); | ||
| 73 | - assertPojoEquals(dictData02, valueDictDataCache.get(dictData02.getDictType(), dictData02.getValue())); | ||
| 74 | - // 断言 maxUpdateTime 缓存 | ||
| 75 | - Date maxUpdateTime = (Date) getFieldValue(dictDataService, "maxUpdateTime"); | ||
| 76 | - assertEquals(ObjectUtils.max(dictData01.getUpdateTime(), dictData02.getUpdateTime()), maxUpdateTime); | ||
| 77 | - } | ||
| 78 | 41 | ||
| 79 | @Test | 42 | @Test |
| 80 | public void testGetDictDataPage() { | 43 | public void testGetDictDataPage() { |
| @@ -148,8 +111,6 @@ public class DictDataServiceTest extends BaseDbUnitTest { | @@ -148,8 +111,6 @@ public class DictDataServiceTest extends BaseDbUnitTest { | ||
| 148 | // 校验记录的属性是否正确 | 111 | // 校验记录的属性是否正确 |
| 149 | DictDataDO dictData = dictDataMapper.selectById(dictDataId); | 112 | DictDataDO dictData = dictDataMapper.selectById(dictDataId); |
| 150 | assertPojoEquals(reqVO, dictData); | 113 | assertPojoEquals(reqVO, dictData); |
| 151 | - // 校验调用 | ||
| 152 | - verify(dictDataProducer, times(1)).sendDictDataRefreshMessage(); | ||
| 153 | } | 114 | } |
| 154 | 115 | ||
| 155 | @Test | 116 | @Test |
| @@ -170,8 +131,6 @@ public class DictDataServiceTest extends BaseDbUnitTest { | @@ -170,8 +131,6 @@ public class DictDataServiceTest extends BaseDbUnitTest { | ||
| 170 | // 校验是否更新正确 | 131 | // 校验是否更新正确 |
| 171 | DictDataDO dictData = dictDataMapper.selectById(reqVO.getId()); // 获取最新的 | 132 | DictDataDO dictData = dictDataMapper.selectById(reqVO.getId()); // 获取最新的 |
| 172 | assertPojoEquals(reqVO, dictData); | 133 | assertPojoEquals(reqVO, dictData); |
| 173 | - // 校验调用 | ||
| 174 | - verify(dictDataProducer, times(1)).sendDictDataRefreshMessage(); | ||
| 175 | } | 134 | } |
| 176 | 135 | ||
| 177 | @Test | 136 | @Test |
| @@ -186,8 +145,6 @@ public class DictDataServiceTest extends BaseDbUnitTest { | @@ -186,8 +145,6 @@ public class DictDataServiceTest extends BaseDbUnitTest { | ||
| 186 | dictDataService.deleteDictData(id); | 145 | dictDataService.deleteDictData(id); |
| 187 | // 校验数据不存在了 | 146 | // 校验数据不存在了 |
| 188 | assertNull(dictDataMapper.selectById(id)); | 147 | assertNull(dictDataMapper.selectById(id)); |
| 189 | - // 校验调用 | ||
| 190 | - verify(dictDataProducer, times(1)).sendDictDataRefreshMessage(); | ||
| 191 | } | 148 | } |
| 192 | 149 | ||
| 193 | @Test | 150 | @Test |
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceTest.java
| 1 | package cn.iocoder.yudao.module.system.service.errorcode; | 1 | package cn.iocoder.yudao.module.system.service.errorcode; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; | ||
| 5 | -import cn.iocoder.yudao.module.system.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; | 4 | +import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; |
| 5 | +import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; | ||
| 6 | +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; | ||
| 7 | +import cn.iocoder.yudao.module.system.api.errorcode.dto.ErrorCodeAutoGenerateReqDTO; | ||
| 6 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; | 8 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeCreateReqVO; |
| 7 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeExportReqVO; | 9 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeExportReqVO; |
| 8 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodePageReqVO; | 10 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodePageReqVO; |
| 9 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; | 11 | import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.ErrorCodeUpdateReqVO; |
| 12 | +import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; | ||
| 10 | import cn.iocoder.yudao.module.system.dal.mysql.errorcode.ErrorCodeMapper; | 13 | import cn.iocoder.yudao.module.system.dal.mysql.errorcode.ErrorCodeMapper; |
| 11 | import cn.iocoder.yudao.module.system.enums.errorcode.ErrorCodeTypeEnum; | 14 | import cn.iocoder.yudao.module.system.enums.errorcode.ErrorCodeTypeEnum; |
| 12 | -import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; | ||
| 13 | -import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; | ||
| 14 | -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; | ||
| 15 | import org.assertj.core.util.Lists; | 15 | import org.assertj.core.util.Lists; |
| 16 | import org.junit.jupiter.api.Test; | 16 | import org.junit.jupiter.api.Test; |
| 17 | import org.springframework.context.annotation.Import; | 17 | import org.springframework.context.annotation.Import; |
| @@ -21,12 +21,12 @@ import java.util.List; | @@ -21,12 +21,12 @@ import java.util.List; | ||
| 21 | import java.util.function.Consumer; | 21 | import java.util.function.Consumer; |
| 22 | 22 | ||
| 23 | import static cn.hutool.core.util.RandomUtil.randomEle; | 23 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 24 | -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.ERROR_CODE_DUPLICATE; | ||
| 25 | -import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.ERROR_CODE_NOT_EXISTS; | 24 | +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; |
| 26 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; | 25 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 27 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; | 26 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; |
| 28 | -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; | ||
| 29 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; | 27 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; |
| 28 | +import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.ERROR_CODE_DUPLICATE; | ||
| 29 | +import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.ERROR_CODE_NOT_EXISTS; | ||
| 30 | import static org.junit.jupiter.api.Assertions.*; | 30 | import static org.junit.jupiter.api.Assertions.*; |
| 31 | 31 | ||
| 32 | @Import(ErrorCodeServiceImpl.class) | 32 | @Import(ErrorCodeServiceImpl.class) |
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java
| @@ -7,9 +7,10 @@ import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstant | @@ -7,9 +7,10 @@ import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstant | ||
| 7 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 7 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 8 | import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils; | 8 | import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils; |
| 9 | import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; | 9 | import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; |
| 10 | -import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO; | ||
| 11 | import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; | 10 | import cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum; |
| 11 | +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; | ||
| 12 | import cn.iocoder.yudao.framework.test.core.util.RandomUtils; | 12 | import cn.iocoder.yudao.framework.test.core.util.RandomUtils; |
| 13 | +import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO; | ||
| 13 | import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; | 14 | import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; |
| 14 | import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; | 15 | import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; |
| 15 | import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO; | 16 | import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO; |
| @@ -17,7 +18,6 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; | @@ -17,7 +18,6 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; | ||
| 17 | import cn.iocoder.yudao.module.system.dal.mysql.logger.OperateLogMapper; | 18 | import cn.iocoder.yudao.module.system.dal.mysql.logger.OperateLogMapper; |
| 18 | import cn.iocoder.yudao.module.system.enums.common.SexEnum; | 19 | import cn.iocoder.yudao.module.system.enums.common.SexEnum; |
| 19 | import cn.iocoder.yudao.module.system.service.user.AdminUserService; | 20 | import cn.iocoder.yudao.module.system.service.user.AdminUserService; |
| 20 | -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; | ||
| 21 | import org.junit.jupiter.api.Test; | 21 | import org.junit.jupiter.api.Test; |
| 22 | import org.springframework.boot.test.mock.mockito.MockBean; | 22 | import org.springframework.boot.test.mock.mockito.MockBean; |
| 23 | import org.springframework.context.annotation.Import; | 23 | import org.springframework.context.annotation.Import; |
| @@ -25,8 +25,6 @@ import org.springframework.context.annotation.Import; | @@ -25,8 +25,6 @@ import org.springframework.context.annotation.Import; | ||
| 25 | import javax.annotation.Resource; | 25 | import javax.annotation.Resource; |
| 26 | import java.util.Collections; | 26 | import java.util.Collections; |
| 27 | import java.util.List; | 27 | import java.util.List; |
| 28 | -import java.util.concurrent.ExecutionException; | ||
| 29 | -import java.util.concurrent.Future; | ||
| 30 | 28 | ||
| 31 | import static cn.hutool.core.util.RandomUtil.randomEle; | 29 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 32 | import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST; | 30 | import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST; |
| @@ -49,7 +47,7 @@ public class OperateLogServiceImplTest extends BaseDbUnitTest { | @@ -49,7 +47,7 @@ public class OperateLogServiceImplTest extends BaseDbUnitTest { | ||
| 49 | private AdminUserService userService; | 47 | private AdminUserService userService; |
| 50 | 48 | ||
| 51 | @Test | 49 | @Test |
| 52 | - public void testCreateOperateLogAsync() throws InterruptedException, ExecutionException { | 50 | + public void testCreateOperateLogAsync() { |
| 53 | String traceId = TracerUtils.getTraceId(); | 51 | String traceId = TracerUtils.getTraceId(); |
| 54 | OperateLogCreateReqDTO reqVO = RandomUtils.randomPojo(OperateLogCreateReqDTO.class, o -> { | 52 | OperateLogCreateReqDTO reqVO = RandomUtils.randomPojo(OperateLogCreateReqDTO.class, o -> { |
| 55 | o.setTraceId(traceId); | 53 | o.setTraceId(traceId); |
| @@ -59,8 +57,7 @@ public class OperateLogServiceImplTest extends BaseDbUnitTest { | @@ -59,8 +57,7 @@ public class OperateLogServiceImplTest extends BaseDbUnitTest { | ||
| 59 | }); | 57 | }); |
| 60 | 58 | ||
| 61 | // 执行service方法 | 59 | // 执行service方法 |
| 62 | - Future<Boolean> future = operateLogServiceImpl.createOperateLogAsync(reqVO); | ||
| 63 | - future.get(); | 60 | + operateLogServiceImpl.createOperateLog(reqVO); |
| 64 | // 断言插入是否正确 | 61 | // 断言插入是否正确 |
| 65 | OperateLogDO sysOperateLogDO = operateLogMapper.selectOne("trace_id", traceId); | 62 | OperateLogDO sysOperateLogDO = operateLogMapper.selectOne("trace_id", traceId); |
| 66 | assertPojoEquals(reqVO, sysOperateLogDO); | 63 | assertPojoEquals(reqVO, sysOperateLogDO); |
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java
| 1 | package cn.iocoder.yudao.module.system.service.tenant; | 1 | package cn.iocoder.yudao.module.system.service.tenant; |
| 2 | 2 | ||
| 3 | -import cn.hutool.core.util.ReflectUtil; | ||
| 4 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | import cn.iocoder.yudao.framework.tenant.config.TenantProperties; | 5 | import cn.iocoder.yudao.framework.tenant.config.TenantProperties; |
| 7 | import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; | 6 | import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; |
| 7 | +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; | ||
| 8 | import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantCreateReqVO; | 8 | import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantCreateReqVO; |
| 9 | import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantExportReqVO; | 9 | import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantExportReqVO; |
| 10 | import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO; | 10 | import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.TenantPageReqVO; |
| @@ -16,14 +16,12 @@ import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO; | @@ -16,14 +16,12 @@ import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO; | ||
| 16 | import cn.iocoder.yudao.module.system.dal.mysql.tenant.TenantMapper; | 16 | import cn.iocoder.yudao.module.system.dal.mysql.tenant.TenantMapper; |
| 17 | import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; | 17 | import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum; |
| 18 | import cn.iocoder.yudao.module.system.enums.permission.RoleTypeEnum; | 18 | import cn.iocoder.yudao.module.system.enums.permission.RoleTypeEnum; |
| 19 | -import cn.iocoder.yudao.module.system.mq.producer.tenant.TenantProducer; | ||
| 20 | import cn.iocoder.yudao.module.system.service.permission.MenuService; | 19 | import cn.iocoder.yudao.module.system.service.permission.MenuService; |
| 21 | import cn.iocoder.yudao.module.system.service.permission.PermissionService; | 20 | import cn.iocoder.yudao.module.system.service.permission.PermissionService; |
| 22 | import cn.iocoder.yudao.module.system.service.permission.RoleService; | 21 | import cn.iocoder.yudao.module.system.service.permission.RoleService; |
| 23 | import cn.iocoder.yudao.module.system.service.tenant.handler.TenantInfoHandler; | 22 | import cn.iocoder.yudao.module.system.service.tenant.handler.TenantInfoHandler; |
| 24 | import cn.iocoder.yudao.module.system.service.tenant.handler.TenantMenuHandler; | 23 | import cn.iocoder.yudao.module.system.service.tenant.handler.TenantMenuHandler; |
| 25 | import cn.iocoder.yudao.module.system.service.user.AdminUserService; | 24 | import cn.iocoder.yudao.module.system.service.user.AdminUserService; |
| 26 | -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; | ||
| 27 | import org.junit.jupiter.api.BeforeEach; | 25 | import org.junit.jupiter.api.BeforeEach; |
| 28 | import org.junit.jupiter.api.Test; | 26 | import org.junit.jupiter.api.Test; |
| 29 | import org.springframework.boot.test.mock.mockito.MockBean; | 27 | import org.springframework.boot.test.mock.mockito.MockBean; |
| @@ -34,13 +32,11 @@ import java.time.Duration; | @@ -34,13 +32,11 @@ import java.time.Duration; | ||
| 34 | import java.util.Arrays; | 32 | import java.util.Arrays; |
| 35 | import java.util.Collections; | 33 | import java.util.Collections; |
| 36 | import java.util.List; | 34 | import java.util.List; |
| 37 | -import java.util.Map; | ||
| 38 | 35 | ||
| 39 | import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet; | 36 | import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet; |
| 40 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.addTime; | 37 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.addTime; |
| 41 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; | 38 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; |
| 42 | import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; | 39 | import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; |
| 43 | -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.max; | ||
| 44 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; | 40 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 45 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; | 41 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; |
| 46 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; | 42 | import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; |
| @@ -78,43 +74,18 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | @@ -78,43 +74,18 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | ||
| 78 | private MenuService menuService; | 74 | private MenuService menuService; |
| 79 | @MockBean | 75 | @MockBean |
| 80 | private PermissionService permissionService; | 76 | private PermissionService permissionService; |
| 81 | - @MockBean | ||
| 82 | - private TenantProducer tenantProducer; | ||
| 83 | 77 | ||
| 84 | @BeforeEach | 78 | @BeforeEach |
| 85 | public void setUp() { | 79 | public void setUp() { |
| 86 | - // 清理缓存 | ||
| 87 | - ReflectUtil.setFieldValue(tenantService, "tenantCache", Collections.emptyMap()); | ||
| 88 | - ReflectUtil.setFieldValue(tenantService, "maxUpdateTime", null); | ||
| 89 | // 清理租户上下文 | 80 | // 清理租户上下文 |
| 90 | TenantContextHolder.clear(); | 81 | TenantContextHolder.clear(); |
| 91 | } | 82 | } |
| 92 | 83 | ||
| 93 | @Test | 84 | @Test |
| 94 | - public void testInitLocalCache() { | ||
| 95 | - // mock 数据 | ||
| 96 | - TenantDO tenantDO1 = randomPojo(TenantDO.class); | ||
| 97 | - tenantMapper.insert(tenantDO1); | ||
| 98 | - TenantDO tenantDO2 = randomPojo(TenantDO.class); | ||
| 99 | - tenantMapper.insert(tenantDO2); | ||
| 100 | - | ||
| 101 | - // 调用 | ||
| 102 | - tenantService.initLocalCache(); | ||
| 103 | - // 断言 tenantCache 缓存 | ||
| 104 | - Map<Long, TenantDO> tenantCache = tenantService.getTenantCache(); | ||
| 105 | - assertEquals(2, tenantCache.size()); | ||
| 106 | - assertPojoEquals(tenantDO1, tenantCache.get(tenantDO1.getId())); | ||
| 107 | - assertPojoEquals(tenantDO2, tenantCache.get(tenantDO2.getId())); | ||
| 108 | - // 断言 maxUpdateTime 缓存 | ||
| 109 | - assertEquals(max(tenantDO1.getUpdateTime(), tenantDO2.getUpdateTime()), tenantService.getMaxUpdateTime()); | ||
| 110 | - } | ||
| 111 | - | ||
| 112 | - @Test | ||
| 113 | public void testGetTenantIds() { | 85 | public void testGetTenantIds() { |
| 114 | // mock 数据 | 86 | // mock 数据 |
| 115 | TenantDO tenant = randomPojo(TenantDO.class, o -> o.setId(1L)); | 87 | TenantDO tenant = randomPojo(TenantDO.class, o -> o.setId(1L)); |
| 116 | tenantMapper.insert(tenant); | 88 | tenantMapper.insert(tenant); |
| 117 | - tenantService.initLocalCache(); | ||
| 118 | 89 | ||
| 119 | // 调用，并断言业务异常 | 90 | // 调用，并断言业务异常 |
| 120 | List<Long> result = tenantService.getTenantIds(); | 91 | List<Long> result = tenantService.getTenantIds(); |
| @@ -131,7 +102,6 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | @@ -131,7 +102,6 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | ||
| 131 | // mock 数据 | 102 | // mock 数据 |
| 132 | TenantDO tenant = randomPojo(TenantDO.class, o -> o.setId(1L).setStatus(CommonStatusEnum.DISABLE.getStatus())); | 103 | TenantDO tenant = randomPojo(TenantDO.class, o -> o.setId(1L).setStatus(CommonStatusEnum.DISABLE.getStatus())); |
| 133 | tenantMapper.insert(tenant); | 104 | tenantMapper.insert(tenant); |
| 134 | - tenantService.initLocalCache(); | ||
| 135 | 105 | ||
| 136 | // 调用，并断言业务异常 | 106 | // 调用，并断言业务异常 |
| 137 | assertServiceException(() -> tenantService.validTenant(1L), TENANT_DISABLE, tenant.getName()); | 107 | assertServiceException(() -> tenantService.validTenant(1L), TENANT_DISABLE, tenant.getName()); |
| @@ -143,7 +113,6 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | @@ -143,7 +113,6 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | ||
| 143 | TenantDO tenant = randomPojo(TenantDO.class, o -> o.setId(1L).setStatus(CommonStatusEnum.ENABLE.getStatus()) | 113 | TenantDO tenant = randomPojo(TenantDO.class, o -> o.setId(1L).setStatus(CommonStatusEnum.ENABLE.getStatus()) |
| 144 | .setExpireTime(buildTime(2020, 2, 2))); | 114 | .setExpireTime(buildTime(2020, 2, 2))); |
| 145 | tenantMapper.insert(tenant); | 115 | tenantMapper.insert(tenant); |
| 146 | - tenantService.initLocalCache(); | ||
| 147 | 116 | ||
| 148 | // 调用，并断言业务异常 | 117 | // 调用，并断言业务异常 |
| 149 | assertServiceException(() -> tenantService.validTenant(1L), TENANT_EXPIRE, tenant.getName()); | 118 | assertServiceException(() -> tenantService.validTenant(1L), TENANT_EXPIRE, tenant.getName()); |
| @@ -155,7 +124,6 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | @@ -155,7 +124,6 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | ||
| 155 | TenantDO tenant = randomPojo(TenantDO.class, o -> o.setId(1L).setStatus(CommonStatusEnum.ENABLE.getStatus()) | 124 | TenantDO tenant = randomPojo(TenantDO.class, o -> o.setId(1L).setStatus(CommonStatusEnum.ENABLE.getStatus()) |
| 156 | .setExpireTime(addTime(Duration.ofDays(1)))); | 125 | .setExpireTime(addTime(Duration.ofDays(1)))); |
| 157 | tenantMapper.insert(tenant); | 126 | tenantMapper.insert(tenant); |
| 158 | - tenantService.initLocalCache(); | ||
| 159 | 127 | ||
| 160 | // 调用，并断言业务异常 | 128 | // 调用，并断言业务异常 |
| 161 | tenantService.validTenant(1L); | 129 | tenantService.validTenant(1L); |
| @@ -206,8 +174,6 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | @@ -206,8 +174,6 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | ||
| 206 | verify(permissionService).assignRoleMenu(eq(200L), same(tenantPackage.getMenuIds())); | 174 | verify(permissionService).assignRoleMenu(eq(200L), same(tenantPackage.getMenuIds())); |
| 207 | // verify 分配角色 | 175 | // verify 分配角色 |
| 208 | verify(permissionService).assignUserRole(eq(300L), eq(singleton(200L))); | 176 | verify(permissionService).assignUserRole(eq(300L), eq(singleton(200L))); |
| 209 | - // verify 发送刷新消息 | ||
| 210 | - verify(tenantProducer).sendTenantRefreshMessage(); | ||
| 211 | } | 177 | } |
| 212 | 178 | ||
| 213 | @Test | 179 | @Test |
| @@ -240,8 +206,6 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | @@ -240,8 +206,6 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | ||
| 240 | // 校验是否更新正确 | 206 | // 校验是否更新正确 |
| 241 | TenantDO tenant = tenantMapper.selectById(reqVO.getId()); // 获取最新的 | 207 | TenantDO tenant = tenantMapper.selectById(reqVO.getId()); // 获取最新的 |
| 242 | assertPojoEquals(reqVO, tenant); | 208 | assertPojoEquals(reqVO, tenant); |
| 243 | - // verify 发送刷新消息 | ||
| 244 | - verify(tenantProducer).sendTenantRefreshMessage(); | ||
| 245 | // verify 设置角色权限 | 209 | // verify 设置角色权限 |
| 246 | verify(permissionService).assignRoleMenu(eq(100L), eq(asSet(200L, 201L))); | 210 | verify(permissionService).assignRoleMenu(eq(100L), eq(asSet(200L, 201L))); |
| 247 | verify(permissionService).assignRoleMenu(eq(101L), eq(asSet(201L))); | 211 | verify(permissionService).assignRoleMenu(eq(101L), eq(asSet(201L))); |
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
| @@ -225,7 +225,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest { | @@ -225,7 +225,7 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest { | ||
| 225 | ByteArrayInputStream avatarFile = new ByteArrayInputStream(avatarFileBytes); | 225 | ByteArrayInputStream avatarFile = new ByteArrayInputStream(avatarFileBytes); |
| 226 | // mock 方法 | 226 | // mock 方法 |
| 227 | String avatar = randomString(); | 227 | String avatar = randomString(); |
| 228 | - when(fileApi.createFile(eq(avatarFileBytes))).thenReturn(avatar); | 228 | + when(fileApi.createFile(eq( avatarFileBytes))).thenReturn(avatar); |
| 229 | 229 | ||
| 230 | // 调用 | 230 | // 调用 |
| 231 | userService.updateUserAvatar(userId, avatarFile); | 231 | userService.updateUserAvatar(userId, avatarFile); |
yudao-server/pom.xml
| @@ -62,6 +62,10 @@ | @@ -62,6 +62,10 @@ | ||
| 62 | <!-- <artifactId>yudao-module-bpm-biz-activiti</artifactId>--> | 62 | <!-- <artifactId>yudao-module-bpm-biz-activiti</artifactId>--> |
| 63 | <!-- <version>${revision}</version>--> | 63 | <!-- <version>${revision}</version>--> |
| 64 | <!-- </dependency>--> | 64 | <!-- </dependency>--> |
| 65 | + <dependency> | ||
| 66 | + <groupId>cn.iocoder.boot</groupId> | ||
| 67 | + <artifactId>yudao-spring-boot-starter-biz-error-code</artifactId> | ||
| 68 | + </dependency> | ||
| 65 | 69 | ||
| 66 | <!-- spring boot 配置所需依赖 --> | 70 | <!-- spring boot 配置所需依赖 --> |
| 67 | <dependency> | 71 | <dependency> |
| @@ -69,6 +73,10 @@ | @@ -69,6 +73,10 @@ | ||
| 69 | <artifactId>spring-boot-configuration-processor</artifactId> | 73 | <artifactId>spring-boot-configuration-processor</artifactId> |
| 70 | <optional>true</optional> | 74 | <optional>true</optional> |
| 71 | </dependency> | 75 | </dependency> |
| 76 | + <dependency> | ||
| 77 | + <groupId>cn.iocoder.boot</groupId> | ||
| 78 | + <artifactId>yudao-spring-boot-starter-banner</artifactId> | ||
| 79 | + </dependency> | ||
| 72 | 80 | ||
| 73 | <!-- 服务保障相关 --> | 81 | <!-- 服务保障相关 --> |
| 74 | <dependency> | 82 | <dependency> |
| @@ -86,7 +94,7 @@ | @@ -86,7 +94,7 @@ | ||
| 86 | <plugin> | 94 | <plugin> |
| 87 | <groupId>org.springframework.boot</groupId> | 95 | <groupId>org.springframework.boot</groupId> |
| 88 | <artifactId>spring-boot-maven-plugin</artifactId> | 96 | <artifactId>spring-boot-maven-plugin</artifactId> |
| 89 | - <version>2.5.12</version> <!-- 如果 spring.boot.version 版本修改，则这里也要跟着修改 --> | 97 | + <version>2.6.7</version> <!-- 如果 spring.boot.version 版本修改，则这里也要跟着修改 --> |
| 90 | <configuration> | 98 | <configuration> |
| 91 | <fork>true</fork> | 99 | <fork>true</fork> |
| 92 | </configuration> | 100 | </configuration> |
yudao-server/src/main/resources/application-dev.yaml
| @@ -171,10 +171,6 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta | @@ -171,10 +171,6 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta | ||
| 171 | 171 | ||
| 172 | # 芋道配置项，设置当前项目所有自定义的配置 | 172 | # 芋道配置项，设置当前项目所有自定义的配置 |
| 173 | yudao: | 173 | yudao: |
| 174 | - security: | ||
| 175 | - token-header: Authorization | ||
| 176 | - mock-enable: true | ||
| 177 | - mock-secret: test | ||
| 178 | xss: | 174 | xss: |
| 179 | enable: false | 175 | enable: false |
| 180 | exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系 | 176 | exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系 |
yudao-server/src/main/resources/application-local.yaml
| @@ -198,9 +198,7 @@ yudao: | @@ -198,9 +198,7 @@ yudao: | ||
| 198 | captcha: | 198 | captcha: |
| 199 | enable: false # 本地环境，暂时关闭图片验证码，方便登录等接口的测试 | 199 | enable: false # 本地环境，暂时关闭图片验证码，方便登录等接口的测试 |
| 200 | security: | 200 | security: |
| 201 | - token-header: Authorization | ||
| 202 | mock-enable: true | 201 | mock-enable: true |
| 203 | - mock-secret: test | ||
| 204 | xss: | 202 | xss: |
| 205 | enable: false | 203 | enable: false |
| 206 | exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系 | 204 | exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系 |
| @@ -210,6 +208,10 @@ yudao: | @@ -210,6 +208,10 @@ yudao: | ||
| 210 | pay-notify-url: http://niubi.natapp1.cc/api/pay/order/notify | 208 | pay-notify-url: http://niubi.natapp1.cc/api/pay/order/notify |
| 211 | pay-return-url: http://niubi.natapp1.cc/api/pay/order/return | 209 | pay-return-url: http://niubi.natapp1.cc/api/pay/order/return |
| 212 | refund-notify-url: http://niubi.natapp1.cc/api/pay/refund/notify | 210 | refund-notify-url: http://niubi.natapp1.cc/api/pay/refund/notify |
| 211 | + access-log: # 访问日志的配置项 | ||
| 212 | + enable: false | ||
| 213 | + error-code: # 错误码相关配置项 | ||
| 214 | + enable: false | ||
| 213 | demo: false # 关闭演示模式 | 215 | demo: false # 关闭演示模式 |
| 214 | 216 | ||
| 215 | justauth: | 217 | justauth: |
yudao-server/src/main/resources/application.yaml
| @@ -5,12 +5,18 @@ spring: | @@ -5,12 +5,18 @@ spring: | ||
| 5 | profiles: | 5 | profiles: |
| 6 | active: local | 6 | active: local |
| 7 | 7 | ||
| 8 | + main: | ||
| 9 | + allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 | ||
| 10 | + | ||
| 8 | # Servlet 配置 | 11 | # Servlet 配置 |
| 9 | servlet: | 12 | servlet: |
| 10 | # 文件上传相关配置项 | 13 | # 文件上传相关配置项 |
| 11 | multipart: | 14 | multipart: |
| 12 | max-file-size: 16MB # 单个文件大小 | 15 | max-file-size: 16MB # 单个文件大小 |
| 13 | max-request-size: 32MB # 设置总上传的文件大小 | 16 | max-request-size: 32MB # 设置总上传的文件大小 |
| 17 | + mvc: | ||
| 18 | + pathmatch: | ||
| 19 | + matching-strategy: ANT_PATH_MATCHER # 解决 SpringFox 与 SpringBoot 2.6.x 不兼容的问题，参见 SpringFoxHandlerProviderBeanPostProcessor 类 | ||
| 14 | 20 | ||
| 15 | # Jackson 配置项 | 21 | # Jackson 配置项 |
| 16 | jackson: | 22 | jackson: |
| @@ -69,12 +75,6 @@ yudao: | @@ -69,12 +75,6 @@ yudao: | ||
| 69 | version: 1.0.0 | 75 | version: 1.0.0 |
| 70 | base-package: cn.iocoder.yudao | 76 | base-package: cn.iocoder.yudao |
| 71 | web: | 77 | web: |
| 72 | - admin-api: | ||
| 73 | - prefix: /admin-api | ||
| 74 | - controller: '**.controller.admin.**' | ||
| 75 | - app-api: | ||
| 76 | - prefix: /app-api | ||
| 77 | - controller: '**.controller.app.**' | ||
| 78 | admin-ui: | 78 | admin-ui: |
| 79 | url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址 | 79 | url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址 |
| 80 | swagger: | 80 | swagger: |
| @@ -103,6 +103,7 @@ yudao: | @@ -103,6 +103,7 @@ yudao: | ||
| 103 | - /admin-api/system/captcha/get-image # 获取图片验证码，和租户无关 | 103 | - /admin-api/system/captcha/get-image # 获取图片验证码，和租户无关 |
| 104 | - /admin-api/infra/file/*/get/** # 获取图片，和租户无关 | 104 | - /admin-api/infra/file/*/get/** # 获取图片，和租户无关 |
| 105 | - /admin-api/system/sms/callback/* # 短信回调接口，无法带上租户编号 | 105 | - /admin-api/system/sms/callback/* # 短信回调接口，无法带上租户编号 |
| 106 | + - /app-api/pay/order/notify/* # 支付回调通知，不携带租户编号 | ||
| 106 | ignore-tables: | 107 | ignore-tables: |
| 107 | - system_tenant | 108 | - system_tenant |
| 108 | - system_tenant_package | 109 | - system_tenant_package |
yudao-ui-admin/package.json
| @@ -45,7 +45,7 @@ | @@ -45,7 +45,7 @@ | ||
| 45 | "clipboard": "2.0.8", | 45 | "clipboard": "2.0.8", |
| 46 | "core-js": "^3.21.1", | 46 | "core-js": "^3.21.1", |
| 47 | "echarts": "4.9.0", | 47 | "echarts": "4.9.0", |
| 48 | - "element-ui": "^2.15.6", | 48 | + "element-ui": "2.15.8", |
| 49 | "file-saver": "2.0.5", | 49 | "file-saver": "2.0.5", |
| 50 | "fuse.js": "6.4.3", | 50 | "fuse.js": "6.4.3", |
| 51 | "highlight.js": "9.18.5", | 51 | "highlight.js": "9.18.5", |
yudao-ui-admin/src/assets/icons/svg/config.svg
| 1 | -<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1635996976125" class="icon" viewBox="0 0 1070 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4431" xmlns:xlink="http://www.w3.org/1999/xlink" width="208.984375" height="200"><defs><style type="text/css">@font-face { font-family: element-icons; src: url("chrome-extension://moombeodfomdpjnpocobemoiaemednkg/fonts/element-icons.woff") format("woff"), url("chrome-extension://moombeodfomdpjnpocobemoiaemednkg/fonts/element-icons.ttf ") format("truetype"); } | ||
| 2 | -</style></defs><path d="M682.216727 1024a35.281455 35.281455 0 0 1-18.618182-7.912727 46.638545 46.638545 0 0 1-12.101818-16.337455l-3.258182-8.378182a19.549091 19.549091 0 0 1-3.258181-4.654545 139.915636 139.915636 0 0 0-35.793455-46.685091 104.448 104.448 0 0 0-134.888727 0c-19.083636 15.080727-33.698909 35.048727-42.356364 57.856a37.748364 37.748364 0 0 1-16.244363 19.083636c-18.757818 7.912727-39.842909 7.912727-58.600728 0a320.791273 320.791273 0 0 1-38.167272-13.498181 185.902545 185.902545 0 0 1-34.397091-19.083637 95.511273 95.511273 0 0 1-20.945455-21.038545 33.652364 33.652364 0 0 1-6.050909-18.152728c-0.465455-10.053818 1.629091-20.014545 6.050909-28.951272 8.238545-18.106182 11.450182-38.074182 9.309091-57.856a100.398545 100.398545 0 0 0-27.927273-59.717818 71.121455 71.121455 0 0 0-37.189818-21.41091 159.557818 159.557818 0 0 0-41.890909-3.723636c-15.825455 0.930909-31.418182 3.909818-46.498909 8.843636a46.405818 46.405818 0 0 1-30.72 0 50.269091 50.269091 0 0 1-22.295273-20.526545 237.661091 237.661091 0 0 1-18.618182-35.002182 219.229091 219.229091 0 0 1-12.567272-39.656727 93.556364 93.556364 0 0 1 0-33.559273 35.002182 35.002182 0 0 1 21.876363-30.813091 154.903273 154.903273 0 0 0 59.112728-43.380363c16.896-18.432 26.344727-42.589091 26.530909-67.630546a96.256 96.256 0 0 0-26.065455-67.165091c-16.337455-18.245818-36.538182-32.581818-59.112727-41.984a30.254545 30.254545 0 0 1-16.290909-15.872 56.087273 56.087273 0 0 1-10.24-27.508363c0.465455-10.891636 2.141091-21.736727 5.12-32.209455a217.367273 217.367273 0 0 1 27.927272-64.372364c5.306182-8.238545 12.288-15.220364 20.48-20.48a22.760727 22.760727 0 0 1 16.756364-4.70109c6.144 0.791273 12.241455 2.234182 18.152727 4.18909 21.643636 8.843636 45.195636 11.729455 68.328728 8.378182 23.738182-3.397818 45.754182-14.336 62.836363-31.232 8.890182-8.843636 15.592727-19.735273 19.549091-31.697454 3.770182-12.334545 6.283636-24.994909 7.447273-37.794909a168.401455 168.401455 0 0 0 0-34.071273c0-9.309091 0-16.756364-2.792727-21.876364a113.105455 113.105455 0 0 1-3.723637-13.591272 23.365818 23.365818 0 0 1 0-16.29091c5.306182-11.636364 14.056727-21.410909 25.088-28.020363 11.450182-7.912727 23.784727-14.429091 36.770909-19.549091 12.520727-4.794182 25.413818-8.517818 38.586182-11.217455 10.379636-2.466909 20.945455-3.909818 31.650909-4.189091a28.811636 28.811636 0 0 1 22.295273 9.309091c5.12 5.538909 9.076364 12.008727 11.636364 19.130182 8.564364 20.48 22.155636 38.446545 39.563636 52.270546 39.330909 29.323636 93.184 29.323636 132.514909 0 19.176727-13.498182 33.792-32.581818 41.890909-54.597819l2.327273-4.654545c3.444364-4.887273 7.354182-9.402182 11.636364-13.498182l3.258181-3.770182c14.848-6.330182 31.650909-6.330182 46.498909 0 12.101818 2.978909 23.924364 7.028364 35.374546 12.101819 11.682909 4.980364 22.667636 11.543273 32.535273 19.595636 9.309091 7.447273 17.361455 16.477091 23.738181 26.624 3.258182 5.771636 4.375273 12.567273 3.258182 19.083636a50.501818 50.501818 0 0 1-5.12 15.872c-9.169455 20.805818-12.101818 43.845818-8.378182 66.234182 3.677091 23.412364 14.754909 45.009455 31.65091 61.579636 17.221818 17.314909 40.261818 27.601455 64.60509 28.951273a142.894545 142.894545 0 0 0 71.214546-12.567273c6.423273-3.816727 13.963636-5.259636 21.364364-4.235636 8.564364 0.279273 16.709818 3.723636 22.807272 9.774546 12.939636 13.312 22.946909 29.184 29.323637 46.68509 8.285091 20.340364 14.056727 41.658182 17.175272 63.441455a38.353455 38.353455 0 0 1-6.050909 28.858182 40.96 40.96 0 0 1-17.221818 14.056727c-22.993455 8.331636-43.147636 23.04-58.135273 42.449455a107.985455 107.985455 0 0 0-25.134545 70.423272c-0.465455 23.365818 6.516364 46.219636 20.014545 65.303273a112.64 112.64 0 0 0 53.061819 40.122182 23.272727 23.272727 0 0 1 10.24 7.447273h2.792727c7.493818 5.957818 13.032727 14.103273 15.778909 23.319272 0.093091 1.396364 0.093091 2.792727 0 4.189091a97.745455 97.745455 0 0 1 0 29.882182c-2.234182 12.939636-5.818182 25.6-10.705455 37.794909-4.840727 12.194909-11.077818 23.738182-18.618181 34.490182a67.025455 67.025455 0 0 1-24.203637 21.922909c-14.475636 7.912727-31.976727 7.912727-46.498909 0a229.236364 229.236364 0 0 0-27.461818-6.050909 131.723636 131.723636 0 0 0-33.466182 0 159.650909 159.650909 0 0 0-33.978182 6.981818 65.582545 65.582545 0 0 0-28.811636 18.664727 108.357818 108.357818 0 0 0-30.72 62.510546c-3.025455 22.900364 0.372364 46.126545 9.774545 67.165091a42.077091 42.077091 0 0 1-3.258181 43.892363 86.574545 86.574545 0 0 1-20.945455 18.152728c-9.914182 6.562909-20.293818 12.334545-31.138909 17.268363a195.444364 195.444364 0 0 1-35.84 12.101819 150.807273 150.807273 0 0 1-31.604364 5.166545z m-378.135272-83.037091l7.912727 6.516364c8.098909 5.771636 16.849455 10.612364 26.065454 14.475636 10.705455 4.561455 21.736727 8.471273 33.000728 11.636364 6.656 2.094545 13.498182 3.351273 20.48 3.723636a179.525818 179.525818 0 0 1 54.411636-72.285091 150.807273 150.807273 0 0 1 194.420364 0c18.944 15.173818 34.722909 33.838545 46.545454 55.063273 2.187636 2.094545 3.956364 4.654545 5.12 7.447273l3.258182 8.843636h12.055273c9.309091-2.187636 18.292364-5.306182 26.996363-9.309091 8.704-3.863273 17.082182-8.378182 25.134546-13.498182l6.981818-4.654545a172.125091 172.125091 0 0 1-13.032727-90.996364 152.669091 152.669091 0 0 1 42.775272-88.622545 111.616 111.616 0 0 1 48.826182-31.232c14.196364-4.701091 28.858182-7.819636 43.752728-9.309091a179.479273 179.479273 0 0 1 46.498909 0c11.636364 1.861818 23.133091 4.468364 34.443636 7.912727h9.262545a22.807273 22.807273 0 0 0 6.981819-7.447273c5.492364-7.866182 10.007273-16.290909 13.498181-25.227636 3.816727-9.309091 6.609455-18.990545 8.378182-28.904727 0.372364-4.189091 0.372364-8.424727 0-12.613818l-3.258182-2.327273A158.673455 158.673455 0 0 1 932.910545 605.090909a155.648 155.648 0 0 1-28.811636-93.277091 153.274182 153.274182 0 0 1 34.443636-97.978182c18.199273-23.412364 42.077091-41.890909 69.306182-53.620363a216.901818 216.901818 0 0 0-13.498182-46.685091 108.311273 108.311273 0 0 0-13.498181-25.6 187.904 187.904 0 0 1-89.786182 14.894545 144.011636 144.011636 0 0 1-92.997818-42.914909 156.392727 156.392727 0 0 1-46.545455-87.226182 165.562182 165.562182 0 0 1 11.170909-90.484363 89.739636 89.739636 0 0 0-29.789091-20.992 161.978182 161.978182 0 0 0-27.880727-9.309091l-13.963636-4.701091a161.373091 161.373091 0 0 1-55.342546 73.216 157.323636 157.323636 0 0 1-190.696727-2.792727 178.641455 178.641455 0 0 1-52.596364-70.423273h-11.636363a204.241455 204.241455 0 0 0-31.138909 9.309091 139.403636 139.403636 0 0 0-27.461819 14.475636l-3.723636 2.792727v6.05091c0 8.843636 2.792727 17.268364 3.723636 27.089454 1.442909 14.242909 1.442909 28.625455 0 42.914909-1.582545 15.825455-4.840727 31.464727-9.774545 46.638546-6.050909 19.549091-16.756364 37.236364-31.138909 51.758545-24.203636 24.064-55.528727 39.563636-89.320727 44.311273a175.336727 175.336727 0 0 1-90.205091-10.24v2.327273a143.825455 143.825455 0 0 0-12.101819 22.388363 170.123636 170.123636 0 0 0-8.843636 26.577455 90.298182 90.298182 0 0 0-3.258182 25.693091A211.176727 211.176727 0 0 1 148.247273 410.530909c24.901818 26.670545 38.725818 61.905455 38.632727 98.443636a146.245818 146.245818 0 0 1-38.167273 97.931637c-19.409455 23.133091-43.752727 41.611636-71.168 54.132363-0.512 4.654545-0.512 9.309091 0 13.963637a175.755636 175.755636 0 0 0 24.669091 58.786909l2.792727 3.723636a198.097455 198.097455 0 0 1 112.081455-6.050909c23.412364 5.12 44.683636 17.361455 60.974545 35.002182a145.687273 145.687273 0 0 1 41.37891 87.691636c2.839273 27.927273-1.815273 56.133818-13.498182 81.640728l-1.861818 5.12zM77.544727 360.261818l-18.618182 13.498182 18.618182-9.774545v-3.723637zM405.922909 25.739636l-17.221818 15.36 3.723636 3.258182 13.498182-18.618182z" p-id="4432"></path><path d="M543.045818 698.181818a186.181818 186.181818 0 1 1 0-372.363636 186.181818 186.181818 0 0 1 0 372.363636z m0-325.818182a139.636364 139.636364 0 1 0 0 279.272728 139.636364 139.636364 0 0 0 0-279.272728z" p-id="4433"></path></svg> | ||
| 3 | \ No newline at end of file | 1 | \ No newline at end of file |
| 2 | +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1635996976125" class="icon" viewBox="0 0 1070 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4431" xmlns:xlink="http://www.w3.org/1999/xlink" width="208.984375" height="200"><defs><style type="text/css"></style></defs><path d="M682.216727 1024a35.281455 35.281455 0 0 1-18.618182-7.912727 46.638545 46.638545 0 0 1-12.101818-16.337455l-3.258182-8.378182a19.549091 19.549091 0 0 1-3.258181-4.654545 139.915636 139.915636 0 0 0-35.793455-46.685091 104.448 104.448 0 0 0-134.888727 0c-19.083636 15.080727-33.698909 35.048727-42.356364 57.856a37.748364 37.748364 0 0 1-16.244363 19.083636c-18.757818 7.912727-39.842909 7.912727-58.600728 0a320.791273 320.791273 0 0 1-38.167272-13.498181 185.902545 185.902545 0 0 1-34.397091-19.083637 95.511273 95.511273 0 0 1-20.945455-21.038545 33.652364 33.652364 0 0 1-6.050909-18.152728c-0.465455-10.053818 1.629091-20.014545 6.050909-28.951272 8.238545-18.106182 11.450182-38.074182 9.309091-57.856a100.398545 100.398545 0 0 0-27.927273-59.717818 71.121455 71.121455 0 0 0-37.189818-21.41091 159.557818 159.557818 0 0 0-41.890909-3.723636c-15.825455 0.930909-31.418182 3.909818-46.498909 8.843636a46.405818 46.405818 0 0 1-30.72 0 50.269091 50.269091 0 0 1-22.295273-20.526545 237.661091 237.661091 0 0 1-18.618182-35.002182 219.229091 219.229091 0 0 1-12.567272-39.656727 93.556364 93.556364 0 0 1 0-33.559273 35.002182 35.002182 0 0 1 21.876363-30.813091 154.903273 154.903273 0 0 0 59.112728-43.380363c16.896-18.432 26.344727-42.589091 26.530909-67.630546a96.256 96.256 0 0 0-26.065455-67.165091c-16.337455-18.245818-36.538182-32.581818-59.112727-41.984a30.254545 30.254545 0 0 1-16.290909-15.872 56.087273 56.087273 0 0 1-10.24-27.508363c0.465455-10.891636 2.141091-21.736727 5.12-32.209455a217.367273 217.367273 0 0 1 27.927272-64.372364c5.306182-8.238545 12.288-15.220364 20.48-20.48a22.760727 22.760727 0 0 1 16.756364-4.70109c6.144 0.791273 12.241455 2.234182 18.152727 4.18909 21.643636 8.843636 45.195636 11.729455 68.328728 8.378182 23.738182-3.397818 45.754182-14.336 62.836363-31.232 8.890182-8.843636 15.592727-19.735273 19.549091-31.697454 3.770182-12.334545 6.283636-24.994909 7.447273-37.794909a168.401455 168.401455 0 0 0 0-34.071273c0-9.309091 0-16.756364-2.792727-21.876364a113.105455 113.105455 0 0 1-3.723637-13.591272 23.365818 23.365818 0 0 1 0-16.29091c5.306182-11.636364 14.056727-21.410909 25.088-28.020363 11.450182-7.912727 23.784727-14.429091 36.770909-19.549091 12.520727-4.794182 25.413818-8.517818 38.586182-11.217455 10.379636-2.466909 20.945455-3.909818 31.650909-4.189091a28.811636 28.811636 0 0 1 22.295273 9.309091c5.12 5.538909 9.076364 12.008727 11.636364 19.130182 8.564364 20.48 22.155636 38.446545 39.563636 52.270546 39.330909 29.323636 93.184 29.323636 132.514909 0 19.176727-13.498182 33.792-32.581818 41.890909-54.597819l2.327273-4.654545c3.444364-4.887273 7.354182-9.402182 11.636364-13.498182l3.258181-3.770182c14.848-6.330182 31.650909-6.330182 46.498909 0 12.101818 2.978909 23.924364 7.028364 35.374546 12.101819 11.682909 4.980364 22.667636 11.543273 32.535273 19.595636 9.309091 7.447273 17.361455 16.477091 23.738181 26.624 3.258182 5.771636 4.375273 12.567273 3.258182 19.083636a50.501818 50.501818 0 0 1-5.12 15.872c-9.169455 20.805818-12.101818 43.845818-8.378182 66.234182 3.677091 23.412364 14.754909 45.009455 31.65091 61.579636 17.221818 17.314909 40.261818 27.601455 64.60509 28.951273a142.894545 142.894545 0 0 0 71.214546-12.567273c6.423273-3.816727 13.963636-5.259636 21.364364-4.235636 8.564364 0.279273 16.709818 3.723636 22.807272 9.774546 12.939636 13.312 22.946909 29.184 29.323637 46.68509 8.285091 20.340364 14.056727 41.658182 17.175272 63.441455a38.353455 38.353455 0 0 1-6.050909 28.858182 40.96 40.96 0 0 1-17.221818 14.056727c-22.993455 8.331636-43.147636 23.04-58.135273 42.449455a107.985455 107.985455 0 0 0-25.134545 70.423272c-0.465455 23.365818 6.516364 46.219636 20.014545 65.303273a112.64 112.64 0 0 0 53.061819 40.122182 23.272727 23.272727 0 0 1 10.24 7.447273h2.792727c7.493818 5.957818 13.032727 14.103273 15.778909 23.319272 0.093091 1.396364 0.093091 2.792727 0 4.189091a97.745455 97.745455 0 0 1 0 29.882182c-2.234182 12.939636-5.818182 25.6-10.705455 37.794909-4.840727 12.194909-11.077818 23.738182-18.618181 34.490182a67.025455 67.025455 0 0 1-24.203637 21.922909c-14.475636 7.912727-31.976727 7.912727-46.498909 0a229.236364 229.236364 0 0 0-27.461818-6.050909 131.723636 131.723636 0 0 0-33.466182 0 159.650909 159.650909 0 0 0-33.978182 6.981818 65.582545 65.582545 0 0 0-28.811636 18.664727 108.357818 108.357818 0 0 0-30.72 62.510546c-3.025455 22.900364 0.372364 46.126545 9.774545 67.165091a42.077091 42.077091 0 0 1-3.258181 43.892363 86.574545 86.574545 0 0 1-20.945455 18.152728c-9.914182 6.562909-20.293818 12.334545-31.138909 17.268363a195.444364 195.444364 0 0 1-35.84 12.101819 150.807273 150.807273 0 0 1-31.604364 5.166545z m-378.135272-83.037091l7.912727 6.516364c8.098909 5.771636 16.849455 10.612364 26.065454 14.475636 10.705455 4.561455 21.736727 8.471273 33.000728 11.636364 6.656 2.094545 13.498182 3.351273 20.48 3.723636a179.525818 179.525818 0 0 1 54.411636-72.285091 150.807273 150.807273 0 0 1 194.420364 0c18.944 15.173818 34.722909 33.838545 46.545454 55.063273 2.187636 2.094545 3.956364 4.654545 5.12 7.447273l3.258182 8.843636h12.055273c9.309091-2.187636 18.292364-5.306182 26.996363-9.309091 8.704-3.863273 17.082182-8.378182 25.134546-13.498182l6.981818-4.654545a172.125091 172.125091 0 0 1-13.032727-90.996364 152.669091 152.669091 0 0 1 42.775272-88.622545 111.616 111.616 0 0 1 48.826182-31.232c14.196364-4.701091 28.858182-7.819636 43.752728-9.309091a179.479273 179.479273 0 0 1 46.498909 0c11.636364 1.861818 23.133091 4.468364 34.443636 7.912727h9.262545a22.807273 22.807273 0 0 0 6.981819-7.447273c5.492364-7.866182 10.007273-16.290909 13.498181-25.227636 3.816727-9.309091 6.609455-18.990545 8.378182-28.904727 0.372364-4.189091 0.372364-8.424727 0-12.613818l-3.258182-2.327273A158.673455 158.673455 0 0 1 932.910545 605.090909a155.648 155.648 0 0 1-28.811636-93.277091 153.274182 153.274182 0 0 1 34.443636-97.978182c18.199273-23.412364 42.077091-41.890909 69.306182-53.620363a216.901818 216.901818 0 0 0-13.498182-46.685091 108.311273 108.311273 0 0 0-13.498181-25.6 187.904 187.904 0 0 1-89.786182 14.894545 144.011636 144.011636 0 0 1-92.997818-42.914909 156.392727 156.392727 0 0 1-46.545455-87.226182 165.562182 165.562182 0 0 1 11.170909-90.484363 89.739636 89.739636 0 0 0-29.789091-20.992 161.978182 161.978182 0 0 0-27.880727-9.309091l-13.963636-4.701091a161.373091 161.373091 0 0 1-55.342546 73.216 157.323636 157.323636 0 0 1-190.696727-2.792727 178.641455 178.641455 0 0 1-52.596364-70.423273h-11.636363a204.241455 204.241455 0 0 0-31.138909 9.309091 139.403636 139.403636 0 0 0-27.461819 14.475636l-3.723636 2.792727v6.05091c0 8.843636 2.792727 17.268364 3.723636 27.089454 1.442909 14.242909 1.442909 28.625455 0 42.914909-1.582545 15.825455-4.840727 31.464727-9.774545 46.638546-6.050909 19.549091-16.756364 37.236364-31.138909 51.758545-24.203636 24.064-55.528727 39.563636-89.320727 44.311273a175.336727 175.336727 0 0 1-90.205091-10.24v2.327273a143.825455 143.825455 0 0 0-12.101819 22.388363 170.123636 170.123636 0 0 0-8.843636 26.577455 90.298182 90.298182 0 0 0-3.258182 25.693091A211.176727 211.176727 0 0 1 148.247273 410.530909c24.901818 26.670545 38.725818 61.905455 38.632727 98.443636a146.245818 146.245818 0 0 1-38.167273 97.931637c-19.409455 23.133091-43.752727 41.611636-71.168 54.132363-0.512 4.654545-0.512 9.309091 0 13.963637a175.755636 175.755636 0 0 0 24.669091 58.786909l2.792727 3.723636a198.097455 198.097455 0 0 1 112.081455-6.050909c23.412364 5.12 44.683636 17.361455 60.974545 35.002182a145.687273 145.687273 0 0 1 41.37891 87.691636c2.839273 27.927273-1.815273 56.133818-13.498182 81.640728l-1.861818 5.12zM77.544727 360.261818l-18.618182 13.498182 18.618182-9.774545v-3.723637zM405.922909 25.739636l-17.221818 15.36 3.723636 3.258182 13.498182-18.618182z" p-id="4432"></path><path d="M543.045818 698.181818a186.181818 186.181818 0 1 1 0-372.363636 186.181818 186.181818 0 0 1 0 372.363636z m0-325.818182a139.636364 139.636364 0 1 0 0 279.272728 139.636364 139.636364 0 0 0 0-279.272728z" p-id="4433"></path></svg> | ||
| 4 | \ No newline at end of file | 3 | \ No newline at end of file |
yudao-ui-admin/src/assets/icons/svg/download.svg
| 1 | -<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569915748289" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3062" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M768.35456 416a256 256 0 1 0-512 0 192 192 0 1 0 0 384v64a256 256 0 0 1-58.88-505.216 320.128 320.128 0 0 1 629.76 0A256.128 256.128 0 0 1 768.35456 864v-64a192 192 0 0 0 0-384z m-512 384h64v64H256.35456v-64z m448 0h64v64h-64v-64z" fill="#333333" p-id="3063"></path><path d="M539.04256 845.248V512.192a32.448 32.448 0 0 0-32-32.192c-17.664 0-32 14.912-32 32.192v333.056l-36.096-36.096a32.192 32.192 0 0 0-45.056 0.192 31.616 31.616 0 0 0-0.192 45.056l90.88 90.944a31.36 31.36 0 0 0 22.528 9.088 30.08 30.08 0 0 0 22.4-9.088l90.88-90.88a32.192 32.192 0 0 0-0.192-45.12 31.616 31.616 0 0 0-45.056-0.192l-36.096 36.096z" fill="#333333" p-id="3064"></path></svg> | ||
| 2 | \ No newline at end of file | 1 | \ No newline at end of file |
| 2 | +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569915748289" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3062" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M768.35456 416a256 256 0 1 0-512 0 192 192 0 1 0 0 384v64a256 256 0 0 1-58.88-505.216 320.128 320.128 0 0 1 629.76 0A256.128 256.128 0 0 1 768.35456 864v-64a192 192 0 0 0 0-384z m-512 384h64v64H256.35456v-64z m448 0h64v64h-64v-64z" p-id="3063"></path><path d="M539.04256 845.248V512.192a32.448 32.448 0 0 0-32-32.192c-17.664 0-32 14.912-32 32.192v333.056l-36.096-36.096a32.192 32.192 0 0 0-45.056 0.192 31.616 31.616 0 0 0-0.192 45.056l90.88 90.944a31.36 31.36 0 0 0 22.528 9.088 30.08 30.08 0 0 0 22.4-9.088l90.88-90.88a32.192 32.192 0 0 0-0.192-45.12 31.616 31.616 0 0 0-45.056-0.192l-36.096 36.096z" p-id="3064"></path></svg> | ||
| 3 | \ No newline at end of file | 3 | \ No newline at end of file |
yudao-ui-admin/src/assets/icons/svg/merchant.svg
| 1 | -<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1635907181185" class="icon" viewBox="0 0 1184 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3259" xmlns:xlink="http://www.w3.org/1999/xlink" width="231.25" height="200"><defs><style type="text/css">@font-face { font-family: element-icons; src: url("chrome-extension://moombeodfomdpjnpocobemoiaemednkg/fonts/element-icons.woff") format("woff"), url("chrome-extension://moombeodfomdpjnpocobemoiaemednkg/fonts/element-icons.ttf ") format("truetype"); } | ||
| 2 | -</style></defs><path d="M1005.633722 616.006249c-5.311502-0.479955-10.431022-1.27988-15.518545-2.143799-1.087898-0.127988-2.271787-0.287973-3.359685-0.479955-2.399775-0.415961-4.671562-1.055901-7.007343-1.631847-9.951067-2.143799-19.678155-4.831547-28.989282-8.351217l0 133.235509-731.355435 0 0-133.235509c-9.375121 3.551667-19.006218 6.303409-29.053276 8.511202-2.335781 0.415961-4.607568 1.055901-6.943349 1.535856-1.087898 0.191982-2.175796 0.31997-3.359685 0.511952-5.11952 0.767928-10.271037 1.535856-15.518545 2.079805-5.983439 0.479955-12.094866 0.863919-18.270287 0.863919-12.47883 0-24.701684-1.215886-36.540574-3.327688l0 357.310502c0 29.309252 24.573696 53.11502 54.874855 53.11502l841.073149 0c30.237165 0 54.810861-23.773771 54.810861-53.11502l0-357.342499c-11.83889 2.143799-24.061744 3.327688-36.540574 3.327688-6.07943 0-12.254851-0.351967-18.23829-0.863919z" p-id="3260"></path><path d="M182.83086 109.749711l804.500578 0c30.301159 0 54.874855-24.573696 54.874855-54.874855s-24.573696-54.874855-54.874855-54.874855l-804.500578 0c-30.301159 0-54.874855 24.573696-54.874855 54.874855 0.031997 30.301159 24.605693 54.874855 54.874855 54.874855z" p-id="3261"></path><path d="M1067.387932 164.592569l-964.549573 0-102.838359 256.007999c0 80.728432 65.529857 146.258288 146.258288 146.258288s146.258288-65.529857 146.258288-146.258288c0 80.728432 65.529857 146.258288 146.258288 146.258288s146.258288-65.529857 146.258288-146.258288c0 80.728432 65.529857 146.258288 146.258288 146.258288s146.258288-65.529857 146.258288-146.258288c0 80.728432 65.529857 146.258288 146.258288 146.258288s146.258288-65.529857 146.258288-146.258288l-102.806362-256.007999z" p-id="3262"></path></svg> | ||
| 3 | \ No newline at end of file | 1 | \ No newline at end of file |
| 2 | +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1635907181185" class="icon" viewBox="0 0 1184 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3259" xmlns:xlink="http://www.w3.org/1999/xlink" width="231.25" height="200"><defs><style type="text/css"></style></defs><path d="M1005.633722 616.006249c-5.311502-0.479955-10.431022-1.27988-15.518545-2.143799-1.087898-0.127988-2.271787-0.287973-3.359685-0.479955-2.399775-0.415961-4.671562-1.055901-7.007343-1.631847-9.951067-2.143799-19.678155-4.831547-28.989282-8.351217l0 133.235509-731.355435 0 0-133.235509c-9.375121 3.551667-19.006218 6.303409-29.053276 8.511202-2.335781 0.415961-4.607568 1.055901-6.943349 1.535856-1.087898 0.191982-2.175796 0.31997-3.359685 0.511952-5.11952 0.767928-10.271037 1.535856-15.518545 2.079805-5.983439 0.479955-12.094866 0.863919-18.270287 0.863919-12.47883 0-24.701684-1.215886-36.540574-3.327688l0 357.310502c0 29.309252 24.573696 53.11502 54.874855 53.11502l841.073149 0c30.237165 0 54.810861-23.773771 54.810861-53.11502l0-357.342499c-11.83889 2.143799-24.061744 3.327688-36.540574 3.327688-6.07943 0-12.254851-0.351967-18.23829-0.863919z" p-id="3260"></path><path d="M182.83086 109.749711l804.500578 0c30.301159 0 54.874855-24.573696 54.874855-54.874855s-24.573696-54.874855-54.874855-54.874855l-804.500578 0c-30.301159 0-54.874855 24.573696-54.874855 54.874855 0.031997 30.301159 24.605693 54.874855 54.874855 54.874855z" p-id="3261"></path><path d="M1067.387932 164.592569l-964.549573 0-102.838359 256.007999c0 80.728432 65.529857 146.258288 146.258288 146.258288s146.258288-65.529857 146.258288-146.258288c0 80.728432 65.529857 146.258288 146.258288 146.258288s146.258288-65.529857 146.258288-146.258288c0 80.728432 65.529857 146.258288 146.258288 146.258288s146.258288-65.529857 146.258288-146.258288c0 80.728432 65.529857 146.258288 146.258288 146.258288s146.258288-65.529857 146.258288-146.258288l-102.806362-256.007999z" p-id="3262"></path></svg> | ||
| 4 | \ No newline at end of file | 3 | \ No newline at end of file |
yudao-ui-admin/src/assets/icons/svg/monitor.svg
| 1 | -<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543827393750" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4695" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: rbicon; src: url("chrome-extension://dipiagiiohfljcicegpgffpbnjmgjcnf/fonts/rbicon.woff2") format("woff2"); font-weight: normal; font-style: normal; } | ||
| 2 | -</style></defs><path d="M64 64V640H896V64H64zM0 0h960v704H0V0z" p-id="4696"></path><path d="M192 896H768v64H192zM448 640H512v256h-64z" p-id="4697"></path><path d="M479.232 561.604267l309.9904-348.330667-47.803733-42.5472-259.566934 291.669333L303.957333 240.008533 163.208533 438.6048l52.224 37.009067 91.6224-129.28z" p-id="4698"></path></svg> | ||
| 3 | \ No newline at end of file | 1 | \ No newline at end of file |
| 2 | +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543827393750" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4695" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M64 64V640H896V64H64zM0 0h960v704H0V0z" p-id="4696"></path><path d="M192 896H768v64H192zM448 640H512v256h-64z" p-id="4697"></path><path d="M479.232 561.604267l309.9904-348.330667-47.803733-42.5472-259.566934 291.669333L303.957333 240.008533 163.208533 438.6048l52.224 37.009067 91.6224-129.28z" p-id="4698"></path></svg> | ||
| 4 | \ No newline at end of file | 3 | \ No newline at end of file |
yudao-ui-admin/src/assets/icons/svg/order.svg
| 1 | -<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1638429990011" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1233" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: element-icons; src: url("chrome-extension://moombeodfomdpjnpocobemoiaemednkg/fonts/element-icons.woff") format("woff"), url("chrome-extension://moombeodfomdpjnpocobemoiaemednkg/fonts/element-icons.ttf ") format("truetype"); } | ||
| 2 | -</style></defs><path d="M459.954135 607.201246l233.733369 0c14.352893 0 25.941835-11.088546 25.941835-24.798802 0-13.623275-11.587919-24.710798-25.941835-24.710798l-233.733369 0c-14.352893 0-25.986861 11.087523-25.986861 24.710798C433.967274 596.1127 445.601242 607.201246 459.954135 607.201246zM382.017088 824.38673l287.564391-0.272199 0-0.633427c9.370415-1.494027 16.660448-9.233292 16.660448-19.053961 0-9.773598-7.290033-17.693987-16.660448-19.23304l0-0.633427L369.500007 784.560676c-27.275203 0-51.949162-38.46915-51.949162-65.214281l0-415.585113c0.181125-1.041726 0.633427-1.992377 0.633427-3.123131 0-10.997472-8.985652-20.00359-20.032242-20.00359-11.023054 0-20.010753 9.007141-20.010753 20.00359l0 418.708244C278.1423 773.383102 327.080895 824.38673 382.017088 824.38673zM693.687504 89.925079c-3.235694 0-311.669392-0.814552-311.669392-0.814552-51.2922 0-96.314603 39.10053-102.108562 88.294952-0.181125 1.085728-0.656963 2.036379-0.656963 3.168156 0 0.091074 0.023536 0.135076 0.023536 0.181125 0 0.046049-0.023536 0.090051-0.023536 0.181125l0.067538 0c0.181125 10.860349 9.031701 19.685341 19.942191 19.685341 10.933003 0 19.762089-8.824993 19.964704-19.685341l0.226151 0c6.043646-24.664749 27.027563-52.04433 50.04786-52.04433l284.755416 0c-0.406253 60.461023 0 118.435413 0 118.435413 0 54.531987 35.991726 91.642187 91.358731 91.642187 0 0 40.133046 0 90.428545 0l0 380.37724c0.338714 44.261063-33.70259 65.757656-62.180178 65.214281l0 0.272199c-10.229992 0.723477-18.425651 9.188266-18.425651 19.594267 0 10.454096 8.195659 18.736736 18.425651 19.417235l0 0.271176c0.248663 0 0.49835-0.091074 0.74599-0.091074 0.184195 0 0.340761 0.091074 0.522909 0.091074 0.971118 0 1.811252-0.407276 2.739391-0.544399 52.287877-3.755534 97.580432-52.314483 97.580432-104.22476L875.452267 299.777551 693.687504 89.925079zM745.615177 299.777551c-27.684526 0-51.927673-51.411927-51.927673-78.69941 0 0 0-27.606755 0-78.656431l0-0.045025 129.839137 157.400866L745.615177 299.777551zM459.954135 483.471246l233.733369 0c14.352893 0 25.941835-11.041474 25.941835-24.708751 0-13.667278-11.587919-24.7548-25.941835-24.7548l-233.733369 0c-14.352893 0-25.986861 11.087523-25.986861 24.7548C433.967274 472.430796 445.601242 483.471246 459.954135 483.471246zM716.709847 841.356216c-8.53335 0-15.32708 6.246261-17.113773 14.256702l-0.475837-0.045025c-21.73093 44.171012-40.426735 34.032094-62.294788 34.032094L252.179998 889.599987c-27.27725 0-64.466244-38.512129-64.466244-65.213257L187.713754 322.314847c0-24.800849 29.857005-58.606793 55.954383-63.403029l0-0.543376c10.571776-0.543376 19.082614-9.142218 19.082614-19.86749 0-10.68127-8.510838-19.279089-19.082614-19.777439l0-0.226151c-0.181125 0.044002-0.339738 0.091074-0.51984 0.091074-0.158612 0-0.272199-0.091074-0.429789-0.091074-1.245364 0-2.353604 0.497327-3.553942 0.724501-50.703799 5.203512-90.860381 52.134381-90.860381 103.092983l0 502.07086c0 54.034661 48.938596 105.038288 103.875812 105.038288l389.558343 0c47.104831 0 78.254272-17.198707 90.542132-61.683874 1.358951-2.533706 2.330068-5.250584 2.330068-8.326643C734.611565 849.546759 726.601124 841.356216 716.709847 841.356216z" p-id="1234"></path></svg> | ||
| 3 | \ No newline at end of file | 1 | \ No newline at end of file |
| 2 | +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1638429990011" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1233" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M459.954135 607.201246l233.733369 0c14.352893 0 25.941835-11.088546 25.941835-24.798802 0-13.623275-11.587919-24.710798-25.941835-24.710798l-233.733369 0c-14.352893 0-25.986861 11.087523-25.986861 24.710798C433.967274 596.1127 445.601242 607.201246 459.954135 607.201246zM382.017088 824.38673l287.564391-0.272199 0-0.633427c9.370415-1.494027 16.660448-9.233292 16.660448-19.053961 0-9.773598-7.290033-17.693987-16.660448-19.23304l0-0.633427L369.500007 784.560676c-27.275203 0-51.949162-38.46915-51.949162-65.214281l0-415.585113c0.181125-1.041726 0.633427-1.992377 0.633427-3.123131 0-10.997472-8.985652-20.00359-20.032242-20.00359-11.023054 0-20.010753 9.007141-20.010753 20.00359l0 418.708244C278.1423 773.383102 327.080895 824.38673 382.017088 824.38673zM693.687504 89.925079c-3.235694 0-311.669392-0.814552-311.669392-0.814552-51.2922 0-96.314603 39.10053-102.108562 88.294952-0.181125 1.085728-0.656963 2.036379-0.656963 3.168156 0 0.091074 0.023536 0.135076 0.023536 0.181125 0 0.046049-0.023536 0.090051-0.023536 0.181125l0.067538 0c0.181125 10.860349 9.031701 19.685341 19.942191 19.685341 10.933003 0 19.762089-8.824993 19.964704-19.685341l0.226151 0c6.043646-24.664749 27.027563-52.04433 50.04786-52.04433l284.755416 0c-0.406253 60.461023 0 118.435413 0 118.435413 0 54.531987 35.991726 91.642187 91.358731 91.642187 0 0 40.133046 0 90.428545 0l0 380.37724c0.338714 44.261063-33.70259 65.757656-62.180178 65.214281l0 0.272199c-10.229992 0.723477-18.425651 9.188266-18.425651 19.594267 0 10.454096 8.195659 18.736736 18.425651 19.417235l0 0.271176c0.248663 0 0.49835-0.091074 0.74599-0.091074 0.184195 0 0.340761 0.091074 0.522909 0.091074 0.971118 0 1.811252-0.407276 2.739391-0.544399 52.287877-3.755534 97.580432-52.314483 97.580432-104.22476L875.452267 299.777551 693.687504 89.925079zM745.615177 299.777551c-27.684526 0-51.927673-51.411927-51.927673-78.69941 0 0 0-27.606755 0-78.656431l0-0.045025 129.839137 157.400866L745.615177 299.777551zM459.954135 483.471246l233.733369 0c14.352893 0 25.941835-11.041474 25.941835-24.708751 0-13.667278-11.587919-24.7548-25.941835-24.7548l-233.733369 0c-14.352893 0-25.986861 11.087523-25.986861 24.7548C433.967274 472.430796 445.601242 483.471246 459.954135 483.471246zM716.709847 841.356216c-8.53335 0-15.32708 6.246261-17.113773 14.256702l-0.475837-0.045025c-21.73093 44.171012-40.426735 34.032094-62.294788 34.032094L252.179998 889.599987c-27.27725 0-64.466244-38.512129-64.466244-65.213257L187.713754 322.314847c0-24.800849 29.857005-58.606793 55.954383-63.403029l0-0.543376c10.571776-0.543376 19.082614-9.142218 19.082614-19.86749 0-10.68127-8.510838-19.279089-19.082614-19.777439l0-0.226151c-0.181125 0.044002-0.339738 0.091074-0.51984 0.091074-0.158612 0-0.272199-0.091074-0.429789-0.091074-1.245364 0-2.353604 0.497327-3.553942 0.724501-50.703799 5.203512-90.860381 52.134381-90.860381 103.092983l0 502.07086c0 54.034661 48.938596 105.038288 103.875812 105.038288l389.558343 0c47.104831 0 78.254272-17.198707 90.542132-61.683874 1.358951-2.533706 2.330068-5.250584 2.330068-8.326643C734.611565 849.546759 726.601124 841.356216 716.709847 841.356216z" p-id="1234"></path></svg> | ||
| 4 | \ No newline at end of file | 3 | \ No newline at end of file |
yudao-ui-admin/src/assets/icons/svg/pay.svg
| 1 | -<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1635906769564" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2420" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: element-icons; src: url("chrome-extension://moombeodfomdpjnpocobemoiaemednkg/fonts/element-icons.woff") format("woff"), url("chrome-extension://moombeodfomdpjnpocobemoiaemednkg/fonts/element-icons.ttf ") format("truetype"); } | ||
| 2 | -</style></defs><path d="M512 0C230.4 0 0 230.4 0 512s230.4 512 512 512 512-230.4 512-512S793.6 0 512 0z m0 921.6c-225.28 0-409.6-184.32-409.6-409.6s184.32-409.6 409.6-409.6 409.6 184.32 409.6 409.6-184.32 409.6-409.6 409.6z" p-id="2421"></path><path d="M665.6 537.6h-102.4v-51.2h102.4c25.6 0 51.2-25.6 51.2-51.2s-25.6-51.2-51.2-51.2h-30.72l20.48-20.48c20.48-20.48 20.48-51.2 0-71.68s-51.2-20.48-71.68 0L512 363.52 440.32 296.96c-20.48-20.48-51.2-20.48-71.68 0s-20.48 51.2 0 71.68l20.48 20.48H358.4c-25.6 0-51.2 25.6-51.2 51.2s25.6 51.2 51.2 51.2h102.4v51.2H358.4c-25.6 0-51.2 25.6-51.2 51.2s25.6 51.2 51.2 51.2h102.4v56.32c0 25.6 20.48 46.08 46.08 46.08h10.24c25.6 0 46.08-20.48 46.08-46.08v-56.32h102.4c25.6 0 51.2-25.6 51.2-51.2s-25.6-56.32-51.2-56.32z" p-id="2422"></path></svg> | ||
| 3 | \ No newline at end of file | 1 | \ No newline at end of file |
| 2 | +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1635906769564" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2420" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 0C230.4 0 0 230.4 0 512s230.4 512 512 512 512-230.4 512-512S793.6 0 512 0z m0 921.6c-225.28 0-409.6-184.32-409.6-409.6s184.32-409.6 409.6-409.6 409.6 184.32 409.6 409.6-184.32 409.6-409.6 409.6z" p-id="2421"></path><path d="M665.6 537.6h-102.4v-51.2h102.4c25.6 0 51.2-25.6 51.2-51.2s-25.6-51.2-51.2-51.2h-30.72l20.48-20.48c20.48-20.48 20.48-51.2 0-71.68s-51.2-20.48-71.68 0L512 363.52 440.32 296.96c-20.48-20.48-51.2-20.48-71.68 0s-20.48 51.2 0 71.68l20.48 20.48H358.4c-25.6 0-51.2 25.6-51.2 51.2s25.6 51.2 51.2 51.2h102.4v51.2H358.4c-25.6 0-51.2 25.6-51.2 51.2s25.6 51.2 51.2 51.2h102.4v56.32c0 25.6 20.48 46.08 46.08 46.08h10.24c25.6 0 46.08-20.48 46.08-46.08v-56.32h102.4c25.6 0 51.2-25.6 51.2-51.2s-25.6-56.32-51.2-56.32z" p-id="2422"></path></svg> | ||
| 4 | \ No newline at end of file | 3 | \ No newline at end of file |
yudao-ui-admin/src/assets/icons/svg/percentSign.svg
| 1 | -<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1636341153732" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2282" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: element-icons; src: url("chrome-extension://moombeodfomdpjnpocobemoiaemednkg/fonts/element-icons.woff") format("woff"), url("chrome-extension://moombeodfomdpjnpocobemoiaemednkg/fonts/element-icons.ttf ") format("truetype"); } | ||
| 2 | -</style></defs><path d="M294.912 874.666667a21.333333 21.333333 0 0 1-17.194667-33.962667l469.333334-640a21.333333 21.333333 0 0 1 34.432 25.258667l-469.333334 640a21.248 21.248 0 0 1-17.237333 8.704zM358.912 533.333333a161.28 161.28 0 0 1-149.333333-170.666666 161.28 161.28 0 0 1 149.333333-170.666667 161.28 161.28 0 0 1 149.333333 170.666667 161.28 161.28 0 0 1-149.333333 170.666666z m0-298.666666a118.912 118.912 0 0 0-106.666667 128 118.912 118.912 0 0 0 106.666667 128 118.912 118.912 0 0 0 106.666667-128 118.912 118.912 0 0 0-106.666667-128zM700.245333 874.666667a161.28 161.28 0 0 1-149.333333-170.666667 161.28 161.28 0 0 1 149.333333-170.666667 161.28 161.28 0 0 1 149.333334 170.666667 161.28 161.28 0 0 1-149.333334 170.666667z m0-298.666667a118.912 118.912 0 0 0-106.666666 128 118.912 118.912 0 0 0 106.666666 128 118.912 118.912 0 0 0 106.666667-128 118.912 118.912 0 0 0-106.666667-128z" fill="#757575" p-id="2283"></path></svg> | ||
| 3 | \ No newline at end of file | 1 | \ No newline at end of file |
| 2 | +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1636341153732" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2282" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M294.912 874.666667a21.333333 21.333333 0 0 1-17.194667-33.962667l469.333334-640a21.333333 21.333333 0 0 1 34.432 25.258667l-469.333334 640a21.248 21.248 0 0 1-17.237333 8.704zM358.912 533.333333a161.28 161.28 0 0 1-149.333333-170.666666 161.28 161.28 0 0 1 149.333333-170.666667 161.28 161.28 0 0 1 149.333333 170.666667 161.28 161.28 0 0 1-149.333333 170.666666z m0-298.666666a118.912 118.912 0 0 0-106.666667 128 118.912 118.912 0 0 0 106.666667 128 118.912 118.912 0 0 0 106.666667-128 118.912 118.912 0 0 0-106.666667-128zM700.245333 874.666667a161.28 161.28 0 0 1-149.333333-170.666667 161.28 161.28 0 0 1 149.333333-170.666667 161.28 161.28 0 0 1 149.333334 170.666667 161.28 161.28 0 0 1-149.333334 170.666667z m0-298.666667a118.912 118.912 0 0 0-106.666666 128 118.912 118.912 0 0 0 106.666666 128 118.912 118.912 0 0 0 106.666667-128 118.912 118.912 0 0 0-106.666667-128z" fill="#757575" p-id="2283"></path></svg> | ||
| 4 | \ No newline at end of file | 3 | \ No newline at end of file |
yudao-ui-admin/src/assets/icons/svg/system.svg
| 1 | -<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543827724451" class="icon" style="" viewBox="0 0 1084 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10233" xmlns:xlink="http://www.w3.org/1999/xlink" width="211.71875" height="200"><defs><style type="text/css">@font-face { font-family: rbicon; src: url("chrome-extension://dipiagiiohfljcicegpgffpbnjmgjcnf/fonts/rbicon.woff2") format("woff2"); font-weight: normal; font-style: normal; } | ||
| 2 | -</style></defs><path d="M1080.09609 434.500756c-4.216302-23.731757-26.9241-47.945376-50.595623-53.185637l-17.648235-4.095836a175.940257 175.940257 0 0 1-101.612877-80.832531 177.807476 177.807476 0 0 1-18.732427-129.801867l5.541425-16.684509c7.10748-23.129428-2.108151-54.992624-20.599646-70.833873 0 0-16.624276-14.094495-63.244529-41.199293-46.800951-26.984332-66.858502-34.513443-66.858502-34.513443-22.76803-8.372371-54.631227-0.361397-71.255503 17.407304l-12.287509 13.251234a173.470708 173.470708 0 0 1-120.465769 48.065842A174.13327 174.13327 0 0 1 421.329029 33.590675L409.583617 20.761071C393.140039 2.99237 361.096144-4.898138 338.267881 3.353767c0 0-20.358715 7.529111-67.099434 34.513443-46.800951 27.34573-63.244529 41.440225-63.244529 41.440225-18.431263 15.66055-27.646894 47.222582-20.539413 70.592941l5.059562 16.865207a178.048407 178.048407 0 0 1-18.672194 129.621169 174.916297 174.916297 0 0 1-102.275439 81.073463l-17.045906 3.854904c-23.310126 5.42096-46.258856 29.333415-50.595623 53.185637 0 0-3.854905 21.382674-3.854905 75.712737 0 54.330062 3.854905 75.712736 3.854905 75.712736 4.216302 23.972688 26.9241 47.945376 50.595623 53.185637l16.624276 3.854905a174.253736 174.253736 0 0 1 102.395904 81.314394c23.310126 40.837896 28.911785 87.337683 18.732427 129.801867l-4.81863 16.443578c-7.10748 23.129428 2.108151 54.992624 20.599646 70.833872 0 0 16.624276 14.094495 63.244529 41.199293 46.800951 27.104798 66.918735 34.513443 66.918735 34.513443 22.707798 8.372371 54.631227 0.361397 71.255503-17.407303l11.624947-12.588673a175.096996 175.096996 0 0 1 242.256662 0.120465l11.624947 12.648906c16.383345 17.708468 48.427239 25.598976 71.255503 17.347071 0 0 20.358715-7.529111 67.159666-34.513443 46.740719-27.104798 63.124063-41.199293 63.124064-41.199293 18.491496-15.600317 27.707127-47.463513 20.599646-70.833873l-5.059562-17.106139a176.723284 176.723284 0 0 1 18.672194-129.139305 176.060722 176.060722 0 0 1 102.395904-81.314394l16.68451-3.854905c23.310126-5.42096 46.258856-29.333415 50.595623-53.185637 0 0 3.854905-21.382674 3.854904-75.712737-0.240932-54.330062-4.095836-75.833202-4.095836-75.833202z m-537.819428 293.334149c-119.261112 0-216.175824-97.336342-216.175824-217.621412a216.657687 216.657687 0 0 1 216.236057-217.320249c119.200879 0 216.115591 97.276109 216.11559 217.56118-0.240932 120.044139-96.974945 217.320248-216.175823 217.320249z" p-id="10234" fill="#bfbfbf"></path></svg> | ||
| 3 | \ No newline at end of file | 1 | \ No newline at end of file |
| 2 | +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543827724451" class="icon" style="" viewBox="0 0 1084 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10233" xmlns:xlink="http://www.w3.org/1999/xlink" width="211.71875" height="200"><defs><style type="text/css"></style></defs><path d="M1080.09609 434.500756c-4.216302-23.731757-26.9241-47.945376-50.595623-53.185637l-17.648235-4.095836a175.940257 175.940257 0 0 1-101.612877-80.832531 177.807476 177.807476 0 0 1-18.732427-129.801867l5.541425-16.684509c7.10748-23.129428-2.108151-54.992624-20.599646-70.833873 0 0-16.624276-14.094495-63.244529-41.199293-46.800951-26.984332-66.858502-34.513443-66.858502-34.513443-22.76803-8.372371-54.631227-0.361397-71.255503 17.407304l-12.287509 13.251234a173.470708 173.470708 0 0 1-120.465769 48.065842A174.13327 174.13327 0 0 1 421.329029 33.590675L409.583617 20.761071C393.140039 2.99237 361.096144-4.898138 338.267881 3.353767c0 0-20.358715 7.529111-67.099434 34.513443-46.800951 27.34573-63.244529 41.440225-63.244529 41.440225-18.431263 15.66055-27.646894 47.222582-20.539413 70.592941l5.059562 16.865207a178.048407 178.048407 0 0 1-18.672194 129.621169 174.916297 174.916297 0 0 1-102.275439 81.073463l-17.045906 3.854904c-23.310126 5.42096-46.258856 29.333415-50.595623 53.185637 0 0-3.854905 21.382674-3.854905 75.712737 0 54.330062 3.854905 75.712736 3.854905 75.712736 4.216302 23.972688 26.9241 47.945376 50.595623 53.185637l16.624276 3.854905a174.253736 174.253736 0 0 1 102.395904 81.314394c23.310126 40.837896 28.911785 87.337683 18.732427 129.801867l-4.81863 16.443578c-7.10748 23.129428 2.108151 54.992624 20.599646 70.833872 0 0 16.624276 14.094495 63.244529 41.199293 46.800951 27.104798 66.918735 34.513443 66.918735 34.513443 22.707798 8.372371 54.631227 0.361397 71.255503-17.407303l11.624947-12.588673a175.096996 175.096996 0 0 1 242.256662 0.120465l11.624947 12.648906c16.383345 17.708468 48.427239 25.598976 71.255503 17.347071 0 0 20.358715-7.529111 67.159666-34.513443 46.740719-27.104798 63.124063-41.199293 63.124064-41.199293 18.491496-15.600317 27.707127-47.463513 20.599646-70.833873l-5.059562-17.106139a176.723284 176.723284 0 0 1 18.672194-129.139305 176.060722 176.060722 0 0 1 102.395904-81.314394l16.68451-3.854905c23.310126-5.42096 46.258856-29.333415 50.595623-53.185637 0 0 3.854905-21.382674 3.854904-75.712737-0.240932-54.330062-4.095836-75.833202-4.095836-75.833202z m-537.819428 293.334149c-119.261112 0-216.175824-97.336342-216.175824-217.621412a216.657687 216.657687 0 0 1 216.236057-217.320249c119.200879 0 216.115591 97.276109 216.11559 217.56118-0.240932 120.044139-96.974945 217.320248-216.175823 217.320249z" p-id="10234" fill="#bfbfbf"></path></svg> | ||
| 4 | \ No newline at end of file | 3 | \ No newline at end of file |
yudao-ui-admin/src/layout/components/Navbar.vue
| @@ -28,6 +28,7 @@ | @@ -28,6 +28,7 @@ | ||
| 28 | <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click"> | 28 | <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click"> |
| 29 | <div class="avatar-wrapper"> | 29 | <div class="avatar-wrapper"> |
| 30 | <img :src="avatar" class="user-avatar"> | 30 | <img :src="avatar" class="user-avatar"> |
| 31 | + <span v-if="nickname" class="user-nickname">{{ nickname }}</span> | ||
| 31 | <i class="el-icon-caret-bottom" /> | 32 | <i class="el-icon-caret-bottom" /> |
| 32 | </div> | 33 | </div> |
| 33 | <el-dropdown-menu slot="dropdown"> | 34 | <el-dropdown-menu slot="dropdown"> |
| @@ -73,6 +74,7 @@ export default { | @@ -73,6 +74,7 @@ export default { | ||
| 73 | ...mapGetters([ | 74 | ...mapGetters([ |
| 74 | 'sidebar', | 75 | 'sidebar', |
| 75 | 'avatar', | 76 | 'avatar', |
| 77 | + 'nickname', | ||
| 76 | 'device' | 78 | 'device' |
| 77 | ]), | 79 | ]), |
| 78 | setting: { | 80 | setting: { |
| @@ -173,14 +175,20 @@ export default { | @@ -173,14 +175,20 @@ export default { | ||
| 173 | margin-right: 30px; | 175 | margin-right: 30px; |
| 174 | 176 | ||
| 175 | .avatar-wrapper { | 177 | .avatar-wrapper { |
| 176 | - margin-top: 5px; | 178 | + display: flex; |
| 179 | + justify-content: center; | ||
| 180 | + align-items: center; | ||
| 177 | position: relative; | 181 | position: relative; |
| 178 | 182 | ||
| 179 | .user-avatar { | 183 | .user-avatar { |
| 180 | cursor: pointer; | 184 | cursor: pointer; |
| 181 | - width: 40px; | ||
| 182 | - height: 40px; | ||
| 183 | - border-radius: 10px; | 185 | + width: 35px; |
| 186 | + height: 35px; | ||
| 187 | + border-radius: 50%; | ||
| 188 | + } | ||
| 189 | + .user-nickname{ | ||
| 190 | + margin-left: 5px; | ||
| 191 | + font-size: 14px; | ||
| 184 | } | 192 | } |
| 185 | 193 | ||
| 186 | .el-icon-caret-bottom { | 194 | .el-icon-caret-bottom { |
yudao-ui-admin/src/store/getters.js
| @@ -8,6 +8,7 @@ const getters = { | @@ -8,6 +8,7 @@ const getters = { | ||
| 8 | token: state => state.user.token, | 8 | token: state => state.user.token, |
| 9 | avatar: state => state.user.avatar, | 9 | avatar: state => state.user.avatar, |
| 10 | name: state => state.user.name, | 10 | name: state => state.user.name, |
| 11 | + nickname: state => state.user.nickname, | ||
| 11 | introduction: state => state.user.introduction, | 12 | introduction: state => state.user.introduction, |
| 12 | roles: state => state.user.roles, | 13 | roles: state => state.user.roles, |
| 13 | permissions: state => state.user.permissions, | 14 | permissions: state => state.user.permissions, |
yudao-ui-admin/src/store/modules/user.js
| @@ -17,6 +17,9 @@ const user = { | @@ -17,6 +17,9 @@ const user = { | ||
| 17 | SET_NAME: (state, name) => { | 17 | SET_NAME: (state, name) => { |
| 18 | state.name = name | 18 | state.name = name |
| 19 | }, | 19 | }, |
| 20 | + SET_NICKNAME: (state, nickname) => { | ||
| 21 | + state.nickname = nickname | ||
| 22 | + }, | ||
| 20 | SET_AVATAR: (state, avatar) => { | 23 | SET_AVATAR: (state, avatar) => { |
| 21 | state.avatar = avatar | 24 | state.avatar = avatar |
| 22 | }, | 25 | }, |
| @@ -109,7 +112,8 @@ const user = { | @@ -109,7 +112,8 @@ const user = { | ||
| 109 | user: { | 112 | user: { |
| 110 | id: '', | 113 | id: '', |
| 111 | avatar: '', | 114 | avatar: '', |
| 112 | - userName: '' | 115 | + userName: '', |
| 116 | + nickname: '' | ||
| 113 | } | 117 | } |
| 114 | } | 118 | } |
| 115 | } | 119 | } |
| @@ -126,6 +130,7 @@ const user = { | @@ -126,6 +130,7 @@ const user = { | ||
| 126 | } | 130 | } |
| 127 | commit('SET_ID', user.id) | 131 | commit('SET_ID', user.id) |
| 128 | commit('SET_NAME', user.userName) | 132 | commit('SET_NAME', user.userName) |
| 133 | + commit('SET_NICKNAME', user.nickname) | ||
| 129 | commit('SET_AVATAR', avatar) | 134 | commit('SET_AVATAR', avatar) |
| 130 | resolve(res) | 135 | resolve(res) |
| 131 | }).catch(error => { | 136 | }).catch(error => { |
yudao-ui-admin/src/views/infra/dbDoc/index.vue
| @@ -27,7 +27,7 @@ export default { | @@ -27,7 +27,7 @@ export default { | ||
| 27 | return { | 27 | return { |
| 28 | height: document.documentElement.clientHeight - 94.5 + "px;", | 28 | height: document.documentElement.clientHeight - 94.5 + "px;", |
| 29 | loading: true, | 29 | loading: true, |
| 30 | - src: undefined, | 30 | + src: "undefined", |
| 31 | }; | 31 | }; |
| 32 | }, | 32 | }, |
| 33 | mounted: function() { | 33 | mounted: function() { |
yudao-ui-admin/src/views/infra/file/index.vue
| @@ -26,8 +26,9 @@ | @@ -26,8 +26,9 @@ | ||
| 26 | 26 | ||
| 27 | <!-- 列表 --> | 27 | <!-- 列表 --> |
| 28 | <el-table v-loading="loading" :data="list"> | 28 | <el-table v-loading="loading" :data="list"> |
| 29 | - <el-table-column label="文件名" align="center" prop="path" /> | ||
| 30 | - <el-table-column label="URL" align="center" prop="url" /> | 29 | + <el-table-column label="文件名" align="center" prop="name" /> |
| 30 | + <el-table-column label="文件路径" align="center" prop="path" /> | ||
| 31 | + <el-table-column label="文件 URL" align="center" prop="url" /> | ||
| 31 | <el-table-column label="文件大小" align="center" prop="size" width="120" :formatter="sizeFormat" /> | 32 | <el-table-column label="文件大小" align="center" prop="size" width="120" :formatter="sizeFormat" /> |
| 32 | <el-table-column label="文件类型" align="center" prop="type" width="80" /> | 33 | <el-table-column label="文件类型" align="center" prop="type" width="80" /> |
| 33 | <!-- <el-table-column label="文件内容" align="center" prop="content">--> | 34 | <!-- <el-table-column label="文件内容" align="center" prop="content">--> |
| @@ -160,7 +161,7 @@ export default { | @@ -160,7 +161,7 @@ export default { | ||
| 160 | }, | 161 | }, |
| 161 | /** 处理上传的文件发生变化 */ | 162 | /** 处理上传的文件发生变化 */ |
| 162 | handleFileChange(file, fileList) { | 163 | handleFileChange(file, fileList) { |
| 163 | - this.upload.data.path = file.name; | 164 | + |
| 164 | }, | 165 | }, |
| 165 | /** 处理文件上传中 */ | 166 | /** 处理文件上传中 */ |
| 166 | handleFileUploadProgress(event, file, fileList) { | 167 | handleFileUploadProgress(event, file, fileList) { |
yudao-ui-admin/src/views/infra/fileConfig/index.vue
| @@ -77,7 +77,7 @@ | @@ -77,7 +77,7 @@ | ||
| 77 | <el-input v-model="form.remark" placeholder="请输入备注" /> | 77 | <el-input v-model="form.remark" placeholder="请输入备注" /> |
| 78 | </el-form-item> | 78 | </el-form-item> |
| 79 | <el-form-item label="存储器" prop="storage"> | 79 | <el-form-item label="存储器" prop="storage"> |
| 80 | - <el-select v-model="form.storage" placeholder="请选择存储器" :disabled="form.id"> | 80 | + <el-select v-model="form.storage" placeholder="请选择存储器" :disabled="form.id !== undefined"> |
| 81 | <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_FILE_STORAGE)" | 81 | <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_FILE_STORAGE)" |
| 82 | :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> | 82 | :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> |
| 83 | </el-select> | 83 | </el-select> |
| @@ -91,7 +91,7 @@ | @@ -91,7 +91,7 @@ | ||
| 91 | <el-input v-model="form.config.host" placeholder="请输入主机地址" /> | 91 | <el-input v-model="form.config.host" placeholder="请输入主机地址" /> |
| 92 | </el-form-item> | 92 | </el-form-item> |
| 93 | <el-form-item v-if="form.storage >= 11 && form.storage <= 12" label="主机端口" prop="config.port"> | 93 | <el-form-item v-if="form.storage >= 11 && form.storage <= 12" label="主机端口" prop="config.port"> |
| 94 | - <el-input-number min="0" v-model="form.config.port" placeholder="请输入主机端口" /> | 94 | + <el-input-number :min="0" v-model="form.config.port" placeholder="请输入主机端口" /> |
| 95 | </el-form-item> | 95 | </el-form-item> |
| 96 | <el-form-item v-if="form.storage >= 11 && form.storage <= 12" label="用户名" prop="config.username"> | 96 | <el-form-item v-if="form.storage >= 11 && form.storage <= 12" label="用户名" prop="config.username"> |
| 97 | <el-input v-model="form.config.username" placeholder="请输入密码" /> | 97 | <el-input v-model="form.config.username" placeholder="请输入密码" /> |
yudao-ui-admin/src/views/system/sms/smsLog.vue
| @@ -45,10 +45,6 @@ | @@ -45,10 +45,6 @@ | ||
| 45 | <!-- 操作工具栏 --> | 45 | <!-- 操作工具栏 --> |
| 46 | <el-row :gutter="10" class="mb8"> | 46 | <el-row :gutter="10" class="mb8"> |
| 47 | <el-col :span="1.5"> | 47 | <el-col :span="1.5"> |
| 48 | - <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" | ||
| 49 | - v-hasPermi="['system:sms-log:create']">新增</el-button> | ||
| 50 | - </el-col> | ||
| 51 | - <el-col :span="1.5"> | ||
| 52 | <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" | 48 | <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" |
| 53 | v-hasPermi="['system:sms-log:export']">导出</el-button> | 49 | v-hasPermi="['system:sms-log:export']">导出</el-button> |
| 54 | </el-col> | 50 | </el-col> |