From 556bfb924a1e5834fe0a101b9ff52cc5bb36d578 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Mon, 25 Dec 2023 23:05:02 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20MyBatis=20Plus=203.5.4.1=20=3D>=203.5.?=
 =?UTF-8?q?5=EF=BC=88=E4=BF=AE=E5=A4=8D=E4=B8=8E=20Spring=20Boot=203.1.7?=
 =?UTF-8?q?=20=E7=9A=84=20DdlApplicationRunner=E5=86=B2=E7=AA=81=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MybatisPlusAutoConfiguration.java           | 17 +----------------
 continew-starter-dependencies/pom.xml           |  2 +-
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java
index c184866c..b9b08a40 100644
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java
@@ -18,10 +18,8 @@ package top.charles7c.continew.starter.data.mybatis.plus.autoconfigure;
 
 import cn.hutool.core.net.NetUtil;
 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.IdentifierGenerator;
-import com.baomidou.mybatisplus.extension.ddl.IDdl;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
 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 lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 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.DataPermissionHandlerImpl;
 
-import java.util.List;
 
 /**
  * MyBatis Plus 自动配置
@@ -51,7 +47,7 @@ import java.util.List;
  * @since 1.0.0
  */
 @Slf4j
-@AutoConfiguration(before = com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration.class)
+@AutoConfiguration
 @MapperScan("${mybatis-plus.extension.mapper-package}")
 @EnableTransactionManagement(proxyTargetClass = true)
 @EnableConfigurationProperties(MyBatisPlusExtensionProperties.class)
@@ -116,17 +112,6 @@ public class MybatisPlusAutoConfiguration {
         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
     public void postConstruct() {
         log.info("[ContiNew Starter] - Auto Configuration 'MyBatis Plus' completed initialization.");
diff --git a/continew-starter-dependencies/pom.xml b/continew-starter-dependencies/pom.xml
index 4aa9b071..57aafb81 100644
--- a/continew-starter-dependencies/pom.xml
+++ b/continew-starter-dependencies/pom.xml
@@ -57,7 +57,7 @@
         <revision>1.1.0-SNAPSHOT</revision>
         <just-auth.version>1.16.6</just-auth.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>
         <p6spy.version>3.9.1</p6spy.version>
         <redisson.version>3.25.2</redisson.version>