Solve the problem that the following starters fail to autowire when DTT is integrated with the following starters in JDK 17 and spring-boot-starter-parent:3.0.0-M3 environment:

mybatis-plus-boot-starter:3.5.2
mybatis-spring-boot-starter:2.2.2
mapper-spring-boot-starter:4.2.1

Author: Weasley

mydtt-plus-spring-boot-demo/mydtt-plus-spring-boot-2-x/pom.xml

@@ -5,7 +5,8 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.1</version>
+        <!--<version>2.7.1</version>-->
+        <version>2.3.12.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -24,7 +25,7 @@
         <dependency>
             <groupId>io.github.weasley-j</groupId>
             <artifactId>mydtt-plus-spring-boot-starter</artifactId>
-            <version>1.0.7</version>
+            <version>1.0.8</version>
         </dependency>
         <!-- javadoc-scribe start  -->
         <dependency>

mydtt-plus-spring-boot-demo/mydtt-plus-spring-boot-2-x/src/main/resources/application-mybatis.yml

@@ -1,6 +1,6 @@
 logging:
   level:
-    org.springframework.jdbc.core.JdbcTemplate: info
+    org.springframework.jdbc.core.JdbcTemplate: debug
     jdbc.sqltiming: debug
 
 spring:

mydtt-plus-spring-boot-demo/mydtt-plus-spring-boot-3-x/package.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+SETTINGS="/Users/weasley/Development/program/apache-maven/conf/settings-sonatype.xml"
+MODULE="mydtt-plus-spring-boot-3-x"
+
+clear &&
+  mvn clean package -pl :$MODULE -am --settings $SETTINGS

mydtt-plus-spring-boot-demo/mydtt-plus-spring-boot-3-x/pom.xml

@@ -46,7 +46,7 @@
         <dependency>
             <groupId>io.github.weasley-j</groupId>
             <artifactId>mydtt-plus-spring-boot-starter</artifactId>
-            <version>1.0.7</version>
+            <version>1.0.8</version>
         </dependency>
         <!-- javadoc-scribe start  -->
         <dependency>

mydtt-plus-spring-boot-starter/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>io.github.weasley-j</groupId>
     <artifactId>mydtt-plus-spring-boot-starter</artifactId>
-    <version>1.0.7</version>
+    <version>1.0.8</version>
     <name>mydtt-plus-spring-boot-starter</name>
     <description>MyDtt-Plus is a starter of SpringBoot，I named it DTT,It's an object-oriented Java framework，
         The design concept of DTT is "Domain Driven Table", Makes you more focused on your Java domain.
@@ -54,7 +54,6 @@
         <hutool.version>5.8.4</hutool.version>
         <mybatis-plus.version>3.5.2</mybatis-plus.version>
         <therapi-runtime-javadoc.version>0.13.0</therapi-runtime-javadoc.version>
-        <spring-cloud-context.version>3.1.3</spring-cloud-context.version>
         <velocity-engine-core.version>2.3</velocity-engine-core.version>
         <mybatis-spring.version>2.0.7</mybatis-spring.version>
         <mybatis.version>3.5.10</mybatis.version>
@@ -136,11 +135,6 @@
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
         <!-- end jackson -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-context</artifactId>
-            <version>${spring-cloud-context.version}</version>
-        </dependency>
         <!-- jdbc -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

mydtt-plus-spring-boot-starter/src/main/java/cn/alphahub/dtt/plus/config/DttDataSourceAutoConfigurer.java

@@ -1,6 +1,7 @@
 package cn.alphahub.dtt.plus.config.support;
 
 import cn.alphahub.dtt.plus.framework.annotations.EnableDtt;
+import cn.alphahub.dtt.plus.util.SysUtil;
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -20,16 +21,13 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnJava;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
-import org.springframework.boot.jdbc.DataSourceBuilder;
-import org.springframework.boot.system.JavaVersion;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
@@ -67,7 +65,6 @@
 @ConditionalOnBean(annotation = {EnableDtt.class})
 @ConfigurationPropertiesScan({"cn.alphahub.dtt.plus.config"})
 @ConditionalOnMissingBean({SqlSessionFactory.class, SqlSessionTemplate.class})
