Merge branch 'dev_test_pingyin' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_test_pingyin

epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml

@@ -32,6 +32,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-commons/epmet-commons-mybatis/pom.xml

@@ -70,6 +70,12 @@
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>1.2.12</version>
         </dependency>
+        <!--读写分离-->
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
+            <version>4.0.0-RC1</version>
+        </dependency>
 
         <!--flyway 数据库迁移工具-->
         <dependency>

epmet-commons/epmet-commons-tools/pom.xml

@@ -75,6 +75,12 @@
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <version>${commons.fileupload.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -32,6 +32,13 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-mybatis</artifactId>
             <version>2.0.0</version>
+            <!--排除主从-->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.shardingsphere</groupId>
+                    <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>

epmet-module/data-report/data-report-server/pom.xml

@@ -28,6 +28,13 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-mybatis</artifactId>
             <version>2.0.0</version>
+            <!--排除主从-->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.shardingsphere</groupId>
+                    <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -22,6 +22,13 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-mybatis</artifactId>
             <version>2.0.0</version>
+            <!--排除主从-->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.shardingsphere</groupId>
+                    <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

epmet-module/epmet-activiti/epmet-activiti-server/pom.xml

@@ -84,6 +84,10 @@
                     <artifactId>slf4j-log4j12</artifactId>
                     <groupId>org.slf4j</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -122,6 +126,10 @@
                     <artifactId>spring-security-crypto</artifactId>
                     <groupId>org.springframework.security</groupId>
                 </exclusion>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!-- 替换Feign原生httpclient -->

epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml

@@ -32,6 +32,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml

@@ -32,6 +32,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/epmet-demo/epmet-demo-server/pom.xml

@@ -125,6 +125,38 @@
     <profiles>
         <profile>
             <id>dev</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <server.port>8088</server.port>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <!-- 数据库配置-->
+                <spring.datasource.druid.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </spring.datasource.druid.url>
+                <spring.datasource.druid.username>epmet_demo_user</spring.datasource.druid.username>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                <!-- redis配置 -->
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>192.168.1.140</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>123456</spring.redis.password>
+                <!-- nacos -->
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>192.168.1.140:8848</nacos.server-addr>
+                <nacos.discovery.namespace>1fecc730-5e6e-464c-aae9-7567944e7936</nacos.discovery.namespace>
+                <nacos.config.namespace></nacos.config.namespace>
+                <nacos.config.group></nacos.config.group>
+                <nacos.config-enabled>false</nacos.config-enabled>
+                <nacos.ip/>
+                <!--是否开启服务列表变更监听-->
+                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
+            </properties>
+        </profile>
+        <profile>
+            <id>local</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>

epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml

@@ -32,6 +32,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL
@@ -39,6 +41,15 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+  # 数据迁移工具flyway
+  flyway:
+    enabled: false
+    locations: classpath:db/migration
+    url:
+    user:
+    password:
+    baseline-on-migrate: true
+    baseline-version: 0
   cloud:
     nacos:
       discovery:

epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml

@@ -29,6 +29,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml

@@ -29,6 +29,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml

@@ -32,6 +32,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml

@@ -32,6 +32,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/epmet-oss/epmet-oss-client/pom.xml

@@ -32,6 +32,12 @@
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <version>1.3.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>net.coobird</groupId>

epmet-module/epmet-oss/epmet-oss-server/pom.xml

@@ -55,6 +55,12 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -85,6 +91,12 @@
             <groupId>com.github.tobato</groupId>
             <artifactId>fastdfs-client</artifactId>
             <version>${fastdfs.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml

@@ -32,6 +32,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml

@@ -29,6 +29,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml

@@ -29,6 +29,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml

@@ -29,6 +29,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml

@@ -29,6 +29,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/gov-org/gov-org-server/pom.xml

@@ -33,11 +33,6 @@
             <artifactId>epmet-commons-mybatis</artifactId>
             <version>2.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>epmet-commons-dynamic-datasource</artifactId>
-            <version>2.0.0</version>
-        </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-oss-client</artifactId>

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -111,6 +111,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     private GovProjectOpenFeignClient govProjectOpenFeignClient;
     @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
 
 

epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml

@@ -29,6 +29,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml

@@ -29,6 +29,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml

@@ -32,6 +32,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml

@@ -32,6 +32,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml

@@ -32,7 +32,10 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
+
     druid:
       #MySQL
       driver-class-name: com.mysql.cj.jdbc.Driver

epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml

@@ -32,6 +32,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml

@@ -32,6 +32,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml

@@ -32,6 +32,8 @@ spring:
     cluster:
       nodes: @spring.redis.cluster.nodes@
       max-redirects: @spring.redis.cluster.max-redirects@
+  shardingsphere:
+    enabled: false
   datasource:
     druid:
       #MySQL

epmet-user/epmet-user-server/pom.xml

@@ -28,11 +28,11 @@
             <artifactId>epmet-commons-mybatis</artifactId>
             <version>2.0.0</version>
         </dependency>
-        <dependency>
+       <!-- <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-dynamic-datasource</artifactId>
             <version>2.0.0</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>