From 65a06cba60fd43a54ad2902812da7022bf84bd9a Mon Sep 17 00:00:00 2001
From: Bill <771989711@qq.com>
Date: Thu, 9 Nov 2023 13:29:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0=E9=83=A8=E5=88=86=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-aggregator-server/pom.xml            | 62 +++++++++----------
 .../epmet-third/epmet-third-server/pom.xml    | 12 ++--
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/code/smart-community/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/code/smart-community/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index 279a7a06..058b78c1 100644
--- a/code/smart-community/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/code/smart-community/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -189,113 +189,113 @@
                 <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]]>
                 </datasource.druid.govorg.url>
-                <datasource.druid.govorg.username>epmet_gov_org_user</datasource.druid.govorg.username>
-                <datasource.druid.govorg.password>Zhsq@Szrz%2023_</datasource.druid.govorg.password>
+                <datasource.druid.govorg.username>root</datasource.druid.govorg.username>
+                <datasource.druid.govorg.password>Elink@888</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]]>
                 </datasource.druid.govissue.url>
-                <datasource.druid.govissue.username>epmet_gov_issue_user</datasource.druid.govissue.username>
-                <datasource.druid.govissue.password>Zhsq@Szrz%2023_</datasource.druid.govissue.password>
+                <datasource.druid.govissue.username>root</datasource.druid.govissue.username>
+                <datasource.druid.govissue.password>Elink@888</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]]>
                 </datasource.druid.govproject.url>
-                <datasource.druid.govproject.username>epmet_gov_project_user</datasource.druid.govproject.username>
-                <datasource.druid.govproject.password>Zhsq@Szrz%2023_</datasource.druid.govproject.password>
+                <datasource.druid.govproject.username>root</datasource.druid.govproject.username>
+                <datasource.druid.govproject.password>Elink@888</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]]>
                 </datasource.druid.resigroup.url>
-                <datasource.druid.resigroup.username>epmet_resi_group_user</datasource.druid.resigroup.username>
-                <datasource.druid.resigroup.password>Zhsq@Szrz%2023_</datasource.druid.resigroup.password>
+                <datasource.druid.resigroup.username>root</datasource.druid.resigroup.username>
+                <datasource.druid.resigroup.password>Elink@888</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]]>
                 </datasource.druid.epmetuser.url>
-                <datasource.druid.epmetuser.username>epmet_user_user</datasource.druid.epmetuser.username>
-                <datasource.druid.epmetuser.password>Zhsq@Szrz%2023_</datasource.druid.epmetuser.password>
+                <datasource.druid.epmetuser.username>root</datasource.druid.epmetuser.username>
+                <datasource.druid.epmetuser.password>Elink@888</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]]>
                 </datasource.druid.commonservice.url>
-                <datasource.druid.commonservice.username>epmet_common_service_user</datasource.druid.commonservice.username>
-                <datasource.druid.commonservice.password>Zhsq@Szrz%2023_</datasource.druid.commonservice.password>
+                <datasource.druid.commonservice.username>root</datasource.druid.commonservice.username>
+                <datasource.druid.commonservice.password>Elink@888</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]]>
                 </datasource.druid.opercrm.url>
-                <datasource.druid.opercrm.username>epmet_oper_crm_user</datasource.druid.opercrm.username>
-                <datasource.druid.opercrm.password>Zhsq@Szrz%2023_</datasource.druid.opercrm.password>
+                <datasource.druid.opercrm.username>root</datasource.druid.opercrm.username>
+                <datasource.druid.opercrm.password>Elink@888</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]]>
                 </datasource.druid.stats.url>
-                <datasource.druid.stats.username>epmet_data_statistical_user</datasource.druid.stats.username>
-                <datasource.druid.stats.password>Zhsq@Szrz%2023_</datasource.druid.stats.password>
+                <datasource.druid.stats.username>root</datasource.druid.stats.username>
+                <datasource.druid.stats.password>Elink@888</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]]>
                 </datasource.druid.evaluationIndex.url>
-                <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
-                <datasource.druid.evaluationIndex.password>Zhsq@Szrz%2023_</datasource.druid.evaluationIndex.password>
+                <datasource.druid.evaluationIndex.username>root</datasource.druid.evaluationIndex.username>
+                <datasource.druid.evaluationIndex.password>Elink@888</datasource.druid.evaluationIndex.password>
 
                 <datasource.druid..url>
                     <![CDATA[jdbc:mysql://172.16.3.86:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid..url>
                 <datasource.druid..username>root</datasource.druid..username>
-                <datasource.druid..password>root</datasource.druid..password>
+                <datasource.druid..password>Elink@888</datasource.druid..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]]>
                 </datasource.druid.opercustomize.url>
