mirror of
				https://github.com/continew-org/continew-starter.git
				synced 2025-10-30 23:00:11 +08:00 
			
		
		
		
	chore: 升级后端依赖
1.Spring Boot 3.1.5 => 3.1.7(存在 MyBatis Plus 冲突异常,已临时修复) 2.Just Auth 1.16.5 => 1.16.6 3.Redisson 3.24.3 => 3.25.2 4.Easy Excel 3.3.2 => 3.3.3 5.Knife4j 4.3.0 => 4.4.0 6.Hutool 5.8.23 => 5.8.24
This commit is contained in:
		
							
								
								
									
										10
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								README.md
									
									
									
									
									
								
							| @@ -150,17 +150,17 @@ cors: | |||||||
|  |  | ||||||
| | 模块名称                           | 模块说明                                 | 依赖版本                                                     | | | 模块名称                           | 模块说明                                 | 依赖版本                                                     | | ||||||
| | ---------------------------------- | ---------------------------------------- | ------------------------------------------------------------ | | | ---------------------------------- | ---------------------------------------- | ------------------------------------------------------------ | | ||||||
| | continew-starter-core              | 核心模块:包含跨域、线程池等自动配置     | <a href="https://spring.io/projects/spring-boot" target="_blank">Spring Boot</a>:3.1.5<br /><a href="https://undertow.io/" target="_blank">Undertow</a>:2.3.10.Final<br /><a href="https://www.hutool.cn/" target="_blank">Hutool</a>:5.8.23<br />mica-ip2region:3.1.5.1 | | | continew-starter-core              | 核心模块:包含跨域、线程池等自动配置     | <a href="https://spring.io/projects/spring-boot" target="_blank">Spring Boot</a>:3.1.7<br /><a href="https://undertow.io/" target="_blank">Undertow</a>:2.3.10.Final<br /><a href="https://www.hutool.cn/" target="_blank">Hutool</a>:5.8.24<br />mica-ip2region:3.1.5.1 | | ||||||
| | continew-starter-json-jackson      | JSON 模块:Jackson 自动配置              | Jackson:2.15.3                                              | | | continew-starter-json-jackson      | JSON 模块:Jackson 自动配置              | Jackson:2.15.3                                              | | ||||||
| | continew-starter-api-doc           | API 文档模块:Knife4j 自动配置           | <a href="https://doc.xiaominfo.com/" target="_blank">Knife4j</a>:4.3.0 | | | continew-starter-api-doc           | API 文档模块:Knife4j 自动配置           | <a href="https://doc.xiaominfo.com/" target="_blank">Knife4j</a>:4.4.0 | | ||||||
| | continew-starter-log               | 日志模块:HTTP Trace Pro                 |                                                              | | | continew-starter-log               | 日志模块:HTTP Trace Pro                 |                                                              | | ||||||
| | continew-starter-storage           | 存储模块:本地存储、OSS 自动配置         |                                                              | | | continew-starter-storage           | 存储模块:本地存储、OSS 自动配置         |                                                              | | ||||||
| | continew-starter-file-excel        | 文件处理模块:Excel 相关配置             | <a href="https://easyexcel.opensource.alibaba.com/" target="_blank">Easy Excel</a>:3.3.2 | | | continew-starter-file-excel        | 文件处理模块:Excel 相关配置             | <a href="https://easyexcel.opensource.alibaba.com/" target="_blank">Easy Excel</a>:3.3.4 | | ||||||
| | continew-starter-captcha-graphic   | 验证码模块:图形验证码                   | Easy Captcha:1.6.2                                          | | | continew-starter-captcha-graphic   | 验证码模块:图形验证码                   | Easy Captcha:1.6.2                                          | | ||||||
| | continew-starter-cache-redisson    | 缓存模块:Redisson 自动配置              | <a href="https://github.com/redisson/redisson/wiki/Redisson%E9%A1%B9%E7%9B%AE%E4%BB%8B%E7%BB%8D" target="_blank">Redisson</a>:3.24.3 | | | continew-starter-cache-redisson    | 缓存模块:Redisson 自动配置              | <a href="https://github.com/redisson/redisson/wiki/Redisson%E9%A1%B9%E7%9B%AE%E4%BB%8B%E7%BB%8D" target="_blank">Redisson</a>:3.25.2 | | ||||||
| | continew-starter-data-mybatis-plus | 数据访问模块:MyBatis Plus 自动配置      | <a href="https://baomidou.com/" target="_blank">MyBatis Plus</a>:3.5.4.1<br /><a href="https://www.kancloud.cn/tracy5546/dynamic-datasource/2264611" target="_blank">dynamic-datasource-spring-boot-starter</a>:4.2.0<br /><a href="https://github.com/p6spy/p6spy" target="_blank">P6Spy</a>:3.9.1 | | | continew-starter-data-mybatis-plus | 数据访问模块:MyBatis Plus 自动配置      | <a href="https://baomidou.com/" target="_blank">MyBatis Plus</a>:3.5.4.1<br /><a href="https://www.kancloud.cn/tracy5546/dynamic-datasource/2264611" target="_blank">dynamic-datasource-spring-boot-starter</a>:4.2.0<br /><a href="https://github.com/p6spy/p6spy" target="_blank">P6Spy</a>:3.9.1 | | ||||||
| | continew-starter-auth-satoken      | 认证模块:SaToken 自动配置               | <a href="https://sa-token.dev33.cn/" target="_blank">Sa-Token</a>:1.37.0 | | | continew-starter-auth-satoken      | 认证模块:SaToken 自动配置               | <a href="https://sa-token.dev33.cn/" target="_blank">Sa-Token</a>:1.37.0 | | ||||||
| | continew-starter-auth-justauth     | 认证模块:JustAuth 自动配置              | <a href="https://justauth.cn/" target="_blank">Just Auth</a>:1.16.5 | | | continew-starter-auth-justauth     | 认证模块:JustAuth 自动配置              | <a href="https://justauth.cn/" target="_blank">Just Auth</a>:1.16.6 | | ||||||
| | continew-starter-messaging-mail    | 消息模块:邮件                           | Jakarta Mail:1.1.0                                          | | | continew-starter-messaging-mail    | 消息模块:邮件                           | Jakarta Mail:1.1.0                                          | | ||||||
| | continew-starter-messaging-sms     | 消息模块:短信                           | <a href="https://sms4j.com/" target="_blank">SMS4J</a>:3.0.4 | | | continew-starter-messaging-sms     | 消息模块:短信                           | <a href="https://sms4j.com/" target="_blank">SMS4J</a>:3.0.4 | | ||||||
| | continew-starter-extension         | 扩展模块:包含 CRUD 等复杂模组及自动配置 |                                                              | | | continew-starter-extension         | 扩展模块:包含 CRUD 等复杂模组及自动配置 |                                                              | | ||||||
|   | |||||||
| @@ -16,7 +16,6 @@ | |||||||
|  |  | ||||||
| package top.charles7c.continew.starter.core.autoconfigure.project; | package top.charles7c.continew.starter.core.autoconfigure.project; | ||||||
|  |  | ||||||
| import cn.hutool.core.convert.Convert; |  | ||||||
| import cn.hutool.extra.spring.SpringUtil; | import cn.hutool.extra.spring.SpringUtil; | ||||||
| import lombok.Data; | import lombok.Data; | ||||||
| import org.springframework.boot.context.properties.ConfigurationProperties; | import org.springframework.boot.context.properties.ConfigurationProperties; | ||||||
| @@ -82,9 +81,8 @@ public class ProjectProperties { | |||||||
|     public static final boolean IP_ADDR_LOCAL_PARSE_ENABLED; |     public static final boolean IP_ADDR_LOCAL_PARSE_ENABLED; | ||||||
|  |  | ||||||
|     static { |     static { | ||||||
|         String underlineCaseProperty = SpringUtil.getProperty("project.ip-addr-local-parse-enabled"); |         IP_ADDR_LOCAL_PARSE_ENABLED = SpringUtil.getProperty("project.ip-addr-local-parse-enabled", boolean.class, false) | ||||||
|         String camelCaseProperty = SpringUtil.getProperty("project.ipAddrLocalParseEnabled"); |                 || SpringUtil.getProperty("project.ipAddrLocalParseEnabled", boolean.class, false); | ||||||
|         IP_ADDR_LOCAL_PARSE_ENABLED = Convert.toBool(underlineCaseProperty, false) || Convert.toBool(camelCaseProperty, false); |  | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|   | |||||||
| @@ -18,8 +18,10 @@ package top.charles7c.continew.starter.data.mybatis.plus.autoconfigure; | |||||||
|  |  | ||||||
| import cn.hutool.core.net.NetUtil; | import cn.hutool.core.net.NetUtil; | ||||||
| import cn.hutool.extra.spring.SpringUtil; | import cn.hutool.extra.spring.SpringUtil; | ||||||
|  | import com.baomidou.mybatisplus.autoconfigure.DdlApplicationRunner; | ||||||
| import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; | import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; | ||||||
| import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; | import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; | ||||||
|  | import com.baomidou.mybatisplus.extension.ddl.IDdl; | ||||||
| import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; | import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; | ||||||
| import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler; | import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler; | ||||||
| import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; | import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; | ||||||
| @@ -28,6 +30,7 @@ import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerIntercept | |||||||
| import jakarta.annotation.PostConstruct; | import jakarta.annotation.PostConstruct; | ||||||
| import lombok.extern.slf4j.Slf4j; | import lombok.extern.slf4j.Slf4j; | ||||||
| import org.mybatis.spring.annotation.MapperScan; | import org.mybatis.spring.annotation.MapperScan; | ||||||
|  | import org.springframework.beans.factory.annotation.Autowired; | ||||||
| import org.springframework.boot.autoconfigure.AutoConfiguration; | import org.springframework.boot.autoconfigure.AutoConfiguration; | ||||||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; | import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; | ||||||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | ||||||
| @@ -39,6 +42,8 @@ import top.charles7c.continew.starter.core.handler.GeneralPropertySourceFactory; | |||||||
| import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter; | import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter; | ||||||
| import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermissionHandlerImpl; | import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermissionHandlerImpl; | ||||||
|  |  | ||||||
|  | import java.util.List; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * MyBatis Plus 自动配置 |  * MyBatis Plus 自动配置 | ||||||
|  * |  * | ||||||
| @@ -46,7 +51,7 @@ import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermi | |||||||
|  * @since 1.0.0 |  * @since 1.0.0 | ||||||
|  */ |  */ | ||||||
| @Slf4j | @Slf4j | ||||||
| @AutoConfiguration | @AutoConfiguration(before = com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration.class) | ||||||
| @MapperScan("${mybatis-plus.extension.mapper-package}") | @MapperScan("${mybatis-plus.extension.mapper-package}") | ||||||
| @EnableTransactionManagement(proxyTargetClass = true) | @EnableTransactionManagement(proxyTargetClass = true) | ||||||
| @EnableConfigurationProperties(MyBatisPlusExtensionProperties.class) | @EnableConfigurationProperties(MyBatisPlusExtensionProperties.class) | ||||||
| @@ -111,6 +116,17 @@ public class MybatisPlusAutoConfiguration { | |||||||
|         return paginationInnerInterceptor; |         return paginationInnerInterceptor; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Spring Boot 3.1.7 升级冲突 | ||||||
|  |      * <p> | ||||||
|  |      * org.springframework.beans.factory.BeanNotOfRequiredTypeException: Bean named 'ddlApplicationRunner' is expected to be of type 'org.springframework.boot.Runner' but was actually of type 'org.springframework.beans.factory.support.NullBean' | ||||||
|  |      * </p> | ||||||
|  |      */ | ||||||
|  |     @Bean | ||||||
|  |     public DdlApplicationRunner ddlApplicationRunner(@Autowired(required = false) List<IDdl> ddlList) { | ||||||
|  |         return new DdlApplicationRunner(ddlList); | ||||||
|  |     } | ||||||
|  |  | ||||||
|     @PostConstruct |     @PostConstruct | ||||||
|     public void postConstruct() { |     public void postConstruct() { | ||||||
|         log.info("[ContiNew Starter] - Auto Configuration 'MyBatis Plus' completed initialization."); |         log.info("[ContiNew Starter] - Auto Configuration 'MyBatis Plus' completed initialization."); | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ | |||||||
|     <parent> |     <parent> | ||||||
|         <groupId>org.springframework.boot</groupId> |         <groupId>org.springframework.boot</groupId> | ||||||
|         <artifactId>spring-boot-dependencies</artifactId> |         <artifactId>spring-boot-dependencies</artifactId> | ||||||
|         <version>3.1.5</version> |         <version>3.1.7</version> | ||||||
|         <relativePath/> |         <relativePath/> | ||||||
|     </parent> |     </parent> | ||||||
|  |  | ||||||
| @@ -55,19 +55,19 @@ | |||||||
|  |  | ||||||
|     <properties> |     <properties> | ||||||
|         <revision>1.1.0-SNAPSHOT</revision> |         <revision>1.1.0-SNAPSHOT</revision> | ||||||
|         <just-auth.version>1.16.5</just-auth.version> |         <just-auth.version>1.16.6</just-auth.version> | ||||||
|         <sa-token.version>1.37.0</sa-token.version> |         <sa-token.version>1.37.0</sa-token.version> | ||||||
|         <mybatis-plus.version>3.5.4.1</mybatis-plus.version> |         <mybatis-plus.version>3.5.4.1</mybatis-plus.version> | ||||||
|         <dynamic-datasource.version>4.2.0</dynamic-datasource.version> |         <dynamic-datasource.version>4.2.0</dynamic-datasource.version> | ||||||
|         <p6spy.version>3.9.1</p6spy.version> |         <p6spy.version>3.9.1</p6spy.version> | ||||||
|         <redisson.version>3.24.3</redisson.version> |         <redisson.version>3.25.2</redisson.version> | ||||||
|         <sms4j.version>3.0.4</sms4j.version> |         <sms4j.version>3.0.4</sms4j.version> | ||||||
|         <easy-captcha.version>1.6.2</easy-captcha.version> |         <easy-captcha.version>1.6.2</easy-captcha.version> | ||||||
|         <easy-excel.version>3.3.2</easy-excel.version> |         <easy-excel.version>3.3.3</easy-excel.version> | ||||||
|         <knife4j.version>4.3.0</knife4j.version> |         <knife4j.version>4.4.0</knife4j.version> | ||||||
|         <ttl.version>2.14.4</ttl.version> |         <ttl.version>2.14.4</ttl.version> | ||||||
|         <ip2region.version>3.1.5.1</ip2region.version> |         <ip2region.version>3.1.5.1</ip2region.version> | ||||||
|         <hutool.version>5.8.23</hutool.version> |         <hutool.version>5.8.24</hutool.version> | ||||||
|     </properties> |     </properties> | ||||||
|  |  | ||||||
|     <dependencyManagement> |     <dependencyManagement> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user