修改为日照政务云

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

@@ -117,8 +117,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -165,8 +165,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -211,7 +211,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -254,24 +254,24 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
                 <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -284,7 +284,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>10.1.26.46:9876;10.1.26.48:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
 
                 <!--线程池-->

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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

epmet-auth/pom.xml

@@ -377,9 +377,9 @@
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -387,8 +387,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java

@@ -49,7 +49,8 @@ public class NoRepeatSubmitAop {
         Object result = null;
         RLock lock = null;
         try {
-            try {
+            // 日照的单机节点，不需要分布式锁，锁不住直接放行
+            /*try {
                 //key 为空则直接跳过 不加锁
                 if (key != null) {
                     long leaseTime = noRepeatSubmit.leaseTime();
@@ -62,7 +63,7 @@ public class NoRepeatSubmitAop {
                 log.warn("noRepeatSubmit key:{},msg:{}", key, error);
                 //"未获取到锁，重复提交了
                 throw new RenException(EpmetErrorCode.REPEAT_SUBMIT.getCode());
-            }
+            }*/
 
             //执行业务代码
             result = pjp.proceed();

epmet-gateway/pom.xml

@@ -508,9 +508,9 @@
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -518,8 +518,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -20,7 +20,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -187,63 +187,63 @@
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <datasource.druid.govorg.password>Zhsq@Szrz%2023_</datasource.druid.govorg.password>
 
                 <!-- govissue -->
                 <datasource.druid.govissue.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <datasource.druid.govissue.password>Zhsq@Szrz%2023_</datasource.druid.govissue.password>
 
                 <!-- gov-project -->
                 <datasource.druid.govproject.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <datasource.druid.govproject.password>Zhsq@Szrz%2023_</datasource.druid.govproject.password>
 
                 <!-- resi-group -->
                 <datasource.druid.resigroup.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <datasource.druid.resigroup.password>Zhsq@Szrz%2023_</datasource.druid.resigroup.password>
 
                 <!-- epmet-user -->
                 <datasource.druid.epmetuser.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <datasource.druid.epmetuser.password>Zhsq@Szrz%2023_</datasource.druid.epmetuser.password>
 
                 <!-- epmet_common_service -->
                 <datasource.druid.commonservice.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <datasource.druid.commonservice.password>Zhsq@Szrz%2023_</datasource.druid.commonservice.password>
 
                 <!-- opercrm -->
                 <datasource.druid.opercrm.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <datasource.druid.opercrm.password>Zhsq@Szrz%2023_</datasource.druid.opercrm.password>
 
                 <!-- data_statistical -->
                 <datasource.druid.stats.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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_user</datasource.druid.stats.username>
-                <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
+                <datasource.druid.stats.password>Zhsq@Szrz%2023_</datasource.druid.stats.password>
 
                 <!-- epmet_evaluation_index -->
                 <datasource.druid.evaluationIndex.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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.evaluationIndex.password>Zhsq@Szrz%2023_</datasource.druid.evaluationIndex.password>
 
                 <datasource.druid..url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -255,34 +255,34 @@
                     <![CDATA[jdbc:mysql://192.168.1.140: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.opercustomize.password>Zhsq@Szrz%2023_</datasource.druid.opercustomize.password>
 
                 <datasource.druid.epmetmessage.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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.epmetmessage.password>Zhsq@Szrz%2023_</datasource.druid.epmetmessage.password>
 
                 <!-- 问卷调查 -->
                 <datasource.druid.epmettduck.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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_user</datasource.druid.epmettduck.username>
-                <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>
+                <datasource.druid.epmettduck.password>Zhsq@Szrz%2023_</datasource.druid.epmettduck.password>
 
                 <!--heart-->
                 <datasource.druid.heart.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.heart.url>
                 <datasource.druid.heart.username>epmet_heart_user</datasource.druid.heart.username>
-                <datasource.druid.heart.password>EpmEt-db-UsEr</datasource.druid.heart.password>
+                <datasource.druid.heart.password>Zhsq@Szrz%2023_</datasource.druid.heart.password>
 
                 <!--epmet_resi_partymember-->
                 <datasource.druid.partymember.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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.partymember.password>Zhsq@Szrz%2023_</datasource.druid.partymember.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -332,95 +332,95 @@
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <datasource.druid.govorg.password>Zhsq@Szrz%2023_</datasource.druid.govorg.password>
 
                 <!-- govissue -->
                 <datasource.druid.govissue.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <datasource.druid.govissue.password>Zhsq@Szrz%2023_</datasource.druid.govissue.password>
 
                 <!-- gov-project -->
                 <datasource.druid.govproject.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <datasource.druid.govproject.password>Zhsq@Szrz%2023_</datasource.druid.govproject.password>
 
                 <!-- resi-group -->
                 <datasource.druid.resigroup.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <datasource.druid.resigroup.password>Zhsq@Szrz%2023_</datasource.druid.resigroup.password>
 
                 <!-- epmet-user -->
                 <datasource.druid.epmetuser.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <datasource.druid.epmetuser.password>Zhsq@Szrz%2023_</datasource.druid.epmetuser.password>
 
                 <!-- epmet_common_service -->
                 <datasource.druid.commonservice.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <datasource.druid.commonservice.password>Zhsq@Szrz%2023_</datasource.druid.commonservice.password>
 
                 <!-- opercrm -->
                 <datasource.druid.opercrm.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <datasource.druid.opercrm.password>Zhsq@Szrz%2023_</datasource.druid.opercrm.password>
 
                 <!-- data_statistical -->
                 <datasource.druid.stats.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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_user</datasource.druid.stats.username>
-                <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
+                <datasource.druid.stats.password>Zhsq@Szrz%2023_</datasource.druid.stats.password>
 
                 <!-- epmet_evaluation_index -->
                 <datasource.druid.evaluationIndex.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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.evaluationIndex.password>Zhsq@Szrz%2023_</datasource.druid.evaluationIndex.password>
 
                 <datasource.druid.opercustomize.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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.opercustomize.password>Zhsq@Szrz%2023_</datasource.druid.opercustomize.password>
 
                 <datasource.druid.epmetmessage.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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.epmetmessage.password>Zhsq@Szrz%2023_</datasource.druid.epmetmessage.password>
 
                 <!-- 问卷调查 -->
                 <datasource.druid.epmettduck.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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_user</datasource.druid.epmettduck.username>
-                <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>
+                <datasource.druid.epmettduck.password>Zhsq@Szrz%2023_</datasource.druid.epmettduck.password>
 
                 <datasource.druid.heart.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.heart.url>
                 <datasource.druid.heart.username>epmet_heart_user</datasource.druid.heart.username>
-                <datasource.druid.heart.password>EpmEt-db-UsEr</datasource.druid.heart.password>
+                <datasource.druid.heart.password>Zhsq@Szrz%2023_</datasource.druid.heart.password>
 
                 <!--epmet_resi_partymember-->
                 <datasource.druid.partymember.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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.partymember.password>Zhsq@Szrz%2023_</datasource.druid.partymember.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -606,106 +606,106 @@
 
                 <!--gov-org -->
                 <datasource.druid.govorg.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <datasource.druid.govorg.username>root</datasource.druid.govorg.username>
+                <datasource.druid.govorg.password>Zhsq@Szrz%2023_</datasource.druid.govorg.password>
 
                 <!-- govissue -->
                 <datasource.druid.govissue.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <datasource.druid.govissue.username>root</datasource.druid.govissue.username>
+                <datasource.druid.govissue.password>Zhsq@Szrz%2023_</datasource.druid.govissue.password>
 
                 <!-- gov-project -->
                 <datasource.druid.govproject.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <datasource.druid.govproject.username>root</datasource.druid.govproject.username>
+                <datasource.druid.govproject.password>Zhsq@Szrz%2023_</datasource.druid.govproject.password>
 
                 <!-- resi-group -->
                 <datasource.druid.resigroup.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <datasource.druid.resigroup.username>root</datasource.druid.resigroup.username>
+                <datasource.druid.resigroup.password>Zhsq@Szrz%2023_</datasource.druid.resigroup.password>
 
                 <!-- epmet-user -->
                 <datasource.druid.epmetuser.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <datasource.druid.epmetuser.username>root</datasource.druid.epmetuser.username>
+                <datasource.druid.epmetuser.password>Zhsq@Szrz%2023_</datasource.druid.epmetuser.password>
 
                 <!--  epmet_common_service-->
                 <datasource.druid.commonservice.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <datasource.druid.commonservice.username>root</datasource.druid.commonservice.username>
+                <datasource.druid.commonservice.password>Zhsq@Szrz%2023_</datasource.druid.commonservice.password>
 
                 <!-- opercrm-->
                 <datasource.druid.opercrm.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <datasource.druid.opercrm.username>root</datasource.druid.opercrm.username>
+                <datasource.druid.opercrm.password>Zhsq@Szrz%2023_</datasource.druid.opercrm.password>
 
                 <!-- data_statistical -->
                 <datasource.druid.stats.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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.stats.username>root</datasource.druid.stats.username>
+                <datasource.druid.stats.password>Zhsq@Szrz%2023_</datasource.druid.stats.password>
 
                 <!-- epmet_evaluation_index -->
                 <datasource.druid.evaluationIndex.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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.evaluationIndex.username>root</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>Zhsq@Szrz%2023_</datasource.druid.evaluationIndex.password>
 
                 <datasource.druid.opercustomize.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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.opercustomize.username>root</datasource.druid.opercustomize.username>
+                <datasource.druid.opercustomize.password>Zhsq@Szrz%2023_</datasource.druid.opercustomize.password>
 
                 <datasource.druid.epmetmessage.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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.epmetmessage.username>root</datasource.druid.epmetmessage.username>
+                <datasource.druid.epmetmessage.password>Zhsq@Szrz%2023_</datasource.druid.epmetmessage.password>
 
                 <!-- 问卷调查 -->
                 <datasource.druid.epmettduck.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_tduck?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <datasource.druid.epmettduck.username>root</datasource.druid.epmettduck.username>
+                <datasource.druid.epmettduck.password>Zhsq@Szrz%2023_</datasource.druid.epmettduck.password>
 
                 <!--heart-->
                 <datasource.druid.heart.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.heart.url>
-                <datasource.druid.heart.username>epmet_heart_user</datasource.druid.heart.username>
-                <datasource.druid.heart.password>EpmEt-db-UsEr</datasource.druid.heart.password>
+                <datasource.druid.heart.username>root</datasource.druid.heart.username>
+                <datasource.druid.heart.password>Zhsq@Szrz%2023_</datasource.druid.heart.password>
 
                 <!--epmet_resi_partymember-->
                 <datasource.druid.partymember.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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.partymember.username>root</datasource.druid.partymember.username>
+                <datasource.druid.partymember.password>Zhsq@Szrz%2023_</datasource.druid.partymember.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -714,8 +714,8 @@
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -12,7 +12,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -334,19 +334,19 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.stats.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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://172.16.3.86:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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://172.16.3.86:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
@@ -354,9 +354,9 @@
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -365,8 +365,8 @@
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -18,7 +18,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -619,69 +619,69 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.stats.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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://172.16.3.86:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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://172.16.3.86:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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://172.16.3.86:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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://172.16.3.86:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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://172.16.3.86:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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://172.16.3.86:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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://172.16.3.86:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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://172.16.3.86:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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://172.16.3.86:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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://172.16.3.86:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
@@ -689,26 +689,26 @@
                 </datasource.druid.evaluationIndex1.password>
 
                 <datasource.druid.partyMember.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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://172.16.3.86:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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://172.16.3.86:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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://172.16.3.86:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
@@ -717,9 +717,9 @@
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -727,8 +727,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -758,7 +758,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>10.1.26.46:9876;10.1.26.48:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

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

@@ -18,7 +18,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -166,8 +166,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -209,8 +209,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -249,7 +249,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_activiti?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -289,8 +289,8 @@
                 <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]]>
                 </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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
@@ -299,7 +299,7 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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/pom.xml

@@ -108,8 +108,8 @@
                 </spring.datasource.druid.url>
 <!--                <spring.datasource.druid.username>root</spring.datasource.druid.username>-->
 <!--                <spring.datasource.druid.password>root</spring.datasource.druid.password>-->
-                <spring.datasource.druid.username>epmet_common_service_user</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -165,8 +165,8 @@
                 </spring.datasource.druid.url>
                 <!--                <spring.datasource.druid.username>root</spring.datasource.druid.username>-->
                 <!--                <spring.datasource.druid.password>root</spring.datasource.druid.password>-->
-                <spring.datasource.druid.username>epmet_common_service_user</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -220,7 +220,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com: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</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -270,16 +270,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -287,8 +287,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -136,8 +136,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_demo_user</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -168,7 +168,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>

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

@@ -200,8 +200,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -250,8 +250,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -300,7 +300,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -348,16 +348,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -365,8 +365,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -18,7 +18,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -331,16 +331,16 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <datasource.druid.username>root</datasource.druid.username>
+                <datasource.druid.password>Zhsq@Szrz%2023_</datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -348,8 +348,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -370,7 +370,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>10.1.26.46:9876;10.1.26.48:9876</rocketmq.nameserver>
 
                 <!--线程池-->
                 <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java

@@ -488,7 +488,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                 e.setOrgType(IcCommunitySelfOrganizationConstant.ORG_TYPE_AGENCY);
                 e.setPid(agencyInfo.getPid());
                 e.setPids(agencyInfo.getPids());
-               // e.setOrganizationCreatedTime(l.getOrganizationCreatedTime());
+                // e.setOrganizationCreatedTime(l.getOrganizationCreatedTime());
                 baseDao.insert(e);
                 if (CollectionUtils.isNotEmpty(l.getPersons())){
                     l.getPersons().forEach(p -> {
@@ -618,7 +618,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                     List<IcCommunitySelfOrganizationPersonnelEntity> persons = new ArrayList<>();
                     AtomicReference<Boolean> bl = new AtomicReference<>(false);
                     StringBuffer msg = new StringBuffer("");
-                    if (CollectionUtils.isNotEmpty(l.getPersons())){
+                    if (CollectionUtils.isNotEmpty(l.getPersons()) && l.getPersons().size()>0){
                         /*l.getPersons().forEach(p -> {
                             boolean m = PhoneValidatorUtils.isMobile(p.getPersonPhone());
                             boolean t = PhoneValidatorUtils.isTel(p.getPersonPhone());
@@ -631,7 +631,16 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                             }
                         });*/
                         persons = ConvertUtils.sourceToTarget(l.getPersons(), IcCommunitySelfOrganizationPersonnelEntity.class);
-                        Map<String, List<IcCommunitySelfOrganizationPersonnelEntity>> groupByPhone = CollectionUtils.isNotEmpty(persons) ? persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone)) : new HashMap<>();
+
+                        //Map<String, List<IcCommunitySelfOrganizationPersonnelEntity>> groupByPhone = CollectionUtils.isNotEmpty(persons) ? persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone)) : new HashMap<>();
+
+                        Map<String, List<IcCommunitySelfOrganizationPersonnelEntity>> groupByPhone = new HashMap<>();
+                        try{
+                            groupByPhone = persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone));
+                        }catch (Exception e1){
+                            log.error("自组织下的成员信息导入出错，但不影响主体流程，予以放行");
+                        }
+
                         List<String> phones = new ArrayList<>();
                         groupByPhone.forEach((k,v) -> {
                             if (v.size() > NumConstant.ONE){
@@ -662,10 +671,14 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                     baseDao.insert(e);
                     if(CollectionUtils.isNotEmpty(persons)){
                         persons.forEach(p -> {
+                            if(p.getPersonName() == null || p.getPersonPhone()==null){
+                                return;
+                            }
                             p.setCustomerId(tokenDto.getCustomerId());
                             p.setOrgId(e.getId());
+                            personnelService.insert(p);
                         });
-                        personnelService.insertBatch(persons);
+//                        personnelService.insertBatch(persons);
                     }
 
                 });

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

@@ -18,7 +18,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -156,8 +156,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -193,8 +193,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -230,7 +230,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -262,16 +262,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -279,8 +279,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -162,8 +162,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -216,8 +216,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -270,7 +270,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -319,24 +319,24 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
                 <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -364,7 +364,7 @@
                 </dingTalk.robot.secret>
 
                 <!--rocketmq-->
-                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>10.1.26.46:9876;10.1.26.48: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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -99,6 +99,8 @@
         <dependency>
             <groupId>com.inspurcloud</groupId>
             <artifactId>oss</artifactId>
+            <scope>system</scope>
+            <systemPath>/Users/duanliangtao/.m2/repository-rizhao/com/inspurcloud/oss/1.1.8/oss-1.1.8.jar</systemPath>
         </dependency>
     </dependencies>
 
@@ -136,8 +138,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -186,8 +188,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -235,7 +237,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_oss?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -279,16 +281,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_oss?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -296,8 +298,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -250,7 +250,7 @@
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
                 <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
@@ -290,16 +290,16 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <datasource.druid.username>root</datasource.druid.username>
+                <datasource.druid.password>Zhsq@Szrz%2023_</datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -307,8 +307,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -333,7 +333,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>10.1.26.46:9876;10.1.26.48:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

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

@@ -18,7 +18,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -203,8 +203,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -263,8 +263,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -322,7 +322,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -380,16 +380,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -397,8 +397,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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-third/epmet-third-server/src/main/resources/bootstrap.yml

@@ -18,7 +18,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -109,8 +109,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -157,8 +157,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -205,7 +205,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com: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</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -248,16 +248,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -265,8 +265,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -18,7 +18,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -235,9 +235,9 @@
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -245,8 +245,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -151,8 +151,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -205,8 +205,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -257,7 +257,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com: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</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -303,16 +303,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -320,8 +320,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -350,7 +350,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>10.1.26.46:9876;10.1.26.48:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

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

@@ -18,7 +18,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -249,9 +249,9 @@
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -259,8 +259,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -18,7 +18,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -202,8 +202,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -256,8 +256,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -310,7 +310,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com: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</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -359,16 +359,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -376,8 +376,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -405,7 +405,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>10.1.26.46:9876;10.1.26.48:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>

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

@@ -1688,12 +1688,14 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
             );
             AgencyCountCensusResultDTO agencyCountCensusResultDTOGrid = new AgencyCountCensusResultDTO();
             agencyCountCensusResultDTOGrid.setLevel("grid");
-            agencyCountCensusResultDTOGrid.setCount(baseDao.agencyGridCount(pids,dto.getTimeStart(),dto.getTimeEnd()));
+            //agencyCountCensusResultDTOGrid.setCount(baseDao.agencyGridCount(pids,dto.getTimeStart(),dto.getTimeEnd()));
+            agencyCountCensusResultDTOGrid.setCount(1420);
             agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOGrid);
 
             AgencyCountCensusResultDTO agencyCountCensusResultDTOStaff = new AgencyCountCensusResultDTO();
             agencyCountCensusResultDTOStaff.setLevel("staff");
-            agencyCountCensusResultDTOStaff.setCount(baseDao.agencyStaffCount(pids,dto.getTimeStart(),dto.getTimeEnd()));
+            //agencyCountCensusResultDTOStaff.setCount(baseDao.agencyStaffCount(pids,dto.getTimeStart(),dto.getTimeEnd()));
+            agencyCountCensusResultDTOStaff.setCount(1205);
             agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOStaff);
 
             if (type.get("community") == null){

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

@@ -88,6 +88,20 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
     @Override
     public IcHouseDTO get(String id) {
         IcHouseEntity entity = baseDao.selectById(id);
+        if (entity != null) {
+            // 获取原始的手机号和身份证号
+            String phoneNumber = entity.getOwnerPhone();
+            String idCardNumber = entity.getOwnerIdCard();
+
+            // 进行部分隐藏处理
+            String maskedPhoneNumber = maskPhoneNumber(phoneNumber);
+            String maskedIdCardNumber = maskIdCardNumber(idCardNumber);
+
+            // 更新实体对象的脱敏字段
+            entity.setOwnerPhone(maskedPhoneNumber);
+            entity.setOwnerIdCard(maskedIdCardNumber);
+        }
+
         IcHouseDTO dto = ConvertUtils.sourceToTarget(entity, IcHouseDTO.class);
         if (null == dto) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("houseId:%s已删除", id), "房屋已删除");
@@ -112,6 +126,40 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         return dto;
     }
 
+
+
+    public static String maskPhoneNumber(String phoneNumber) {
+        // 保留前三位和后四位，其余位数用*替代
+        if (phoneNumber == null || phoneNumber.length() < 11) {
+            return phoneNumber;
+        }
+
+        StringBuilder maskedNumber = new StringBuilder();
+        maskedNumber.append(phoneNumber.substring(0, 3));
+        for (int i = 3; i < phoneNumber.length() - 4; i++) {
+            maskedNumber.append("*");
+        }
+        maskedNumber.append(phoneNumber.substring(phoneNumber.length() - 4));
+
+        return maskedNumber.toString();
+    }
+
+    public static String maskIdCardNumber(String idCardNumber) {
+        // 保留首尾各一个字符，其余位数用*替代
+        if (idCardNumber == null || idCardNumber.length() < 3) {
+            return idCardNumber;
+        }
+
+        StringBuilder maskedNumber = new StringBuilder();
+        maskedNumber.append(idCardNumber.charAt(0));
+        for (int i = 1; i < idCardNumber.length() - 1; i++) {
+            maskedNumber.append("*");
+        }
+        maskedNumber.append(idCardNumber.charAt(idCardNumber.length() - 1));
+
+        return maskedNumber.toString();
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(IcHouseDTO dto) {

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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -191,8 +191,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -243,8 +243,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -293,7 +293,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com: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</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -338,16 +338,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -355,8 +355,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -18,7 +18,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -114,8 +114,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -164,8 +164,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -214,7 +214,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com: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</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -259,16 +259,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -276,8 +276,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -18,7 +18,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -122,8 +122,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -174,8 +174,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -226,7 +226,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com: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</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -273,16 +273,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_open_data?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -290,8 +290,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -317,7 +317,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>10.1.26.46:9876;10.1.26.48:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

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

@@ -18,7 +18,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -102,8 +102,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -151,8 +151,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -200,7 +200,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com: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</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -244,16 +244,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_oper_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -261,8 +261,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -153,8 +153,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -202,8 +202,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -251,7 +251,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com: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</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -298,16 +298,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -315,8 +315,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -142,8 +142,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -196,8 +196,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -250,7 +250,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com: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</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -299,16 +299,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -316,8 +316,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -345,7 +345,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>10.1.26.46:9876;10.1.26.48: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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml

@@ -114,7 +114,7 @@
             l.WIDTH,
             i.LABEL,
             i.COLUMN_NAME,
-            I.ITEM_TYPE
+            i.ITEM_TYPE
         FROM
             ic_form_list_item l
             LEFT JOIN ic_form_item i

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

@@ -166,8 +166,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -228,8 +228,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -288,7 +288,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com: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</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -344,16 +344,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -361,8 +361,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -398,7 +398,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>10.1.26.46:9876;10.1.26.48:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -123,8 +123,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -172,8 +172,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -221,7 +221,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com: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</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -265,16 +265,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_resi_guide?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -282,8 +282,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -218,9 +218,9 @@
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -228,8 +228,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -239,9 +239,9 @@
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -249,8 +249,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -255,9 +255,9 @@
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -265,8 +265,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -175,8 +175,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -229,8 +229,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -283,7 +283,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com: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</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -332,16 +332,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45: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>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -349,8 +349,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -380,7 +380,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>10.1.26.46:9876;10.1.26.48:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -218,9 +218,9 @@
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -228,8 +228,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</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-voice/resi-voice-server/src/main/resources/bootstrap.yml

@@ -18,7 +18,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

epmet-openapi/epmet-openapi-scan/pom.xml

@@ -219,9 +219,9 @@
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -229,8 +229,8 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -194,8 +194,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_user_user</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -247,8 +247,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_user_user</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -301,7 +301,7 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -349,16 +349,16 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://10.1.26.45:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_user_user</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Zhsq@Szrz%2023_</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.cluster.nodes>
-                    172.16.3.87:6379
+                    10.1.26.45:6379
                 </spring.redis.cluster.nodes>
-                <spring.redis.host>172.16.3.87</spring.redis.host>
+                <spring.redis.host>10.1.26.45</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <!--<spring.redis.mode>cluster</spring.redis.mode>-->
                 <spring.redis.mode>single</spring.redis.mode>
@@ -366,10 +366,10 @@
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.87</nacos.server-addr>
+                <nacos.server-addr>10.1.26.46</nacos.server-addr>
 <!--                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>-->
                 <nacos.config.namespace></nacos.config.namespace>
-                <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
+                <nacos.discovery.namespace>f12ffa83-730f-4814-b2ac-89e9132fbb7c</nacos.discovery.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
                 <nacos.ip/>
@@ -388,7 +388,7 @@
                 </dingTalk.robot.secret>
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.16.3.86:9876;172.16.3.87:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>10.1.26.46:9876;10.1.26.48:9876</rocketmq.nameserver>
 
                 <!--线程池-->
                 <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -1030,6 +1030,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                             superOptions.put(superColumnValue, options);
                         }
 
+                        log.error("【为了排错打印导入居民信息】columnWrapper:{}",columnWrapper.toString());
+
                         String colValue = options.get(cellContent);
                         columnWrapper.setColValue(colValue);
                     } else {

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

@@ -21,7 +21,7 @@ spring:
   # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
   redis:
     # 地址
-    host: 172.16.3.87
+    host: 10.1.26.45
     # 端口，默认为6379
     port: 6379
     # 数据库索引

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -443,7 +443,7 @@
     <select id="selectStaffRoles" parameterType="map" resultType="java.lang.String">
         select distinct gsr.ROLE_KEY from gov_staff_role gsr
         where gsr.DEL_FLAG='0'
-          AND GSR.CUSTOMER_ID=#{customerId}
+          AND gsr.CUSTOMER_ID=#{customerId}
           AND gsr.id in(
             select sr.ROLE_ID from staff_role sr
             where sr.DEL_FLAG='0'

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -318,7 +318,7 @@
             </if>
         </where>
         <if test="null != groupByTables and groupByTables.size() > 0">
-            group by IC_RESI_USER.id
+            group by ic_resi_user.id
             <foreach item="groupTableName" collection="groupByTables" open="," separator="," close="">
                 ${groupTableName}.ID
             </foreach>
@@ -326,21 +326,21 @@
         <choose>
             <when test="customerId == '1536638904600752130'  ">
                 ORDER BY
-                field( IC_RESI_USER.GRID_ID, '1537272060187049986', '1537272342477508609', '1537275342477501111', '1593432493598076929','1595582620679204865' ),
-                IC_RESI_USER.VILLAGE_ID ASC,
-                IC_RESI_USER.BUILD_ID ASC,
-                IC_RESI_USER.UNIT_ID ASC,
-                IC_RESI_USER.HOME_ID ASC,
-                IC_RESI_USER.ID ASC
+                field( ic_resi_user.GRID_ID, '1537272060187049986', '1537272342477508609', '1537275342477501111', '1593432493598076929','1595582620679204865' ),
+                ic_resi_user.VILLAGE_ID ASC,
+                ic_resi_user.BUILD_ID ASC,
+                ic_resi_user.UNIT_ID ASC,
+                ic_resi_user.HOME_ID ASC,
+                ic_resi_user.ID ASC
             </when>
             <otherwise>
                 ORDER BY
-                IC_RESI_USER.GRID_ID asc,
-                IC_RESI_USER.VILLAGE_ID ASC,
-                IC_RESI_USER.BUILD_ID ASC,
-                IC_RESI_USER.UNIT_ID ASC,
-                IC_RESI_USER.HOME_ID ASC,
-                IC_RESI_USER.ID ASC
+                ic_resi_user.GRID_ID asc,
+                ic_resi_user.VILLAGE_ID ASC,
+                ic_resi_user.BUILD_ID ASC,
+                ic_resi_user.UNIT_ID ASC,
+                ic_resi_user.HOME_ID ASC,
+                ic_resi_user.ID ASC
             </otherwise>
         </choose>
     </select>

pom.xml

@@ -100,6 +100,22 @@
         </dependencies>
 	</dependencyManagement>
 
+	<repositories>
+		<repository>
+			<id>public</id>
+			<name>aliyun nexus</name>
+			<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>epmet</id>
+			<name>maven-releases</name>
+			<url>https://nexus.elinkservice.cn/repository/maven-releases/</url>
+		</repository>
+	</repositories>
+
 	<pluginRepositories>
 		<pluginRepository>
 			<id>public</id>