BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 92632c046cea25e9e48ff08f2d836403490f645c

Authored by YunaiV
2 parents 7a4a6a30 893b6cf4

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 

# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue
Inline Side-by-side
Showing 496 changed files with 15310 additions and 14148 deletions

Too many changes.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 496 files are displayed.

README.md
  View file @92632c0
... ... @@ -38,11 +38,12 @@
38 38 * 集成阿里云、腾讯云等短信渠道，集成 MinIO、阿里云、腾讯云、七牛云等云存储服务
39 39 * 集成报表设计器，支持数据报表、图形报表、打印设计等
40 40  
41   -| 项目名 | 说明 | 传说门 |
42   -|--------------------|------------------------|-------------------------------------------------------------------------------------------------------------------------------------|
43   -| `ruoyi-vue-pro` | Spring Boot 多模块 | **[Gitee](https://gitee.com/zhijiantianya/ruoyi-vue-pro)**     [Github](https://github.com/YunaiV/ruoyi-vue-pro) |
44   -| `yudao-cloud` | Spring Cloud 微服务 | **[Gitee](https://gitee.com/zhijiantianya/yudao-cloud)**     [Github](https://github.com/YunaiV/yudao-cloud) |
  41 +| 项目名 | 说明 | 传送门 |
  42 +|--------------------|------------------------|-----------------------------------------------------------------------------------------------------------------------------------|
  43 +| `ruoyi-vue-pro` | Spring Boot 多模块 | **[Gitee](https://gitee.com/zhijiantianya/ruoyi-vue-pro)**     [Github](https://github.com/YunaiV/ruoyi-vue-pro) |
  44 +| `yudao-cloud` | Spring Cloud 微服务 | **[Gitee](https://gitee.com/zhijiantianya/yudao-cloud)**     [Github](https://github.com/YunaiV/yudao-cloud) |
45 45 | `Spring-Boot-Labs` | Spring Boot & Cloud 入门 | **[Gitee](https://gitee.com/zhijiantianya/SpringBoot-Labs)**     [Github](https://github.com/YunaiV/SpringBoot-Labs) |
  46 + | `ruoyi-vue-pro-mini` | 精简版 移除工作流 支付等模块| **[Gitee](https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/mini)** |
46 47  
47 48 ## 😎 开源协议
48 49  
... ... @@ -168,42 +169,42 @@ ps：核心功能已经实现，正在对接微信小程序中...
168 169  
169 170 ## 🐨 技术栈
170 171  
171   -| 项目 | 说明 |
172   -|-----------------------|--------------------|
173   -| `yudao-dependencies` | Maven 依赖版本管理 |
174   -| `yudao-framework` | Java 框架拓展 |
175   -| `yudao-server` | 管理后台 + 用户 APP 的服务端 |
176   -| `yudao-ui-admin` | 管理后台的 Vue2 前端项目 |
177   -| `yudao-ui-admin-vue3` | 管理后台的 Vue3 前端项目 |
178   -| `yudao-ui-admin-uniapp` | 管理后台的 uni-app 多端项目 |
179   -| `yudao-ui-app` | 用户 APP 的 UI 界面 |
180   -| `yudao-module-system` | 系统功能的 Module 模块 |
181   -| `yudao-module-member` | 会员中心的 Module 模块 |
182   -| `yudao-module-infra` | 基础设施的 Module 模块 |
183   -| `yudao-module-tool` | 研发工具的 Module 模块 |
184   -| `yudao-module-bpm` | 工作流程的 Module 模块 |
185   -| `yudao-module-pay` | 支付系统的 Module 模块 |
  172 +| 项目 | 说明 |
  173 +|-------------------------|-----------------------|
  174 +| `yudao-dependencies` | Maven 依赖版本管理 |
  175 +| `yudao-framework` | Java 框架拓展 |
  176 +| `yudao-server` | 管理后台 + 用户 APP 的服务端 |
  177 +| `yudao-ui-admin` | 管理后台的 Vue2 前端项目 |
  178 +| `yudao-ui-admin-vue3` | 管理后台的 Vue3 前端项目 |
  179 +| `yudao-ui-admin-uniapp` | 管理后台的 uni-app 多端项目 |
  180 +| `yudao-ui-app` | 用户 APP 的 UI 界面 |
  181 +| `yudao-module-system` | 系统功能的 Module 模块 |
  182 +| `yudao-module-member` | 会员中心的 Module 模块 |
  183 +| `yudao-module-infra` | 基础设施的 Module 模块 |
  184 +| `yudao-module-tool` | 研发工具的 Module 模块 |
  185 +| `yudao-module-bpm` | 工作流程的 Module 模块 |
  186 +| `yudao-module-pay` | 支付系统的 Module 模块 |
186 187  
187 188 ### 后端
188 189  
189 190 | 框架 | 说明 | 版本 | 学习指南 |
190 191 |---------------------------------------------------------------------------------------------|-----------------------|-------------|----------------------------------------------------------------|
191   -| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.6.13 | [文档](https://github.com/YunaiV/SpringBoot-Labs) |
  192 +| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.7.6 | [文档](https://github.com/YunaiV/SpringBoot-Labs) |
192 193 | [MySQL](https://www.mysql.com/cn/) | 数据库服务器 | 5.7 / 8.0+ | |
193   -| [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.14 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
  194 +| [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.15 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
194 195 | [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.5.2 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) |
195   -| [Dynamic Datasource](https://dynamic-datasource.com/) | 动态数据源 | 3.5.2 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
  196 +| [Dynamic Datasource](https://dynamic-datasource.com/) | 动态数据源 | 3.6.0 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) |
196 197 | [Redis](https://redis.io/) | key-value 数据库 | 5.0 / 6.0 | |
197   -| [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 3.17.7 | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao) |
198   -| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架 | 5.3.23 | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao) |
199   -| [Spring Security](https://github.com/spring-projects/spring-security) | Spring 安全框架 | 5.6.8 | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) |
200   -| [Hibernate Validator](https://github.com/hibernate/hibernate-validator) | 参数校验组件 | 6.2.3 | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?yudao) |
  198 +| [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 3.18.0 | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao) |
  199 +| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架 | 5.3.24 | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao) |
  200 +| [Spring Security](https://github.com/spring-projects/spring-security) | Spring 安全框架 | 5.7.5 | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) |
  201 +| [Hibernate Validator](https://github.com/hibernate/hibernate-validator) | 参数校验组件 | 6.2.5 | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?yudao) |
201 202 | [Flowable](https://github.com/flowable/flowable-engine) | 工作流引擎 | 6.7.2 | [文档](https://doc.iocoder.cn/bpm/) |
202 203 | [Quartz](https://github.com/quartz-scheduler) | 任务调度组件 | 2.3.2 | [文档](http://www.iocoder.cn/Spring-Boot/Job/?yudao) |
203 204 | [Knife4j](https://gitee.com/xiaoym/knife4j) | Swagger 增强 UI 实现 | 3.0.3 | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?yudao) |
204 205 | [Resilience4j](https://github.com/resilience4j/resilience4j) | 服务保障组件 | 1.7.1 | [文档](http://www.iocoder.cn/Spring-Boot/Resilience4j/?yudao) |
205   -| [SkyWalking](https://skywalking.apache.org/) | 分布式应用追踪系统 | 8.5.0 | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao) |
206   -| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.6.9 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) |
  206 +| [SkyWalking](https://skywalking.apache.org/) | 分布式应用追踪系统 | 8.12.0 | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao) |
  207 +| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.7.9 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) |
207 208 | [Jackson](https://github.com/FasterXML/jackson) | JSON 工具库 | 2.13.3 | |
208 209 | [MapStruct](https://mapstruct.org/) | Java Bean 转换 | 1.5.3.Final | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao) |
209 210 | [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代码 | 1.18.24 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao) |
... ... @@ -212,23 +213,22 @@ ps：核心功能已经实现，正在对接微信小程序中...
212 213  
213 214 ### [管理后台 Vue2 前端](./yudao-ui-admin)
214 215  
215   -| 框架 | 说明 | 版本 |
216   -|------------------------------------------------------------------------------|---------------|-------|
217   -| [Vue](https://cn.vuejs.org/index.html) | JavaScript 框架 | 2.7.0 |
218   -| [Vue Element Admin](https://panjiachen.github.io/vue-element-admin-site/zh/) | 后台前端解决方案 | - |
  216 +| 框架 | 说明 | 版本 |
  217 +|------------------------------------------------------------------------------|---------------|--------|
  218 +| [Vue](https://cn.vuejs.org/index.html) | JavaScript 框架 | 2.7.14 |
  219 +| [Vue Element Admin](https://panjiachen.github.io/vue-element-admin-site/zh/) | 后台前端解决方案 | - |
219 220  
220 221 ### [管理后台 Vue3 前端](./yudao-ui-admin-vue3)
221 222  
222   -| 框架 | 说明 | 版本 |
223   -|----------------------------------------------------------------------|-----------------|--------|
224   -| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.2.44 |
225   -| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.2.3 |
226   -| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.20 |
227   -| [TypeScript](https://www.typescriptlang.org/docs/) | TypeScript | 4.8.4 |
228   -| [pinia](https://pinia.vuejs.org/) | vuex5 | 2.0.23 |
229   -| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 |
230   -| [windicss](https://cn.windicss.org/) | 下一代工具优先的 CSS 框架 | 3.5.6 |
231   -| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.0.0 |
  223 +| 框架 | 说明 | 版本 |
  224 +|----------------------------------------------------------------------|:------------:|:------:|
  225 +| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.2.45 |
  226 +| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.0.3 |
  227 +| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.27 |
  228 +| [TypeScript](https://www.typescriptlang.org/docs/) | TypeScript | 4.9.4 |
  229 +| [pinia](https://pinia.vuejs.org/) | vuex5 | 2.0.28 |
  230 +| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 |
  231 +| [vxe-table](https://vxetable.cn/) | vue最强表单 | 4.3.7 |
232 232  
233 233 ### [管理后台 uni-app 跨端](./yudao-ui-admin-uniapp)
234 234  
... ... @@ -242,15 +242,15 @@ ps：核心功能已经实现，正在对接微信小程序中...
242 242 ### 系统功能
243 243  
244 244 | 模块 | biu | biu | biu |
245   -|----------|--------------------------------------------------------------------|------------------------------------------------------------------|------------------------------------------------------------------|
  245 +|------------|--------------------------------------------------------------------|------------------------------------------------------------------|------------------------------------------------------------------|
246 246 | 登录 & 首页 | ![登录](https://static.iocoder.cn/images/ruoyi-vue-pro/登录.jpg?imageView2/2/format/webp/w/1280) | ![首页](https://static.iocoder.cn/images/ruoyi-vue-pro/首页.jpg?imageView2/2/format/webp/w/1280) | ![个人中心](https://static.iocoder.cn/images/ruoyi-vue-pro/个人中心.jpg?imageView2/2/format/webp/w/1280) |
247   -| 用户 & 应用 | ![用户管理](https://static.iocoder.cn/images/ruoyi-vue-pro/用户管理.jpg?imageView2/2/format/webp/w/1280) | ![令牌管理](https://static.iocoder.cn/images/ruoyi-vue-pro/令牌管理.jpg?imageView2/2/format/webp/w/1280) | ![应用管理](https://static.iocoder.cn/images/ruoyi-vue-pro/应用管理.jpg?imageView2/2/format/webp/w/1280) |
  247 +| 用户 & 应用 | ![用户管理](https://static.iocoder.cn/images/ruoyi-vue-pro/用户管理.jpg?imageView2/2/format/webp/w/1280) | ![令牌管理](https://static.iocoder.cn/images/ruoyi-vue-pro/令牌管理.jpg?imageView2/2/format/webp/w/1280) | ![应用管理](https://static.iocoder.cn/images/ruoyi-vue-pro/应用管理.jpg?imageView2/2/format/webp/w/1280) |
248 248 | 租户 & 套餐 | ![租户管理](https://static.iocoder.cn/images/ruoyi-vue-pro/租户管理.jpg?imageView2/2/format/webp/w/1280) | ![租户套餐](https://static.iocoder.cn/images/ruoyi-vue-pro/租户套餐.png) | - |
249 249 | 部门 & 岗位 | ![部门管理](https://static.iocoder.cn/images/ruoyi-vue-pro/部门管理.jpg?imageView2/2/format/webp/w/1280) | ![岗位管理](https://static.iocoder.cn/images/ruoyi-vue-pro/岗位管理.jpg?imageView2/2/format/webp/w/1280) | - |
250 250 | 菜单 & 角色 | ![菜单管理](https://static.iocoder.cn/images/ruoyi-vue-pro/菜单管理.jpg?imageView2/2/format/webp/w/1280) | ![角色管理](https://static.iocoder.cn/images/ruoyi-vue-pro/角色管理.jpg?imageView2/2/format/webp/w/1280) | - |
251 251 | 审计日志 | ![操作日志](https://static.iocoder.cn/images/ruoyi-vue-pro/操作日志.jpg?imageView2/2/format/webp/w/1280) | ![登录日志](https://static.iocoder.cn/images/ruoyi-vue-pro/登录日志.jpg?imageView2/2/format/webp/w/1280) | - |
252 252 | 短信 | ![短信渠道](https://static.iocoder.cn/images/ruoyi-vue-pro/短信渠道.jpg?imageView2/2/format/webp/w/1280) | ![短信模板](https://static.iocoder.cn/images/ruoyi-vue-pro/短信模板.jpg?imageView2/2/format/webp/w/1280) | ![短信日志](https://static.iocoder.cn/images/ruoyi-vue-pro/短信日志.jpg?imageView2/2/format/webp/w/1280) |
253   -| 字典 & 敏感词 | ![字典类型](https://static.iocoder.cn/images/ruoyi-vue-pro/字典类型.jpg?imageView2/2/format/webp/w/1280) | ![字典数据](https://static.iocoder.cn/images/ruoyi-vue-pro/字典数据.jpg?imageView2/2/format/webp/w/1280) | ![敏感词](https://static.iocoder.cn/images/ruoyi-vue-pro/敏感词.jpg?imageView2/2/format/webp/w/1280) |
  253 +| 字典 & 敏感词 | ![字典类型](https://static.iocoder.cn/images/ruoyi-vue-pro/字典类型.jpg?imageView2/2/format/webp/w/1280) | ![字典数据](https://static.iocoder.cn/images/ruoyi-vue-pro/字典数据.jpg?imageView2/2/format/webp/w/1280) | ![敏感词](https://static.iocoder.cn/images/ruoyi-vue-pro/敏感词.jpg?imageView2/2/format/webp/w/1280) |
254 254 | 错误码 & 通知 | ![错误码管理](https://static.iocoder.cn/images/ruoyi-vue-pro/错误码管理.jpg?imageView2/2/format/webp/w/1280) | ![通知公告](https://static.iocoder.cn/images/ruoyi-vue-pro/通知公告.jpg?imageView2/2/format/webp/w/1280) | - |
255 255  
256 256 ### 工作流程
... ...
... ... @@ -29,7 +29,7 @@
29 29 <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
30 30  
31 31 <properties>
32   - <revision>1.6.4-snapshot</revision>
  32 + <revision>1.6.5-snapshot</revision>
33 33 <!-- Maven 相关 -->
34 34 <java.version>1.8</java.version>
35 35 <maven.compiler.source>${java.version}</maven.compiler.source>
... ...
sql/mysql/ruoyi-vue-pro.sql
  View file @92632c0
... ... @@ -11,7 +11,7 @@
11 11 Target Server Version : 80026
12 12 File Encoding : 65001
13 13  
14   - Date: 29/07/2022 00:33:25
  14 + Date: 20/12/2022 00:33:25
15 15 */
16 16  
17 17 SET NAMES utf8mb4;
... ... @@ -300,7 +300,7 @@ CREATE TABLE `bpm_form` (
300 300 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
301 301 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
302 302 PRIMARY KEY (`id`) USING BTREE
303   -) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的表单定义';
  303 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的表单定义';
304 304  
305 305 -- ----------------------------
306 306 -- Records of bpm_form
... ... @@ -329,7 +329,7 @@ CREATE TABLE `bpm_oa_leave` (
329 329 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
330 330 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
331 331 PRIMARY KEY (`id`) USING BTREE
332   -) ENGINE = InnoDB AUTO_INCREMENT = 33 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OA 请假申请表';
  332 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OA 请假申请表';
333 333  
334 334 -- ----------------------------
335 335 -- Records of bpm_oa_leave
... ... @@ -359,7 +359,7 @@ CREATE TABLE `bpm_process_definition_ext` (
359 359 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
360 360 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
361 361 PRIMARY KEY (`id`) USING BTREE
362   -) ENGINE = InnoDB AUTO_INCREMENT = 135 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Bpm 流程定义的拓展表\n';
  362 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Bpm 流程定义的拓展表\n';
363 363  
364 364 -- ----------------------------
365 365 -- Records of bpm_process_definition_ext
... ... @@ -389,7 +389,7 @@ CREATE TABLE `bpm_process_instance_ext` (
389 389 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
390 390 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
391 391 PRIMARY KEY (`id`) USING BTREE
392   -) ENGINE = InnoDB AUTO_INCREMENT = 290 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的流程实例的拓展';
  392 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的流程实例的拓展';
393 393  
394 394 -- ----------------------------
395 395 -- Records of bpm_process_instance_ext
... ... @@ -415,7 +415,7 @@ CREATE TABLE `bpm_task_assign_rule` (
415 415 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
416 416 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
417 417 PRIMARY KEY (`id`) USING BTREE
418   -) ENGINE = InnoDB AUTO_INCREMENT = 265 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Bpm 任务规则表';
  418 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Bpm 任务规则表';
419 419  
420 420 -- ----------------------------
421 421 -- Records of bpm_task_assign_rule
... ... @@ -444,7 +444,7 @@ CREATE TABLE `bpm_task_ext` (
444 444 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
445 445 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
446 446 PRIMARY KEY (`id`) USING BTREE
447   -) ENGINE = InnoDB AUTO_INCREMENT = 341 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的流程任务的拓展表';
  447 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '工作流的流程任务的拓展表';
448 448  
449 449 -- ----------------------------
450 450 -- Records of bpm_task_ext
... ... @@ -469,7 +469,7 @@ CREATE TABLE `bpm_user_group` (
469 469 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
470 470 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
471 471 PRIMARY KEY (`id`) USING BTREE
472   -) ENGINE = InnoDB AUTO_INCREMENT = 111 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户组';
  472 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户组';
473 473  
474 474 -- ----------------------------
475 475 -- Records of bpm_user_group
... ... @@ -504,7 +504,7 @@ CREATE TABLE `infra_api_access_log` (
504 504 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
505 505 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
506 506 PRIMARY KEY (`id`) USING BTREE
507   -) ENGINE = InnoDB AUTO_INCREMENT = 35822 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'API 访问日志表';
  507 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'API 访问日志表';
508 508  
509 509 -- ----------------------------
510 510 -- Records of infra_api_access_log
... ... @@ -546,7 +546,7 @@ CREATE TABLE `infra_api_error_log` (
546 546 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
547 547 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
548 548 PRIMARY KEY (`id`) USING BTREE
549   -) ENGINE = InnoDB AUTO_INCREMENT = 647 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统异常日志';
  549 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统异常日志';
550 550  
551 551 -- ----------------------------
552 552 -- Records of infra_api_error_log
... ... @@ -584,7 +584,7 @@ CREATE TABLE `infra_codegen_column` (
584 584 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
585 585 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
586 586 PRIMARY KEY (`id`) USING BTREE
587   -) ENGINE = InnoDB AUTO_INCREMENT = 1126 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表字段定义';
  587 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表字段定义';
588 588  
589 589 -- ----------------------------
590 590 -- Records of infra_codegen_column
... ... @@ -616,7 +616,7 @@ CREATE TABLE `infra_codegen_table` (
616 616 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
617 617 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
618 618 PRIMARY KEY (`id`) USING BTREE
619   -) ENGINE = InnoDB AUTO_INCREMENT = 99 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表定义';
  619 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表定义';
620 620  
621 621 -- ----------------------------
622 622 -- Records of infra_codegen_table
... ... @@ -673,7 +673,7 @@ CREATE TABLE `infra_data_source_config` (
673 673 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
674 674 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
675 675 PRIMARY KEY (`id`) USING BTREE
676   -) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '数据源配置表';
  676 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '数据源配置表';
677 677  
678 678 -- ----------------------------
679 679 -- Records of infra_data_source_config
... ... @@ -699,7 +699,7 @@ CREATE TABLE `infra_file` (
699 699 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
700 700 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
701 701 PRIMARY KEY (`id`) USING BTREE
702   -) ENGINE = InnoDB AUTO_INCREMENT = 93 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表';
  702 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表';
703 703  
704 704 -- ----------------------------
705 705 -- Records of infra_file
... ... @@ -753,7 +753,7 @@ CREATE TABLE `infra_file_content` (
753 753 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
754 754 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
755 755 PRIMARY KEY (`id`) USING BTREE
756   -) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表';
  756 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表';
757 757  
758 758 -- ----------------------------
759 759 -- Records of infra_file_content
... ... @@ -781,13 +781,13 @@ CREATE TABLE `infra_job` (
781 781 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
782 782 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
783 783 PRIMARY KEY (`id`) USING BTREE
784   -) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '定时任务表';
  784 +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '定时任务表';
785 785  
786 786 -- ----------------------------
787 787 -- Records of infra_job
788 788 -- ----------------------------
789 789 BEGIN;
790   -INSERT INTO `infra_job` (`id`, `name`, `status`, `handler_name`, `handler_param`, `cron_expression`, `retry_count`, `retry_interval`, `monitor_timeout`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (5, '支付通知 Job', 2, 'payNotifyJob', NULL, '* * * * * ?', 0, 0, 0, '1', '2021-10-27 08:34:42', '1', '2022-04-03 20:35:25', b'0');
  790 +INSERT INTO `infra_job` (`id`, `name`, `status`, `handler_name`, `handler_param`, `cron_expression`, `retry_count`, `retry_interval`, `monitor_timeout`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1, '支付通知 Job', 2, 'payNotifyJob', NULL, '* * * * * ?', 0, 0, 0, '1', '2021-10-27 08:34:42', '1', '2022-04-03 20:35:25', b'0');
791 791 COMMIT;
792 792  
793 793 -- ----------------------------
... ... @@ -811,7 +811,7 @@ CREATE TABLE `infra_job_log` (
811 811 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
812 812 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
813 813 PRIMARY KEY (`id`) USING BTREE
814   -) ENGINE = InnoDB AUTO_INCREMENT = 25295 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '定时任务日志表';
  814 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '定时任务日志表';
815 815  
816 816 -- ----------------------------
817 817 -- Records of infra_job_log
... ... @@ -836,7 +836,7 @@ CREATE TABLE `infra_test_demo` (
836 836 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
837 837 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
838 838 PRIMARY KEY (`id`) USING BTREE
839   -) ENGINE = InnoDB AUTO_INCREMENT = 108 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典类型表';
  839 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典类型表';
840 840  
841 841 -- ----------------------------
842 842 -- Records of infra_test_demo
... ... @@ -866,7 +866,7 @@ CREATE TABLE `member_user` (
866 866 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
867 867 PRIMARY KEY (`id`) USING BTREE,
868 868 UNIQUE INDEX `uk_mobile`(`mobile` ASC) USING BTREE COMMENT '手机号'
869   -) ENGINE = InnoDB AUTO_INCREMENT = 248 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户';
  869 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户';
870 870  
871 871 -- ----------------------------
872 872 -- Records of member_user
... ... @@ -893,7 +893,7 @@ CREATE TABLE `pay_app` (
893 893 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
894 894 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
895 895 PRIMARY KEY (`id`) USING BTREE
896   -) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '支付应用信息';
  896 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '支付应用信息';
897 897  
898 898 -- ----------------------------
899 899 -- Records of pay_app
... ... @@ -921,7 +921,7 @@ CREATE TABLE `pay_channel` (
921 921 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
922 922 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
923 923 PRIMARY KEY (`id`) USING BTREE
924   -) ENGINE = InnoDB AUTO_INCREMENT = 18 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '支付渠道\n';
  924 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '支付渠道\n';
925 925  
926 926 -- ----------------------------
927 927 -- Records of pay_channel
... ... @@ -947,7 +947,7 @@ CREATE TABLE `pay_merchant` (
947 947 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
948 948 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
949 949 PRIMARY KEY (`id`) USING BTREE
950   -) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '支付商户信息';
  950 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '支付商户信息';
951 951  
952 952 -- ----------------------------
953 953 -- Records of pay_merchant
... ... @@ -972,7 +972,7 @@ CREATE TABLE `pay_notify_log` (
972 972 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
973 973 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
974 974 PRIMARY KEY (`id`) USING BTREE
975   -) ENGINE = InnoDB AUTO_INCREMENT = 363051 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '支付通知 App 的日志';
  975 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '支付通知 App 的日志';
976 976  
977 977 -- ----------------------------
978 978 -- Records of pay_notify_log
... ... @@ -1004,7 +1004,7 @@ CREATE TABLE `pay_notify_task` (
1004 1004 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1005 1005 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1006 1006 PRIMARY KEY (`id`) USING BTREE
1007   -) ENGINE = InnoDB AUTO_INCREMENT = 112 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '商户支付、退款等的通知\n';
  1007 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '商户支付、退款等的通知\n';
1008 1008  
1009 1009 -- ----------------------------
1010 1010 -- Records of pay_notify_task
... ... @@ -1048,7 +1048,7 @@ CREATE TABLE `pay_order` (
1048 1048 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1049 1049 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1050 1050 PRIMARY KEY (`id`) USING BTREE
1051   -) ENGINE = InnoDB AUTO_INCREMENT = 125 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '支付订单\n';
  1051 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '支付订单\n';
1052 1052  
1053 1053 -- ----------------------------
1054 1054 -- Records of pay_order
... ... @@ -1077,7 +1077,7 @@ CREATE TABLE `pay_order_extension` (
1077 1077 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1078 1078 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1079 1079 PRIMARY KEY (`id`) USING BTREE
1080   -) ENGINE = InnoDB AUTO_INCREMENT = 124 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '支付订单\n';
  1080 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '支付订单\n';
1081 1081  
1082 1082 -- ----------------------------
1083 1083 -- Records of pay_order_extension
... ... @@ -1166,8 +1166,6 @@ INSERT INTO `system_dept` (`id`, `name`, `parent_id`, `sort`, `leader_user_id`,
1166 1166 INSERT INTO `system_dept` (`id`, `name`, `parent_id`, `sort`, `leader_user_id`, `phone`, `email`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (107, '运维部门', 101, 5, NULL, '15888888888', 'ry@qq.com', 0, 'admin', '2021-01-05 17:03:47', '', '2021-12-15 05:01:33', b'0', 1);
1167 1167 INSERT INTO `system_dept` (`id`, `name`, `parent_id`, `sort`, `leader_user_id`, `phone`, `email`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (108, '市场部门', 102, 1, NULL, '15888888888', 'ry@qq.com', 0, 'admin', '2021-01-05 17:03:47', '1', '2022-02-16 08:35:45', b'0', 1);
1168 1168 INSERT INTO `system_dept` (`id`, `name`, `parent_id`, `sort`, `leader_user_id`, `phone`, `email`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (109, '财务部门', 102, 2, NULL, '15888888888', 'ry@qq.com', 0, 'admin', '2021-01-05 17:03:47', '', '2021-12-15 05:01:29', b'0', 1);
1169   -INSERT INTO `system_dept` (`id`, `name`, `parent_id`, `sort`, `leader_user_id`, `phone`, `email`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (110, '新部门', 0, 1, NULL, NULL, NULL, 0, '110', '2022-02-23 20:46:30', '110', '2022-02-23 20:46:30', b'0', 121);
1170   -INSERT INTO `system_dept` (`id`, `name`, `parent_id`, `sort`, `leader_user_id`, `phone`, `email`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (111, '顶级部门', 0, 1, NULL, NULL, NULL, 0, '113', '2022-03-07 21:44:50', '113', '2022-03-07 21:44:50', b'0', 122);
1171 1169 COMMIT;
1172 1170  
1173 1171 -- ----------------------------
... ... @@ -1335,19 +1333,20 @@ COMMIT;
1335 1333 -- Table structure for system_dict_type
1336 1334 -- ----------------------------
1337 1335 DROP TABLE IF EXISTS `system_dict_type`;
1338   -CREATE TABLE `system_dict_type` (
1339   - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '字典主键',
1340   - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '字典名称',
1341   - `type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '字典类型',
1342   - `status` tinyint NOT NULL DEFAULT 0 COMMENT '状态（0正常 1停用）',
1343   - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注',
1344   - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
1345   - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
1346   - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
1347   - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
1348   - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1349   - PRIMARY KEY (`id`) USING BTREE,
1350   - UNIQUE INDEX `dict_type`(`type` ASC) USING BTREE
  1336 +CREATE TABLE `system_dict_type`(
  1337 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '字典主键',
  1338 + `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '字典名称',
  1339 + `type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '字典类型',
  1340 + `status` tinyint NOT NULL DEFAULT 0 COMMENT '状态（0正常 1停用）',
  1341 + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注',
  1342 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
  1343 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  1344 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
  1345 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  1346 + `deleted_time` datetime DEFAULT NULL COMMENT '删除时间',
  1347 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  1348 + PRIMARY KEY (`id`) USING BTREE,
  1349 + UNIQUE INDEX `dict_type`(`type` ASC,`deleted_time` ASC) USING BTREE
1351 1350 ) ENGINE = InnoDB AUTO_INCREMENT = 149 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典类型表';
1352 1351  
1353 1352 -- ----------------------------
... ... @@ -1413,7 +1412,7 @@ CREATE TABLE `system_error_code` (
1413 1412 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
1414 1413 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1415 1414 PRIMARY KEY (`id`) USING BTREE
1416   -) ENGINE = InnoDB AUTO_INCREMENT = 5832 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '错误码表';
  1415 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '错误码表';
1417 1416  
1418 1417 -- ----------------------------
1419 1418 -- Records of system_error_code
... ... @@ -1442,7 +1441,7 @@ CREATE TABLE `system_login_log` (
1442 1441 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1443 1442 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1444 1443 PRIMARY KEY (`id`) USING BTREE
1445   -) ENGINE = InnoDB AUTO_INCREMENT = 1670 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统访问记录';
  1444 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统访问记录';
1446 1445  
1447 1446 -- ----------------------------
1448 1447 -- Records of system_login_log
... ... @@ -1761,7 +1760,7 @@ CREATE TABLE `system_oauth2_access_token` (
1761 1760 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1762 1761 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1763 1762 PRIMARY KEY (`id`) USING BTREE
1764   -) ENGINE = InnoDB AUTO_INCREMENT = 404 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 访问令牌';
  1763 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 访问令牌';
1765 1764  
1766 1765 -- ----------------------------
1767 1766 -- Records of system_oauth2_access_token
... ... @@ -1788,7 +1787,7 @@ CREATE TABLE `system_oauth2_approve` (
1788 1787 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1789 1788 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1790 1789 PRIMARY KEY (`id`) USING BTREE
1791   -) ENGINE = InnoDB AUTO_INCREMENT = 79 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 批准表';
  1790 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 批准表';
1792 1791  
1793 1792 -- ----------------------------
1794 1793 -- Records of system_oauth2_approve
... ... @@ -1854,7 +1853,7 @@ CREATE TABLE `system_oauth2_code` (
1854 1853 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1855 1854 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1856 1855 PRIMARY KEY (`id`) USING BTREE
1857   -) ENGINE = InnoDB AUTO_INCREMENT = 103 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 授权码表';
  1856 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 授权码表';
1858 1857  
1859 1858 -- ----------------------------
1860 1859 -- Records of system_oauth2_code
... ... @@ -1881,7 +1880,7 @@ CREATE TABLE `system_oauth2_refresh_token` (
1881 1880 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1882 1881 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1883 1882 PRIMARY KEY (`id`) USING BTREE
1884   -) ENGINE = InnoDB AUTO_INCREMENT = 295 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '刷新令牌';
  1883 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '刷新令牌';
1885 1884  
1886 1885 -- ----------------------------
1887 1886 -- Records of system_oauth2_refresh_token
... ... @@ -1921,7 +1920,7 @@ CREATE TABLE `system_operate_log` (
1921 1920 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1922 1921 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1923 1922 PRIMARY KEY (`id`) USING BTREE
1924   -) ENGINE = InnoDB AUTO_INCREMENT = 2764 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '操作日志记录';
  1923 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '操作日志记录';
1925 1924  
1926 1925 -- ----------------------------
1927 1926 -- Records of system_operate_log
... ... @@ -1947,7 +1946,7 @@ CREATE TABLE `system_post` (
1947 1946 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1948 1947 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1949 1948 PRIMARY KEY (`id`) USING BTREE
1950   -) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '岗位信息表';
  1949 +) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '岗位信息表';
1951 1950  
1952 1951 -- ----------------------------
1953 1952 -- Records of system_post
... ... @@ -2303,7 +2302,7 @@ CREATE TABLE `system_sms_code` (
2303 2302 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
2304 2303 PRIMARY KEY (`id`) USING BTREE,
2305 2304 INDEX `idx_mobile`(`mobile` ASC) USING BTREE COMMENT '手机号'
2306   -) ENGINE = InnoDB AUTO_INCREMENT = 480 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '手机验证码';
  2305 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '手机验证码';
2307 2306  
2308 2307 -- ----------------------------
2309 2308 -- Records of system_sms_code
... ... @@ -2346,7 +2345,7 @@ CREATE TABLE `system_sms_log` (
2346 2345 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
2347 2346 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
2348 2347 PRIMARY KEY (`id`) USING BTREE
2349   -) ENGINE = InnoDB AUTO_INCREMENT = 337 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '短信日志';
  2348 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '短信日志';
2350 2349  
2351 2350 -- ----------------------------
2352 2351 -- Records of system_sms_log
... ... @@ -2416,7 +2415,7 @@ CREATE TABLE `system_social_user` (
2416 2415 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
2417 2416 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
2418 2417 PRIMARY KEY (`id`) USING BTREE
2419   -) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '社交用户表';
  2418 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '社交用户表';
2420 2419  
2421 2420 -- ----------------------------
2422 2421 -- Records of system_social_user
... ... @@ -2441,7 +2440,7 @@ CREATE TABLE `system_social_user_bind` (
2441 2440 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
2442 2441 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
2443 2442 PRIMARY KEY (`id`) USING BTREE
2444   -) ENGINE = InnoDB AUTO_INCREMENT = 25 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '社交绑定表';
  2443 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '社交绑定表';
2445 2444  
2446 2445 -- ----------------------------
2447 2446 -- Records of system_social_user_bind
... ... @@ -2527,12 +2526,7 @@ CREATE TABLE `system_user_post` (
2527 2526 -- Records of system_user_post
2528 2527 -- ----------------------------
2529 2528 BEGIN;
2530   -INSERT INTO `system_user_post` (`id`, `user_id`, `post_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (112, 1, 1, 'admin', '2022-05-02 07:25:24', 'admin', '2022-05-02 07:25:24', b'0', 1);
2531   -INSERT INTO `system_user_post` (`id`, `user_id`, `post_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (113, 100, 1, 'admin', '2022-05-02 07:25:24', 'admin', '2022-05-02 07:25:24', b'0', 1);
2532   -INSERT INTO `system_user_post` (`id`, `user_id`, `post_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (114, 114, 3, 'admin', '2022-05-02 07:25:24', 'admin', '2022-05-02 07:25:24', b'0', 1);
2533   -INSERT INTO `system_user_post` (`id`, `user_id`, `post_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (115, 104, 1, '1', '2022-05-16 19:36:28', '1', '2022-05-16 19:36:28', b'0', 1);
2534   -INSERT INTO `system_user_post` (`id`, `user_id`, `post_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (116, 117, 2, '1', '2022-07-09 17:40:26', '1', '2022-07-09 17:40:26', b'0', 1);
2535   -INSERT INTO `system_user_post` (`id`, `user_id`, `post_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (117, 118, 1, '1', '2022-07-09 17:44:44', '1', '2022-07-09 17:44:44', b'0', 1);
  2529 +INSERT INTO `system_user_post` (`id`, `user_id`, `post_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 1, 1, 'admin', '2022-05-02 07:25:24', 'admin', '2022-05-02 07:25:24', b'0', 1);
2536 2530 COMMIT;
2537 2531  
2538 2532 -- ----------------------------
... ... @@ -2550,7 +2544,7 @@ CREATE TABLE `system_user_role` (
2550 2544 `deleted` bit(1) NULL DEFAULT b'0' COMMENT '是否删除',
2551 2545 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
2552 2546 PRIMARY KEY (`id`) USING BTREE
2553   -) ENGINE = InnoDB AUTO_INCREMENT = 23 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户和角色关联表';
  2547 +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户和角色关联表';
2554 2548  
2555 2549 -- ----------------------------
2556 2550 -- Records of system_user_role
... ... @@ -2558,21 +2552,6 @@ CREATE TABLE `system_user_role` (
2558 2552 BEGIN;
2559 2553 INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 1, 1, '', '2022-01-11 13:19:45', '', '2022-05-12 12:35:17', b'0', 1);
2560 2554 INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2, 2, 2, '', '2022-01-11 13:19:45', '', '2022-05-12 12:35:13', b'0', 1);
2561   -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);
2562   -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);
2563   -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);
2564   -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);
2565   -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);
2566   -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   -INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (13, 109, 108, '1', '2022-02-20 23:11:50', '1', '2022-02-20 23:11:50', b'0', 120);
2568   -INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (14, 110, 109, '1', '2022-02-22 00:56:14', '1', '2022-02-22 00:56:14', b'0', 121);
2569   -INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (15, 111, 110, '110', '2022-02-23 13:14:38', '110', '2022-02-23 13:14:38', b'0', 121);
2570   -INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (16, 113, 111, '1', '2022-03-07 21:37:58', '1', '2022-03-07 21:37:58', b'0', 122);
2571   -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);
2572   -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);
2573   -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);
2574   -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);
2575   -INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (22, 115, 2, '1', '2022-07-21 22:08:30', '1', '2022-07-21 22:08:30', b'0', 1);
2576 2555 COMMIT;
2577 2556  
2578 2557 -- ----------------------------
... ... @@ -2595,7 +2574,7 @@ CREATE TABLE `system_user_session` (
2595 2574 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
2596 2575 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
2597 2576 PRIMARY KEY (`id`) USING BTREE
2598   -) ENGINE = InnoDB AUTO_INCREMENT = 17 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户在线 Session';
  2577 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户在线 Session';
2599 2578  
2600 2579 -- ----------------------------
2601 2580 -- Records of system_user_session
... ...
sql/optional/visualization/jimureport.mysql5.7.create.sql
  View file @92632c0
... ... @@ -418,17 +418,19 @@ CREATE TABLE `jimu_report_data_source` (
418 418 `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
419 419 `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期',
420 420 `connect_times` int(1) UNSIGNED NULL DEFAULT 0 COMMENT '连接失败次数',
  421 + `tenant_id` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '多租户标识',
  422 + `type` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类型(report:报表;drag:仪表盘)',
421 423 PRIMARY KEY (`id`) USING BTREE,
422 424 INDEX `idx_jmdatasource_report_id`(`report_id`) USING BTREE,
423 425 INDEX `idx_jmdatasource_code`(`code`) USING BTREE
424   -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
  426 +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
425 427  
426 428 -- ----------------------------
427 429 -- Records of jimu_report_data_source
428 430 -- ----------------------------
429   -INSERT INTO `jimu_report_data_source` VALUES ('1324261983692902402', 'jeewx', '1324261770294071296', '', NULL, 'MYSQL', 'com.mysql.jdbc.Driver', 'jdbc:mysql://127.0.0.1:3306/jeewx-boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8', 'root', 'root', 'jeecg', '2020-11-05 16:07:15', NULL, '2020-11-05 16:07:15', 0);
430   -INSERT INTO `jimu_report_data_source` VALUES ('26d21fe4f27920d2f56abc8d90a8e527', 'oracle', '1308645288868712448', '', NULL, 'ORACLE', 'oracle.jdbc.OracleDriver', 'jdbc:oracle:thin:@192.168.1.199:1521:helowin', 'jeecgbootbpm', 'jeecg196283', 'admin', '2021-01-05 19:26:24', NULL, '2021-01-05 19:26:24', 1);
431   -INSERT INTO `jimu_report_data_source` VALUES ('8f90daf47d15d35ca6cf420748b8b9ba', 'localhost', '1316944968992034816', '', NULL, 'MYSQL5.7', 'com.mysql.cj.jdbc.Driver', 'jdbc:mysql://127.0.0.1:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8', 'root', 'root', 'admin', '2021-01-13 14:34:00', NULL, '2021-01-13 14:34:00', 0);
  431 +INSERT INTO `jimu_report_data_source` VALUES ('1324261983692902402', 'jeewx', '1324261770294071296', '', NULL, 'MYSQL', 'com.mysql.jdbc.Driver', 'jdbc:mysql://127.0.0.1:3306/jeewx-boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8', 'root', 'root', 'jeecg', '2020-11-05 16:07:15', NULL, '2020-11-05 16:07:15', 0, NULL, 'report');
  432 +INSERT INTO `jimu_report_data_source` VALUES ('26d21fe4f27920d2f56abc8d90a8e527', 'oracle', '1308645288868712448', '', NULL, 'ORACLE', 'oracle.jdbc.OracleDriver', 'jdbc:oracle:thin:@192.168.1.199:1521:helowin', 'jeecgbootbpm', 'jeecg196283', 'admin', '2021-01-05 19:26:24', NULL, '2021-01-05 19:26:24', 1, NULL, 'report');
  433 +INSERT INTO `jimu_report_data_source` VALUES ('8f90daf47d15d35ca6cf420748b8b9ba', 'localhost', '1316944968992034816', '', NULL, 'MYSQL5.7', 'com.mysql.cj.jdbc.Driver', 'jdbc:mysql://127.0.0.1:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8', 'root', 'root', 'admin', '2021-01-13 14:34:00', NULL, '2021-01-13 14:34:00', 0, NULL, 'report');
432 434  
433 435 -- ----------------------------
434 436 -- Table structure for jimu_report_db
... ...
sql/oracle/ruoyi-vue-pro.sql
  View file @92632c0
... ... @@ -2474,17 +2474,18 @@ COMMIT;
2474 2474 -- Table structure for SYSTEM_DICT_TYPE
2475 2475 -- ----------------------------
2476 2476 DROP TABLE "SYSTEM_DICT_TYPE";
2477   -CREATE TABLE "SYSTEM_DICT_TYPE" (
2478   - "ID" NUMBER(20,0) NOT NULL,
2479   - "NAME" NVARCHAR2(100),
2480   - "TYPE" NVARCHAR2(100),
2481   - "STATUS" NUMBER(4,0) NOT NULL,
2482   - "REMARK" NVARCHAR2(500),
2483   - "CREATOR" NVARCHAR2(64),
2484   - "CREATE_TIME" DATE NOT NULL,
2485   - "UPDATER" NVARCHAR2(64),
2486   - "UPDATE_TIME" DATE NOT NULL,
2487   - "DELETED" NUMBER(1,0) DEFAULT 0 NOT NULL
  2477 +CREATE TABLE "SYSTEM_DICT_TYPE"(
  2478 + "ID" NUMBER(20,0) NOT NULL,
  2479 + "NAME" NVARCHAR2(100),
  2480 + "TYPE" NVARCHAR2(100),
  2481 + "STATUS" NUMBER(4,0) NOT NULL,
  2482 + "REMARK" NVARCHAR2(500),
  2483 + "CREATOR" NVARCHAR2(64),
  2484 + "CREATE_TIME" DATE NOT NULL,
  2485 + "UPDATER" NVARCHAR2(64),
  2486 + "UPDATE_TIME" DATE NOT NULL,
  2487 + "DELETED_TIME" DATE,
  2488 + "DELETED" NUMBER(1,0) DEFAULT 0 NOT NULL
2488 2489 )
2489 2490 LOGGING
2490 2491 NOCOMPRESS
... ... @@ -2503,25 +2504,54 @@ PARALLEL 1
2503 2504 NOCACHE
2504 2505 DISABLE ROW MOVEMENT
2505 2506 ;
2506   -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."ID" IS '字典主键';
2507   -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."NAME" IS '字典名称';
2508   -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."TYPE" IS '字典类型';
2509   -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."STATUS" IS '状态（0正常 1停用）';
2510   -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."REMARK" IS '备注';
2511   -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."CREATOR" IS '创建者';
2512   -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."CREATE_TIME" IS '创建时间';
2513   -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."UPDATER" IS '更新者';
2514   -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."UPDATE_TIME" IS '更新时间';
2515   -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."DELETED" IS '是否删除';
2516   -COMMENT ON TABLE "SYSTEM_DICT_TYPE" IS '字典类型表';
  2507 +COMMENT
  2508 +ON COLUMN "SYSTEM_DICT_TYPE"."ID" IS '字典主键';
  2509 +COMMENT
  2510 +ON COLUMN "SYSTEM_DICT_TYPE"."NAME" IS '字典名称';
  2511 +COMMENT
  2512 +ON COLUMN "SYSTEM_DICT_TYPE"."TYPE" IS '字典类型';
  2513 +COMMENT
  2514 +ON COLUMN "SYSTEM_DICT_TYPE"."STATUS" IS '状态（0正常 1停用）';
  2515 +COMMENT
  2516 +ON COLUMN "SYSTEM_DICT_TYPE"."REMARK" IS '备注';
  2517 +COMMENT
  2518 +ON COLUMN "SYSTEM_DICT_TYPE"."CREATOR" IS '创建者';
  2519 +COMMENT
  2520 +ON COLUMN "SYSTEM_DICT_TYPE"."CREATE_TIME" IS '创建时间';
  2521 +COMMENT
  2522 +ON COLUMN "SYSTEM_DICT_TYPE"."UPDATER" IS '更新者';
  2523 +COMMENT
  2524 +ON COLUMN "SYSTEM_DICT_TYPE"."UPDATE_TIME" IS '更新时间';
  2525 +COMMENT
  2526 +ON COLUMN "SYSTEM_DICT_TYPE"."DELETED_TIME" IS '删除时间';
  2527 +COMMENT
  2528 +ON COLUMN "SYSTEM_DICT_TYPE"."DELETED" IS '是否删除';
  2529 +COMMENT
  2530 +ON TABLE "SYSTEM_DICT_TYPE" IS '字典类型表';
2517 2531  
2518 2532 -- ----------------------------
2519 2533 -- Records of SYSTEM_DICT_TYPE
2520 2534 -- ----------------------------
2521   -INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('1', '用户性别', 'system_user_sex', '0', NULL, 'admin', TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-05-01 12:55:56', 'SYYYY-MM-DD HH24:MI:SS'), '0');
2522   -INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('6', '参数类型', 'infra_config_type', '0', NULL, 'admin', TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-02-01 16:36:54', 'SYYYY-MM-DD HH24:MI:SS'), '0');
2523   -INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('7', '通知类型', 'system_notice_type', '0', NULL, 'admin', TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-02-01 16:35:26', 'SYYYY-MM-DD HH24:MI:SS'), '0');
2524   -INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('9', '操作类型', 'system_operate_type', '0', NULL, 'admin', TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-02-16 09:32:21', 'SYYYY-MM-DD HH24:MI:SS'), '0');
  2535 +INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER",
  2536 + "UPDATE_TIME", "DELETED")
  2537 +VALUES ('1', '用户性别', 'system_user_sex', '0', NULL, 'admin',
  2538 + TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), '1',
  2539 + TO_DATE('2022-05-01 12:55:56', 'SYYYY-MM-DD HH24:MI:SS'), '0');
  2540 +INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER",
  2541 + "UPDATE_TIME", "DELETED")
  2542 +VALUES ('6', '参数类型', 'infra_config_type', '0', NULL, 'admin',
  2543 + TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), NULL,
  2544 + TO_DATE('2022-02-01 16:36:54', 'SYYYY-MM-DD HH24:MI:SS'), '0');
  2545 +INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER",
  2546 + "UPDATE_TIME", "DELETED")
  2547 +VALUES ('7', '通知类型', 'system_notice_type', '0', NULL, 'admin',
  2548 + TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), NULL,
  2549 + TO_DATE('2022-02-01 16:35:26', 'SYYYY-MM-DD HH24:MI:SS'), '0');
  2550 +INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER",
  2551 + "UPDATE_TIME", "DELETED")
  2552 +VALUES ('9', '操作类型', 'system_operate_type', '0', NULL, 'admin',
  2553 + TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), '1',
  2554 + TO_DATE('2022-02-16 09:32:21', 'SYYYY-MM-DD HH24:MI:SS'), '0');
2525 2555 INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('10', '系统状态', 'common_status', '0', NULL, 'admin', TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-02-01 16:21:28', 'SYYYY-MM-DD HH24:MI:SS'), '0');
2526 2556 INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('11', 'Boolean 是否类型', 'infra_boolean_string', '0', 'boolean 转是否', NULL, TO_DATE('2021-01-19 03:20:08', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-02-01 16:37:10', 'SYYYY-MM-DD HH24:MI:SS'), '0');
2527 2557 INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('104', '登陆结果', 'system_login_result', '0', '登陆结果', NULL, TO_DATE('2021-01-18 06:17:11', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-02-01 16:36:00', 'SYYYY-MM-DD HH24:MI:SS'), '0');
... ...
sql/postgresql/ruoyi-vue-pro.sql
  View file @92632c0
... ... @@ -2357,38 +2357,58 @@ COMMIT;
2357 2357 -- Table structure for system_dict_type
2358 2358 -- ----------------------------
2359 2359 DROP TABLE IF EXISTS "system_dict_type";
2360   -CREATE TABLE "system_dict_type" (
2361   - "id" int8 NOT NULL,
2362   - "name" varchar(100) COLLATE "pg_catalog"."default" NOT NULL,
2363   - "type" varchar(100) COLLATE "pg_catalog"."default" NOT NULL,
2364   - "status" int2 NOT NULL,
2365   - "remark" varchar(500) COLLATE "pg_catalog"."default",
2366   - "creator" varchar(64) COLLATE "pg_catalog"."default",
2367   - "create_time" timestamp(6) NOT NULL,
2368   - "updater" varchar(64) COLLATE "pg_catalog"."default",
2369   - "update_time" timestamp(6) NOT NULL,
2370   - "deleted" int2 NOT NULL DEFAULT 0
  2360 +CREATE TABLE "system_dict_type"(
  2361 + "id" int8 NOT NULL,
  2362 + "name" varchar(100) COLLATE "pg_catalog"."default" NOT NULL,
  2363 + "type" varchar(100) COLLATE "pg_catalog"."default" NOT NULL,
  2364 + "status" int2 NOT NULL,
  2365 + "remark" varchar(500) COLLATE "pg_catalog"."default",
  2366 + "creator" varchar(64) COLLATE "pg_catalog"."default",
  2367 + "create_time" timestamp(6) NOT NULL,
  2368 + "updater" varchar(64) COLLATE "pg_catalog"."default",
  2369 + "update_time" timestamp(6) NOT NULL,
  2370 + "deleted_time" timestamp(6),
  2371 + "deleted" int2 NOT NULL DEFAULT 0
2371 2372 )
2372 2373 ;
2373   -COMMENT ON COLUMN "system_dict_type"."id" IS '字典主键';
2374   -COMMENT ON COLUMN "system_dict_type"."name" IS '字典名称';
2375   -COMMENT ON COLUMN "system_dict_type"."type" IS '字典类型';
2376   -COMMENT ON COLUMN "system_dict_type"."status" IS '状态（0正常 1停用）';
2377   -COMMENT ON COLUMN "system_dict_type"."remark" IS '备注';
2378   -COMMENT ON COLUMN "system_dict_type"."creator" IS '创建者';
2379   -COMMENT ON COLUMN "system_dict_type"."create_time" IS '创建时间';
2380   -COMMENT ON COLUMN "system_dict_type"."updater" IS '更新者';
2381   -COMMENT ON COLUMN "system_dict_type"."update_time" IS '更新时间';
2382   -COMMENT ON COLUMN "system_dict_type"."deleted" IS '是否删除';
2383   -COMMENT ON TABLE "system_dict_type" IS '字典类型表';
  2374 +COMMENT
  2375 +ON COLUMN "system_dict_type"."id" IS '字典主键';
  2376 +COMMENT
  2377 +ON COLUMN "system_dict_type"."name" IS '字典名称';
  2378 +COMMENT
  2379 +ON COLUMN "system_dict_type"."type" IS '字典类型';
  2380 +COMMENT
  2381 +ON COLUMN "system_dict_type"."status" IS '状态（0正常 1停用）';
  2382 +COMMENT
  2383 +ON COLUMN "system_dict_type"."remark" IS '备注';
  2384 +COMMENT
  2385 +ON COLUMN "system_dict_type"."creator" IS '创建者';
  2386 +COMMENT
  2387 +ON COLUMN "system_dict_type"."create_time" IS '创建时间';
  2388 +COMMENT
  2389 +ON COLUMN "system_dict_type"."updater" IS '更新者';
  2390 +COMMENT
  2391 +ON COLUMN "system_dict_type"."update_time" IS '更新时间';
  2392 +COMMENT
  2393 +ON COLUMN "system_dict_type"."deleted_time" IS '删除时间';
  2394 +COMMENT
  2395 +ON COLUMN "system_dict_type"."deleted" IS '是否删除';
  2396 +COMMENT
  2397 +ON TABLE "system_dict_type" IS '字典类型表';
2384 2398  
2385 2399 -- ----------------------------
2386 2400 -- Records of system_dict_type
2387 2401 -- ----------------------------
2388 2402 BEGIN;
2389   -INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (1, '用户性别', 'system_user_sex', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:30:31', 0);
2390   -INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (6, '参数类型', 'infra_config_type', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:36:54', 0);
2391   -INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (7, '通知类型', 'system_notice_type', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:35:26', 0);
  2403 +INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater",
  2404 + "update_time", "deleted")
  2405 +VALUES (1, '用户性别', 'system_user_sex', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:30:31', 0);
  2406 +INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater",
  2407 + "update_time", "deleted")
  2408 +VALUES (6, '参数类型', 'infra_config_type', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:36:54', 0);
  2409 +INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater",
  2410 + "update_time", "deleted")
  2411 +VALUES (7, '通知类型', 'system_notice_type', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:35:26', 0);
2392 2412 INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (9, '操作类型', 'system_operate_type', 0, NULL, 'admin', '2021-01-05 17:03:48', '1', '2022-02-16 09:32:21', 0);
2393 2413 INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (10, '系统状态', 'common_status', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:21:28', 0);
2394 2414 INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (11, 'Boolean 是否类型', 'infra_boolean_string', 0, 'boolean 转是否', '', '2021-01-19 03:20:08', '', '2022-02-01 16:37:10', 0);
... ...
sql/sqlserver/ruoyi-vue-pro.sql
  View file @92632c0
... ... @@ -5813,18 +5813,51 @@ IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N&#39;[dbo].[sy
5813 5813 DROP TABLE [dbo].[system_dict_type]
5814 5814 GO
5815 5815  
5816   -CREATE TABLE [dbo].[system_dict_type] (
5817   - [id] bigint IDENTITY(1,1) NOT NULL,
5818   - [name] nvarchar(100) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
5819   - [type] nvarchar(100) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
5820   - [status] tinyint NOT NULL,
5821   - [remark] nvarchar(500) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
5822   - [creator] nvarchar(64) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
5823   - [create_time] datetime2(7) NOT NULL,
5824   - [updater] nvarchar(64) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
5825   - [update_time] datetime2(7) NOT NULL,
5826   - [deleted] bit DEFAULT 0 NOT NULL
5827   -)
  5816 +CREATE TABLE [dbo].[system_dict_type]
  5817 +(
  5818 + [
  5819 + id]
  5820 + bigint
  5821 + IDENTITY
  5822 +(
  5823 + 1,
  5824 + 1
  5825 +) NOT NULL,
  5826 + [name] nvarchar
  5827 +(
  5828 + 100
  5829 +) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
  5830 + [type] nvarchar
  5831 +(
  5832 + 100
  5833 +) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
  5834 + [status] tinyint NOT NULL,
  5835 + [remark] nvarchar
  5836 +(
  5837 + 500
  5838 +) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
  5839 + [creator] nvarchar
  5840 +(
  5841 + 64
  5842 +) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
  5843 + [create_time] datetime2
  5844 +(
  5845 + 7
  5846 +) NOT NULL,
  5847 + [updater] nvarchar
  5848 +(
  5849 + 64
  5850 +) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
  5851 + [update_time] datetime2
  5852 +(
  5853 + 7
  5854 +) NOT NULL,
  5855 + [deleted_time] datetime2
  5856 +(
  5857 + 7
  5858 +),
  5859 + [deleted] bit DEFAULT 0 NOT NULL
  5860 + )
5828 5861 GO
5829 5862  
5830 5863 ALTER TABLE [dbo].[system_dict_type] SET (LOCK_ESCALATION = TABLE)
... ... @@ -5882,26 +5915,29 @@ GO
5882 5915 EXEC sp_addextendedproperty
5883 5916 'MS_Description', N'更新者',
5884 5917 'SCHEMA', N'dbo',
5885   -'TABLE', N'system_dict_type',
5886   -'COLUMN', N'updater'
5887   -GO
5888   -
5889   -EXEC sp_addextendedproperty
5890   -'MS_Description', N'更新时间',
5891   -'SCHEMA', N'dbo',
5892   -'TABLE', N'system_dict_type',
5893   -'COLUMN', N'update_time'
5894   -GO
5895   -
5896   -EXEC sp_addextendedproperty
5897   -'MS_Description', N'是否删除',
5898   -'SCHEMA', N'dbo',
5899   -'TABLE', N'system_dict_type',
5900   -'COLUMN', N'deleted'
5901   -GO
5902   -
5903   -EXEC sp_addextendedproperty
5904   -'MS_Description', N'字典类型表',
  5918 + 'TABLE', N'system_dict_type',
  5919 + 'COLUMN', N'updater'
  5920 + GO
  5921 + EXEC sp_addextendedproperty
  5922 + 'MS_Description', N'更新时间',
  5923 + 'SCHEMA', N'dbo',
  5924 + 'TABLE', N'system_dict_type',
  5925 + 'COLUMN', N'update_time'
  5926 + GO
  5927 + EXEC sp_addextendedproperty
  5928 + 'MS_Description', N'删除时间',
  5929 + 'SCHEMA', N'dbo',
  5930 + 'TABLE', N'system_dict_type',
  5931 + 'COLUMN', N'deleted_time'
  5932 + GO
  5933 + EXEC sp_addextendedproperty
  5934 + 'MS_Description', N'是否删除',
  5935 + 'SCHEMA', N'dbo',
  5936 + 'TABLE', N'system_dict_type',
  5937 + 'COLUMN', N'deleted'
  5938 + GO
  5939 + EXEC sp_addextendedproperty
  5940 + 'MS_Description', N'字典类型表',
5905 5941 'SCHEMA', N'dbo',
5906 5942 'TABLE', N'system_dict_type'
5907 5943 GO
... ...
yudao-dependencies/pom.xml
  View file @92632c0
... ... @@ -14,56 +14,57 @@
14 14 <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
15 15  
16 16 <properties>
17   - <revision>1.6.4-snapshot</revision>
  17 + <revision>1.6.5-snapshot</revision>
18 18 <!-- 统一依赖管理 -->
19   - <spring.boot.version>2.6.13</spring.boot.version>
  19 + <spring.boot.version>2.7.6</spring.boot.version>
20 20 <!-- Web 相关 -->
21 21 <knife4j.version>3.0.3</knife4j.version>
22   - <swagger-annotations.version>1.6.7</swagger-annotations.version>
  22 + <swagger-annotations.version>1.6.8</swagger-annotations.version>
23 23 <servlet.versoin>2.5</servlet.versoin>
24 24 <!-- DB 相关 -->
25   - <druid.version>1.2.14</druid.version>
  25 + <druid.version>1.2.15</druid.version>
26 26 <mybatis-plus.version>3.5.2</mybatis-plus.version>
27 27 <mybatis-plus-generator.version>3.5.2</mybatis-plus-generator.version>
28   - <dynamic-datasource.version>3.5.2</dynamic-datasource.version>
29   - <redisson.version>3.17.7</redisson.version>
30   - <!-- Config 配置中心相关 -->
  28 + <dynamic-datasource.version>3.6.0</dynamic-datasource.version>
  29 + <redisson.version>3.18.0</redisson.version>
31 30 <!-- 服务保障相关 -->
32   - <lock4j.version>2.2.2</lock4j.version>
  31 + <lock4j.version>2.2.3</lock4j.version>
33 32 <resilience4j.version>1.7.1</resilience4j.version>
34 33 <!-- 监控相关 -->
35 34 <skywalking.version>8.12.0</skywalking.version>
36   - <spring-boot-admin.version>2.6.9</spring-boot-admin.version>
  35 + <spring-boot-admin.version>2.7.9</spring-boot-admin.version>
37 36 <opentracing.version>0.33.0</opentracing.version>
38 37 <!-- Test 测试相关 -->
39   - <podam.version>7.2.9.RELEASE</podam.version>
40   - <jedis-mock.version>1.0.4</jedis-mock.version>
  38 + <podam.version>7.2.11.RELEASE</podam.version>
  39 + <jedis-mock.version>1.0.5</jedis-mock.version>
41 40 <mockito-inline.version>4.8.0</mockito-inline.version>
42 41 <!-- Bpm 工作流相关 -->
43 42 <flowable.version>6.7.2</flowable.version>
44 43 <!-- 工具类相关 -->
45 44 <lombok.version>1.18.24</lombok.version>
46 45 <mapstruct.version>1.5.3.Final</mapstruct.version>
47   - <hutool.version>5.8.9</hutool.version>
48   - <easyexcel.verion>3.1.2</easyexcel.verion>
  46 + <hutool.version>5.8.10</hutool.version>
  47 + <easyexcel.verion>3.1.3</easyexcel.verion>
49 48 <velocity.version>2.3</velocity.version>
50 49 <screw.version>1.0.5</screw.version>
51 50 <fastjson.version>1.2.83</fastjson.version>
52 51 <guava.version>31.1-jre</guava.version>
53 52 <guice.version>5.1.0</guice.version>
54   - <transmittable-thread-local.version>2.14.0</transmittable-thread-local.version>
  53 + <transmittable-thread-local.version>2.14.2</transmittable-thread-local.version>
55 54 <commons-net.version>3.8.0</commons-net.version>
56 55 <jsch.version>0.1.55</jsch.version>
57   - <tika-core.version>2.5.0</tika-core.version>
  56 + <tika-core.version>2.6.0</tika-core.version>
58 57 <aj-captcha.version>1.3.0</aj-captcha.version>
59   - <netty-all.version>4.1.82.Final</netty-all.version>
  58 + <netty-all.version>4.1.85.Final</netty-all.version>
60 59 <!-- 三方云服务相关 -->
61   - <minio.version>8.2.2</minio.version>
62   - <aliyun-java-sdk-core.version>4.6.2</aliyun-java-sdk-core.version>
  60 + <okio.version>3.0.0</okio.version>
  61 + <okhttp3.version>4.10.0</okhttp3.version>
  62 + <minio.version>8.4.6</minio.version>
  63 + <aliyun-java-sdk-core.version>4.6.3</aliyun-java-sdk-core.version>
63 64 <aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
64   - <tencentcloud-sdk-java.version>3.1.561</tencentcloud-sdk-java.version>
  65 + <tencentcloud-sdk-java.version>3.1.637</tencentcloud-sdk-java.version>
65 66 <justauth.version>1.4.0</justauth.version>
66   - <jimureport.version>1.5.3</jimureport.version>
  67 + <jimureport.version>1.5.6</jimureport.version>
67 68 <xercesImpl.version>2.12.2</xercesImpl.version>
68 69 </properties>
69 70  
... ... @@ -501,6 +502,7 @@
501 502 <artifactId>commons-net</artifactId> <!-- 解决 ftp 连接 -->
502 503 <version>${commons-net.version}</version>
503 504 </dependency>
  505 +
504 506 <dependency>
505 507 <groupId>com.jcraft</groupId>
506 508 <artifactId>jsch</artifactId> <!-- 解决 sftp 连接 -->
... ... @@ -515,6 +517,16 @@
515 517  
516 518 <!-- 三方云服务相关 -->
517 519 <dependency>
  520 + <groupId>com.squareup.okio</groupId>
  521 + <artifactId>okio</artifactId>
  522 + <version>${okio.version}</version>
  523 + </dependency>
  524 + <dependency>
  525 + <groupId>com.squareup.okhttp3</groupId>
  526 + <artifactId>okhttp</artifactId>
  527 + <version>${okhttp3.version}</version>
  528 + </dependency>
  529 + <dependency>
518 530 <groupId>cn.iocoder.boot</groupId>
519 531 <artifactId>yudao-spring-boot-starter-file</artifactId>
520 532 <version>${revision}</version>
... ... @@ -548,7 +560,7 @@
548 560 </dependency>
549 561 <dependency>
550 562 <groupId>com.tencentcloudapi</groupId>
551   - <artifactId>tencentcloud-sdk-java</artifactId>
  563 + <artifactId>tencentcloud-sdk-java-sms</artifactId>
552 564 <version>${tencentcloud-sdk-java.version}</version>
553 565 </dependency>
554 566 <!-- SMS SDK end -->
... ... @@ -564,6 +576,12 @@
564 576 <groupId>org.jeecgframework.jimureport</groupId>
565 577 <artifactId>jimureport-spring-boot-starter</artifactId>
566 578 <version>${jimureport.version}</version>
  579 + <exclusions>
  580 + <exclusion>
  581 + <groupId>com.alibaba</groupId>
  582 + <artifactId>druid</artifactId>
  583 + </exclusion>
  584 + </exclusions>
567 585 </dependency>
568 586 <dependency>
569 587 <groupId>xerces</groupId>
... ...
yudao-example/yudao-sso-demo-by-code/pom.xml
  View file @92632c0
... ... @@ -21,7 +21,7 @@
21 21 <maven.compiler.target>8</maven.compiler.target>
22 22 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23 23 <!-- 统一依赖管理 -->
24   - <spring.boot.version>2.6.13</spring.boot.version>
  24 + <spring.boot.version>2.7.6</spring.boot.version>
25 25 </properties>
26 26  
27 27 <dependencyManagement>
... ... @@ -52,7 +52,7 @@
52 52 <dependency>
53 53 <groupId>cn.hutool</groupId>
54 54 <artifactId>hutool-all</artifactId>
55   - <version>5.8.9</version>
  55 + <version>5.8.10</version>
56 56 </dependency>
57 57  
58 58 <dependency>
... ...
yudao-example/yudao-sso-demo-by-code/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
  View file @92632c0
... ... @@ -2,17 +2,20 @@ package cn.iocoder.yudao.ssodemo.framework.config;
2 2  
3 3 import cn.iocoder.yudao.ssodemo.framework.core.filter.TokenAuthenticationFilter;
4 4 import cn.iocoder.yudao.ssodemo.framework.core.handler.AccessDeniedHandlerImpl;
  5 +import org.springframework.context.annotation.Bean;
5 6 import org.springframework.context.annotation.Configuration;
6 7 import org.springframework.http.HttpMethod;
7 8 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
8   -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
  9 +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
9 10 import org.springframework.security.web.AuthenticationEntryPoint;
  11 +import org.springframework.security.web.SecurityFilterChain;
10 12 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
11 13  
12 14 import javax.annotation.Resource;
13 15  
14 16 @Configuration(proxyBeanMethods = false)
15   -public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
  17 +@EnableWebSecurity
  18 +public class SecurityConfiguration{
16 19  
17 20 @Resource
18 21 private TokenAuthenticationFilter tokenAuthenticationFilter;
... ... @@ -22,8 +25,8 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
22 25 @Resource
23 26 private AuthenticationEntryPoint authenticationEntryPoint;
24 27  
25   - @Override
26   - protected void configure(HttpSecurity httpSecurity) throws Exception {
  28 + @Bean
  29 + protected SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
27 30 // 设置 URL 安全权限
28 31 httpSecurity.csrf().disable() // 禁用 CSRF 保护
29 32 .authorizeRequests()
... ... @@ -43,6 +46,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
43 46  
44 47 // 添加 Token Filter
45 48 httpSecurity.addFilterBefore(tokenAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
  49 + return httpSecurity.build();
46 50 }
47 51  
48 52 }
... ...
yudao-example/yudao-sso-demo-by-password/pom.xml
  View file @92632c0
... ... @@ -21,7 +21,7 @@
21 21 <maven.compiler.target>8</maven.compiler.target>
22 22 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23 23 <!-- 统一依赖管理 -->
24   - <spring.boot.version>2.6.13</spring.boot.version>
  24 + <spring.boot.version>2.7.6</spring.boot.version>
25 25 </properties>
26 26  
27 27 <dependencyManagement>
... ... @@ -52,7 +52,7 @@
52 52 <dependency>
53 53 <groupId>cn.hutool</groupId>
54 54 <artifactId>hutool-all</artifactId>
55   - <version>5.8.9</version>
  55 + <version>5.8.10</version>
56 56 </dependency>
57 57  
58 58 <dependency>
... ...
yudao-example/yudao-sso-demo-by-password/src/main/java/cn/iocoder/yudao/ssodemo/framework/config/SecurityConfiguration.java
  View file @92632c0
... ... @@ -2,17 +2,20 @@ package cn.iocoder.yudao.ssodemo.framework.config;
2 2  
3 3 import cn.iocoder.yudao.ssodemo.framework.core.filter.TokenAuthenticationFilter;
4 4 import cn.iocoder.yudao.ssodemo.framework.core.handler.AccessDeniedHandlerImpl;
  5 +import org.springframework.context.annotation.Bean;
5 6 import org.springframework.context.annotation.Configuration;
6 7 import org.springframework.http.HttpMethod;
7 8 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
8   -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
  9 +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
9 10 import org.springframework.security.web.AuthenticationEntryPoint;
  11 +import org.springframework.security.web.SecurityFilterChain;
10 12 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
11 13  
12 14 import javax.annotation.Resource;
13 15  
14 16 @Configuration(proxyBeanMethods = false)
15   -public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
  17 +@EnableWebSecurity
  18 +public class SecurityConfiguration {
16 19  
17 20 @Resource
18 21 private TokenAuthenticationFilter tokenAuthenticationFilter;
... ... @@ -22,8 +25,8 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
22 25 @Resource
23 26 private AuthenticationEntryPoint authenticationEntryPoint;
24 27  
25   - @Override
26   - protected void configure(HttpSecurity httpSecurity) throws Exception {
  28 + @Bean
  29 + protected SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
27 30 // 设置 URL 安全权限
28 31 httpSecurity.csrf().disable() // 禁用 CSRF 保护
29 32 .authorizeRequests()
... ... @@ -43,6 +46,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
43 46  
44 47 // 添加 Token Filter
45 48 httpSecurity.addFilterBefore(tokenAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
  49 + return httpSecurity.build();
46 50 }
47 51  
48 52 }
... ...
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/SetUtils.java
  View file @92632c0
... ... @@ -11,6 +11,7 @@ import java.util.Set;
11 11 */
12 12 public class SetUtils {
13 13  
  14 + @SafeVarargs
14 15 public static <T> Set<T> asSet(T... objs) {
15 16 return new HashSet<>(Arrays.asList(objs));
16 17 }
... ...
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
  View file @92632c0
... ... @@ -85,11 +85,6 @@ public class DateUtils {
85 85 return buildTime(year, mouth, day, 0, 0, 0);
86 86 }
87 87  
88   - @Deprecated
89   - public static LocalDateTime buildLocalDateTime(int year, int mouth, int day) {
90   - return LocalDateTime.of(year, mouth, day, 0, 0, 0);
91   - }
92   -
93 88 /**
94 89 * 创建指定时间
95 90 *
... ... @@ -134,11 +129,6 @@ public class DateUtils {
134 129 return a.isAfter(b) ? a : b;
135 130 }
136 131  
137   - @Deprecated
138   - public static boolean afterNow(LocalDateTime localDateTime) {
139   - return localDateTime.isAfter(LocalDateTime.now());
140   - }
141   -
142 132 /**
143 133 * 计算当期时间相差的日期
144 134 *
... ...
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/ObjectUtils.java
  View file @92632c0
1 1 package cn.iocoder.yudao.framework.common.util.object;
2 2  
3   -import cn.hutool.core.util.ArrayUtil;
4 3 import cn.hutool.core.util.ObjectUtil;
5 4 import cn.hutool.core.util.ReflectUtil;
6 5  
7 6 import java.lang.reflect.Field;
8 7 import java.util.Arrays;
9   -import java.util.Objects;
10 8 import java.util.function.Consumer;
11 9  
12 10 /**
... ... @@ -47,6 +45,7 @@ public class ObjectUtils {
47 45 return obj1.compareTo(obj2) > 0 ? obj1 : obj2;
48 46 }
49 47  
  48 + @SafeVarargs
50 49 public static <T> T defaultIfNull(T... array) {
51 50 for (T item : array) {
52 51 if (item != null) {
... ... @@ -56,6 +55,7 @@ public class ObjectUtils {
56 55 return null;
57 56 }
58 57  
  58 + @SafeVarargs
59 59 public static <T> boolean equalsAny(T obj, T... array) {
60 60 return Arrays.asList(array).contains(obj);
61 61 }
... ...
yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/config/YudaoBannerAutoConfiguration.java
  View file @92632c0
1 1 package cn.iocoder.yudao.framework.banner.config;
2 2  
3 3 import cn.iocoder.yudao.framework.banner.core.BannerApplicationRunner;
  4 +import org.springframework.boot.autoconfigure.AutoConfiguration;
4 5 import org.springframework.context.annotation.Bean;
5   -import org.springframework.context.annotation.Configuration;
6 6  
7 7 /**
8 8 * Banner 的自动配置类
9 9 *
10 10 * @author 芋道源码
11 11 */
12   -@Configuration(proxyBeanMethods = false)
  12 +@AutoConfiguration
13 13 public class YudaoBannerAutoConfiguration {
14 14  
15 15 @Bean
... ...
yudao-framework/yudao-spring-boot-starter-banner/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.banner.config.YudaoBannerAutoConfiguration
yudao-framework/yudao-spring-boot-starter-banner/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.banner.config.YudaoBannerAutoConfiguration
0 2 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/config/YudaoDataPermissionAutoConfiguration.java
  View file @92632c0
... ... @@ -7,8 +7,8 @@ import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRuleFac
7 7 import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRuleFactoryImpl;
8 8 import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
9 9 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
  10 +import org.springframework.boot.autoconfigure.AutoConfiguration;
10 11 import org.springframework.context.annotation.Bean;
11   -import org.springframework.context.annotation.Configuration;
12 12  
13 13 import java.util.List;
14 14  
... ... @@ -17,7 +17,7 @@ import java.util.List;
17 17 *
18 18 * @author 芋道源码
19 19 */
20   -@Configuration(proxyBeanMethods = false)
  20 +@AutoConfiguration
21 21 public class YudaoDataPermissionAutoConfiguration {
22 22  
23 23 @Bean
... ...
yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/config/YudaoDeptDataPermissionAutoConfiguration.java
  View file @92632c0
... ... @@ -4,10 +4,10 @@ import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissi
4 4 import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
5 5 import cn.iocoder.yudao.framework.security.core.LoginUser;
6 6 import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
  7 +import org.springframework.boot.autoconfigure.AutoConfiguration;
7 8 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
8 9 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
9 10 import org.springframework.context.annotation.Bean;
10   -import org.springframework.context.annotation.Configuration;
11 11  
12 12 import java.util.List;
13 13  
... ... @@ -16,7 +16,7 @@ import java.util.List;
16 16 *
17 17 * @author 芋道源码
18 18 */
19   -@Configuration(proxyBeanMethods = false)
  19 +@AutoConfiguration
20 20 @ConditionalOnClass(LoginUser.class)
21 21 @ConditionalOnBean(value = {PermissionApi.class, DeptDataPermissionRuleCustomizer.class})
22 22 public class YudaoDeptDataPermissionAutoConfiguration {
... ...
yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java
  View file @92632c0
... ... @@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
7 7 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
8 8 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
9 9 import cn.iocoder.yudao.framework.datapermission.core.rule.DataPermissionRule;
  10 +import cn.iocoder.yudao.framework.expression.OrExpressionX;
10 11 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
11 12 import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
12 13 import cn.iocoder.yudao.framework.security.core.LoginUser;
... ... @@ -20,7 +21,6 @@ import net.sf.jsqlparser.expression.Alias;
20 21 import net.sf.jsqlparser.expression.Expression;
21 22 import net.sf.jsqlparser.expression.LongValue;
22 23 import net.sf.jsqlparser.expression.NullValue;
23   -import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
24 24 import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
25 25 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
26 26 import net.sf.jsqlparser.expression.operators.relational.InExpression;
... ... @@ -143,8 +143,8 @@ public class DeptDataPermissionRule implements DataPermissionRule {
143 143 if (userExpression == null) {
144 144 return deptExpression;
145 145 }
146   - // 目前，如果有指定部门 + 可查看自己，采用 OR 条件。即，WHERE dept_id IN ? OR user_id = ?
147   - return new OrExpression(deptExpression, userExpression);
  146 + // 目前，如果有指定部门 + 可查看自己，采用 OR 条件。即，WHERE (dept_id IN ? OR user_id = ?)
  147 + return new OrExpressionX(deptExpression, userExpression);
148 148 }
149 149  
150 150 private Expression buildDeptExpression(String tableName, Alias tableAlias, Set<Long> deptIds) {
... ...
yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/resources/META-INF/spring.factories renamed to yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  View file @92632c0
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.datapermission.config.YudaoDataPermissionAutoConfiguration,\
3   - cn.iocoder.yudao.framework.datapermission.config.YudaoDeptDataPermissionAutoConfiguration
  1 +cn.iocoder.yudao.framework.datapermission.config.YudaoDataPermissionAutoConfiguration
  2 +cn.iocoder.yudao.framework.datapermission.config.YudaoDeptDataPermissionAutoConfiguration
4 3 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/java/cn/iocoder/yudao/framework/dict/config/YudaoDictAutoConfiguration.java
  View file @92632c0
... ... @@ -2,10 +2,10 @@ package cn.iocoder.yudao.framework.dict.config;
2 2  
3 3 import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
4 4 import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
  5 +import org.springframework.boot.autoconfigure.AutoConfiguration;
5 6 import org.springframework.context.annotation.Bean;
6   -import org.springframework.context.annotation.Configuration;
7 7  
8   -@Configuration(proxyBeanMethods = false)
  8 +@AutoConfiguration
9 9 public class YudaoDictAutoConfiguration {
10 10  
11 11 @Bean
... ...
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.dict.config.YudaoDictAutoConfiguration
yudao-framework/yudao-spring-boot-starter-biz-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.dict.config.YudaoDictAutoConfiguration
0 2 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/java/cn/iocoder/yudao/framework/errorcode/config/YudaoErrorCodeConfiguration.java
  View file @92632c0
... ... @@ -6,10 +6,10 @@ import cn.iocoder.yudao.framework.errorcode.core.loader.ErrorCodeLoader;
6 6 import cn.iocoder.yudao.framework.errorcode.core.loader.ErrorCodeLoaderImpl;
7 7 import cn.iocoder.yudao.module.system.api.errorcode.ErrorCodeApi;
8 8 import org.springframework.beans.factory.annotation.Value;
  9 +import org.springframework.boot.autoconfigure.AutoConfiguration;
9 10 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
10 11 import org.springframework.boot.context.properties.EnableConfigurationProperties;
11 12 import org.springframework.context.annotation.Bean;
12   -import org.springframework.context.annotation.Configuration;
13 13 import org.springframework.scheduling.annotation.EnableScheduling;
14 14  
15 15 /**
... ... @@ -17,7 +17,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
17 17 *
18 18 * @author 芋道源码
19 19 */
20   -@Configuration(proxyBeanMethods = false)
  20 +@AutoConfiguration
21 21 @ConditionalOnProperty(prefix = "yudao.error-code", value = "enable", matchIfMissing = true) // 允许使用 yudao.error-code.enable=false 禁用访问日志
22 22 @EnableConfigurationProperties(ErrorCodeProperties.class)
23 23 @EnableScheduling // 开启调度任务的功能，因为 ErrorCodeRemoteLoader 通过定时刷新错误码
... ...
yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.errorcode.config.YudaoErrorCodeConfiguration
yudao-framework/yudao-spring-boot-starter-biz-error-code/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.errorcode.config.YudaoErrorCodeConfiguration
0 2 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/config/YudaoOperateLogAutoConfiguration.java
  View file @92632c0
... ... @@ -4,10 +4,10 @@ import cn.iocoder.yudao.framework.operatelog.core.aop.OperateLogAspect;
4 4 import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkService;
5 5 import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkServiceImpl;
6 6 import cn.iocoder.yudao.module.system.api.logger.OperateLogApi;
  7 +import org.springframework.boot.autoconfigure.AutoConfiguration;
7 8 import org.springframework.context.annotation.Bean;
8   -import org.springframework.context.annotation.Configuration;
9 9  
10   -@Configuration(proxyBeanMethods = false)
  10 +@AutoConfiguration
11 11 public class YudaoOperateLogAutoConfiguration {
12 12  
13 13 @Bean
... ...
yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.operatelog.config.YudaoOperateLogAutoConfiguration
yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.operatelog.config.YudaoOperateLogAutoConfiguration
0 2 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml
  View file @92632c0
... ... @@ -52,7 +52,7 @@
52 52 <dependency>
53 53 <groupId>com.alipay.sdk</groupId>
54 54 <artifactId>alipay-sdk-java</artifactId>
55   - <version>4.33.44.ALL</version>
  55 + <version>4.35.0.ALL</version>
56 56 <exclusions>
57 57 <exclusion>
58 58 <groupId>org.bouncycastle</groupId>
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/config/YudaoPayAutoConfiguration.java
  View file @92632c0
... ... @@ -2,16 +2,16 @@ package cn.iocoder.yudao.framework.pay.config;
2 2  
3 3 import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory;
4 4 import cn.iocoder.yudao.framework.pay.core.client.impl.PayClientFactoryImpl;
  5 +import org.springframework.boot.autoconfigure.AutoConfiguration;
5 6 import org.springframework.boot.context.properties.EnableConfigurationProperties;
6 7 import org.springframework.context.annotation.Bean;
7   -import org.springframework.context.annotation.Configuration;
8 8  
9 9 /**
10 10 * 支付配置类
11 11 *
12 12 * @author 芋道源码
13 13 */
14   -@Configuration(proxyBeanMethods = false)
  14 +@AutoConfiguration
15 15 @EnableConfigurationProperties(PayProperties.class)
16 16 public class YudaoPayAutoConfiguration {
17 17  
... ...
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.pay.config.YudaoPayAutoConfiguration
yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.pay.config.YudaoPayAutoConfiguration
0 2 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-biz-sms/pom.xml
  View file @92632c0
... ... @@ -74,7 +74,7 @@
74 74 </dependency>
75 75 <dependency>
76 76 <groupId>com.tencentcloudapi</groupId>
77   - <artifactId>tencentcloud-sdk-java</artifactId>
  77 + <artifactId>tencentcloud-sdk-java-sms</artifactId>
78 78 </dependency>
79 79 <!-- SMS SDK end -->
80 80 </dependencies>
... ...
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/java/cn/iocoder/yudao/framework/sms/config/YudaoSmsAutoConfiguration.java
  View file @92632c0
... ... @@ -2,15 +2,15 @@ package cn.iocoder.yudao.framework.sms.config;
2 2  
3 3 import cn.iocoder.yudao.framework.sms.core.client.SmsClientFactory;
4 4 import cn.iocoder.yudao.framework.sms.core.client.impl.SmsClientFactoryImpl;
  5 +import org.springframework.boot.autoconfigure.AutoConfiguration;
5 6 import org.springframework.context.annotation.Bean;
6   -import org.springframework.context.annotation.Configuration;
7 7  
8 8 /**
9 9 * 短信配置类
10 10 *
11 11 * @author 芋道源码
12 12 */
13   -@Configuration(proxyBeanMethods = false)
  13 +@AutoConfiguration
14 14 public class YudaoSmsAutoConfiguration {
15 15  
16 16 @Bean
... ...
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.sms.config.YudaoSmsAutoConfiguration
yudao-framework/yudao-spring-boot-starter-biz-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.sms.config.YudaoSmsAutoConfiguration
0 2 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/config/YudaoSocialAutoConfiguration.java
  View file @92632c0
... ... @@ -6,10 +6,10 @@ import com.xkcoding.http.support.hutool.HutoolImpl;
6 6 import com.xkcoding.justauth.autoconfigure.JustAuthProperties;
7 7 import lombok.extern.slf4j.Slf4j;
8 8 import me.zhyd.oauth.cache.AuthStateCache;
  9 +import org.springframework.boot.autoconfigure.AutoConfiguration;
9 10 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
10 11 import org.springframework.boot.context.properties.EnableConfigurationProperties;
11 12 import org.springframework.context.annotation.Bean;
12   -import org.springframework.context.annotation.Configuration;
13 13 import org.springframework.context.annotation.Primary;
14 14  
15 15 /**
... ... @@ -19,7 +19,7 @@ import org.springframework.context.annotation.Primary;
19 19 * @date 2021-10-30
20 20 */
21 21 @Slf4j
22   -@Configuration(proxyBeanMethods = false)
  22 +@AutoConfiguration
23 23 @EnableConfigurationProperties(JustAuthProperties.class)
24 24 public class YudaoSocialAutoConfiguration {
25 25  
... ...
yudao-framework/yudao-spring-boot-starter-biz-social/src/main/java/cn/iocoder/yudao/framework/social/core/YudaoAuthRequestFactory.java
  View file @92632c0
... ... @@ -43,6 +43,7 @@ public class YudaoAuthRequestFactory extends AuthRequestFactory {
43 43 * @param source {@link AuthSource}
44 44 * @return {@link AuthRequest}
45 45 */
  46 + @Override
46 47 public AuthRequest get(String source) {
47 48 // 先尝试获取自定义扩展的
48 49 AuthRequest authRequest = getExtendRequest(source);
... ...
yudao-framework/yudao-spring-boot-starter-biz-social/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.social.config.YudaoSocialAutoConfiguration
yudao-framework/yudao-spring-boot-starter-biz-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.social.config.YudaoSocialAutoConfiguration
0 2 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
  View file @92632c0
... ... @@ -21,11 +21,11 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
21 21 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
22 22 import org.springframework.beans.BeansException;
23 23 import org.springframework.beans.factory.config.BeanPostProcessor;
  24 +import org.springframework.boot.autoconfigure.AutoConfiguration;
24 25 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
25 26 import org.springframework.boot.context.properties.EnableConfigurationProperties;
26 27 import org.springframework.boot.web.servlet.FilterRegistrationBean;
27 28 import org.springframework.context.annotation.Bean;
28   -import org.springframework.context.annotation.Configuration;
29 29 import org.springframework.context.annotation.Primary;
30 30 import org.springframework.data.redis.cache.RedisCacheConfiguration;
31 31 import org.springframework.data.redis.cache.RedisCacheManager;
... ... @@ -35,7 +35,7 @@ import org.springframework.data.redis.core.RedisTemplate;
35 35  
36 36 import java.util.Objects;
37 37  
38   -@Configuration(proxyBeanMethods = false)
  38 +@AutoConfiguration
39 39 @ConditionalOnProperty(prefix = "yudao.tenant", value = "enable", matchIfMissing = true) // 允许使用 yudao.tenant.enable=false 禁用多租户
40 40 @EnableConfigurationProperties(TenantProperties.class)
41 41 public class YudaoTenantAutoConfiguration {
... ...
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.tenant.config.YudaoTenantAutoConfiguration
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.tenant.config.YudaoTenantAutoConfiguration
0 2 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java
  View file @92632c0
... ... @@ -4,11 +4,11 @@ import cn.hutool.core.util.ClassUtil;
4 4 import cn.iocoder.yudao.framework.captcha.core.enums.CaptchaRedisKeyConstants;
5 5 import cn.iocoder.yudao.framework.captcha.core.service.RedisCaptchaServiceImpl;
6 6 import com.anji.captcha.service.CaptchaCacheService;
  7 +import org.springframework.boot.autoconfigure.AutoConfiguration;
7 8 import org.springframework.context.annotation.Bean;
8   -import org.springframework.context.annotation.Configuration;
9 9 import org.springframework.data.redis.core.StringRedisTemplate;
10 10  
11   -@Configuration(proxyBeanMethods = false)
  11 +@AutoConfiguration
12 12 public class YudaoCaptchaConfiguration {
13 13  
14 14 static {
... ...
yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.captcha.config.YudaoCaptchaConfiguration
yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.captcha.config.YudaoCaptchaConfiguration
0 2 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/config/YudaoFileAutoConfiguration.java
  View file @92632c0
... ... @@ -2,15 +2,15 @@ package cn.iocoder.yudao.framework.file.config;
2 2  
3 3 import cn.iocoder.yudao.framework.file.core.client.FileClientFactory;
4 4 import cn.iocoder.yudao.framework.file.core.client.FileClientFactoryImpl;
  5 +import org.springframework.boot.autoconfigure.AutoConfiguration;
5 6 import org.springframework.context.annotation.Bean;
6   -import org.springframework.context.annotation.Configuration;
7 7  
8 8 /**
9 9 * 文件配置类
10 10 *
11 11 * @author 芋道源码
12 12 */
13   -@Configuration(proxyBeanMethods = false)
  13 +@AutoConfiguration
14 14 public class YudaoFileAutoConfiguration {
15 15  
16 16 @Bean
... ...
yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/FileClient.java
  View file @92632c0
... ... @@ -22,7 +22,7 @@ public interface FileClient {
22 22 * @return 完整路径，即 HTTP 访问地址
23 23 * @throws Exception 上传文件时，抛出 Exception 异常
24 24 */
25   - String upload(byte[] content, String path) throws Exception;
  25 + String upload(byte[] content, String path, String type) throws Exception;
26 26  
27 27 /**
28 28 * 删除文件
... ...
yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/db/DBFileClient.java
  View file @92632c0
... ... @@ -21,7 +21,7 @@ public class DBFileClient extends AbstractFileClient&lt;DBFileClientConfig&gt; {
21 21 }
22 22  
23 23 @Override
24   - public String upload(byte[] content, String path) {
  24 + public String upload(byte[] content, String path, String type) {
25 25 getDao().insert(getId(), path, content);
26 26 // 拼接返回路径
27 27 return super.formatFileUrl(config.getDomain(), path);
... ...
yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClient.java
  View file @92632c0
... ... @@ -38,7 +38,7 @@ public class FtpFileClient extends AbstractFileClient&lt;FtpFileClientConfig&gt; {
38 38 }
39 39  
40 40 @Override
41   - public String upload(byte[] content, String path) {
  41 + public String upload(byte[] content, String path, String type) {
42 42 // 执行写入
43 43 String filePath = getFilePath(path);
44 44 String fileName = FileUtil.getName(filePath);
... ...
yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/local/LocalFileClient.java
  View file @92632c0
... ... @@ -25,7 +25,7 @@ public class LocalFileClient extends AbstractFileClient&lt;LocalFileClientConfig&gt; {
25 25 }
26 26  
27 27 @Override
28   - public String upload(byte[] content, String path) {
  28 + public String upload(byte[] content, String path, String type) {
29 29 // 执行写入
30 30 String filePath = getFilePath(path);
31 31 FileUtil.writeBytes(content, filePath);
... ...
yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClient.java
  View file @92632c0
... ... @@ -82,10 +82,11 @@ public class S3FileClient extends AbstractFileClient&lt;S3FileClientConfig&gt; {
82 82 }
83 83  
84 84 @Override
85   - public String upload(byte[] content, String path) throws Exception {
  85 + public String upload(byte[] content, String path, String type) throws Exception {
86 86 // 执行上传
87 87 client.putObject(PutObjectArgs.builder()
88 88 .bucket(config.getBucket()) // bucket 必须传递
  89 + .contentType(type)
89 90 .object(path) // 相对路径作为 key
90 91 .stream(new ByteArrayInputStream(content), content.length, -1) // 文件内容
91 92 .build());
... ...
yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/sftp/SftpFileClient.java
  View file @92632c0
... ... @@ -31,7 +31,7 @@ public class SftpFileClient extends AbstractFileClient&lt;SftpFileClientConfig&gt; {
31 31 }
32 32  
33 33 @Override
34   - public String upload(byte[] content, String path) {
  34 + public String upload(byte[] content, String path, String type) {
35 35 // 执行写入
36 36 String filePath = getFilePath(path);
37 37 File file = FileUtils.createTempFile(content);
... ...
yudao-framework/yudao-spring-boot-starter-file/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.file.config.YudaoFileAutoConfiguration
yudao-framework/yudao-spring-boot-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.file.config.YudaoFileAutoConfiguration
0 2 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClientTest.java
  View file @92632c0
... ... @@ -25,7 +25,7 @@ public class FtpFileClientTest {
25 25 // 上传文件
26 26 String path = IdUtil.fastSimpleUUID() + ".jpg";
27 27 byte[] content = ResourceUtil.readBytes("file/erweima.jpg");
28   - String fullPath = client.upload(content, path);
  28 + String fullPath = client.upload(content, path, "image/jpeg");
29 29 System.out.println("访问地址：" + fullPath);
30 30 if (false) {
31 31 byte[] bytes = client.getContent(path);
... ...
yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/local/LocalFileClientTest.java
  View file @92632c0
... ... @@ -19,7 +19,7 @@ public class LocalFileClientTest {
19 19 // 上传文件
20 20 String path = IdUtil.fastSimpleUUID() + ".jpg";
21 21 byte[] content = ResourceUtil.readBytes("file/erweima.jpg");
22   - String fullPath = client.upload(content, path);
  22 + String fullPath = client.upload(content, path, "image/jpeg");
23 23 System.out.println("访问地址：" + fullPath);
24 24 client.delete(path);
25 25 }
... ...
yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClientTest.java
  View file @92632c0
... ... @@ -101,7 +101,7 @@ public class S3FileClientTest {
101 101 // 上传文件
102 102 String path = IdUtil.fastSimpleUUID() + ".jpg";
103 103 byte[] content = ResourceUtil.readBytes("file/erweima.jpg");
104   - String fullPath = client.upload(content, path);
  104 + String fullPath = client.upload(content, path, "image/jpeg");
105 105 System.out.println("访问地址：" + fullPath);
106 106 // 读取文件
107 107 if (true) {
... ...
yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/sftp/SftpFileClientTest.java
  View file @92632c0
... ... @@ -23,7 +23,7 @@ public class SftpFileClientTest {
23 23 // 上传文件
24 24 String path = IdUtil.fastSimpleUUID() + ".jpg";
25 25 byte[] content = ResourceUtil.readBytes("file/erweima.jpg");
26   - String fullPath = client.upload(content, path);
  26 + String fullPath = client.upload(content, path, "image/jpeg");
27 27 System.out.println("访问地址：" + fullPath);
28 28 if (false) {
29 29 byte[] bytes = client.getContent(path);
... ...
yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/config/YudaoFlowableConfiguration.java
  View file @92632c0
... ... @@ -2,13 +2,13 @@ package cn.iocoder.yudao.framework.flowable.config;
2 2  
3 3 import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum;
4 4 import cn.iocoder.yudao.framework.flowable.core.web.FlowableWebFilter;
  5 +import org.springframework.boot.autoconfigure.AutoConfiguration;
5 6 import org.springframework.boot.web.servlet.FilterRegistrationBean;
6 7 import org.springframework.context.annotation.Bean;
7   -import org.springframework.context.annotation.Configuration;
8 8 import org.springframework.core.task.AsyncListenableTaskExecutor;
9 9 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
10 10  
11   -@Configuration(proxyBeanMethods = false)
  11 +@AutoConfiguration
12 12 public class YudaoFlowableConfiguration {
13 13  
14 14 /**
... ...
yudao-framework/yudao-spring-boot-starter-flowable/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.flowable.config.YudaoFlowableConfiguration
yudao-framework/yudao-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.flowable.config.YudaoFlowableConfiguration
0 2 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/config/YudaoAsyncAutoConfiguration.java
  View file @92632c0
... ... @@ -3,15 +3,15 @@ package cn.iocoder.yudao.framework.quartz.config;
3 3 import com.alibaba.ttl.TtlRunnable;
4 4 import org.springframework.beans.BeansException;
5 5 import org.springframework.beans.factory.config.BeanPostProcessor;
  6 +import org.springframework.boot.autoconfigure.AutoConfiguration;
6 7 import org.springframework.context.annotation.Bean;
7   -import org.springframework.context.annotation.Configuration;
8 8 import org.springframework.scheduling.annotation.EnableAsync;
9 9 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
10 10  
11 11 /**
12 12 * 异步任务 Configuration
13 13 */
14   -@Configuration(proxyBeanMethods = false)
  14 +@AutoConfiguration
15 15 @EnableAsync
16 16 public class YudaoAsyncAutoConfiguration {
17 17  
... ...
yudao-framework/yudao-spring-boot-starter-job/src/main/java/cn/iocoder/yudao/framework/quartz/config/YudaoQuartzAutoConfiguration.java
  View file @92632c0
... ... @@ -2,14 +2,14 @@ package cn.iocoder.yudao.framework.quartz.config;
2 2  
3 3 import cn.iocoder.yudao.framework.quartz.core.scheduler.SchedulerManager;
4 4 import org.quartz.Scheduler;
  5 +import org.springframework.boot.autoconfigure.AutoConfiguration;
5 6 import org.springframework.context.annotation.Bean;
6   -import org.springframework.context.annotation.Configuration;
7 7 import org.springframework.scheduling.annotation.EnableScheduling;
8 8  
9 9 /**
10 10 * 定时任务 Configuration
11 11 */
12   -@Configuration(proxyBeanMethods = false)
  12 +@AutoConfiguration
13 13 @EnableScheduling // 开启 Spring 自带的定时任务
14 14 public class YudaoQuartzAutoConfiguration {
15 15  
... ...
yudao-framework/yudao-spring-boot-starter-job/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.quartz.config.YudaoQuartzAutoConfiguration,\
3   - cn.iocoder.yudao.framework.quartz.config.YudaoAsyncAutoConfiguration
yudao-framework/yudao-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.quartz.config.YudaoQuartzAutoConfiguration
  2 +cn.iocoder.yudao.framework.quartz.config.YudaoAsyncAutoConfiguration
0 3 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoMetricsAutoConfiguration.java
  View file @92632c0
... ... @@ -3,17 +3,17 @@ package cn.iocoder.yudao.framework.tracer.config;
3 3 import io.micrometer.core.instrument.MeterRegistry;
4 4 import org.springframework.beans.factory.annotation.Value;
5 5 import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
  6 +import org.springframework.boot.autoconfigure.AutoConfiguration;
6 7 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
7 8 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
8 9 import org.springframework.context.annotation.Bean;
9   -import org.springframework.context.annotation.Configuration;
10 10  
11 11 /**
12 12 * Metrics 配置类
13 13 *
14 14 * @author 芋道源码
15 15 */
16   -@Configuration(proxyBeanMethods = false)
  16 +@AutoConfiguration
17 17 @ConditionalOnClass({MeterRegistryCustomizer.class})
18 18 @ConditionalOnProperty(prefix = "yudao.metrics", value = "enable", matchIfMissing = true) // 允许使用 yudao.metrics.enable=false 禁用 Metrics
19 19 public class YudaoMetricsAutoConfiguration {
... ...
yudao-framework/yudao-spring-boot-starter-monitor/src/main/java/cn/iocoder/yudao/framework/tracer/config/YudaoTracerAutoConfiguration.java
  View file @92632c0
... ... @@ -3,19 +3,19 @@ package cn.iocoder.yudao.framework.tracer.config;
3 3 import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum;
4 4 import cn.iocoder.yudao.framework.tracer.core.aop.BizTraceAspect;
5 5 import cn.iocoder.yudao.framework.tracer.core.filter.TraceFilter;
  6 +import org.springframework.boot.autoconfigure.AutoConfiguration;
6 7 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
7 8 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
8 9 import org.springframework.boot.context.properties.EnableConfigurationProperties;
9 10 import org.springframework.boot.web.servlet.FilterRegistrationBean;
10 11 import org.springframework.context.annotation.Bean;
11   -import org.springframework.context.annotation.Configuration;
12 12  
13 13 /**
14 14 * Tracer 配置类
15 15 *
16 16 * @author mashu
17 17 */
18   -@Configuration(proxyBeanMethods = false)
  18 +@AutoConfiguration
19 19 @ConditionalOnClass({BizTraceAspect.class})
20 20 @EnableConfigurationProperties(TracerProperties.class)
21 21 @ConditionalOnProperty(prefix = "yudao.tracer", value = "enable", matchIfMissing = true)
... ...
yudao-framework/yudao-spring-boot-starter-monitor/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.tracer.config.YudaoTracerAutoConfiguration,\
3   - cn.iocoder.yudao.framework.tracer.config.YudaoMetricsAutoConfiguration
yudao-framework/yudao-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.tracer.config.YudaoTracerAutoConfiguration
  2 +cn.iocoder.yudao.framework.tracer.config.YudaoMetricsAutoConfiguration
0 3 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/config/YudaoMQAutoConfiguration.java
  View file @92632c0
... ... @@ -10,9 +10,8 @@ import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessageListener;
10 10 import cn.iocoder.yudao.framework.mq.core.stream.AbstractStreamMessageListener;
11 11 import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration;
12 12 import lombok.extern.slf4j.Slf4j;
13   -import org.springframework.boot.autoconfigure.AutoConfigureAfter;
  13 +import org.springframework.boot.autoconfigure.AutoConfiguration;
14 14 import org.springframework.context.annotation.Bean;
15   -import org.springframework.context.annotation.Configuration;
16 15 import org.springframework.data.redis.connection.RedisServerCommands;
17 16 import org.springframework.data.redis.connection.stream.Consumer;
18 17 import org.springframework.data.redis.connection.stream.ObjectRecord;
... ... @@ -35,9 +34,8 @@ import java.util.Properties;
35 34 *
36 35 * @author 芋道源码
37 36 */
38   -@Configuration(proxyBeanMethods = false)
39   -@AutoConfigureAfter(YudaoRedisAutoConfiguration.class)
40 37 @Slf4j
  38 +@AutoConfiguration(after = YudaoRedisAutoConfiguration.class)
41 39 public class YudaoMQAutoConfiguration {
42 40  
43 41 @Bean
... ... @@ -55,7 +53,6 @@ public class YudaoMQAutoConfiguration {
55 53 * 创建 Redis Pub/Sub 广播消费的容器
56 54 */
57 55 @Bean
58   - @Async // 异步化，可降低 2 秒左右的启动时间
59 56 public RedisMessageListenerContainer redisMessageListenerContainer(
60 57 RedisMQTemplate redisMQTemplate, List<AbstractChannelMessageListener<?>> listeners) {
61 58 // 创建 RedisMessageListenerContainer 对象
... ...
yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/core/pubsub/AbstractChannelMessageListener.java
  View file @92632c0
... ... @@ -39,7 +39,7 @@ public abstract class AbstractChannelMessageListener&lt;T extends AbstractChannelMe
39 39 @SneakyThrows
40 40 protected AbstractChannelMessageListener() {
41 41 this.messageType = getMessageClass();
42   - this.channel = messageType.newInstance().getChannel();
  42 + this.channel = messageType.getDeclaredConstructor().newInstance().getChannel();
43 43 }
44 44  
45 45 /**
... ...
yudao-framework/yudao-spring-boot-starter-mq/src/main/java/cn/iocoder/yudao/framework/mq/core/stream/AbstractStreamMessageListener.java
  View file @92632c0
... ... @@ -50,7 +50,7 @@ public abstract class AbstractStreamMessageListener&lt;T extends AbstractStreamMess
50 50 @SneakyThrows
51 51 protected AbstractStreamMessageListener() {
52 52 this.messageType = getMessageClass();
53   - this.streamKey = messageType.newInstance().getStreamKey();
  53 + this.streamKey = messageType.getDeclaredConstructor().newInstance().getStreamKey();
54 54 }
55 55  
56 56 @Override
... ...
yudao-framework/yudao-spring-boot-starter-mq/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.mq.config.YudaoMQAutoConfiguration
yudao-framework/yudao-spring-boot-starter-mq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.mq.config.YudaoMQAutoConfiguration
0 2 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml
  View file @92632c0
... ... @@ -30,8 +30,8 @@
30 30  
31 31 <!-- DB 相关 -->
32 32 <dependency>
33   - <groupId>mysql</groupId>
34   - <artifactId>mysql-connector-java</artifactId>
  33 + <groupId>com.mysql</groupId>
  34 + <artifactId>mysql-connector-j</artifactId>
35 35 </dependency>
36 36 <dependency>
37 37 <groupId>com.oracle.database.jdbc</groupId>
... ...
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/config/YudaoDataSourceAutoConfiguration.java
  View file @92632c0
... ... @@ -2,11 +2,11 @@ package cn.iocoder.yudao.framework.datasource.config;
2 2  
3 3 import cn.iocoder.yudao.framework.datasource.core.filter.DruidAdRemoveFilter;
4 4 import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
  5 +import org.springframework.boot.autoconfigure.AutoConfiguration;
5 6 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
6 7 import org.springframework.boot.context.properties.EnableConfigurationProperties;
7 8 import org.springframework.boot.web.servlet.FilterRegistrationBean;
8 9 import org.springframework.context.annotation.Bean;
9   -import org.springframework.context.annotation.Configuration;
10 10 import org.springframework.transaction.annotation.EnableTransactionManagement;
11 11  
12 12 /**
... ... @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
14 14 *
15 15 * @author 芋道源码
16 16 */
17   -@Configuration(proxyBeanMethods = false)
  17 +@AutoConfiguration
18 18 @EnableTransactionManagement(proxyTargetClass = true) // 启动事务管理
19 19 @EnableConfigurationProperties(DruidStatProperties.class)
20 20 public class YudaoDataSourceAutoConfiguration {
... ...
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/expression/AndExpressionX.java 0 → 100644
  View file @92632c0
  1 +package cn.iocoder.yudao.framework.expression;
  2 +
  3 +import net.sf.jsqlparser.expression.Expression;
  4 +import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
  5 +
  6 +/**
  7 + * AndExpression 的扩展类(会在原有表达式两端加上括号)
  8 + */
  9 +public class AndExpressionX extends AndExpression {
  10 +
  11 + public AndExpressionX() {
  12 + }
  13 +
  14 + public AndExpressionX(Expression leftExpression, Expression rightExpression) {
  15 + this.setLeftExpression(leftExpression);
  16 + this.setRightExpression(rightExpression);
  17 + }
  18 +
  19 + @Override
  20 + public String toString() {
  21 + return "(" + super.toString() + ")";
  22 + }
  23 +
  24 +}
... ...
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/expression/OrExpressionX.java 0 → 100644
  View file @92632c0
  1 +package cn.iocoder.yudao.framework.expression;
  2 +
  3 +import net.sf.jsqlparser.expression.Expression;
  4 +import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
  5 +
  6 +/**
  7 + * OrExpression 的扩展类(会在原有表达式两端加上括号)
  8 + */
  9 +public class OrExpressionX extends OrExpression {
  10 +
  11 + public OrExpressionX() {
  12 + }
  13 +
  14 + public OrExpressionX(Expression leftExpression, Expression rightExpression) {
  15 + this.setLeftExpression(leftExpression);
  16 + this.setRightExpression(rightExpression);
  17 + }
  18 +
  19 + @Override
  20 + public String toString() {
  21 + return "(" + super.toString() + ")";
  22 + }
  23 +
  24 +}
... ...
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/YudaoMybatisAutoConfiguration.java
  View file @92632c0
... ... @@ -13,9 +13,9 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
13 13 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
14 14 import org.apache.ibatis.annotations.Mapper;
15 15 import org.mybatis.spring.annotation.MapperScan;
  16 +import org.springframework.boot.autoconfigure.AutoConfiguration;
16 17 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
17 18 import org.springframework.context.annotation.Bean;
18   -import org.springframework.context.annotation.Configuration;
19 19 import org.springframework.core.env.ConfigurableEnvironment;
20 20  
21 21 /**
... ... @@ -23,7 +23,7 @@ import org.springframework.core.env.ConfigurableEnvironment;
23 23 *
24 24 * @author 芋道源码
25 25 */
26   -@Configuration(proxyBeanMethods = false)
  26 +@AutoConfiguration
27 27 @MapperScan(value = "${yudao.info.base-package}", annotationClass = Mapper.class,
28 28 lazyInitialization = "${mybatis.lazy-initialization:false}") // Mapper 懒加载，目前仅用于单元测试
29 29 public class YudaoMybatisAutoConfiguration {
... ...
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories
  View file @92632c0
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration,\
3   - cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration
4 1 org.springframework.boot.env.EnvironmentPostProcessor=\
5 2 cn.iocoder.yudao.framework.mybatis.config.IdTypeEnvironmentPostProcessor
... ...
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration
  2 +cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration
0 3 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/idempotent/config/YudaoIdempotentConfiguration.java
  View file @92632c0
... ... @@ -5,16 +5,14 @@ import cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl.DefaultIdempo
5 5 import cn.iocoder.yudao.framework.idempotent.core.keyresolver.impl.ExpressionIdempotentKeyResolver;
6 6 import cn.iocoder.yudao.framework.idempotent.core.keyresolver.IdempotentKeyResolver;
7 7 import cn.iocoder.yudao.framework.idempotent.core.redis.IdempotentRedisDAO;
8   -import org.springframework.boot.autoconfigure.AutoConfigureAfter;
  8 +import org.springframework.boot.autoconfigure.AutoConfiguration;
9 9 import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration;
10 10 import org.springframework.context.annotation.Bean;
11   -import org.springframework.context.annotation.Configuration;
12 11 import org.springframework.data.redis.core.StringRedisTemplate;
13 12  
14 13 import java.util.List;
15 14  
16   -@Configuration(proxyBeanMethods = false)
17   -@AutoConfigureAfter(YudaoRedisAutoConfiguration.class)
  15 +@AutoConfiguration(after = YudaoRedisAutoConfiguration.class)
18 16 public class YudaoIdempotentConfiguration {
19 17  
20 18 @Bean
... ...
yudao-framework/yudao-spring-boot-starter-protection/src/main/java/cn/iocoder/yudao/framework/lock4j/config/YudaoLock4jConfiguration.java
  View file @92632c0
... ... @@ -4,12 +4,10 @@ import cn.hutool.core.util.ClassUtil;
4 4 import com.baomidou.lock.spring.boot.autoconfigure.LockAutoConfiguration;
5 5 import cn.iocoder.yudao.framework.lock4j.core.DefaultLockFailureStrategy;
6 6 import cn.iocoder.yudao.framework.lock4j.core.Lock4jRedisKeyConstants;
7   -import org.springframework.boot.autoconfigure.AutoConfigureBefore;
  7 +import org.springframework.boot.autoconfigure.AutoConfiguration;
8 8 import org.springframework.context.annotation.Bean;
9   -import org.springframework.context.annotation.Configuration;
10 9  
11   -@Configuration(proxyBeanMethods = false)
12   -@AutoConfigureBefore(LockAutoConfiguration.class)
  10 +@AutoConfiguration(before = LockAutoConfiguration.class)
13 11 public class YudaoLock4jConfiguration {
14 12  
15 13 static {
... ...
yudao-framework/yudao-spring-boot-starter-protection/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.idempotent.config.YudaoIdempotentConfiguration,\
3   - cn.iocoder.yudao.framework.lock4j.config.YudaoLock4jConfiguration
yudao-framework/yudao-spring-boot-starter-protection/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.idempotent.config.YudaoIdempotentConfiguration
  2 +cn.iocoder.yudao.framework.lock4j.config.YudaoLock4jConfiguration
0 3 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java
  View file @92632c0
1 1 package cn.iocoder.yudao.framework.redis.config;
2 2  
  3 +import org.springframework.boot.autoconfigure.AutoConfiguration;
3 4 import org.springframework.boot.autoconfigure.cache.CacheProperties;
4 5 import org.springframework.boot.context.properties.EnableConfigurationProperties;
5 6 import org.springframework.cache.annotation.EnableCaching;
6 7 import org.springframework.context.annotation.Bean;
7   -import org.springframework.context.annotation.Configuration;
8 8 import org.springframework.context.annotation.Primary;
9 9 import org.springframework.data.redis.cache.RedisCacheConfiguration;
10 10 import org.springframework.data.redis.serializer.RedisSerializationContext;
... ... @@ -13,7 +13,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
13 13 /**
14 14 * Cache 配置类，基于 Redis 实现
15 15 */
16   -@Configuration(proxyBeanMethods = false)
  16 +@AutoConfiguration
17 17 @EnableConfigurationProperties({CacheProperties.class})
18 18 @EnableCaching
19 19 public class YudaoCacheAutoConfiguration {
... ...
yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoRedisAutoConfiguration.java
  View file @92632c0
1 1 package cn.iocoder.yudao.framework.redis.config;
2 2  
  3 +import org.springframework.boot.autoconfigure.AutoConfiguration;
3 4 import org.springframework.context.annotation.Bean;
4   -import org.springframework.context.annotation.Configuration;
5 5 import org.springframework.data.redis.connection.RedisConnectionFactory;
6 6 import org.springframework.data.redis.core.RedisTemplate;
7 7 import org.springframework.data.redis.serializer.RedisSerializer;
... ... @@ -9,7 +9,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
9 9 /**
10 10 * Redis 配置类
11 11 */
12   -@Configuration(proxyBeanMethods = false)
  12 +@AutoConfiguration
13 13 public class YudaoRedisAutoConfiguration {
14 14  
15 15 /**
... ...
yudao-framework/yudao-spring-boot-starter-redis/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration,\
3   - cn.iocoder.yudao.framework.redis.config.YudaoCacheAutoConfiguration
yudao-framework/yudao-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration
  2 +cn.iocoder.yudao.framework.redis.config.YudaoCacheAutoConfiguration
0 3 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
  View file @92632c0
... ... @@ -11,9 +11,9 @@ import cn.iocoder.yudao.framework.web.core.handler.GlobalExceptionHandler;
11 11 import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi;
12 12 import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
13 13 import org.springframework.beans.factory.config.MethodInvokingFactoryBean;
  14 +import org.springframework.boot.autoconfigure.AutoConfiguration;
14 15 import org.springframework.boot.context.properties.EnableConfigurationProperties;
15 16 import org.springframework.context.annotation.Bean;
16   -import org.springframework.context.annotation.Configuration;
17 17 import org.springframework.security.core.context.SecurityContextHolder;
18 18 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
19 19 import org.springframework.security.crypto.password.PasswordEncoder;
... ... @@ -30,7 +30,7 @@ import javax.annotation.Resource;
30 30 *
31 31 * @author 芋道源码
32 32 */
33   -@Configuration(proxyBeanMethods = false)
  33 +@AutoConfiguration
34 34 @EnableConfigurationProperties(SecurityProperties.class)
35 35 public class YudaoSecurityAutoConfiguration {
36 36  
... ...
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
  View file @92632c0
... ... @@ -4,17 +4,17 @@ import cn.iocoder.yudao.framework.security.core.filter.TokenAuthenticationFilter
4 4 import cn.iocoder.yudao.framework.web.config.WebProperties;
5 5 import com.google.common.collect.HashMultimap;
6 6 import com.google.common.collect.Multimap;
7   -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
  7 +import org.springframework.boot.autoconfigure.AutoConfiguration;
8 8 import org.springframework.context.ApplicationContext;
9 9 import org.springframework.context.annotation.Bean;
10   -import org.springframework.context.annotation.Configuration;
11 10 import org.springframework.http.HttpMethod;
12 11 import org.springframework.security.authentication.AuthenticationManager;
  12 +import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
13 13 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
14 14 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
15   -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
16 15 import org.springframework.security.config.http.SessionCreationPolicy;
17 16 import org.springframework.security.web.AuthenticationEntryPoint;
  17 +import org.springframework.security.web.SecurityFilterChain;
18 18 import org.springframework.security.web.access.AccessDeniedHandler;
19 19 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
20 20 import org.springframework.web.method.HandlerMethod;
... ... @@ -32,9 +32,9 @@ import java.util.Set;
32 32 *
33 33 * @author 芋道源码
34 34 */
35   -@Configuration(proxyBeanMethods = false)
  35 +@AutoConfiguration
36 36 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
37   -public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter {
  37 +public class YudaoWebSecurityConfigurerAdapter {
38 38  
39 39 @Resource
40 40 private WebProperties webProperties;
... ... @@ -72,11 +72,9 @@ public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdap
72 72 * 由于 Spring Security 创建 AuthenticationManager 对象时，没声明 @Bean 注解，导致无法被注入
73 73 * 通过覆写父类的该方法，添加 @Bean 注解，解决该问题
74 74 */
75   - @Override
76 75 @Bean
77   - @ConditionalOnMissingBean(AuthenticationManager.class)
78   - public AuthenticationManager authenticationManagerBean() throws Exception {
79   - return super.authenticationManagerBean();
  76 + public AuthenticationManager authenticationManagerBean(AuthenticationConfiguration authenticationConfiguration) throws Exception {
  77 + return authenticationConfiguration.getAuthenticationManager();
80 78 }
81 79  
82 80 /**
... ... @@ -96,8 +94,8 @@ public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdap
96 94 * rememberMe | 允许通过remember-me登录的用户访问
97 95 * authenticated | 用户登录后可访问
98 96 */
99   - @Override
100   - protected void configure(HttpSecurity httpSecurity) throws Exception {
  97 + @Bean
  98 + protected SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
101 99 // 登出
102 100 httpSecurity
103 101 // 开启跨域
... ... @@ -141,6 +139,8 @@ public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdap
141 139  
142 140 // 添加 Token Filter
143 141 httpSecurity.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class);
  142 +
  143 + return httpSecurity.build();
144 144 }
145 145  
146 146 private String buildAppApi(String url) {
... ...
yudao-framework/yudao-spring-boot-starter-security/src/main/resources/META-INF/spring.factories deleted
View file @7a4a6a3
1   -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2   - cn.iocoder.yudao.framework.security.config.YudaoSecurityAutoConfiguration,\
3   - cn.iocoder.yudao.framework.security.config.YudaoWebSecurityConfigurerAdapter
yudao-framework/yudao-spring-boot-starter-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 0 → 100644
  View file @92632c0
  1 +cn.iocoder.yudao.framework.security.config.YudaoSecurityAutoConfiguration
  2 +cn.iocoder.yudao.framework.security.config.YudaoWebSecurityConfigurerAdapter
0 3 \ No newline at end of file
... ...
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
  View file @92632c0
... ... @@ -11,16 +11,14 @@ import cn.iocoder.yudao.framework.web.config.YudaoWebAutoConfiguration;
11 11 import cn.iocoder.yudao.module.infra.api.logger.ApiAccessLogApi;
12 12 import cn.iocoder.yudao.module.infra.api.logger.ApiErrorLogApi;
13 13 import org.springframework.beans.factory.annotation.Value;
14   -import org.springframework.boot.autoconfigure.AutoConfigureAfter;
  14 +import org.springframework.boot.autoconfigure.AutoConfiguration;
15 15 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
16 16 import org.springframework.boot.web.servlet.FilterRegistrationBean;
17 17 import org.springframework.context.annotation.Bean;
18   -import org.springframework.context.annotation.Configuration;
19 18  
20 19 import javax.servlet.Filter;
21 20  
22   -@Configuration(proxyBeanMethods = false)
23   -@AutoConfigureAfter(YudaoWebAutoConfiguration.class)
  21 +@AutoConfiguration(after = YudaoWebAutoConfiguration.class)
24 22 public class YudaoApiLogAutoConfiguration {
25 23  
26 24 @Bean
... ...
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
  View file @92632c0
1 1 package cn.iocoder.yudao.framework.jackson.config;
2 2  
3   -import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
  3 +import cn.iocoder.yudao.framework.jackson.core.databind.NumberSerializer;
4 4 import cn.iocoder.yudao.framework.jackson.core.databind.LocalDateTimeDeserializer;
5 5 import cn.iocoder.yudao.framework.jackson.core.databind.LocalDateTimeSerializer;
6   -import cn.iocoder.yudao.framework.jackson.core.databind.LocalTimeJson;
  6 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
7 7 import com.fasterxml.jackson.databind.ObjectMapper;
8 8 import com.fasterxml.jackson.databind.module.SimpleModule;
9 9 import lombok.extern.slf4j.Slf4j;
10 10 import org.springframework.beans.BeansException;
11 11 import org.springframework.beans.factory.config.BeanPostProcessor;
  12 +import org.springframework.boot.autoconfigure.AutoConfiguration;
12 13 import org.springframework.context.annotation.Bean;
13   -import org.springframework.context.annotation.Configuration;
14 14  
15 15 import java.time.LocalDateTime;
16   -import java.time.LocalTime;
17 16  
18   -@Configuration(proxyBeanMethods = false)
  17 +@AutoConfiguration
19 18 @Slf4j
20 19 public class YudaoJacksonAutoConfiguration {
21 20  
... ... @@ -32,15 +31,12 @@ public class YudaoJacksonAutoConfiguration {
32 31 /*
33 32 * 1. 新增Long类型序列化规则，数值超过2^53-1，在JS会出现精度丢失问题，因此Long自动序列化为字符串类型
34 33 * 2. 新增LocalDateTime序列化、反序列化规则
35   - * 3. 新增LocalTime序列化、反序列化规则
36 34 */
37 35 simpleModule
38   -// .addSerializer(Long.class, ToStringSerializer.instance)
39   -// .addSerializer(Long.TYPE, ToStringSerializer.instance)
  36 + .addSerializer(Long.class, NumberSerializer.INSTANCE)
  37 + .addSerializer(Long.TYPE, NumberSerializer.INSTANCE)
40 38 .addSerializer(LocalDateTime.class, LocalDateTimeSerializer.INSTANCE)
41   - .addDeserializer(LocalDateTime.class, LocalDateTimeDeserializer.INSTANCE)
42   - .addSerializer(LocalTime.class, LocalTimeJson.SERIALIZER)
43   - .addDeserializer(LocalTime.class, LocalTimeJson.DESERIALIZABLE);
  39 + .addDeserializer(LocalDateTime.class, LocalDateTimeDeserializer.INSTANCE);
44 40  
45 41 objectMapper.registerModules(simpleModule);
46 42  
... ...
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/core/databind/NumberSerializer.java 0 → 100644
  View file @92632c0
  1 +package cn.iocoder.yudao.framework.jackson.core.databind;
  2 +
  3 +import com.fasterxml.jackson.core.JsonGenerator;
  4 +import com.fasterxml.jackson.databind.SerializerProvider;
  5 +import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
  6 +
  7 +import java.io.IOException;
  8 +
  9 +/**
  10 + * Long 序列化规则
  11 + *
  12 + * 会将超长 long 值转换为 string，解决前端 JavaScript 最大安全整数是 2^53-1 的问题
  13 + *
  14 + * @author 星语
  15 + */
  16 +@JacksonStdImpl
  17 +public class NumberSerializer extends com.fasterxml.jackson.databind.ser.std.NumberSerializer {
  18 +
  19 + private static final long MAX_SAFE_INTEGER = 9007199254740991L;
  20 + private static final long MIN_SAFE_INTEGER = -9007199254740991L;
  21 +
  22 + public static final NumberSerializer INSTANCE = new NumberSerializer(Number.class);
  23 +
  24 + public NumberSerializer(Class<? extends Number> rawType) {
  25 + super(rawType);
  26 + }
  27 +
  28 + @Override
  29 + public void serialize(Number value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
  30 + // 超出范围 序列化位字符串
  31 + if (value.longValue() > MIN_SAFE_INTEGER && value.longValue() < MAX_SAFE_INTEGER) {
  32 + super.serialize(value, gen, serializers);
  33 + } else {
  34 + gen.writeString(value.toString());
  35 + }
  36 + }
  37 +}
... ...