分区处理

CommunityService/src/main/resources/dataSource.yml

@@ -46,16 +46,16 @@ shardingRule:
   tables:
     business_community:
       actualDataNodes: ds${0..1}.business_community
-      tableStrategy:
+      databaseStrategy:
         inline:
           shardingColumn: community_id
-          algorithmExpression: business_community${business_community % 2}
+          algorithmExpression: ds${Integer.parseInt(community_id) % 2}
     community:
       actualDataNodes: ds${0..1}.community
-      tableStrategy:
+      databaseStrategy:
         inline:
           shardingColumn: community_id
-          algorithmExpression: community${community_id % 2}
+          algorithmExpression: ds${Integer.parseInt(community_id) % 2}
   bindingTables:
     - business_community,community
 
@@ -76,5 +76,5 @@ shardingRule:
 #     slaveDataSourceNames:
 #       - ds1_slave0
 #     loadBalanceAlgorithmType: ROUND_ROBIN
-#props:
-#  sql.show: true
+props:
+  sql.show: true

WebService/src/main/java/com/java110/web/WebServiceApplicationStart.java

@@ -2,21 +2,12 @@ package com.java110.web;
 
 import com.java110.service.init.ServiceStartInit;
 import com.java110.web.core.VueComponentTemplate;
-import org.apache.catalina.Context;
-import org.apache.catalina.connector.Connector;
-import org.apache.tomcat.util.descriptor.web.SecurityCollection;
-import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.converter.StringHttpMessageConverter;

java110-db/pom.xml

@@ -43,9 +43,13 @@
             <groupId>tk.mybatis</groupId>
             <artifactId>mapper-spring-boot-starter</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>io.shardingsphere</groupId>
             <artifactId>sharding-jdbc</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>io.shardingsphere</groupId>
+            <artifactId>sharding-jdbc-core</artifactId>
         </dependency>
     </dependencies>
 </project>

java110-db/src/main/java/com/java110/db/DataSourceConfig.java

@@ -3,9 +3,9 @@ package com.java110.db;
 import com.alibaba.druid.filter.Filter;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.google.common.collect.Lists;
-import io.shardingsphere.core.api.ShardingDataSourceFactory;
 import io.shardingsphere.core.yaml.sharding.YamlShardingConfiguration;
 import io.shardingsphere.core.yaml.sharding.YamlShardingRuleConfiguration;
+import io.shardingsphere.shardingjdbc.api.ShardingDataSourceFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,7 +51,7 @@ public class DataSourceConfig {
             d.setProxyFilters(Lists.newArrayList(statFilter));
         }
         return ShardingDataSourceFactory.createDataSource(config.getDataSources(),
-                rule.getShardingRuleConfiguration(), rule.getConfigMap(), rule.getProps());
+                rule.getShardingRuleConfiguration(), config.getConfigMap(), config.getProps());
     }
 
     /**

pom.xml

@@ -305,10 +305,16 @@
                 <version>${httpclient.verion}</version>
             </dependency>
 
-            <dependency>
+            <!--<dependency>
                 <groupId>io.shardingsphere</groupId>
                 <artifactId>sharding-jdbc</artifactId>
                 <version>3.0.0.M3</version>
+            </dependency>-->
+
+            <dependency>
+                <groupId>io.shardingsphere</groupId>
+                <artifactId>sharding-jdbc-core</artifactId>
+                <version>3.1.0</version>
             </dependency>