diff --git a/pom.xml b/pom.xml index 850f705..e0e6e04 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.github.sunkolin starfish - 2.0.2-SNAPSHOT + 2.1.0 jar starfish starfish @@ -178,13 +178,28 @@ com.xuxueli xxl-job-core - 3.2.0 + 3.3.0 - org.mybatis.spring.boot - mybatis-spring-boot-starter - 3.0.3 + com.baomidou + mybatis-plus-spring-boot4-starter + 3.5.14 + + com.baomidou + mybatis-plus-jsqlparser + 3.5.14 + + + com.baomidou + mybatis-plus-generator + 3.5.14 + + + + + + com.belerweb pinyin4j diff --git a/src/main/java/com/starfish/common/cache/CacheAutoConfiguration.java b/src/main/java/com/starfish/common/cache/CacheAutoConfiguration.java index 3189ac0..958b454 100644 --- a/src/main/java/com/starfish/common/cache/CacheAutoConfiguration.java +++ b/src/main/java/com/starfish/common/cache/CacheAutoConfiguration.java @@ -65,8 +65,8 @@ public CacheManager cacheManager(Caffeine caffeine) { return cacheManager; } - @Bean(name = "cache") - public CacheImpl newCaffeineCache(Cache caffeineCache) { + @Bean(name = "cacheImpl") + public CacheImpl newCaffeineCacheImpl(Cache caffeineCache) { return new CacheImpl(caffeineCache); } diff --git a/src/main/java/com/starfish/common/task/XxlJobAutoConfiguration.java b/src/main/java/com/starfish/common/task/XxlJobAutoConfiguration.java index 1c38ef2..87c834f 100644 --- a/src/main/java/com/starfish/common/task/XxlJobAutoConfiguration.java +++ b/src/main/java/com/starfish/common/task/XxlJobAutoConfiguration.java @@ -17,7 +17,7 @@ */ @Slf4j @AutoConfiguration -@ConditionalOnProperty(value = {"starfish.xxl.job.enabled"}, havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(value = {"starfish.xxl.job.enabled"}, havingValue = "true") @EnableConfigurationProperties({XxlJobProperties.class}) public class XxlJobAutoConfiguration { diff --git a/src/main/resources/META-INF/spring.factories b/src/main/resources/META-INF/spring.factories index 2915df2..fbbfe35 100644 --- a/src/main/resources/META-INF/spring.factories +++ b/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ -org.springframework.boot.env.EnvironmentPostProcessor=com.starfish.core.CustomEnvironmentPostProcessor +org.springframework.boot.EnvironmentPostProcessor=com.starfish.core.CustomEnvironmentPostProcessor #org.springframework.boot.autoconfigure.AutoConfigurationImportFilter=com.starfish.experiment.datasource.DataSourceAutoConfigurationImportFilter \ No newline at end of file diff --git a/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.exclude b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.exclude index c8086ef..edf8c56 100644 --- a/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.exclude +++ b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.exclude @@ -1,3 +1,3 @@ -org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration -org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration -org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration \ No newline at end of file +# org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration +# org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration +# org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration \ No newline at end of file