平阴线上环境参数配置

epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-admin-server:
     container_name: epmet-admin-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.32
+    image: 172.22.76.12:5000/epmet-cloud-master/epmet-admin-server:0.3.32
     ports:
       - "8082:8082"
     network_mode: host # 使用现有网络

epmet-admin/epmet-admin-server/pom.xml

@@ -254,19 +254,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_admin_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -279,7 +280,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
 
                 <!--线程池-->

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-auth/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.98
+    image: 172.22.76.12:5000/epmet-cloud-master/epmet-auth:0.3.98
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络

epmet-auth/pom.xml

@@ -366,13 +366,14 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-auth/src/main/resources/bootstrap.yml

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     nacos:
       discovery:

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/RedissonConfig.java

@@ -25,6 +25,10 @@ public class RedissonConfig {
     private String port;
     @Value("${spring.redis.password}")
     private String password;
+    @Value("${spring.redis.cluster.nodes}")
+    private String clusterNodesStr;
+    @Value("${spring.redis.cluster.max-redirects}")
+    private Integer rediTimes;
 
 
     @Bean
@@ -41,10 +45,17 @@ public class RedissonConfig {
             config.setNettyThreads(NumConstant.FOUR);
             //redis://ip:port
             //redis的部署方式有单节点部署、主从方式部署、哨兵方式部署、集群方式部署
-            config.useSingleServer().setAddress("redis://".concat(host).concat(StrConstant.COLON).concat(port));
+
-            config.useSingleServer().setPassword(password);
+            //单机模式
-            config.useSingleServer().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE);
+            //config.useSingleServer().setAddress("redis://".concat(host).concat(StrConstant.COLON).concat(port));
-            config.useSingleServer().setDatabase(NumConstant.TEN);
+            //config.useSingleServer().setPassword(password);
+            //config.useSingleServer().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE);
+            //config.useSingleServer().setDatabase(NumConstant.TEN);
+
+            //集群模式
+            config.useClusterServers().addNodeAddress(getClusterNodes());
+            config.useClusterServers().setPassword(password);
+            config.useClusterServers().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE);
             return Redisson.create(config);
         } catch (Exception e) {
             log.error("初始化redisson失败", e);
@@ -53,4 +64,19 @@ public class RedissonConfig {
 
     }
 
+    /**
+     * @Description 获取集群节点列表
+     * @param
+     * @return  java.lang.String[]
+     * @author wxz
+     * @date 2021.08.23 15:21:28
+     */
+    private String[] getClusterNodes() {
+        log.info("RedssionClient::clusterNodes:{}", clusterNodesStr);
+        String[] nodeArray = clusterNodesStr.split(",");
+        for (int index = 0; index < nodeArray.length; index++) {
+            nodeArray[index] = "redis://".concat(nodeArray[index]);
+        }
+        return nodeArray;
+    }
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java

@@ -17,7 +17,7 @@ public enum EnvEnum {
 	LOCAL("local", "本地环境", "http://localhost:8080/api/"),
 	DEV("dev", "开发环境", "http://192.168.1.140:8080/api/"),
 	TEST("test", "体验环境", "https://epmet-dev.elinkservice.cn/api/"),
-	PROD("prod", "生产环境", "https://epmet-cloud.elinkservice.cn/api/"),
+	PROD("prod", "生产环境", "https://epmet-cloud.pingyin.gov.cn/api/"),
 	UN_KNOWN("un_known", "未知", "https://epmet-dev.elinkservice.cn/api/"),
 	;
 

epmet-gateway/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.71
+    image: 172.22.76.12:5000/epmet-cloud-master/epmet-gateway:0.3.71
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络

epmet-gateway/pom.xml

@@ -495,13 +495,14 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-gateway/src/main/resources/bootstrap.yml

@@ -17,11 +17,19 @@ spring:
     encoding: UTF-8
     basename: i18n/messages_common
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     gateway:
       locator:

epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-aggregator-server:
     container_name: data-aggregator-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.92
+    image: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.92
     ports:
       - "8114:8114"
     network_mode: host # 使用现有网络

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

@@ -537,96 +537,97 @@
 
                 <!--gov-org -->
                 <datasource.druid.govorg.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.govorg.url>
                 <datasource.druid.govorg.username>epmet_gov_org_user</datasource.druid.govorg.username>
                 <datasource.druid.govorg.password>EpmEt-db-UsEr</datasource.druid.govorg.password>
 
                 <!-- govissue -->
                 <datasource.druid.govissue.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.govissue.url>
                 <datasource.druid.govissue.username>epmet_gov_issue_user</datasource.druid.govissue.username>
                 <datasource.druid.govissue.password>EpmEt-db-UsEr</datasource.druid.govissue.password>
 
                 <!-- gov-project -->
                 <datasource.druid.govproject.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.govproject.url>
                 <datasource.druid.govproject.username>epmet_gov_project_user</datasource.druid.govproject.username>
                 <datasource.druid.govproject.password>EpmEt-db-UsEr</datasource.druid.govproject.password>
 
                 <!-- resi-group -->
                 <datasource.druid.resigroup.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.resigroup.url>
                 <datasource.druid.resigroup.username>epmet_resi_group_user</datasource.druid.resigroup.username>
                 <datasource.druid.resigroup.password>EpmEt-db-UsEr</datasource.druid.resigroup.password>
 
                 <!-- epmet-user -->
                 <datasource.druid.epmetuser.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetuser.url>
                 <datasource.druid.epmetuser.username>epmet_user_user</datasource.druid.epmetuser.username>
                 <datasource.druid.epmetuser.password>EpmEt-db-UsEr</datasource.druid.epmetuser.password>
 
                 <!--  epmet_common_service-->
                 <datasource.druid.commonservice.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.commonservice.url>
                 <datasource.druid.commonservice.username>epmet_common_service_user</datasource.druid.commonservice.username>
                 <datasource.druid.commonservice.password>EpmEt-db-UsEr</datasource.druid.commonservice.password>
 
                 <!-- opercrm-->
                 <datasource.druid.opercrm.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.opercrm.url>
                 <datasource.druid.opercrm.username>epmet_oper_crm_user</datasource.druid.opercrm.username>
                 <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
 
                 <!-- data_statistical -->
                 <datasource.druid.stats.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.stats.url>
                 <datasource.druid.stats.username>epmet_data_statistical</datasource.druid.stats.username>
                 <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
 
                 <!-- epmet_evaluation_index -->
                 <datasource.druid.evaluationIndex.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex.url>
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <datasource.druid.opercustomize.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.opercustomize.url>
                 <datasource.druid.opercustomize.username>epmet_oper_customize_user</datasource.druid.opercustomize.username>
                 <datasource.druid.opercustomize.password>EpmEt-db-UsEr</datasource.druid.opercustomize.password>
 
                 <datasource.druid.epmetmessage.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetmessage.url>
                 <datasource.druid.epmetmessage.username>epmet_message_user</datasource.druid.epmetmessage.username>
                 <datasource.druid.epmetmessage.password>EpmEt-db-UsEr</datasource.druid.epmetmessage.password>
 
                 <!-- 问卷调查 -->
                 <datasource.druid.epmettduck.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_tduck?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_tduck?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmettduck.url>
                 <datasource.druid.epmettduck.username>epmet_tduck</datasource.druid.epmettduck.username>
                 <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -10,11 +10,19 @@ spring:
   application:
     name: data-aggregator-server
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
       #MySQL
     druid:

epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.210
+    image: 172.22.76.12:5000/epmet-cloud-master/data-report-server:0.3.210
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

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

@@ -340,33 +340,34 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.stats.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.stats.url>
                 <datasource.druid.stats.username>epmet_data_statistical</datasource.druid.stats.username>
                 <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
 
                 <datasource.druid.statsdisplay.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.statsdisplay.url>
                 <datasource.druid.statsdisplay.username>epmet_data_stats_display_user</datasource.druid.statsdisplay.username>
                 <datasource.druid.statsdisplay.password>EpmEt-db-UsEr</datasource.druid.statsdisplay.password>
 
                 <datasource.druid.evaluationIndex.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex.url>
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -16,11 +16,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-statistical-server:
     container_name: data-statistical-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.345
+    image: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:0.3.345
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

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

@@ -593,104 +593,105 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.stats.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.stats.url>
                 <datasource.druid.stats.username>epmet_data_statistical</datasource.druid.stats.username>
                 <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
 
                 <datasource.druid.org.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.org.url>
                 <datasource.druid.org.username>epmet_gov_org_user</datasource.druid.org.username>
                 <datasource.druid.org.password>EpmEt-db-UsEr</datasource.druid.org.password>
 
                 <datasource.druid.issue.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.issue.url>
                 <datasource.druid.issue.username>epmet_gov_issue_user</datasource.druid.issue.username>
                 <datasource.druid.issue.password>EpmEt-db-UsEr</datasource.druid.issue.password>
 
                 <datasource.druid.project.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.project.url>
                 <datasource.druid.project.username>epmet_gov_project_user</datasource.druid.project.username>
                 <datasource.druid.project.password>EpmEt-db-UsEr</datasource.druid.project.password>
 
                 <datasource.druid.voice.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.voice.url>
                 <datasource.druid.voice.username>epmet_gov_voice_user</datasource.druid.voice.username>
                 <datasource.druid.voice.password>EpmEt-db-UsEr</datasource.druid.voice.password>
 
                 <datasource.druid.crm.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.crm.url>
                 <datasource.druid.crm.username>epmet_oper_crm_user</datasource.druid.crm.username>
                 <datasource.druid.crm.password>EpmEt-db-UsEr</datasource.druid.crm.password>
 
                 <datasource.druid.group.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.group.url>
                 <datasource.druid.group.username>epmet_resi_group_user</datasource.druid.group.username>
                 <datasource.druid.group.password>EpmEt-db-UsEr</datasource.druid.group.password>
 
                 <datasource.druid.user.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.user.url>
                 <datasource.druid.user.username>epmet_user_user</datasource.druid.user.username>
                 <datasource.druid.user.password>EpmEt-db-UsEr</datasource.druid.user.password>
 
                 <datasource.druid.statsdisplay.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.statsdisplay.url>
                 <datasource.druid.statsdisplay.username>epmet_data_stats_display_user</datasource.druid.statsdisplay.username>
                 <datasource.druid.statsdisplay.password>EpmEt-db-UsEr</datasource.druid.statsdisplay.password>
 
                 <datasource.druid.evaluationIndex.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex.url>
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <datasource.druid.evaluationIndex1.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex1.url>
                 <datasource.druid.evaluationIndex1.username>epmet_cloud_viewer</datasource.druid.evaluationIndex1.username>
                 <datasource.druid.evaluationIndex1.password>EpmEtclOUdvIEwEr@w</datasource.druid.evaluationIndex1.password>
 
                 <datasource.druid.partyMember.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.partyMember.url>
                 <datasource.druid.partyMember.username>epmet_resi_partymember_user</datasource.druid.partyMember.username>
                 <datasource.druid.partyMember.password>EpmEt-db-UsEr</datasource.druid.partyMember.password>
 
                 <datasource.druid.epmetHeart.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetHeart.url>
                 <datasource.druid.epmetHeart.username>epmet_heart_user</datasource.druid.epmetHeart.username>
                 <datasource.druid.epmetHeart.password>EpmEt-db-UsEr</datasource.druid.epmetHeart.password>
 
                 <datasource.druid.epmetPoint.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetPoint.url>
                 <datasource.druid.epmetPoint.username>epmet_point_user</datasource.druid.epmetPoint.username>
                 <datasource.druid.epmetPoint.password>EpmEt-db-UsEr</datasource.druid.epmetPoint.password>
 
                 <datasource.druid.operCustomize.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.operCustomize.url>
                 <datasource.druid.operCustomize.username>epmet_oper_customize_user</datasource.druid.operCustomize.username>
                 <datasource.druid.operCustomize.password>EpmEt-db-UsEr</datasource.druid.operCustomize.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -716,7 +717,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

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

@@ -16,11 +16,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-activiti-server:
     container_name: epmet-activiti-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-activiti-server:0.3.1
+    image: 172.22.76.12:5000/epmet-cloud-master/epmet-activiti-server:0.3.1
     ports:
       - "8086:8086"
     network_mode: host # 使用现有网络

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

@@ -287,19 +287,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_activiti?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_activiti?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_activiti_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   common-service-server:
     container_name: common-service-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.42
+    image: 172.22.76.12:5000/epmet-cloud-master/common-service-server:0.3.42
     ports:
       - "8103:8103"
     network_mode: host # 使用现有网络

epmet-module/epmet-common-service/common-service-server/pom.xml

@@ -270,19 +270,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_common_service_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-ext-server:
     container_name: epmet-ext-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.20
+    image: 172.22.76.12:5000/epmet-cloud-master/epmet-ext-server:0.0.20
     ports:
       - "8113:8113"
     network_mode: host # 使用现有网络

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

@@ -349,19 +349,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_third_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -16,11 +16,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.72
+    image: 172.22.76.12:5000/epmet-cloud-master/epmet-heart-server:0.0.72
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

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

@@ -318,19 +318,20 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.url>
                 <datasource.druid.username>epmet_heart_user</datasource.druid.username>
                 <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -351,7 +352,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
 
                 <!--线程池-->
                 <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>

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

@@ -16,11 +16,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-job-server:
     container_name: epmet-job-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.47
+    image: 172.22.76.12:5000/epmet-cloud-master/epmet-job-server:0.3.47
     ports:
       - "8084:8084"
     network_mode: host # 使用现有网络

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

@@ -250,19 +250,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_job_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-message-server:
     container_name: epmet-message-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.57
+    image: 172.22.76.12:5000/epmet-cloud-master/epmet-message-server:0.3.57
     ports:
       - "8085:8085"
     network_mode: host # 使用现有网络

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

@@ -324,19 +324,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_message_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -364,7 +365,7 @@
                 </dingTalk.robot.secret>
 
                 <!--rocketmq-->
-                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml

@@ -3,7 +3,7 @@ services:
   epmet-oss-server:
     container_name: epmet-oss-server-prod
 #    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.40
+    image: 172.22.76.12:5000/epmet-cloud-master/epmet-oss-server:0.3.40
     ports:
       - "8083:8083"
     network_mode: host # 使用现有网络

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

@@ -269,19 +269,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oss?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_oss?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_oss_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-point-server:
     container_name: epmet-point-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.63
+    image: 172.22.76.12:5000/epmet-cloud-master/epmet-point-server:0.0.63
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

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

@@ -290,19 +290,20 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.url>
                 <datasource.druid.username>epmet_point_user</datasource.druid.username>
                 <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -327,7 +328,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

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

@@ -16,11 +16,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.183
+    image: 172.22.76.12:5000/epmet-cloud-master/epmet-third-server:0.0.183
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

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

@@ -371,19 +371,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_third_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -411,7 +412,7 @@
 
                 <!-- epmet-cloud内部用的rocketmq配置 -->
                 <!--<rocketmq.epmet-cloud-inner.enable>true</rocketmq.epmet-cloud-inner.enable>
-                <rocketmq.epmet-cloud-inner.name-server>192.168.11.187:9876;192.168.11.184:9876</rocketmq.epmet-cloud-inner.name-server>-->
+                <rocketmq.epmet-cloud-inner.name-server>172.22.76.20:9876;172.22.76.36:9876</rocketmq.epmet-cloud-inner.name-server>-->
 
                 <!-- 区块链用的rocketmq配置 -->
                 <rocketmq.block-chain.enable>false</rocketmq.block-chain.enable>

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

@@ -16,11 +16,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-access-server:
     container_name: gov-access-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.61
+    image: 172.22.76.12:5000/epmet-cloud-master/gov-access-server:0.3.61
     ports:
       - "8099:8099"
     network_mode: host # 使用现有网络

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

@@ -248,19 +248,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_access_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -16,11 +16,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-grid-server:
     container_name: gov-grid-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.49
+    image: 172.22.76.12:5000/epmet-cloud-master/gov-grid-server:0.3.49
     ports:
       - "8097:8097"
     network_mode: host # 使用现有网络

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

@@ -234,13 +234,14 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     nacos:
       discovery:

epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-issue-server:
     container_name: gov-issue-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.100
+    image: 172.22.76.12:5000/epmet-cloud-master/gov-issue-server:0.3.100
     ports:
       - "8101:8101"
     network_mode: host # 使用现有网络

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

@@ -301,19 +301,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_issue_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -342,7 +343,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

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

@@ -16,11 +16,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.47
+    image: 172.22.76.12:5000/epmet-cloud-master/gov-mine-server:0.3.47
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络

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

@@ -248,13 +248,14 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -16,11 +16,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     nacos:
       discovery:

epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.156
+    image: 172.22.76.12:5000/epmet-cloud-master/gov-org-server:0.3.156
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

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

@@ -342,19 +342,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_org_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -382,7 +383,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   # 数据迁移工具flyway
   flyway:
     enabled: @spring.flyway.enabled@

epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.96
+    image: 172.22.76.12:5000/epmet-cloud-master/gov-project-server:0.3.96
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络

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

@@ -315,19 +315,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_project_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -16,11 +16,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-voice-server:
     container_name: gov-voice-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.78
+    image: 172.22.76.12:5000/epmet-cloud-master/gov-voice-server:0.3.78
     ports:
       - "8105:8105"
     network_mode: host # 使用现有网络

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

@@ -259,19 +259,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_voice_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -16,11 +16,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-voice-server:
     container_name: open-data-worker-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.22
+    image: 172.22.76.12:5000/epmet-cloud-master/open-data-worker-server:0.3.22
     ports:
       - "8117:8117"
     network_mode: host # 使用现有网络

epmet-module/open-data-worker/open-data-worker-server/pom.xml

@@ -273,19 +273,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_open_data?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_open_data?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_open_data_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -311,7 +312,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

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

@@ -16,11 +16,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-access-server:
     container_name: oper-access-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:0.3.24
+    image: 172.22.76.12:5000/epmet-cloud-master/oper-access-server:0.3.24
     ports:
       - "8093:8093"
     network_mode: host # 使用现有网络

epmet-module/oper-access/oper-access-server/pom.xml

@@ -244,19 +244,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_oper_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_oper_access_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-crm-server:
     container_name: oper-crm-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.87
+    image: 172.22.76.12:5000/epmet-cloud-master/oper-crm-server:0.3.87
     ports:
       - "8090:8090"
     network_mode: host # 使用现有网络

epmet-module/oper-crm/oper-crm-server/pom.xml

@@ -292,19 +292,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_oper_crm_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-customize-server:
     container_name: oper-customize-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.66
+    image: 172.22.76.12:5000/epmet-cloud-master/oper-customize-server:0.3.66
     ports:
       - "8089:8089"
     network_mode: host # 使用现有网络

epmet-module/oper-customize/oper-customize-server/pom.xml

@@ -276,19 +276,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_oper_customize_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -316,7 +317,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.130
+    image: 172.22.76.12:5000/epmet-cloud-master/resi-group-server:0.3.130
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

epmet-module/resi-group/resi-group-server/pom.xml

@@ -344,19 +344,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_resi_group_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -392,7 +393,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-guide-server:
     container_name: resi-guide-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.34
+    image: 172.22.76.12:5000/epmet-cloud-master/resi-guide-server:0.3.34
     ports:
       - "8091:8091"
     network_mode: host # 使用现有网络

epmet-module/resi-guide/resi-guide-server/pom.xml

@@ -265,19 +265,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_guide?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_resi_guide?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_resi_guide_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-hall-server:
     container_name: resi-hall-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.36
+    image: 172.22.76.12:5000/epmet-cloud-master/resi-hall-server:0.3.36
     ports:
       - "8100:8100"
     network_mode: host # 使用现有网络

epmet-module/resi-hall/resi-hall-server/pom.xml

@@ -217,13 +217,14 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     nacos:
       discovery:

epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-home-server:
     container_name: resi-home-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.23
+    image: 172.22.76.12:5000/epmet-cloud-master/resi-home-server:0.3.23
     ports:
       - "8104:8104"
     network_mode: host # 使用现有网络

epmet-module/resi-home/resi-home-server/pom.xml

@@ -238,13 +238,14 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     nacos:
       discovery:

epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-mine-server:
     container_name: resi-mine-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.54
+    image: 172.22.76.12:5000/epmet-cloud-master/resi-mine-server:0.3.54
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络

epmet-module/resi-mine/resi-mine-server/pom.xml

@@ -254,13 +254,14 @@
                 <spring.profiles.active>prod</spring.profiles.active>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   cloud:
     nacos:
       discovery:

epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-partymember-server:
     container_name: resi-partymember-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.83
+    image: 172.22.76.12:5000/epmet-cloud-master/resi-partymember-server:0.3.83
     ports:
       - "8096:8096"
     network_mode: host # 使用现有网络

epmet-module/resi-partymember/resi-partymember-server/pom.xml

@@ -295,19 +295,20 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_resi_partymember_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>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.cluster.nodes>172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389</spring.redis.cluster.nodes>
-                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.mode>cluster</spring.redis.mode>
-                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
+                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
+                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
+                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

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

@@ -19,11 +19,19 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
+    # 平阴cluster模式下使用cluster:配置段
+    #    database: @spring.redis.index@
+    #    host: @spring.redis.host@
+    #    port: @spring.redis.port@
+    #    password: @spring.redis.password@
+    #    timeout: 30s
+
     database: @spring.redis.index@
-    host: @spring.redis.host@
-    port: @spring.redis.port@
     password: @spring.redis.password@
     timeout: 30s
+    cluster:
+      nodes: @spring.redis.cluster.nodes@
+      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-voice-server:
     container_name: resi-voice-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-voice-server:0.3.12
+    image: 172.22.76.12:5000/epmet-cloud-master/resi-voice-server:0.3.12
     ports:
       - "8106:8106"
     network_mode: host # 使用现有网络