-@ConditionalOnJava(value = JavaVersion.SEVENTEEN, range = ConditionalOnJava.Range.EQUAL_OR_NEWER)
 @EnableConfigurationProperties({DataSourceProperties.class, MybatisProperties.class, MybatisPlusProperties.class})
 public class MybatisDataSourceConfigurer {
 
@@ -84,7 +81,7 @@ public DataSource dataSource(DataSourceProperties properties) {
         if (StringUtils.hasText(properties.getName())) {
             dataSource.setPoolName(properties.getName());
         }
-        return DataSourceBuilder.derivedFrom(dataSource).build();
+        return dataSource;
     }
 
     @Bean
@@ -123,7 +120,8 @@ public static class MybatisSupportCondition implements Condition {
         public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
             String springVersionPrefix = SpringApplication.class.getPackage().getImplementationVersion().split("\\.")[0];
             if (StringUtils.hasText(springVersionPrefix)) {
-                return Integer.parseInt(springVersionPrefix) >= 3;
+                int javaVersion = SysUtil.getJavaInfo().getVersionInt();
+                return Integer.parseInt(springVersionPrefix) >= 3 && javaVersion >= 1700;
             }
             return false;
         }

mydtt-plus-spring-boot-starter/src/main/java/cn/alphahub/dtt/plus/config/support/MybatisDataSourceConfigurer.java

@@ -94,10 +94,10 @@ public Map<DatabaseType, DttTableHandler<ModelEntity>> tableHandlerClient() {
      */
     @Bean
     @SuppressWarnings({"all"})
-    @DependsOn({"commentParserClient", "commentParserClient", "defaultHikariDataSource"})
+    @DependsOn({"commentParserClient", "commentParserClient"})
     public ContextWrapper contextWrapper(@Qualifier("commentParserClient") Map<ParserType, DttCommentParser<ModelEntity>> commentParserClient,
                                          @Qualifier("tableHandlerClient") Map<DatabaseType, DttTableHandler<ModelEntity>> tableHandlerClient,
-                                         @Qualifier("defaultHikariDataSource") DataSource dataSource) throws SQLException {
+                                         DataSource dataSource) throws SQLException {
         String databaseName = "";
         DatabaseMetaData metaData = dataSource.getConnection().getMetaData();
         ResultSet result = metaData.getCatalogs();

mydtt-plus-spring-boot-starter/src/main/java/cn/alphahub/dtt/plus/framework/InitDttClient.java

@@ -2,7 +2,6 @@
 
 import cn.alphahub.dtt.plus.config.DefaultExtraPropertiesLoader;
 import cn.alphahub.dtt.plus.config.DefaultExtraYamlSourceLoader;
-import cn.alphahub.dtt.plus.config.DttDataSourceAutoConfigurer;
 import cn.alphahub.dtt.plus.config.support.MybatisDataSourceConfigurer;
 import cn.alphahub.dtt.plus.enums.ParserType;
 import cn.alphahub.dtt.plus.framework.ClassScanningProvider;
@@ -36,12 +35,11 @@
 @Documented
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-@Import({
-        DttDataSourceAutoConfigurer.class, InitDttHandler.class, DefaultAnnotationParser.class,
+@Import({InitDttHandler.class, InitDttClient.class, DefaultAnnotationParser.class,
         DefaultJavaDocParser.class, DefaultDb2TableHandler.class, DefaultMariadbTableHandler.class,
         DefaultMysqlTableHandler.class, DefaultOracleTableHandler.class, DefaultPostgresqlTableHandler.class,
         DefaultSqlserverTableHandler.class, VelocityHandler.class, DttTableRunner.class,
-        DefaultExtraPropertiesLoader.class, DefaultExtraYamlSourceLoader.class, InitDttClient.class,
+        DefaultExtraPropertiesLoader.class, DefaultExtraYamlSourceLoader.class,
         ClassScanningProvider.class, MybatisDataSourceConfigurer.class,
 })
 public @interface EnableDtt {

mydtt-plus-spring-boot-starter/src/main/java/cn/alphahub/dtt/plus/framework/annotations/EnableDtt.java

@@ -5,7 +5,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
@@ -27,8 +26,7 @@ public class DttTableRunner {
     private static final Logger logger = LoggerFactory.getLogger(DttTableRunner.class);
 
     @Autowired
-    @Qualifier("defaultJdbcTemplate")
-    private JdbcTemplate defaultJdbcTemplate;
+    private JdbcTemplate jdbcTemplate;
 
     /**
      * run create DDL statement
@@ -37,12 +35,10 @@ public class DttTableRunner {
      */
     @Transactional(rollbackFor = {Exception.class}, transactionManager = "defaultDataSourceTransactionManager", propagation = Propagation.REQUIRES_NEW)
     public void execute(StringWriter writer) {
-        final Logger jdbcLogger = LoggerFactory.getLogger(JdbcTemplate.class);
-        boolean debugEnabled = jdbcLogger.isDebugEnabled();
-        if (logger.isDebugEnabled() && !debugEnabled) {
+        if (logger.isDebugEnabled()) {
             logger.debug("数据库建表语句:{}{}", SysUtil.getLineSeparator(), writer);
         }
-        defaultJdbcTemplate.execute(writer.toString());
+        jdbcTemplate.execute(writer.toString());
     }
 
     /**
@@ -52,11 +48,9 @@ public void execute(StringWriter writer) {
      */
     @Transactional(rollbackFor = {Exception.class}, transactionManager = "defaultDataSourceTransactionManager", propagation = Propagation.REQUIRES_NEW)
     public void execute(String table) {
-        final Logger jdbcLogger = LoggerFactory.getLogger(JdbcTemplate.class);
-        boolean debugEnabled = jdbcLogger.isDebugEnabled();
-        if (logger.isDebugEnabled() && !debugEnabled) {
+        if (logger.isDebugEnabled()) {
             logger.debug("数据库建表语句:{}{}", SysUtil.getLineSeparator(), table);
         }
-        defaultJdbcTemplate.execute(table);
+        jdbcTemplate.execute(table);
     }
 }