2025-01-04 16:11:18

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.yingzhuo</groupId>
     <artifactId>spring-turbo-modules</artifactId>
-    <version>3.4.1-3</version>
+    <version>3.4.1-3-SNAPSHOT</version>
     <modules>
         <module>spring-turbo-module-configuration</module>
         <module>spring-turbo-module-jackson</module>

spring-turbo-module-configuration/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.yingzhuo</groupId>
         <artifactId>spring-turbo-modules</artifactId>
-        <version>3.4.1-3</version>
+        <version>3.4.1-3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-turbo-module-configuration</artifactId>

spring-turbo-module-jackson/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.yingzhuo</groupId>
         <artifactId>spring-turbo-modules</artifactId>
-        <version>3.4.1-3</version>
+        <version>3.4.1-3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-turbo-module-jackson</artifactId>

spring-turbo-module-jdbc/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.yingzhuo</groupId>
         <artifactId>spring-turbo-modules</artifactId>
-        <version>3.4.1-3</version>
+        <version>3.4.1-3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-turbo-module-jdbc</artifactId>

spring-turbo-module-jdbc/src/main/java/spring/turbo/module/jdbc/autoconfiguration/RoutingDataSourceAutoConfiguration.java

@@ -1,4 +1,63 @@
 package spring.turbo.module.jdbc.autoconfiguration;
 
+import com.zaxxer.hikari.HikariDataSource;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.Ordered;
+import org.springframework.util.Assert;
+import spring.turbo.module.jdbc.ds.DataSourceSwitchAdvice;
+import spring.turbo.module.jdbc.ds.RoutingDataSource;
+import spring.turbo.module.jdbc.ds.RoutingDataSourceProperties;
+import spring.turbo.module.jdbc.util.DataSourceFactories;
+
+import javax.sql.DataSource;
+import java.util.HashMap;
+
+/**
+ * @author 应卓
+ * @since 3.4.1
+ */
+@EnableConfigurationProperties(RoutingDataSourceProperties.class)
+@ConditionalOnProperty(prefix = "springturbo.routing-data-source", name = "enabled", havingValue = "true", matchIfMissing = true)
 public class RoutingDataSourceAutoConfiguration {
+
+    @Bean
+    @ConditionalOnMissingBean(RoutingDataSource.class)
+    public DataSource dataSource(RoutingDataSourceProperties props) {
+        final var targetDataSources = new HashMap<String, DataSource>();
+
+        props.getHikariDataSources().forEach((dataSourceName, dataSourceConfig) -> {
+            var dataSource = (HikariDataSource) DataSourceFactories.createDataSource(dataSourceConfig, HikariDataSource.class);
+
+            dataSource.setPoolName(dataSourceConfig.getPoolName());
+            dataSource.setMinimumIdle(dataSourceConfig.getMinimumIdle());
+            dataSource.setMaximumPoolSize(dataSourceConfig.getMaximumPoolSize());
+            dataSource.setAutoCommit(dataSourceConfig.isAutoCommit());
+            dataSource.setIdleTimeout(dataSourceConfig.getIdleTimeout());
+            dataSource.setMaxLifetime(dataSourceConfig.getMaxLifetime());
+            dataSource.setConnectionTimeout(dataSourceConfig.getConnectionTimeout());
+            dataSource.setConnectionTestQuery(dataSourceConfig.getConnectionTestQuery());
+            dataSource.setValidationTimeout(dataSourceConfig.getValidationTimeout());
+            dataSource.setConnectionInitSql(dataSourceConfig.getConnectionInitSql());
+            dataSource.setInitializationFailTimeout(dataSourceConfig.getInitializationFailTimeout());
+
+            targetDataSources.put(dataSourceName, dataSource);
+        });
+
+        var defaultDataSource = targetDataSources.get(props.getDefaultDataSourceName());
+        Assert.notNull(defaultDataSource, "unable to find defaultDataSource");
+
+        return new RoutingDataSource(defaultDataSource, targetDataSources);
+    }
+
+    @Bean
+    @ConditionalOnClass(name = "org.aspectj.lang.annotation.Aspect")
+    @ConditionalOnMissingBean(DataSourceSwitchAdvice.class)
+    public DataSourceSwitchAdvice dataSourceSwitchAdvice() {
+        return new DataSourceSwitchAdvice(Ordered.HIGHEST_PRECEDENCE);
+    }
+
 }

spring-turbo-module-jdbc/src/main/java/spring/turbo/module/jdbc/ds/DataSourceSwitchAdvice.java

@@ -6,6 +6,11 @@
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.core.Ordered;
 
