diff --git a/mallinkAdmin/pom.xml b/mallinkAdmin/pom.xml index d17aa1dd1..607df26a9 100644 --- a/mallinkAdmin/pom.xml +++ b/mallinkAdmin/pom.xml @@ -23,11 +23,6 @@ mallinkService 1.0 - - com.iformall - mybatis-multi-tenancy - 1.0 - commons-fileupload commons-fileupload diff --git a/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java index a87812aca..4840020d3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -3,21 +3,15 @@ package com.iformall.config; import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.iformall.plugin.MultiTenancy; -import com.iformall.plugin.shard.impl.EnumShardingRule; -import com.iformall.plugin.shard.impl.ShardingSphere; import com.iformall.plugin.shard.plugin.ShardingSpherePlugin; - import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; - -import java.util.ArrayList; -import java.util.List; import java.util.Properties; @EnableTransactionManagement @Configuration -public class MyBatisConfiguration { +public class MyBatisConfiguration extends BaseMyBatisConfiguration{ @Bean @@ -34,105 +28,7 @@ public class MyBatisConfiguration { @Bean public ShardingSpherePlugin shardingSpherePlugin() { - ShardingSpherePlugin shardingSpherePlugin = new ShardingSpherePlugin(); - Properties properties = new Properties(); - properties.setProperty("dialect", "mysql"); - shardingSpherePlugin.setProperties(properties); - List shardingList = new ArrayList(); - shardingSpherePlugin.setShardingSpheres(shardingList); - - ShardingSphere wxCUserSharding = new ShardingSphere(); - wxCUserSharding.setColumn("tenant_id"); - wxCUserSharding.setTableName("wx_c_user"); - wxCUserSharding.setCount(100); - wxCUserSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCUserSharding); - - ShardingSphere basicInfoSharding = new ShardingSphere(); - basicInfoSharding.setColumn("final_tenant_id"); - basicInfoSharding.setTableName("wx_c_user_basic_info"); - basicInfoSharding.setCount(100); - basicInfoSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(basicInfoSharding); - - ShardingSphere wxOrderSharding = new ShardingSphere(); - wxOrderSharding.setColumn("tenant_id"); - wxOrderSharding.setTableName("wx_order"); - wxOrderSharding.setCount(100); - wxOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderSharding); - - ShardingSphere wxPayOrderSharding = new ShardingSphere(); - wxPayOrderSharding.setColumn("tenant_id"); - wxPayOrderSharding.setTableName("wx_pay_order"); - wxPayOrderSharding.setCount(100); - wxPayOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxPayOrderSharding); - - ShardingSphere wxCouponOrderSharding = new ShardingSphere(); - wxCouponOrderSharding.setColumn("tenant_id"); - wxCouponOrderSharding.setTableName("wx_coupon_order"); - wxCouponOrderSharding.setCount(100); - wxCouponOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponOrderSharding); - - ShardingSphere wxOrderGroupSharding = new ShardingSphere(); - wxOrderGroupSharding.setColumn("tenant_id"); - wxOrderGroupSharding.setTableName("wx_order_group"); - wxOrderGroupSharding.setCount(100); - wxOrderGroupSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderGroupSharding); - - ShardingSphere wxOrderPressSharding = new ShardingSphere(); - wxOrderPressSharding.setColumn("tenant_id"); - wxOrderPressSharding.setTableName("wx_order_press"); - wxOrderPressSharding.setCount(100); - wxOrderPressSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderPressSharding); - - ShardingSphere wxScoreHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_score_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxScoreHistorySharding); - - ShardingSphere wxCreditHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_credit_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCreditHistorySharding); - - ShardingSphere wxCarCmdLogSharding = new ShardingSphere(); - wxCarCmdLogSharding.setColumn("tenant_id"); - wxCarCmdLogSharding.setTableName("wx_car_cmd_log"); - wxCarCmdLogSharding.setCount(100); - wxCarCmdLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCarCmdLogSharding); - - ShardingSphere wxMerchantSubsidySharding = new ShardingSphere(); - wxMerchantSubsidySharding.setColumn("tenant_id"); - wxMerchantSubsidySharding.setTableName("wx_merchant_subsidy"); - wxMerchantSubsidySharding.setCount(100); - wxMerchantSubsidySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxMerchantSubsidySharding); - - ShardingSphere wxProfitSharingOrderSharding = new ShardingSphere(); - wxProfitSharingOrderSharding.setColumn("tenant_id"); - wxProfitSharingOrderSharding.setTableName("wx_profit_sharing_order"); - wxProfitSharingOrderSharding.setCount(100); - wxProfitSharingOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxProfitSharingOrderSharding); - - ShardingSphere wxCouponActionLogSharding = new ShardingSphere(); - wxCouponActionLogSharding.setColumn("tenant_id"); - wxCouponActionLogSharding.setTableName("wx_coupon_action_log"); - wxCouponActionLogSharding.setCount(100); - wxCouponActionLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponActionLogSharding); - - return shardingSpherePlugin; + return baseShardingSpherePlugin(); } @Bean diff --git a/mallinkBApi/pom.xml b/mallinkBApi/pom.xml index d35260501..9678c5914 100644 --- a/mallinkBApi/pom.xml +++ b/mallinkBApi/pom.xml @@ -17,11 +17,6 @@ mallinkService 1.0 - - com.iformall - mybatis-multi-tenancy - 1.0 - diff --git a/mallinkBApi/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkBApi/src/main/java/com/iformall/config/MyBatisConfiguration.java index 12d60d7fd..f17276366 100644 --- a/mallinkBApi/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkBApi/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Properties; @Configuration -public class MyBatisConfiguration { +public class MyBatisConfiguration extends BaseMyBatisConfiguration{ @Bean public MultiTenancy multiTenancy() { @@ -29,104 +29,6 @@ public class MyBatisConfiguration { @Bean public ShardingSpherePlugin shardingSpherePlugin() { - ShardingSpherePlugin shardingSpherePlugin = new ShardingSpherePlugin(); - Properties properties = new Properties(); - properties.setProperty("dialect", "mysql"); - shardingSpherePlugin.setProperties(properties); - List shardingList = new ArrayList(); - shardingSpherePlugin.setShardingSpheres(shardingList); - - ShardingSphere wxCUserSharding = new ShardingSphere(); - wxCUserSharding.setColumn("tenant_id"); - wxCUserSharding.setTableName("wx_c_user"); - wxCUserSharding.setCount(100); - wxCUserSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCUserSharding); - - ShardingSphere basicInfoSharding = new ShardingSphere(); - basicInfoSharding.setColumn("final_tenant_id"); - basicInfoSharding.setTableName("wx_c_user_basic_info"); - basicInfoSharding.setCount(100); - basicInfoSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(basicInfoSharding); - - ShardingSphere wxOrderSharding = new ShardingSphere(); - wxOrderSharding.setColumn("tenant_id"); - wxOrderSharding.setTableName("wx_order"); - wxOrderSharding.setCount(100); - wxOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderSharding); - - ShardingSphere wxPayOrderSharding = new ShardingSphere(); - wxPayOrderSharding.setColumn("tenant_id"); - wxPayOrderSharding.setTableName("wx_pay_order"); - wxPayOrderSharding.setCount(100); - wxPayOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxPayOrderSharding); - - ShardingSphere wxCouponOrderSharding = new ShardingSphere(); - wxCouponOrderSharding.setColumn("tenant_id"); - wxCouponOrderSharding.setTableName("wx_coupon_order"); - wxCouponOrderSharding.setCount(100); - wxCouponOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponOrderSharding); - - ShardingSphere wxOrderGroupSharding = new ShardingSphere(); - wxOrderGroupSharding.setColumn("tenant_id"); - wxOrderGroupSharding.setTableName("wx_order_group"); - wxOrderGroupSharding.setCount(100); - wxOrderGroupSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderGroupSharding); - - ShardingSphere wxOrderPressSharding = new ShardingSphere(); - wxOrderPressSharding.setColumn("tenant_id"); - wxOrderPressSharding.setTableName("wx_order_press"); - wxOrderPressSharding.setCount(100); - wxOrderPressSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderPressSharding); - - ShardingSphere wxScoreHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_score_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxScoreHistorySharding); - - ShardingSphere wxCreditHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_credit_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCreditHistorySharding); - - ShardingSphere wxCarCmdLogSharding = new ShardingSphere(); - wxCarCmdLogSharding.setColumn("tenant_id"); - wxCarCmdLogSharding.setTableName("wx_car_cmd_log"); - wxCarCmdLogSharding.setCount(100); - wxCarCmdLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCarCmdLogSharding); - - ShardingSphere wxMerchantSubsidySharding = new ShardingSphere(); - wxMerchantSubsidySharding.setColumn("tenant_id"); - wxMerchantSubsidySharding.setTableName("wx_merchant_subsidy"); - wxMerchantSubsidySharding.setCount(100); - wxMerchantSubsidySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxMerchantSubsidySharding); - - ShardingSphere wxProfitSharingOrderSharding = new ShardingSphere(); - wxProfitSharingOrderSharding.setColumn("tenant_id"); - wxProfitSharingOrderSharding.setTableName("wx_profit_sharing_order"); - wxProfitSharingOrderSharding.setCount(100); - wxProfitSharingOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxProfitSharingOrderSharding); - - ShardingSphere wxCouponActionLogSharding = new ShardingSphere(); - wxCouponActionLogSharding.setColumn("tenant_id"); - wxCouponActionLogSharding.setTableName("wx_coupon_action_log"); - wxCouponActionLogSharding.setCount(100); - wxCouponActionLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponActionLogSharding); - - return shardingSpherePlugin; + return baseShardingSpherePlugin(); } } diff --git a/mallinkCApi/pom.xml b/mallinkCApi/pom.xml index e3708dd5a..9c71414ee 100644 --- a/mallinkCApi/pom.xml +++ b/mallinkCApi/pom.xml @@ -17,11 +17,6 @@ mallinkService 1.0 - - com.iformall - mybatis-multi-tenancy - 1.0 - diff --git a/mallinkCApi/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkCApi/src/main/java/com/iformall/config/MyBatisConfiguration.java index 12d60d7fd..dbd3c59eb 100644 --- a/mallinkCApi/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkCApi/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Properties; @Configuration -public class MyBatisConfiguration { +public class MyBatisConfiguration extends BaseMyBatisConfiguration { @Bean public MultiTenancy multiTenancy() { @@ -29,104 +29,6 @@ public class MyBatisConfiguration { @Bean public ShardingSpherePlugin shardingSpherePlugin() { - ShardingSpherePlugin shardingSpherePlugin = new ShardingSpherePlugin(); - Properties properties = new Properties(); - properties.setProperty("dialect", "mysql"); - shardingSpherePlugin.setProperties(properties); - List shardingList = new ArrayList(); - shardingSpherePlugin.setShardingSpheres(shardingList); - - ShardingSphere wxCUserSharding = new ShardingSphere(); - wxCUserSharding.setColumn("tenant_id"); - wxCUserSharding.setTableName("wx_c_user"); - wxCUserSharding.setCount(100); - wxCUserSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCUserSharding); - - ShardingSphere basicInfoSharding = new ShardingSphere(); - basicInfoSharding.setColumn("final_tenant_id"); - basicInfoSharding.setTableName("wx_c_user_basic_info"); - basicInfoSharding.setCount(100); - basicInfoSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(basicInfoSharding); - - ShardingSphere wxOrderSharding = new ShardingSphere(); - wxOrderSharding.setColumn("tenant_id"); - wxOrderSharding.setTableName("wx_order"); - wxOrderSharding.setCount(100); - wxOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderSharding); - - ShardingSphere wxPayOrderSharding = new ShardingSphere(); - wxPayOrderSharding.setColumn("tenant_id"); - wxPayOrderSharding.setTableName("wx_pay_order"); - wxPayOrderSharding.setCount(100); - wxPayOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxPayOrderSharding); - - ShardingSphere wxCouponOrderSharding = new ShardingSphere(); - wxCouponOrderSharding.setColumn("tenant_id"); - wxCouponOrderSharding.setTableName("wx_coupon_order"); - wxCouponOrderSharding.setCount(100); - wxCouponOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponOrderSharding); - - ShardingSphere wxOrderGroupSharding = new ShardingSphere(); - wxOrderGroupSharding.setColumn("tenant_id"); - wxOrderGroupSharding.setTableName("wx_order_group"); - wxOrderGroupSharding.setCount(100); - wxOrderGroupSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderGroupSharding); - - ShardingSphere wxOrderPressSharding = new ShardingSphere(); - wxOrderPressSharding.setColumn("tenant_id"); - wxOrderPressSharding.setTableName("wx_order_press"); - wxOrderPressSharding.setCount(100); - wxOrderPressSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderPressSharding); - - ShardingSphere wxScoreHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_score_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxScoreHistorySharding); - - ShardingSphere wxCreditHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_credit_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCreditHistorySharding); - - ShardingSphere wxCarCmdLogSharding = new ShardingSphere(); - wxCarCmdLogSharding.setColumn("tenant_id"); - wxCarCmdLogSharding.setTableName("wx_car_cmd_log"); - wxCarCmdLogSharding.setCount(100); - wxCarCmdLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCarCmdLogSharding); - - ShardingSphere wxMerchantSubsidySharding = new ShardingSphere(); - wxMerchantSubsidySharding.setColumn("tenant_id"); - wxMerchantSubsidySharding.setTableName("wx_merchant_subsidy"); - wxMerchantSubsidySharding.setCount(100); - wxMerchantSubsidySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxMerchantSubsidySharding); - - ShardingSphere wxProfitSharingOrderSharding = new ShardingSphere(); - wxProfitSharingOrderSharding.setColumn("tenant_id"); - wxProfitSharingOrderSharding.setTableName("wx_profit_sharing_order"); - wxProfitSharingOrderSharding.setCount(100); - wxProfitSharingOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxProfitSharingOrderSharding); - - ShardingSphere wxCouponActionLogSharding = new ShardingSphere(); - wxCouponActionLogSharding.setColumn("tenant_id"); - wxCouponActionLogSharding.setTableName("wx_coupon_action_log"); - wxCouponActionLogSharding.setCount(100); - wxCouponActionLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponActionLogSharding); - - return shardingSpherePlugin; + return baseShardingSpherePlugin(); } } diff --git a/mallinkCallback/pom.xml b/mallinkCallback/pom.xml index e220d94ec..4d8ffac74 100644 --- a/mallinkCallback/pom.xml +++ b/mallinkCallback/pom.xml @@ -23,11 +23,6 @@ mallinkService 1.0 - - com.iformall - mybatis-multi-tenancy - 1.0 - diff --git a/mallinkCallback/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkCallback/src/main/java/com/iformall/config/MyBatisConfiguration.java index 8d6b222da..98d9d2b0d 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkCallback/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -1,119 +1,16 @@ package com.iformall.config; -import com.iformall.plugin.shard.impl.EnumShardingRule; -import com.iformall.plugin.shard.impl.ShardingSphere; import com.iformall.plugin.shard.plugin.ShardingSpherePlugin; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; @EnableTransactionManagement @Configuration -public class MyBatisConfiguration { +public class MyBatisConfiguration extends BaseMyBatisConfiguration{ @Bean public ShardingSpherePlugin shardingSpherePlugin() { - ShardingSpherePlugin shardingSpherePlugin = new ShardingSpherePlugin(); - Properties properties = new Properties(); - properties.setProperty("dialect", "mysql"); - shardingSpherePlugin.setProperties(properties); - List shardingList = new ArrayList(); - shardingSpherePlugin.setShardingSpheres(shardingList); - - ShardingSphere wxCUserSharding = new ShardingSphere(); - wxCUserSharding.setColumn("tenant_id"); - wxCUserSharding.setTableName("wx_c_user"); - wxCUserSharding.setCount(100); - wxCUserSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCUserSharding); - - ShardingSphere basicInfoSharding = new ShardingSphere(); - basicInfoSharding.setColumn("final_tenant_id"); - basicInfoSharding.setTableName("wx_c_user_basic_info"); - basicInfoSharding.setCount(100); - basicInfoSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(basicInfoSharding); - - ShardingSphere wxOrderSharding = new ShardingSphere(); - wxOrderSharding.setColumn("tenant_id"); - wxOrderSharding.setTableName("wx_order"); - wxOrderSharding.setCount(100); - wxOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderSharding); - - ShardingSphere wxPayOrderSharding = new ShardingSphere(); - wxPayOrderSharding.setColumn("tenant_id"); - wxPayOrderSharding.setTableName("wx_pay_order"); - wxPayOrderSharding.setCount(100); - wxPayOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxPayOrderSharding); - - ShardingSphere wxCouponOrderSharding = new ShardingSphere(); - wxCouponOrderSharding.setColumn("tenant_id"); - wxCouponOrderSharding.setTableName("wx_coupon_order"); - wxCouponOrderSharding.setCount(100); - wxCouponOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponOrderSharding); - - ShardingSphere wxOrderGroupSharding = new ShardingSphere(); - wxOrderGroupSharding.setColumn("tenant_id"); - wxOrderGroupSharding.setTableName("wx_order_group"); - wxOrderGroupSharding.setCount(100); - wxOrderGroupSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderGroupSharding); - - ShardingSphere wxOrderPressSharding = new ShardingSphere(); - wxOrderPressSharding.setColumn("tenant_id"); - wxOrderPressSharding.setTableName("wx_order_press"); - wxOrderPressSharding.setCount(100); - wxOrderPressSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderPressSharding); - - ShardingSphere wxScoreHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_score_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxScoreHistorySharding); - - ShardingSphere wxCreditHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_credit_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCreditHistorySharding); - - ShardingSphere wxCarCmdLogSharding = new ShardingSphere(); - wxCarCmdLogSharding.setColumn("tenant_id"); - wxCarCmdLogSharding.setTableName("wx_car_cmd_log"); - wxCarCmdLogSharding.setCount(100); - wxCarCmdLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCarCmdLogSharding); - - ShardingSphere wxMerchantSubsidySharding = new ShardingSphere(); - wxMerchantSubsidySharding.setColumn("tenant_id"); - wxMerchantSubsidySharding.setTableName("wx_merchant_subsidy"); - wxMerchantSubsidySharding.setCount(100); - wxMerchantSubsidySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxMerchantSubsidySharding); - - ShardingSphere wxProfitSharingOrderSharding = new ShardingSphere(); - wxProfitSharingOrderSharding.setColumn("tenant_id"); - wxProfitSharingOrderSharding.setTableName("wx_profit_sharing_order"); - wxProfitSharingOrderSharding.setCount(100); - wxProfitSharingOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxProfitSharingOrderSharding); - - ShardingSphere wxCouponActionLogSharding = new ShardingSphere(); - wxCouponActionLogSharding.setColumn("tenant_id"); - wxCouponActionLogSharding.setTableName("wx_coupon_action_log"); - wxCouponActionLogSharding.setCount(100); - wxCouponActionLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponActionLogSharding); - - return shardingSpherePlugin; + return baseShardingSpherePlugin(); } } diff --git a/mallinkMQConsumer/pom.xml b/mallinkMQConsumer/pom.xml index 948c58903..4e5ae9f12 100644 --- a/mallinkMQConsumer/pom.xml +++ b/mallinkMQConsumer/pom.xml @@ -18,11 +18,6 @@ mallinkService 1.0 - - com.iformall - mybatis-multi-tenancy - 1.0 - diff --git a/mallinkMQConsumer/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkMQConsumer/src/main/java/com/iformall/config/MyBatisConfiguration.java index 8d6b222da..44594175c 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -12,108 +12,10 @@ import java.util.Properties; @EnableTransactionManagement @Configuration -public class MyBatisConfiguration { +public class MyBatisConfiguration extends BaseMyBatisConfiguration { @Bean public ShardingSpherePlugin shardingSpherePlugin() { - ShardingSpherePlugin shardingSpherePlugin = new ShardingSpherePlugin(); - Properties properties = new Properties(); - properties.setProperty("dialect", "mysql"); - shardingSpherePlugin.setProperties(properties); - List shardingList = new ArrayList(); - shardingSpherePlugin.setShardingSpheres(shardingList); - - ShardingSphere wxCUserSharding = new ShardingSphere(); - wxCUserSharding.setColumn("tenant_id"); - wxCUserSharding.setTableName("wx_c_user"); - wxCUserSharding.setCount(100); - wxCUserSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCUserSharding); - - ShardingSphere basicInfoSharding = new ShardingSphere(); - basicInfoSharding.setColumn("final_tenant_id"); - basicInfoSharding.setTableName("wx_c_user_basic_info"); - basicInfoSharding.setCount(100); - basicInfoSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(basicInfoSharding); - - ShardingSphere wxOrderSharding = new ShardingSphere(); - wxOrderSharding.setColumn("tenant_id"); - wxOrderSharding.setTableName("wx_order"); - wxOrderSharding.setCount(100); - wxOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderSharding); - - ShardingSphere wxPayOrderSharding = new ShardingSphere(); - wxPayOrderSharding.setColumn("tenant_id"); - wxPayOrderSharding.setTableName("wx_pay_order"); - wxPayOrderSharding.setCount(100); - wxPayOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxPayOrderSharding); - - ShardingSphere wxCouponOrderSharding = new ShardingSphere(); - wxCouponOrderSharding.setColumn("tenant_id"); - wxCouponOrderSharding.setTableName("wx_coupon_order"); - wxCouponOrderSharding.setCount(100); - wxCouponOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponOrderSharding); - - ShardingSphere wxOrderGroupSharding = new ShardingSphere(); - wxOrderGroupSharding.setColumn("tenant_id"); - wxOrderGroupSharding.setTableName("wx_order_group"); - wxOrderGroupSharding.setCount(100); - wxOrderGroupSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderGroupSharding); - - ShardingSphere wxOrderPressSharding = new ShardingSphere(); - wxOrderPressSharding.setColumn("tenant_id"); - wxOrderPressSharding.setTableName("wx_order_press"); - wxOrderPressSharding.setCount(100); - wxOrderPressSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderPressSharding); - - ShardingSphere wxScoreHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_score_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxScoreHistorySharding); - - ShardingSphere wxCreditHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_credit_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCreditHistorySharding); - - ShardingSphere wxCarCmdLogSharding = new ShardingSphere(); - wxCarCmdLogSharding.setColumn("tenant_id"); - wxCarCmdLogSharding.setTableName("wx_car_cmd_log"); - wxCarCmdLogSharding.setCount(100); - wxCarCmdLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCarCmdLogSharding); - - ShardingSphere wxMerchantSubsidySharding = new ShardingSphere(); - wxMerchantSubsidySharding.setColumn("tenant_id"); - wxMerchantSubsidySharding.setTableName("wx_merchant_subsidy"); - wxMerchantSubsidySharding.setCount(100); - wxMerchantSubsidySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxMerchantSubsidySharding); - - ShardingSphere wxProfitSharingOrderSharding = new ShardingSphere(); - wxProfitSharingOrderSharding.setColumn("tenant_id"); - wxProfitSharingOrderSharding.setTableName("wx_profit_sharing_order"); - wxProfitSharingOrderSharding.setCount(100); - wxProfitSharingOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxProfitSharingOrderSharding); - - ShardingSphere wxCouponActionLogSharding = new ShardingSphere(); - wxCouponActionLogSharding.setColumn("tenant_id"); - wxCouponActionLogSharding.setTableName("wx_coupon_action_log"); - wxCouponActionLogSharding.setCount(100); - wxCouponActionLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponActionLogSharding); - - return shardingSpherePlugin; + return baseShardingSpherePlugin(); } } diff --git a/mallinkPosApi/pom.xml b/mallinkPosApi/pom.xml index 4de76d899..24efb4379 100644 --- a/mallinkPosApi/pom.xml +++ b/mallinkPosApi/pom.xml @@ -21,12 +21,7 @@ org.springframework.boot spring-boot-starter-test test - - - com.iformall - mybatis-multi-tenancy - 1.0 - + diff --git a/mallinkPosApi/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkPosApi/src/main/java/com/iformall/config/MyBatisConfiguration.java index 8d6b222da..44594175c 100644 --- a/mallinkPosApi/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkPosApi/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -12,108 +12,10 @@ import java.util.Properties; @EnableTransactionManagement @Configuration -public class MyBatisConfiguration { +public class MyBatisConfiguration extends BaseMyBatisConfiguration { @Bean public ShardingSpherePlugin shardingSpherePlugin() { - ShardingSpherePlugin shardingSpherePlugin = new ShardingSpherePlugin(); - Properties properties = new Properties(); - properties.setProperty("dialect", "mysql"); - shardingSpherePlugin.setProperties(properties); - List shardingList = new ArrayList(); - shardingSpherePlugin.setShardingSpheres(shardingList); - - ShardingSphere wxCUserSharding = new ShardingSphere(); - wxCUserSharding.setColumn("tenant_id"); - wxCUserSharding.setTableName("wx_c_user"); - wxCUserSharding.setCount(100); - wxCUserSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCUserSharding); - - ShardingSphere basicInfoSharding = new ShardingSphere(); - basicInfoSharding.setColumn("final_tenant_id"); - basicInfoSharding.setTableName("wx_c_user_basic_info"); - basicInfoSharding.setCount(100); - basicInfoSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(basicInfoSharding); - - ShardingSphere wxOrderSharding = new ShardingSphere(); - wxOrderSharding.setColumn("tenant_id"); - wxOrderSharding.setTableName("wx_order"); - wxOrderSharding.setCount(100); - wxOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderSharding); - - ShardingSphere wxPayOrderSharding = new ShardingSphere(); - wxPayOrderSharding.setColumn("tenant_id"); - wxPayOrderSharding.setTableName("wx_pay_order"); - wxPayOrderSharding.setCount(100); - wxPayOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxPayOrderSharding); - - ShardingSphere wxCouponOrderSharding = new ShardingSphere(); - wxCouponOrderSharding.setColumn("tenant_id"); - wxCouponOrderSharding.setTableName("wx_coupon_order"); - wxCouponOrderSharding.setCount(100); - wxCouponOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponOrderSharding); - - ShardingSphere wxOrderGroupSharding = new ShardingSphere(); - wxOrderGroupSharding.setColumn("tenant_id"); - wxOrderGroupSharding.setTableName("wx_order_group"); - wxOrderGroupSharding.setCount(100); - wxOrderGroupSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderGroupSharding); - - ShardingSphere wxOrderPressSharding = new ShardingSphere(); - wxOrderPressSharding.setColumn("tenant_id"); - wxOrderPressSharding.setTableName("wx_order_press"); - wxOrderPressSharding.setCount(100); - wxOrderPressSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderPressSharding); - - ShardingSphere wxScoreHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_score_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxScoreHistorySharding); - - ShardingSphere wxCreditHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_credit_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCreditHistorySharding); - - ShardingSphere wxCarCmdLogSharding = new ShardingSphere(); - wxCarCmdLogSharding.setColumn("tenant_id"); - wxCarCmdLogSharding.setTableName("wx_car_cmd_log"); - wxCarCmdLogSharding.setCount(100); - wxCarCmdLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCarCmdLogSharding); - - ShardingSphere wxMerchantSubsidySharding = new ShardingSphere(); - wxMerchantSubsidySharding.setColumn("tenant_id"); - wxMerchantSubsidySharding.setTableName("wx_merchant_subsidy"); - wxMerchantSubsidySharding.setCount(100); - wxMerchantSubsidySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxMerchantSubsidySharding); - - ShardingSphere wxProfitSharingOrderSharding = new ShardingSphere(); - wxProfitSharingOrderSharding.setColumn("tenant_id"); - wxProfitSharingOrderSharding.setTableName("wx_profit_sharing_order"); - wxProfitSharingOrderSharding.setCount(100); - wxProfitSharingOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxProfitSharingOrderSharding); - - ShardingSphere wxCouponActionLogSharding = new ShardingSphere(); - wxCouponActionLogSharding.setColumn("tenant_id"); - wxCouponActionLogSharding.setTableName("wx_coupon_action_log"); - wxCouponActionLogSharding.setCount(100); - wxCouponActionLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponActionLogSharding); - - return shardingSpherePlugin; + return baseShardingSpherePlugin(); } } diff --git a/mallinkSchedule/pom.xml b/mallinkSchedule/pom.xml index 74b0aa69a..0c8cdee1b 100644 --- a/mallinkSchedule/pom.xml +++ b/mallinkSchedule/pom.xml @@ -17,12 +17,7 @@ com.iformall mallinkService 1.0 - - - com.iformall - mybatis-multi-tenancy - 1.0 - + diff --git a/mallinkSchedule/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkSchedule/src/main/java/com/iformall/config/MyBatisConfiguration.java index 8d6b222da..d43f1ee9d 100644 --- a/mallinkSchedule/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkSchedule/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -1,119 +1,16 @@ package com.iformall.config; -import com.iformall.plugin.shard.impl.EnumShardingRule; -import com.iformall.plugin.shard.impl.ShardingSphere; import com.iformall.plugin.shard.plugin.ShardingSpherePlugin; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; @EnableTransactionManagement @Configuration -public class MyBatisConfiguration { +public class MyBatisConfiguration extends BaseMyBatisConfiguration { @Bean public ShardingSpherePlugin shardingSpherePlugin() { - ShardingSpherePlugin shardingSpherePlugin = new ShardingSpherePlugin(); - Properties properties = new Properties(); - properties.setProperty("dialect", "mysql"); - shardingSpherePlugin.setProperties(properties); - List shardingList = new ArrayList(); - shardingSpherePlugin.setShardingSpheres(shardingList); - - ShardingSphere wxCUserSharding = new ShardingSphere(); - wxCUserSharding.setColumn("tenant_id"); - wxCUserSharding.setTableName("wx_c_user"); - wxCUserSharding.setCount(100); - wxCUserSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCUserSharding); - - ShardingSphere basicInfoSharding = new ShardingSphere(); - basicInfoSharding.setColumn("final_tenant_id"); - basicInfoSharding.setTableName("wx_c_user_basic_info"); - basicInfoSharding.setCount(100); - basicInfoSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(basicInfoSharding); - - ShardingSphere wxOrderSharding = new ShardingSphere(); - wxOrderSharding.setColumn("tenant_id"); - wxOrderSharding.setTableName("wx_order"); - wxOrderSharding.setCount(100); - wxOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderSharding); - - ShardingSphere wxPayOrderSharding = new ShardingSphere(); - wxPayOrderSharding.setColumn("tenant_id"); - wxPayOrderSharding.setTableName("wx_pay_order"); - wxPayOrderSharding.setCount(100); - wxPayOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxPayOrderSharding); - - ShardingSphere wxCouponOrderSharding = new ShardingSphere(); - wxCouponOrderSharding.setColumn("tenant_id"); - wxCouponOrderSharding.setTableName("wx_coupon_order"); - wxCouponOrderSharding.setCount(100); - wxCouponOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponOrderSharding); - - ShardingSphere wxOrderGroupSharding = new ShardingSphere(); - wxOrderGroupSharding.setColumn("tenant_id"); - wxOrderGroupSharding.setTableName("wx_order_group"); - wxOrderGroupSharding.setCount(100); - wxOrderGroupSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderGroupSharding); - - ShardingSphere wxOrderPressSharding = new ShardingSphere(); - wxOrderPressSharding.setColumn("tenant_id"); - wxOrderPressSharding.setTableName("wx_order_press"); - wxOrderPressSharding.setCount(100); - wxOrderPressSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderPressSharding); - - ShardingSphere wxScoreHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_score_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxScoreHistorySharding); - - ShardingSphere wxCreditHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_credit_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCreditHistorySharding); - - ShardingSphere wxCarCmdLogSharding = new ShardingSphere(); - wxCarCmdLogSharding.setColumn("tenant_id"); - wxCarCmdLogSharding.setTableName("wx_car_cmd_log"); - wxCarCmdLogSharding.setCount(100); - wxCarCmdLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCarCmdLogSharding); - - ShardingSphere wxMerchantSubsidySharding = new ShardingSphere(); - wxMerchantSubsidySharding.setColumn("tenant_id"); - wxMerchantSubsidySharding.setTableName("wx_merchant_subsidy"); - wxMerchantSubsidySharding.setCount(100); - wxMerchantSubsidySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxMerchantSubsidySharding); - - ShardingSphere wxProfitSharingOrderSharding = new ShardingSphere(); - wxProfitSharingOrderSharding.setColumn("tenant_id"); - wxProfitSharingOrderSharding.setTableName("wx_profit_sharing_order"); - wxProfitSharingOrderSharding.setCount(100); - wxProfitSharingOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxProfitSharingOrderSharding); - - ShardingSphere wxCouponActionLogSharding = new ShardingSphere(); - wxCouponActionLogSharding.setColumn("tenant_id"); - wxCouponActionLogSharding.setTableName("wx_coupon_action_log"); - wxCouponActionLogSharding.setCount(100); - wxCouponActionLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponActionLogSharding); - - return shardingSpherePlugin; + return baseShardingSpherePlugin(); } } diff --git a/mallinkService/pom.xml b/mallinkService/pom.xml index e0b95911d..29d293544 100644 --- a/mallinkService/pom.xml +++ b/mallinkService/pom.xml @@ -30,7 +30,11 @@ ons-client 1.8.4.Final - + + com.iformall + mybatis-multi-tenancy + 1.0 + diff --git a/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java b/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java new file mode 100644 index 000000000..3d7a6db37 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java @@ -0,0 +1,129 @@ +package com.iformall.config; + +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import com.iformall.plugin.shard.impl.EnumShardingRule; +import com.iformall.plugin.shard.impl.ShardingSphere; +import com.iformall.plugin.shard.plugin.ShardingSpherePlugin; + +public class BaseMyBatisConfiguration { + + //分表配置 + protected ShardingSpherePlugin baseShardingSpherePlugin() { + ShardingSpherePlugin shardingSpherePlugin = new ShardingSpherePlugin(); + Properties properties = new Properties(); + properties.setProperty("dialect", "mysql"); + shardingSpherePlugin.setProperties(properties); + List shardingList = new ArrayList(); + shardingSpherePlugin.setShardingSpheres(shardingList); + + ShardingSphere wxCUserSharding = new ShardingSphere(); + wxCUserSharding.setColumn("tenant_id"); + wxCUserSharding.setTableName("wx_c_user"); + wxCUserSharding.setCount(100); + wxCUserSharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxCUserSharding); + + ShardingSphere basicInfoSharding = new ShardingSphere(); + basicInfoSharding.setColumn("final_tenant_id"); + basicInfoSharding.setTableName("wx_c_user_basic_info"); + basicInfoSharding.setCount(100); + basicInfoSharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(basicInfoSharding); + + ShardingSphere wxOrderSharding = new ShardingSphere(); + wxOrderSharding.setColumn("tenant_id"); + wxOrderSharding.setTableName("wx_order"); + wxOrderSharding.setCount(100); + wxOrderSharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxOrderSharding); + + ShardingSphere wxPayOrderSharding = new ShardingSphere(); + wxPayOrderSharding.setColumn("tenant_id"); + wxPayOrderSharding.setTableName("wx_pay_order"); + wxPayOrderSharding.setCount(100); + wxPayOrderSharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxPayOrderSharding); + + ShardingSphere wxCouponOrderSharding = new ShardingSphere(); + wxCouponOrderSharding.setColumn("tenant_id"); + wxCouponOrderSharding.setTableName("wx_coupon_order"); + wxCouponOrderSharding.setCount(100); + wxCouponOrderSharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxCouponOrderSharding); + + ShardingSphere wxOrderGroupSharding = new ShardingSphere(); + wxOrderGroupSharding.setColumn("tenant_id"); + wxOrderGroupSharding.setTableName("wx_order_group"); + wxOrderGroupSharding.setCount(100); + wxOrderGroupSharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxOrderGroupSharding); + + ShardingSphere wxOrderPressSharding = new ShardingSphere(); + wxOrderPressSharding.setColumn("tenant_id"); + wxOrderPressSharding.setTableName("wx_order_press"); + wxOrderPressSharding.setCount(100); + wxOrderPressSharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxOrderPressSharding); + + ShardingSphere wxPosOrderSharding = new ShardingSphere(); + wxPosOrderSharding.setColumn("tenant_id"); + wxPosOrderSharding.setTableName("pos_order"); + wxPosOrderSharding.setCount(100); + wxPosOrderSharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxPosOrderSharding); + + ShardingSphere wxPosPayOrderSharding = new ShardingSphere(); + wxPosPayOrderSharding.setColumn("tenant_id"); + wxPosPayOrderSharding.setTableName("pos_pay_order"); + wxPosPayOrderSharding.setCount(100); + wxPosPayOrderSharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxPosPayOrderSharding); + + ShardingSphere wxScoreHistorySharding = new ShardingSphere(); + wxScoreHistorySharding.setColumn("tenant_id"); + wxScoreHistorySharding.setTableName("wx_score_history"); + wxScoreHistorySharding.setCount(100); + wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxScoreHistorySharding); + + ShardingSphere wxCreditHistorySharding = new ShardingSphere(); + wxScoreHistorySharding.setColumn("tenant_id"); + wxScoreHistorySharding.setTableName("wx_credit_history"); + wxScoreHistorySharding.setCount(100); + wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxCreditHistorySharding); + + ShardingSphere wxCarCmdLogSharding = new ShardingSphere(); + wxCarCmdLogSharding.setColumn("tenant_id"); + wxCarCmdLogSharding.setTableName("wx_car_cmd_log"); + wxCarCmdLogSharding.setCount(100); + wxCarCmdLogSharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxCarCmdLogSharding); + + ShardingSphere wxMerchantSubsidySharding = new ShardingSphere(); + wxMerchantSubsidySharding.setColumn("tenant_id"); + wxMerchantSubsidySharding.setTableName("wx_merchant_subsidy"); + wxMerchantSubsidySharding.setCount(100); + wxMerchantSubsidySharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxMerchantSubsidySharding); + + ShardingSphere wxProfitSharingOrderSharding = new ShardingSphere(); + wxProfitSharingOrderSharding.setColumn("tenant_id"); + wxProfitSharingOrderSharding.setTableName("wx_profit_sharing_order"); + wxProfitSharingOrderSharding.setCount(100); + wxProfitSharingOrderSharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxProfitSharingOrderSharding); + + ShardingSphere wxCouponActionLogSharding = new ShardingSphere(); + wxCouponActionLogSharding.setColumn("tenant_id"); + wxCouponActionLogSharding.setTableName("wx_coupon_action_log"); + wxCouponActionLogSharding.setCount(100); + wxCouponActionLogSharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxCouponActionLogSharding); + + return shardingSpherePlugin; + } +} diff --git a/mallinkSysAdmin/pom.xml b/mallinkSysAdmin/pom.xml index ff6832e29..9544ca12d 100644 --- a/mallinkSysAdmin/pom.xml +++ b/mallinkSysAdmin/pom.xml @@ -40,12 +40,6 @@ kaptcha 0.0.9 - - - com.iformall - mybatis-multi-tenancy - 1.0 - diff --git a/mallinkSysAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkSysAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java index 8d6b222da..44594175c 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -12,108 +12,10 @@ import java.util.Properties; @EnableTransactionManagement @Configuration -public class MyBatisConfiguration { +public class MyBatisConfiguration extends BaseMyBatisConfiguration { @Bean public ShardingSpherePlugin shardingSpherePlugin() { - ShardingSpherePlugin shardingSpherePlugin = new ShardingSpherePlugin(); - Properties properties = new Properties(); - properties.setProperty("dialect", "mysql"); - shardingSpherePlugin.setProperties(properties); - List shardingList = new ArrayList(); - shardingSpherePlugin.setShardingSpheres(shardingList); - - ShardingSphere wxCUserSharding = new ShardingSphere(); - wxCUserSharding.setColumn("tenant_id"); - wxCUserSharding.setTableName("wx_c_user"); - wxCUserSharding.setCount(100); - wxCUserSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCUserSharding); - - ShardingSphere basicInfoSharding = new ShardingSphere(); - basicInfoSharding.setColumn("final_tenant_id"); - basicInfoSharding.setTableName("wx_c_user_basic_info"); - basicInfoSharding.setCount(100); - basicInfoSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(basicInfoSharding); - - ShardingSphere wxOrderSharding = new ShardingSphere(); - wxOrderSharding.setColumn("tenant_id"); - wxOrderSharding.setTableName("wx_order"); - wxOrderSharding.setCount(100); - wxOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderSharding); - - ShardingSphere wxPayOrderSharding = new ShardingSphere(); - wxPayOrderSharding.setColumn("tenant_id"); - wxPayOrderSharding.setTableName("wx_pay_order"); - wxPayOrderSharding.setCount(100); - wxPayOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxPayOrderSharding); - - ShardingSphere wxCouponOrderSharding = new ShardingSphere(); - wxCouponOrderSharding.setColumn("tenant_id"); - wxCouponOrderSharding.setTableName("wx_coupon_order"); - wxCouponOrderSharding.setCount(100); - wxCouponOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponOrderSharding); - - ShardingSphere wxOrderGroupSharding = new ShardingSphere(); - wxOrderGroupSharding.setColumn("tenant_id"); - wxOrderGroupSharding.setTableName("wx_order_group"); - wxOrderGroupSharding.setCount(100); - wxOrderGroupSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderGroupSharding); - - ShardingSphere wxOrderPressSharding = new ShardingSphere(); - wxOrderPressSharding.setColumn("tenant_id"); - wxOrderPressSharding.setTableName("wx_order_press"); - wxOrderPressSharding.setCount(100); - wxOrderPressSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderPressSharding); - - ShardingSphere wxScoreHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_score_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxScoreHistorySharding); - - ShardingSphere wxCreditHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_credit_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCreditHistorySharding); - - ShardingSphere wxCarCmdLogSharding = new ShardingSphere(); - wxCarCmdLogSharding.setColumn("tenant_id"); - wxCarCmdLogSharding.setTableName("wx_car_cmd_log"); - wxCarCmdLogSharding.setCount(100); - wxCarCmdLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCarCmdLogSharding); - - ShardingSphere wxMerchantSubsidySharding = new ShardingSphere(); - wxMerchantSubsidySharding.setColumn("tenant_id"); - wxMerchantSubsidySharding.setTableName("wx_merchant_subsidy"); - wxMerchantSubsidySharding.setCount(100); - wxMerchantSubsidySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxMerchantSubsidySharding); - - ShardingSphere wxProfitSharingOrderSharding = new ShardingSphere(); - wxProfitSharingOrderSharding.setColumn("tenant_id"); - wxProfitSharingOrderSharding.setTableName("wx_profit_sharing_order"); - wxProfitSharingOrderSharding.setCount(100); - wxProfitSharingOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxProfitSharingOrderSharding); - - ShardingSphere wxCouponActionLogSharding = new ShardingSphere(); - wxCouponActionLogSharding.setColumn("tenant_id"); - wxCouponActionLogSharding.setTableName("wx_coupon_action_log"); - wxCouponActionLogSharding.setCount(100); - wxCouponActionLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponActionLogSharding); - - return shardingSpherePlugin; + return baseShardingSpherePlugin(); } } diff --git a/mallinkWebSocketServer/pom.xml b/mallinkWebSocketServer/pom.xml index 14df8f84e..6b91cf9f3 100644 --- a/mallinkWebSocketServer/pom.xml +++ b/mallinkWebSocketServer/pom.xml @@ -25,12 +25,7 @@ org.springframework.boot spring-boot-starter-reactor-netty - - - com.iformall - mybatis-multi-tenancy - 1.0 - + diff --git a/mallinkWebSocketServer/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkWebSocketServer/src/main/java/com/iformall/config/MyBatisConfiguration.java index 8d6b222da..ce76b65a1 100644 --- a/mallinkWebSocketServer/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkWebSocketServer/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -12,108 +12,10 @@ import java.util.Properties; @EnableTransactionManagement @Configuration -public class MyBatisConfiguration { +public class MyBatisConfiguration extends BaseMyBatisConfiguration { @Bean public ShardingSpherePlugin shardingSpherePlugin() { - ShardingSpherePlugin shardingSpherePlugin = new ShardingSpherePlugin(); - Properties properties = new Properties(); - properties.setProperty("dialect", "mysql"); - shardingSpherePlugin.setProperties(properties); - List shardingList = new ArrayList(); - shardingSpherePlugin.setShardingSpheres(shardingList); - - ShardingSphere wxCUserSharding = new ShardingSphere(); - wxCUserSharding.setColumn("tenant_id"); - wxCUserSharding.setTableName("wx_c_user"); - wxCUserSharding.setCount(100); - wxCUserSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCUserSharding); - - ShardingSphere basicInfoSharding = new ShardingSphere(); - basicInfoSharding.setColumn("final_tenant_id"); - basicInfoSharding.setTableName("wx_c_user_basic_info"); - basicInfoSharding.setCount(100); - basicInfoSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(basicInfoSharding); - - ShardingSphere wxOrderSharding = new ShardingSphere(); - wxOrderSharding.setColumn("tenant_id"); - wxOrderSharding.setTableName("wx_order"); - wxOrderSharding.setCount(100); - wxOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderSharding); - - ShardingSphere wxPayOrderSharding = new ShardingSphere(); - wxPayOrderSharding.setColumn("tenant_id"); - wxPayOrderSharding.setTableName("wx_pay_order"); - wxPayOrderSharding.setCount(100); - wxPayOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxPayOrderSharding); - - ShardingSphere wxCouponOrderSharding = new ShardingSphere(); - wxCouponOrderSharding.setColumn("tenant_id"); - wxCouponOrderSharding.setTableName("wx_coupon_order"); - wxCouponOrderSharding.setCount(100); - wxCouponOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponOrderSharding); - - ShardingSphere wxOrderGroupSharding = new ShardingSphere(); - wxOrderGroupSharding.setColumn("tenant_id"); - wxOrderGroupSharding.setTableName("wx_order_group"); - wxOrderGroupSharding.setCount(100); - wxOrderGroupSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderGroupSharding); - - ShardingSphere wxOrderPressSharding = new ShardingSphere(); - wxOrderPressSharding.setColumn("tenant_id"); - wxOrderPressSharding.setTableName("wx_order_press"); - wxOrderPressSharding.setCount(100); - wxOrderPressSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxOrderPressSharding); - - ShardingSphere wxScoreHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_score_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxScoreHistorySharding); - - ShardingSphere wxCreditHistorySharding = new ShardingSphere(); - wxScoreHistorySharding.setColumn("tenant_id"); - wxScoreHistorySharding.setTableName("wx_credit_history"); - wxScoreHistorySharding.setCount(100); - wxScoreHistorySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCreditHistorySharding); - - ShardingSphere wxCarCmdLogSharding = new ShardingSphere(); - wxCarCmdLogSharding.setColumn("tenant_id"); - wxCarCmdLogSharding.setTableName("wx_car_cmd_log"); - wxCarCmdLogSharding.setCount(100); - wxCarCmdLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCarCmdLogSharding); - - ShardingSphere wxMerchantSubsidySharding = new ShardingSphere(); - wxMerchantSubsidySharding.setColumn("tenant_id"); - wxMerchantSubsidySharding.setTableName("wx_merchant_subsidy"); - wxMerchantSubsidySharding.setCount(100); - wxMerchantSubsidySharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxMerchantSubsidySharding); - - ShardingSphere wxProfitSharingOrderSharding = new ShardingSphere(); - wxProfitSharingOrderSharding.setColumn("tenant_id"); - wxProfitSharingOrderSharding.setTableName("wx_profit_sharing_order"); - wxProfitSharingOrderSharding.setCount(100); - wxProfitSharingOrderSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxProfitSharingOrderSharding); - - ShardingSphere wxCouponActionLogSharding = new ShardingSphere(); - wxCouponActionLogSharding.setColumn("tenant_id"); - wxCouponActionLogSharding.setTableName("wx_coupon_action_log"); - wxCouponActionLogSharding.setCount(100); - wxCouponActionLogSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponActionLogSharding); - - return shardingSpherePlugin; + return baseShardingSpherePlugin(); } }