0.9.4修复springboot分表分库路由规则未注册

xuejmnet · xuejmnet · commit 959a39cd49cb · 2023-05-25T00:15:57.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.easy-query</groupId>
     <artifactId>easy-query-all</artifactId>
     <packaging>pom</packaging>
-    <version>0.9.3</version>
+    <version>0.9.4</version>
     <name>easy-query</name>
     <description>java object query distributed connector</description>
     <url>https://github.com/xuejmnet/easy-query</url>
diff --git a/samples/pom.xml b/samples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easy-query-all</artifactId>
         <groupId>com.easy-query</groupId>
-        <version>0.9.3</version>
+        <version>0.9.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/samples/springbootdemo/pom.xml b/samples/springbootdemo/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.easy-query</groupId>
             <artifactId>sql-springboot-starter</artifactId>
-            <version>0.9.3</version>
+            <version>0.9.4</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/sql-core/pom.xml b/sql-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easy-query-all</artifactId>
         <groupId>com.easy-query</groupId>
-        <version>0.9.3</version>
+        <version>0.9.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sql-h2/pom.xml b/sql-h2/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>0.9.3</version>
+        <version>0.9.4</version>
     </parent>
 
     <artifactId>sql-h2</artifactId>
diff --git a/sql-mssql/pom.xml b/sql-mssql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>0.9.3</version>
+        <version>0.9.4</version>
     </parent>
 
     <artifactId>sql-mssql</artifactId>
diff --git a/sql-mysql/pom.xml b/sql-mysql/pom.xml
@@ -5,8 +5,7 @@
     <parent>
         <artifactId>easy-query-all</artifactId>
         <groupId>com.easy-query</groupId>
-        <version>0.9.3</version>
-        <relativePath/>
+        <version>0.9.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sql-pgsql/pom.xml b/sql-pgsql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.easy-query</groupId>
         <artifactId>easy-query-all</artifactId>
-        <version>0.9.3</version>
+        <version>0.9.4</version>
     </parent>
 
     <artifactId>sql-pgsql</artifactId>
diff --git a/sql-springboot-starter/pom.xml b/sql-springboot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easy-query-all</artifactId>
         <groupId>com.easy-query</groupId>
-        <version>0.9.3</version>
+        <version>0.9.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sql-springboot-starter/src/main/java/com/easy/query/sql/starter/EasyQueryStarterAutoConfiguration.java b/sql-springboot-starter/src/main/java/com/easy/query/sql/starter/EasyQueryStarterAutoConfiguration.java
@@ -19,6 +19,8 @@
 import com.easy.query.core.logging.Log;
 import com.easy.query.core.logging.LogFactory;
 import com.easy.query.core.sharding.initializer.ShardingInitializer;
+import com.easy.query.core.sharding.rule.datasource.DataSourceRouteRule;
+import com.easy.query.core.sharding.rule.table.TableRouteRule;
 import com.easy.query.core.util.EasyStringUtil;
 import com.easy.query.h2.config.H2DatabaseConfiguration;
 import com.easy.query.mssql.MsSQLDatabaseConfiguration;
@@ -163,7 +165,14 @@ public EasyQuery easyQuery(DatabaseConfiguration databaseConfiguration, StarterC
 
     @Bean
     @ConditionalOnMissingBean
-    public EasyQueryInitializeOption easyQueryInitializeOption(Map<String, Interceptor> interceptorMap, Map<String, VersionStrategy> versionStrategyMap, Map<String, LogicDeleteStrategy> logicDeleteStrategyMap, Map<String, ShardingInitializer> shardingInitializerMap, Map<String, EncryptionStrategy> encryptionStrategyMap, Map<String, ValueConverter<?, ?>> valueConverterMap) {
-        return new EasyQueryInitializeOption(interceptorMap, versionStrategyMap, logicDeleteStrategyMap, shardingInitializerMap, encryptionStrategyMap, valueConverterMap);
+    public EasyQueryInitializeOption easyQueryInitializeOption(Map<String, Interceptor> interceptorMap,
+                                                               Map<String, VersionStrategy> versionStrategyMap,
+                                                               Map<String, LogicDeleteStrategy> logicDeleteStrategyMap,
+                                                               Map<String, ShardingInitializer> shardingInitializerMap,
+                                                               Map<String, EncryptionStrategy> encryptionStrategyMap,
+                                                               Map<String, ValueConverter<?, ?>> valueConverterMap,
+                                                               Map<String, TableRouteRule<?>> tableRouteRuleMap,
+                                                               Map<String, DataSourceRouteRule<?>> dataSourceRouteRuleMap) {
+        return new EasyQueryInitializeOption(interceptorMap, versionStrategyMap, logicDeleteStrategyMap, shardingInitializerMap, encryptionStrategyMap, valueConverterMap,tableRouteRuleMap,dataSourceRouteRuleMap);
     }
 }
diff --git a/sql-springboot-starter/src/main/java/com/easy/query/sql/starter/EasyQueryStarterInitializeAutoConfiguration.java b/sql-springboot-starter/src/main/java/com/easy/query/sql/starter/EasyQueryStarterInitializeAutoConfiguration.java
@@ -9,6 +9,10 @@
 import com.easy.query.core.configuration.QueryConfiguration;
 import com.easy.query.core.context.QueryRuntimeContext;
 import com.easy.query.core.sharding.initializer.ShardingInitializer;
+import com.easy.query.core.sharding.route.manager.DataSourceRouteManager;
+import com.easy.query.core.sharding.route.manager.TableRouteManager;
+import com.easy.query.core.sharding.rule.datasource.DataSourceRouteRule;
+import com.easy.query.core.sharding.rule.table.TableRouteRule;
 import com.easy.query.sql.starter.config.EasyQueryInitializeOption;
 import com.easy.query.sql.starter.config.EasyQueryProperties;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -75,5 +79,13 @@ public void initialize() {
         for (Map.Entry<String, ValueConverter<?, ?>> valueConverterEntry : easyQueryInitializeOption.getValueConverterMap().entrySet()) {
             configuration.applyValueConverter(valueConverterEntry.getValue());
         }
+        TableRouteManager tableRouteManager = runtimeContext.getTableRouteManager();
+        for (Map.Entry<String, TableRouteRule<?>> tableRouteRuleEntry : easyQueryInitializeOption.getTableRouteRuleMap().entrySet()) {
+            tableRouteManager.addRouteRule(tableRouteRuleEntry.getValue());
+        }
+        DataSourceRouteManager dataSourceRouteManager = runtimeContext.getDataSourceRouteManager();
+        for (Map.Entry<String, DataSourceRouteRule<?>> dataSourceRouteRuleEntry : easyQueryInitializeOption.getDataSourceRouteRuleMap().entrySet()) {
+            dataSourceRouteManager.addRouteRule(dataSourceRouteRuleEntry.getValue());
+        }
     }
 }
