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:
2023-12-24 11:48:43 +08:00
parent c4007fa290
commit 72f55697cc
4 changed files with 30 additions and 16 deletions

View File

@@ -18,8 +18,10 @@ 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;
@@ -28,6 +30,7 @@ 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;
@@ -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.DataPermissionHandlerImpl;
import java.util.List;
/**
* MyBatis Plus 自动配置
*
@@ -46,7 +51,7 @@ import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermi
* @since 1.0.0
*/
@Slf4j
@AutoConfiguration
@AutoConfiguration(before = com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration.class)
@MapperScan("${mybatis-plus.extension.mapper-package}")
@EnableTransactionManagement(proxyTargetClass = true)
@EnableConfigurationProperties(MyBatisPlusExtensionProperties.class)
@@ -111,6 +116,17 @@ 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.");