Commit f94435d592e6bc32ffd73ed8561f3f8eda4d5fac
1 parent
a92acff9
* 【升级】redisson from 3.16.3 to 3.16.6，解决 Stream 在调试场景下会存在 NPE 的问题
* 【升级】spring-boot from 2.4.5 to 2.4.12，最新的 Spring Boot 2.6.X 在等更流行一些，稳定第一 * 【升级】druid from 1.2.4 to 1.2.8，提升数据库连接池的稳定性 * 【升级】dynamic-datasource from 3.3.2 to 3.5.0，修复动态数据源切换的问题
Showing
5 changed files
with
28 additions
and
14 deletions
README.md
| ... | ... | @@ -97,21 +97,21 @@ |
| 97 | 97 | |
| 98 | 98 | | 框架 | 说明 | 版本 | 学习指南 | |
| 99 | 99 | | --- | --- | --- | --- | |
| 100 | -| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.4.5 | [文档](https://github.com/YunaiV/SpringBoot-Labs) | | |
| 100 | +| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.4.12 | [文档](https://github.com/YunaiV/SpringBoot-Labs) | | |
| 101 | 101 | | [MySQL](https://www.mysql.com/cn/) | 数据库服务器 | 5.7 | | |
| 102 | -| [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.4 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) | | |
| 103 | -| [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.4.1 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) | | |
| 104 | -| [Dynamic Datasource](https://dynamic-datasource.com/) | 动态数据源 | 3.3.2 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) | | |
| 102 | +| [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.8 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) | | |
| 103 | +| [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.4.3.4 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) | | |
| 104 | +| [Dynamic Datasource](https://dynamic-datasource.com/) | 动态数据源 | 3.5.0 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) | | |
| 105 | 105 | | [Redis](https://redis.io/) | key-value 数据库 | 5.0 | | |
| 106 | -| [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 3.1.46 | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao) | | |
| 107 | -| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架 | 5.4.6 | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao) | | |
| 108 | -| [Spring Security](https://github.com/spring-projects/spring-security) | Spring 安全框架 | 5.4.6 | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) | | |
| 106 | +| [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 3.16.6 | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao) | | |
| 107 | +| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架 | 5.3.13 | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao) | | |
| 108 | +| [Spring Security](https://github.com/spring-projects/spring-security) | Spring 安全框架 | 5.4.9 | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) | | |
| 109 | 109 | | [Hibernate Validator](https://github.com/hibernate/hibernate-validator) | 参数校验组件 | 6.1.7 | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?yudao) | |
| 110 | 110 | | [Quartz](https://github.com/quartz-scheduler) | 任务调度组件 | 2.3.2 | [文档](http://www.iocoder.cn/Spring-Boot/Job/?yudao) | |
| 111 | 111 | | [Knife4j](https://gitee.com/xiaoym/knife4j) | Swagger 增强 UI 实现 | 3.0.2 | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?yudao) | |
| 112 | 112 | | [Resilience4j](https://github.com/resilience4j/resilience4j) | 服务保障组件 | 1.7.0 | [文档](http://www.iocoder.cn/Spring-Boot/Resilience4j/?yudao) | |
| 113 | 113 | | [SkyWalking](https://skywalking.apache.org/) | 分布式应用追踪系统 | 8.5.0 | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao) | |
| 114 | -| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.3.1 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) | | |
| 114 | +| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.4.2 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) | | |
| 115 | 115 | | [Jackson](https://github.com/FasterXML/jackson) | JSON 工具库 | 2.11.4 | | |
| 116 | 116 | | [MapStruct](https://mapstruct.org/) | Java Bean 转换 | 1.4.1 | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao) | |
| 117 | 117 | | [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代码 | 1.16.14 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao) | | ... | ... |
pom.xml
| ... | ... | @@ -58,9 +58,9 @@ |
| 58 | 58 | <!-- 使用 aliyun 的 Maven 源，提升下载速度 --> |
| 59 | 59 | <repositories> |
| 60 | 60 | <repository> |
| 61 | - <id>aliyun</id> | |
| 61 | + <id>aliyunmaven</id> | |
| 62 | 62 | <name>aliyun</name> |
| 63 | - <url>http://maven.aliyun.com/nexus/content/groups/public</url> | |
| 63 | + <url>https://maven.aliyun.com/repository/public</url> | |
| 64 | 64 | </repository> |
| 65 | 65 | </repositories> |
| 66 | 66 | ... | ... |
yudao-core-service/src/test/resources/application-unit-test.yaml
| ... | ... | @@ -6,6 +6,12 @@ spring: |
| 6 | 6 | --- #################### 数据库相关配置 #################### |
| 7 | 7 | |
| 8 | 8 | spring: |
| 9 | +# sql: | |
| 10 | +# init: | |
| 11 | +# schema-locations: classpath:sql/create_tables.sql | |
| 12 | +# username: sa | |
| 13 | +# password: | |
| 14 | +# enabled: true | |
| 9 | 15 | # 数据源配置项 |
| 10 | 16 | datasource: |
| 11 | 17 | name: ruoyi-vue-pro |
| ... | ... | @@ -23,6 +29,9 @@ spring: |
| 23 | 29 | host: 127.0.0.1 # 地址 |
| 24 | 30 | port: 16379 # 端口（单元测试，使用 16379 端口） |
| 25 | 31 | database: 0 # 数据库索引 |
| 32 | + integration: | |
| 33 | + jdbc: | |
| 34 | + initialize-schema: | |
| 26 | 35 | |
| 27 | 36 | mybatis: |
| 28 | 37 | lazy-initialization: true # 单元测试，设置 MyBatis Mapper 延迟加载，加速每个单元测试 | ... | ... |
yudao-dependencies/pom.xml
| ... | ... | @@ -16,17 +16,17 @@ |
| 16 | 16 | <properties> |
| 17 | 17 | <revision>1.3.0-snapshot</revision> |
| 18 | 18 | <!-- 统一依赖管理 --> |
| 19 | - <spring.boot.version>2.4.5</spring.boot.version> | |
| 19 | + <spring.boot.version>2.4.12</spring.boot.version> | |
| 20 | 20 | <!-- Web 相关 --> |
| 21 | 21 | <knife4j.version>3.0.2</knife4j.version> |
| 22 | 22 | <swagger-annotations.version>1.5.22</swagger-annotations.version> |
| 23 | 23 | <servlet.versoin>2.5</servlet.versoin> |
| 24 | 24 | <!-- DB 相关 --> |
| 25 | 25 | <mysql.version>5.1.46</mysql.version> |
| 26 | - <druid.version>1.2.4</druid.version> | |
| 26 | + <druid.version>1.2.8</druid.version> | |
| 27 | 27 | <mybatis-plus.version>3.4.3.4</mybatis-plus.version> |
| 28 | - <dynamic-datasource.version>3.3.2</dynamic-datasource.version> | |
| 29 | - <redisson.version>3.16.3</redisson.version> | |
| 28 | + <dynamic-datasource.version>3.5.0</dynamic-datasource.version> | |
| 29 | + <redisson.version>3.16.6</redisson.version> | |
| 30 | 30 | <!-- Config 配置中心相关 --> |
| 31 | 31 | <apollo.version>1.7.0</apollo.version> |
| 32 | 32 | <!-- Job 定时任务相关 --> | ... | ... |
更新日志.md
| ... | ... | @@ -30,6 +30,11 @@ |
| 30 | 30 | |
| 31 | 31 | ### 🔨 Dependency Upgrades |
| 32 | 32 | |
| 33 | +* 【升级】redisson from 3.16.3 to 3.16.6，解决 Stream 在调试场景下会存在 NPE 的问题 | |
| 34 | +* 【升级】spring-boot from 2.4.5 to 2.4.12，最新的 Spring Boot 2.6.X 在等更流行一些，稳定第一 | |
| 35 | +* 【升级】druid from 1.2.4 to 1.2.8，提升数据库连接池的稳定性 | |
| 36 | +* 【升级】dynamic-datasource from 3.3.2 to 3.5.0，修复动态数据源切换的问题 | |
| 37 | + | |
| 33 | 38 | ### 📝 TODO |
| 34 | 39 | |
| 35 | 40 | * 支付 | ... | ... |