diff --git a/sql-springboot-starter/src/main/java/com/easy/query/sql/starter/config/EasyQueryInitializeOption.java b/sql-springboot-starter/src/main/java/com/easy/query/sql/starter/config/EasyQueryInitializeOption.java
@@ -6,6 +6,8 @@
 import com.easy.query.core.basic.plugin.logicdel.LogicDeleteStrategy;
 import com.easy.query.core.basic.plugin.version.VersionStrategy;
 import com.easy.query.core.sharding.initializer.ShardingInitializer;
+import com.easy.query.core.sharding.rule.datasource.DataSourceRouteRule;
+import com.easy.query.core.sharding.rule.table.TableRouteRule;
 
 import java.util.Map;
 
@@ -23,6 +25,8 @@ public final class EasyQueryInitializeOption {
     private final Map<String, ShardingInitializer> shardingInitializerMap;
     private final Map<String, EncryptionStrategy> encryptionStrategyMap;
     private final Map<String, ValueConverter<?, ?>> valueConverterMap;
+    private final Map<String, TableRouteRule<?>> tableRouteRuleMap;
+    private final Map<String, DataSourceRouteRule<?>> dataSourceRouteRuleMap;
 
     public Map<String, Interceptor> getInterceptorMap() {
         return interceptorMap;
@@ -48,14 +52,26 @@ public Map<String, EncryptionStrategy> getEncryptionStrategyMap() {
         return valueConverterMap;
     }
 
-    public EasyQueryInitializeOption(Map<String, Interceptor> interceptorMap, Map<String, VersionStrategy> versionStrategyMap, Map<String, LogicDeleteStrategy> logicDeleteStrategyMap, Map<String, ShardingInitializer> shardingInitializerMap, Map<String, EncryptionStrategy> encryptionStrategyMap, Map<String, ValueConverter<?,?>> valueConverterMap){
+    public Map<String, TableRouteRule<?>> getTableRouteRuleMap() {
+        return tableRouteRuleMap;
+    }
+
+    public Map<String, DataSourceRouteRule<?>> getDataSourceRouteRuleMap() {
+        return dataSourceRouteRuleMap;
+    }
+
+    public EasyQueryInitializeOption(Map<String, Interceptor> interceptorMap, Map<String, VersionStrategy> versionStrategyMap, Map<String, LogicDeleteStrategy> logicDeleteStrategyMap, Map<String, ShardingInitializer> shardingInitializerMap, Map<String, EncryptionStrategy> encryptionStrategyMap, Map<String, ValueConverter<?,?>> valueConverterMap,
+                                     Map<String, TableRouteRule<?>> tableRouteRuleMap,
+                                     Map<String, DataSourceRouteRule<?>> dataSourceRouteRuleMap){
 
         this.interceptorMap = interceptorMap;
         this.versionStrategyMap = versionStrategyMap;
         this.logicDeleteStrategyMap = logicDeleteStrategyMap;
         this.shardingInitializerMap = shardingInitializerMap;
         this.encryptionStrategyMap = encryptionStrategyMap;
         this.valueConverterMap = valueConverterMap;
+        this.tableRouteRuleMap = tableRouteRuleMap;
+        this.dataSourceRouteRuleMap = dataSourceRouteRuleMap;
     }
 
 }
diff --git a/sql-test/pom.xml b/sql-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easy-query-all</artifactId>
         <groupId>com.easy-query</groupId>
-        <version>0.9.3</version>
+        <version>0.9.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
