ContiNew/continew-starter
1
1
Fork 0
mirror of https://github.com/continew-org/continew-starter.git synced 2025-09-09 19:03:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: MyBatis Plus 3.5.4.1 => 3.5.5（修复与 Spring Boot 3.1.7 的 DdlApplicationRunner冲突错误）

Browse Source
This commit is contained in:
Charles7c
2023-12-25 23:05:02 +08:00
parent 70ae383de6
commit 556bfb924a
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java
View File

@@ -18,10 +18,8 @@ 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;
@@ -30,7 +28,6 @@ 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;
@@ -42,7 +39,6 @@ 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 自动配置
@@ -51,7 +47,7 @@ import java.util.List;
* @since 1.0.0 * @since 1.0.0
*/ */
@Slf4j @Slf4j
@AutoConfiguration(before = com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration.class) @AutoConfiguration
@MapperScan("${mybatis-plus.extension.mapper-package}") @MapperScan("${mybatis-plus.extension.mapper-package}")
@EnableTransactionManagement(proxyTargetClass = true) @EnableTransactionManagement(proxyTargetClass = true)
@EnableConfigurationProperties(MyBatisPlusExtensionProperties.class) @EnableConfigurationProperties(MyBatisPlusExtensionProperties.class)
@@ -116,17 +112,6 @@ 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.");

2
continew-starter-dependencies/pom.xml
View File

@@ -57,7 +57,7 @@
<revision>1.1.0-SNAPSHOT</revision> <revision>1.1.0-SNAPSHOT</revision>
<just-auth.version>1.16.6</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.5</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.25.2</redisson.version> <redisson.version>3.25.2</redisson.version>