2025-01-04 13:54:30

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-2</version>
+    <version>3.4.1-3</version>
     <modules>
         <module>spring-turbo-module-configuration</module>
         <module>spring-turbo-module-jackson</module>
@@ -16,6 +16,7 @@
         <module>spring-turbo-module-webcli</module>
         <module>spring-turbo-module-webmvc</module>
         <module>spring-turbo-module-redis</module>
+        <module>spring-turbo-module-jdbc</module>
     </modules>
     <packaging>pom</packaging>
 

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-2</version>
+        <version>3.4.1-3</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-2</version>
+        <version>3.4.1-3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-turbo-module-jackson</artifactId>

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

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

spring-turbo-module-jdbc/pom.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>com.github.yingzhuo</groupId>
+        <artifactId>spring-turbo-modules</artifactId>
+        <version>3.4.1-3</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-turbo-module-jdbc</artifactId>
+
+    <dependencies>
+        <!-- spring-turbo & modules -->
+        <dependency>
+            <groupId>com.github.yingzhuo</groupId>
+            <artifactId>spring-turbo</artifactId>
+        </dependency>
+
+        <!-- spring-boot -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,4 @@
+package spring.turbo.module.jdbc.autoconfiguration;
+
+public class RoutingDataSourceAutoConfiguration {
+}

spring-turbo-module-jdbc/src/main/java/spring/turbo/module/jdbc/autoconfiguration/package-info.java

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

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

@@ -0,0 +1,23 @@
+package spring.turbo.module.jdbc.ds;
+
+import java.lang.annotation.*;
+
+/**
+ * 数据源切换
+ *
+ * @author 应卓
+ * @since 3.4.1
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface DataSourceSwitch {
+
+    /**
+     * 数据源名称
+     *
+     * @return 数据源名称
+     */
+    public String value();
+
+}

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

@@ -0,0 +1,34 @@
+package spring.turbo.module.jdbc.ds;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.core.Ordered;
+
+@Aspect
+public record DataSourceSwitchAdvice(int order) implements Ordered {
+
+    @Around("@annotation(spring.turbo.module.jdbc.ds.DataSourceSwitch)")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        var signature = joinPoint.getSignature();
+        if (signature instanceof MethodSignature methodSignature) {
+            var annotation = methodSignature.getMethod().getAnnotation(DataSourceSwitch.class);
+            var dataSourceName = annotation.value();
+            RoutingDataSourceLookup.set(dataSourceName);
+            try {
+                return joinPoint.proceed();
+            } finally {
+                RoutingDataSourceLookup.remove();
+            }
+        } else {
+            return joinPoint.proceed();
+        }
+    }
+
+    @Override
+    public int getOrder() {
+        return order;
+    }
+
+}

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

@@ -0,0 +1,52 @@
+package spring.turbo.module.jdbc.ds;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
+import org.springframework.jdbc.datasource.lookup.MapDataSourceLookup;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+import javax.sql.DataSource;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 路由数据源
+ *
+ * @author 应卓
+ * @see AbstractRoutingDataSource
+ * @see RoutingDataSourceLookup
+ * @since 3.4.1
+ */
+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");
+
+        super.setDefaultTargetDataSource(defaultDataSource);
+        super.setTargetDataSources(new HashMap<>(targetDataSources));
+        super.setDataSourceLookup(new MapDataSourceLookup());
+    }
+
+    @Override
+    @Nullable
+    protected Object determineCurrentLookupKey() {
+        return RoutingDataSourceLookup.get();
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        super.afterPropertiesSet();
+    }
+
+}

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

@@ -0,0 +1,37 @@
+package spring.turbo.module.jdbc.ds;
+
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * 路由数据源查找策略
+ *
+ * @author 应卓
+ * @since 3.4.1
+ */
+public final class RoutingDataSourceLookup {
+
+    private static final ThreadLocal<String> DS_NAME_HOLDER = ThreadLocal.withInitial(() -> null);
+
+    /**
+     * 私有构造方法
+     */
+    private RoutingDataSourceLookup() {
+        super();
+    }
+
+    public static void set(String dataSourceName) {
+        Assert.hasText(dataSourceName, "dataSourceName is required");
+        DS_NAME_HOLDER.set(dataSourceName);
+    }
+
+    @Nullable
+    public static String get() {
+        return DS_NAME_HOLDER.get();
+    }
+
+    public static void remove() {
+        DS_NAME_HOLDER.remove();
+    }
+
+}

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

@@ -0,0 +1,28 @@
+package spring.turbo.module.jdbc.ds.hikari;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+public class HikariProperties implements JdbcConnectionDetails, Serializable {
+
+    private String jdbcUrl;
+    private String username;
+    private String password;
+    private String driverClassName;
+
+    private String poolName = null;
+    private int minimumIdle = 10;
+    private int maximumPoolSize = 30;
+    private boolean autoCommit = true;
+    private long idleTimeout = 30000L;
+    private long maxLifetime = 900000L;
+    private long connectionTimeout = 10000;
+    private String connectionTestQuery = "SELECT 1 FROM DUAL";
+    private long validationTimeout = 1000L;
+
+}

spring-turbo-module-jdbc/src/main/java/spring/turbo/module/jdbc/ds/hikari/package-info.java

@@ -0,0 +1,6 @@
+@NonNullApi
+@NonNullFields
+package spring.turbo.module.jdbc.ds.hikari;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;

spring-turbo-module-jdbc/src/main/java/spring/turbo/module/jdbc/ds/package-info.java

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

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

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

spring-turbo-module-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+spring.turbo.module.jdbc.autoconfiguration.RoutingDataSourceAutoConfiguration

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-2</version>
+        <version>3.4.1-3</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-2</version>
+        <version>3.4.1-3</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-2</version>
+        <version>3.4.1-3</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-2</version>
+        <version>3.4.1-3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-turbo-module-security</artifactId>

spring-turbo-module-security/src/main/java/spring/turbo/module/security/token/TokenResolver.java

@@ -41,7 +41,7 @@ public static TokenResolverBuilder builder() {
      *
      * @return 排序值
      * @see CompositeTokenResolver
-     * @see Ordered#getOrder()
+     * @see Ordered#order()
      * @see Ordered#LOWEST_PRECEDENCE
      * @see Ordered#HIGHEST_PRECEDENCE
      * @see org.springframework.core.OrderComparator

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-2</version>
+        <version>3.4.1-3</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-2</version>
+        <version>3.4.1-3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spring-turbo-module-webmvc</artifactId>