-                <datasource.druid.opercustomize.username>epmet_oper_customize_user</datasource.druid.opercustomize.username>
-                <datasource.druid.opercustomize.password>Zhsq@Szrz%2023_</datasource.druid.opercustomize.password>
+                <datasource.druid.opercustomize.username>root</datasource.druid.opercustomize.username>
+                <datasource.druid.opercustomize.password>Elink@888</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]]>
                 </datasource.druid.epmetmessage.url>
-                <datasource.druid.epmetmessage.username>epmet_message_user</datasource.druid.epmetmessage.username>
-                <datasource.druid.epmetmessage.password>Zhsq@Szrz%2023_</datasource.druid.epmetmessage.password>
+                <datasource.druid.epmetmessage.username>root</datasource.druid.epmetmessage.username>
+                <datasource.druid.epmetmessage.password>Elink@888</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]]>
                 </datasource.druid.epmettduck.url>
-                <datasource.druid.epmettduck.username>epmet_tduck_user</datasource.druid.epmettduck.username>
-                <datasource.druid.epmettduck.password>Zhsq@Szrz%2023_</datasource.druid.epmettduck.password>
+                <datasource.druid.epmettduck.username>root</datasource.druid.epmettduck.username>
+                <datasource.druid.epmettduck.password>Elink@888</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]]>
                 </datasource.druid.heart.url>
-                <datasource.druid.heart.username>epmet_heart_user</datasource.druid.heart.username>
-                <datasource.druid.heart.password>Zhsq@Szrz%2023_</datasource.druid.heart.password>
+                <datasource.druid.heart.username>root</datasource.druid.heart.username>
+                <datasource.druid.heart.password>Elink@888</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]]>
                 </datasource.druid.partymember.url>
-                <datasource.druid.partymember.username>epmet_resi_partymember_user</datasource.druid.partymember.username>
-                <datasource.druid.partymember.password>Zhsq@Szrz%2023_</datasource.druid.partymember.password>
+                <datasource.druid.partymember.username>root</datasource.druid.partymember.username>
+                <datasource.druid.partymember.password>Elink@888</datasource.druid.partymember.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.16.3.86</spring.redis.host>
+                <spring.redis.host>172.16.3.87</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
 
                 <!-- nacos -->
                 <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>172.16.3.86:8848</nacos.server-addr>
+                <nacos.server-addr>172.16.3.87:8848</nacos.server-addr>
                 <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
diff --git a/code/smart-community/epmet-module/epmet-third/epmet-third-server/pom.xml b/code/smart-community/epmet-module/epmet-third/epmet-third-server/pom.xml
index 03ec2b24..afe7e0fa 100644
--- a/code/smart-community/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/code/smart-community/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -214,7 +214,7 @@
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
                 <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>172.16.3.87:8848</nacos.server-addr>
                 <nacos.discovery.namespace>bf153d2b-7aa5-4b6e-ba7b-4977e54eb126</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
@@ -242,15 +242,15 @@
                 <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
                 </dingTalk.robot.secret>
 
-                <!-- epmet-cloud内部用的rocketmq配置 -->
+                <!--epmet-cloud内部用的rocketmq配置-->
                 <!--<rocketmq.epmet-cloud-inner.enable>true</rocketmq.epmet-cloud-inner.enable>
                 <rocketmq.epmet-cloud-inner.name-server>172.16.3.87:9876;172.16.3.86:9876</rocketmq.epmet-cloud-inner.name-server>-->
 
                 <!-- 区块链用的rocketmq配置 -->
-                <rocketmq.block-chain.enable>true</rocketmq.block-chain.enable>
-                <rocketmq.block-chain.name-server>192.168.1.144:9876</rocketmq.block-chain.name-server>
-                <rocketmq.block-chain.access-key>EpmetCloud</rocketmq.block-chain.access-key>
-                <rocketmq.block-chain.secret-key>12345678</rocketmq.block-chain.secret-key>
+                <rocketmq.block-chain.enable>false</rocketmq.block-chain.enable>
+                <rocketmq.block-chain.name-server></rocketmq.block-chain.name-server>
+                <rocketmq.block-chain.access-key></rocketmq.block-chain.access-key>
+                <rocketmq.block-chain.secret-key></rocketmq.block-chain.secret-key>
             </properties>
         </profile>
         <profile>