+/**
+ * @author 应卓
+ * @see DataSourceSwitch
+ * @since 3.4.1
+ */
 @Aspect
 public record DataSourceSwitchAdvice(int order) implements Ordered {
 

spring-turbo-module-jdbc/src/main/java/spring/turbo/module/jdbc/ds/hikari/HikariProperties.java → spring-turbo-module-jdbc/src/main/java/spring/turbo/module/jdbc/ds/HikariProperties.java

@@ -1,11 +1,15 @@
-package spring.turbo.module.jdbc.ds.hikari;
+package spring.turbo.module.jdbc.ds;
 
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
 
 import java.io.Serializable;
 
+/**
+ * @author 应卓
+ * @since 3.4.1
+ */
 @Getter
 @Setter
 public class HikariProperties implements JdbcConnectionDetails, Serializable {
@@ -22,7 +26,9 @@ public class HikariProperties implements JdbcConnectionDetails, Serializable {
     private long idleTimeout = 30000L;
     private long maxLifetime = 900000L;
     private long connectionTimeout = 10000;
-    private String connectionTestQuery = "SELECT 1 FROM DUAL";
+    private String connectionTestQuery = null;
     private long validationTimeout = 1000L;
+    private String connectionInitSql = null;
+    private long initializationFailTimeout = 1000L;
 
 }

spring-turbo-module-jdbc/src/main/java/spring/turbo/module/jdbc/ds/RoutingDataSource.java

@@ -20,15 +20,6 @@
  */
 public class RoutingDataSource extends AbstractRoutingDataSource implements DataSource, InitializingBean {
 
-    public RoutingDataSource(String defaultDataSourceName, Map<String, DataSource> targetDataSources) {
-        Assert.hasText(defaultDataSourceName, "defaultDataSourceName is required");
-        Assert.notEmpty(targetDataSources, "targetDataSources is null or empty");
-
-        super.setDefaultTargetDataSource(defaultDataSourceName);
-        super.setTargetDataSources(new HashMap<>(targetDataSources));
-        super.setDataSourceLookup(new MapDataSourceLookup());
-    }
-
     public RoutingDataSource(DataSource defaultDataSource, Map<String, DataSource> targetDataSources) {
         Assert.notNull(defaultDataSource, "defaultDataSource is required");
         Assert.notEmpty(targetDataSources, "targetDataSources is null or empty");

spring-turbo-module-jdbc/src/main/java/spring/turbo/module/jdbc/ds/RoutingDataSourceProperties.java

@@ -0,0 +1,23 @@
+package spring.turbo.module.jdbc.ds;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @author 应卓
+ * @since 3.4.1
+ */
+@Getter
+@Setter
+@ConfigurationProperties(prefix = "springturbo.routing-data-source")
+public class RoutingDataSourceProperties implements Serializable {
+
+    private boolean enabled = true;
+    private String defaultDataSourceName;
+    private Map<String, HikariProperties> hikariDataSources;
+
+}

spring-turbo-module-jdbc/src/main/java/spring/turbo/module/jdbc/util/DataSourceFactories.java

@@ -0,0 +1,42 @@
+package spring.turbo.module.jdbc.util;
+
+import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.lang.Nullable;
+import org.springframework.util.ClassUtils;
+
+import javax.sql.DataSource;
+import java.util.Objects;
+
+/**
+ * 数据源创建工具
+ *
+ * @author 应卓
+ * @since 3.4.1
+ */
+public final class DataSourceFactories {
+
+    /**
+     * 私有构造方法
+     */
+    private DataSourceFactories() {
+    }
+
+    public static <T> T createDataSource(JdbcConnectionDetails connectionDetails, Class<? extends DataSource> type) {
+        return createDataSource(connectionDetails, type, null);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T createDataSource(JdbcConnectionDetails connectionDetails, Class<? extends DataSource> type, @Nullable ClassLoader classLoader) {
+        // @formatter:off
+        return (T) DataSourceBuilder.create(Objects.requireNonNullElse(classLoader, ClassUtils.getDefaultClassLoader()))
+                .type(type)
+                .driverClassName(connectionDetails.getDriverClassName())
+                .url(connectionDetails.getJdbcUrl())
+                .username(connectionDetails.getUsername())
+                .password(connectionDetails.getPassword())
+                .build();
+        // @formatter:on
+    }
+
+}

spring-turbo-module-jackson/src/main/java/spring.turbo.module.jackson/package-info.java → spring-turbo-module-jdbc/src/main/java/spring/turbo/module/jdbc/util/package-info.java

@@ -1,6 +1,6 @@
 @NonNullApi
 @NonNullFields
-package spring.turbo.module.jackson;
+package spring.turbo.module.jdbc.util;
 
 import org.springframework.lang.NonNullApi;
 import org.springframework.lang.NonNullFields;

spring-turbo-module-jwt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.yingzhuo</groupId>
         <artifactId>spring-turbo-modules</artifactId>
-        <version>3.4.1-3</version>
+        <version>3.4.1-3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-turbo-module-jwt</artifactId>

spring-turbo-module-misc/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.yingzhuo</groupId>
         <artifactId>spring-turbo-modules</artifactId>
-        <version>3.4.1-3</version>
+        <version>3.4.1-3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-turbo-module-misc</artifactId>

spring-turbo-module-redis/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.yingzhuo</groupId>
         <artifactId>spring-turbo-modules</artifactId>
-        <version>3.4.1-3</version>
+        <version>3.4.1-3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-turbo-module-redis</artifactId>

spring-turbo-module-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.yingzhuo</groupId>
         <artifactId>spring-turbo-modules</artifactId>
-        <version>3.4.1-3</version>
+        <version>3.4.1-3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-turbo-module-security</artifactId>

spring-turbo-module-webcli/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.yingzhuo</groupId>
         <artifactId>spring-turbo-modules</artifactId>
-        <version>3.4.1-3</version>
+        <version>3.4.1-3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-turbo-module-webcli</artifactId>

spring-turbo-module-webmvc/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.yingzhuo</groupId>
         <artifactId>spring-turbo-modules</artifactId>
-        <version>3.4.1-3</version>
+        <version>3.4.1-3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-turbo-module-webmvc</artifactId>