diff --git a/accompany-admin/accompany-admin-sdk/pom.xml b/accompany-admin/accompany-admin-sdk/pom.xml index e8e3533ea..94507390f 100644 --- a/accompany-admin/accompany-admin-sdk/pom.xml +++ b/accompany-admin/accompany-admin-sdk/pom.xml @@ -43,11 +43,6 @@ accompany-business-community-sdk ${revision} - - com.accompany - accompany-sharding-sdk - ${revision} - com.accompany accompany-business-sdk diff --git a/accompany-base/accompany-basic/accompany-basic-service/pom.xml b/accompany-base/accompany-basic/accompany-basic-service/pom.xml index 33affc4d6..57fb4e9a7 100644 --- a/accompany-base/accompany-basic/accompany-basic-service/pom.xml +++ b/accompany-base/accompany-basic/accompany-basic-service/pom.xml @@ -17,6 +17,17 @@ com.accompany accompany-basic-sdk ${revision} + + + joda-time + joda-time + + + + + com.accompany + accompany-sharding-service + ${revision} diff --git a/accompany-base/accompany-basic/pom.xml b/accompany-base/accompany-basic/pom.xml index 8b99daf63..5eef0503f 100644 --- a/accompany-base/accompany-basic/pom.xml +++ b/accompany-base/accompany-basic/pom.xml @@ -16,10 +16,4 @@ accompany-basic-service - - 8 - 8 - UTF-8 - - \ No newline at end of file diff --git a/accompany-base/accompany-core/pom.xml b/accompany-base/accompany-core/pom.xml index 790d4948b..e7613cef6 100644 --- a/accompany-base/accompany-core/pom.xml +++ b/accompany-base/accompany-core/pom.xml @@ -45,11 +45,6 @@ spring-boot-starter-aop - - org.springframework.boot - spring-boot-starter-jdbc - - org.springframework.boot spring-boot-starter-data-redis @@ -89,18 +84,6 @@ spring-boot-starter-freemarker - - com.baomidou - mybatis-plus-boot-starter - ${mybatisplus.version} - - - - com.baomidou - mybatis-plus-jsqlparser - ${mybatisplus.version} - - cn.hippo4j hippo4j-config-spring-boot-starter diff --git a/accompany-base/accompany-payment/pom.xml b/accompany-base/accompany-payment/pom.xml index aae2423ae..18be018cb 100644 --- a/accompany-base/accompany-payment/pom.xml +++ b/accompany-base/accompany-payment/pom.xml @@ -16,10 +16,4 @@ accompany-payment-service - - 8 - 8 - UTF-8 - - \ No newline at end of file diff --git a/accompany-base/accompany-sharding/accompany-sharding-service/pom.xml b/accompany-base/accompany-sharding/accompany-sharding-service/pom.xml index 36a7f50fb..c67a51e44 100644 --- a/accompany-base/accompany-sharding/accompany-sharding-service/pom.xml +++ b/accompany-base/accompany-sharding/accompany-sharding-service/pom.xml @@ -18,11 +18,30 @@ accompany-sharding-sdk ${revision} + + + org.springframework.boot + spring-boot-starter-jdbc + + org.apache.shardingsphere shardingsphere-jdbc ${sharding-jdbc.version} + + + com.baomidou + mybatis-plus-boot-starter + ${mybatisplus.version} + + + + com.baomidou + mybatis-plus-jsqlparser + ${mybatisplus.version} + + \ No newline at end of file diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/config/DataSourceConfig.java b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/DataSourceConfig.java similarity index 95% rename from accompany-base/accompany-core/src/main/java/com/accompany/core/config/DataSourceConfig.java rename to accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/DataSourceConfig.java index 07f41234c..f2e7c2e0f 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/config/DataSourceConfig.java +++ b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/DataSourceConfig.java @@ -1,4 +1,4 @@ -package com.accompany.core.config; +package com.accompany.sharding.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.jdbc.DataSourceBuilder; diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/config/MybatisPlusConfig.java b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/MybatisPlusConfig.java similarity index 97% rename from accompany-base/accompany-core/src/main/java/com/accompany/core/config/MybatisPlusConfig.java rename to accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/MybatisPlusConfig.java index d4f803020..4ad28ff3c 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/config/MybatisPlusConfig.java +++ b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.accompany.core.config; +package com.accompany.sharding.config; import com.accompany.common.utils.ResourceUtil; import com.baomidou.mybatisplus.annotation.DbType; @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; import com.github.pagehelper.PageInterceptor; import org.apache.ibatis.plugin.Interceptor; import org.mybatis.spring.annotation.MapperScan; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.context.annotation.*; diff --git a/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/ShardingSphereConfig.java b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/ShardingSphereConfig.java index 20da7bef3..f871d1485 100644 --- a/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/ShardingSphereConfig.java +++ b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/ShardingSphereConfig.java @@ -12,6 +12,7 @@ import org.apache.shardingsphere.infra.config.rule.RuleConfiguration; import org.apache.shardingsphere.mode.repository.standalone.StandalonePersistRepositoryConfiguration; import org.apache.shardingsphere.readwritesplitting.config.ReadwriteSplittingRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.config.rule.ReadwriteSplittingDataSourceGroupRuleConfiguration; +import org.apache.shardingsphere.readwritesplitting.transaction.TransactionalReadQueryStrategy; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; @@ -64,7 +65,7 @@ public class ShardingSphereConfig { ModeConfiguration modeConfig = new ModeConfiguration("Standalone", new StandalonePersistRepositoryConfiguration("JDBC", new Properties())); //是否打印执行的sql语句 Properties properties = new Properties(); - properties.setProperty("sql-show", "true"); + properties.setProperty("sql-show", "false"); return ShardingSphereDataSourceFactory.createDataSource(modeConfig, dataSourceMap, ruleConfigs, properties); } @@ -97,8 +98,9 @@ public class ShardingSphereConfig { } private ReadwriteSplittingRuleConfiguration getReadWriteRuleConfig() { + //同一事务下强制使用主库 ReadwriteSplittingDataSourceGroupRuleConfiguration dataSourceGroupConfig = new ReadwriteSplittingDataSourceGroupRuleConfiguration( - "ds", "ds", Arrays.asList("ds", "ds_slave"), "weight_lb"); + "ds", "ds", Arrays.asList("ds", "ds_slave"), TransactionalReadQueryStrategy.PRIMARY, "weight_lb"); Properties algorithmProps = new Properties(); algorithmProps.setProperty("ds_slave", "3"); algorithmProps.setProperty("ds", "1"); diff --git a/accompany-base/accompany-sharding/pom.xml b/accompany-base/accompany-sharding/pom.xml index f3a71caed..40376756a 100644 --- a/accompany-base/accompany-sharding/pom.xml +++ b/accompany-base/accompany-sharding/pom.xml @@ -16,10 +16,4 @@ accompany-sharding-service - - 8 - 8 - UTF-8 - - \ No newline at end of file diff --git a/accompany-base/accompany-sms/pom.xml b/accompany-base/accompany-sms/pom.xml index db858ca41..2fc1b6f8b 100644 --- a/accompany-base/accompany-sms/pom.xml +++ b/accompany-base/accompany-sms/pom.xml @@ -16,10 +16,4 @@ accompany-sms-service - - 8 - 8 - UTF-8 - - \ No newline at end of file diff --git a/accompany-business/accompany-business-community/pom.xml b/accompany-business/accompany-business-community/pom.xml index 3241eb96a..e03fc348a 100644 --- a/accompany-business/accompany-business-community/pom.xml +++ b/accompany-business/accompany-business-community/pom.xml @@ -16,10 +16,4 @@ accompany-business-community-service - - 8 - 8 - UTF-8 - - \ No newline at end of file diff --git a/accompany-business/accompany-business-festival-activity/pom.xml b/accompany-business/accompany-business-festival-activity/pom.xml index d7a20b269..0a5430351 100644 --- a/accompany-business/accompany-business-festival-activity/pom.xml +++ b/accompany-business/accompany-business-festival-activity/pom.xml @@ -21,10 +21,4 @@ fastival-activity-mq - - 8 - 8 - UTF-8 - - \ No newline at end of file diff --git a/accompany-business/accompany-business-service/pom.xml b/accompany-business/accompany-business-service/pom.xml index 7a5594f7f..c5d127db8 100644 --- a/accompany-business/accompany-business-service/pom.xml +++ b/accompany-business/accompany-business-service/pom.xml @@ -43,11 +43,6 @@ accompany-business-world-service ${revision} - - com.accompany - accompany-sharding-service - ${revision} - com.accompany festival-activity-sdk diff --git a/accompany-business/accompany-business-world/pom.xml b/accompany-business/accompany-business-world/pom.xml index 3e8d9dfa6..710c18f29 100644 --- a/accompany-business/accompany-business-world/pom.xml +++ b/accompany-business/accompany-business-world/pom.xml @@ -16,10 +16,4 @@ accompany-business-world-service - - 8 - 8 - UTF-8 - - \ No newline at end of file diff --git a/accompany-mq/pom.xml b/accompany-mq/pom.xml index c20ba5414..37090287b 100644 --- a/accompany-mq/pom.xml +++ b/accompany-mq/pom.xml @@ -18,10 +18,4 @@ accompany-mq-web - - 8 - 8 - UTF-8 - - \ No newline at end of file diff --git a/accompany-oauth2/accompany-oauth2-service/pom.xml b/accompany-oauth2/accompany-oauth2-service/pom.xml index 1a7dfd991..525b8958b 100644 --- a/accompany-oauth2/accompany-oauth2-service/pom.xml +++ b/accompany-oauth2/accompany-oauth2-service/pom.xml @@ -13,6 +13,11 @@ jar + + com.accompany + accompany-core + ${revision} + com.accompany accompany-oauth2-sdk diff --git a/accompany-oauth2/accompany-oauth2-web/pom.xml b/accompany-oauth2/accompany-oauth2-web/pom.xml index 9301f16da..4c8d4696e 100644 --- a/accompany-oauth2/accompany-oauth2-web/pom.xml +++ b/accompany-oauth2/accompany-oauth2-web/pom.xml @@ -13,11 +13,6 @@ jar - - com.accompany - accompany-core - ${revision} - com.accompany accompany-oauth2-service