From 138017afe4185e7a241c91f20a6fb1fe913d5234 Mon Sep 17 00:00:00 2001 From: luyan Date: Tue, 23 May 2023 13:57:46 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=97=B6=E4=B8=A2=E5=A4=B1=E5=93=8D=E5=BA=94=E7=BA=A7=E5=88=AB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20eventType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcEventDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java index cb8e5a0a2e..1e4d738587 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java @@ -67,6 +67,11 @@ public class IcEventDTO implements Serializable { */ private String sourceType; + /** + * 响应级别 + */ + private String eventType; + /** * 发生时间 */ From 2c415766ca733995cbd58feeb75e29a8e4dd9fd1 Mon Sep 17 00:00:00 2001 From: wxz Date: Sun, 26 Feb 2023 21:40:17 +0800 Subject: [PATCH 02/19] =?UTF-8?q?mariadb=E3=80=81redis=E3=80=81rocketmq?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 22 +- epmet-auth/pom.xml | 6 +- .../epmet/commons/tools/enums/EnvEnum.java | 2 +- epmet-gateway/pom.xml | 6 +- .../data-aggregator-server/pom.xml | 202 ++++++++--------- .../data-report/data-report-server/pom.xml | 48 ++-- .../data-statistical-server/pom.xml | 208 +++++++++--------- .../epmet-activiti-server/pom.xml | 20 +- .../common-service-server/pom.xml | 20 +- .../epmet-demo/epmet-demo-server/pom.xml | 4 +- .../epmet-ext/epmet-ext-server/pom.xml | 20 +- .../epmet-heart/epmet-heart-server/pom.xml | 22 +- .../epmet-job/epmet-job-server/pom.xml | 20 +- .../epmet-message-server/pom.xml | 22 +- .../epmet-oss/epmet-oss-server/pom.xml | 20 +- .../epmet-point/epmet-point-server/pom.xml | 22 +- .../epmet-third/epmet-third-server/pom.xml | 22 +- .../gov-access/gov-access-server/pom.xml | 20 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 6 +- .../gov-issue/gov-issue-server/pom.xml | 22 +- epmet-module/gov-mine/gov-mine-server/pom.xml | 6 +- epmet-module/gov-org/gov-org-server/pom.xml | 22 +- .../gov-project/gov-project-server/pom.xml | 20 +- .../gov-voice/gov-voice-server/pom.xml | 20 +- .../open-data-worker-server/pom.xml | 22 +- .../oper-access/oper-access-server/pom.xml | 20 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 20 +- .../oper-customize-server/pom.xml | 22 +- .../resi-group/resi-group-server/pom.xml | 22 +- .../resi-guide/resi-guide-server/pom.xml | 20 +- .../resi-hall/resi-hall-server/pom.xml | 6 +- .../resi-home/resi-home-server/pom.xml | 6 +- .../resi-mine/resi-mine-server/pom.xml | 6 +- .../resi-partymember-server/pom.xml | 22 +- .../resi-voice/resi-voice-server/pom.xml | 6 +- epmet-openapi/epmet-openapi-scan/pom.xml | 6 +- epmet-user/epmet-user-server/pom.xml | 22 +- 37 files changed, 501 insertions(+), 501 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 815564766a..3c9652cee8 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -117,8 +117,8 @@ - epmet_admin_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -165,8 +165,8 @@ - epmet_admin_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -254,18 +254,18 @@ - + - epmet_admin_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -279,7 +279,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.16.80.50:9876 epmet_message diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 12111136e2..7a61b3e883 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -376,12 +376,12 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java index 708878e4f5..8d79869f2f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java @@ -19,7 +19,7 @@ public enum EnvEnum { LOCAL("local", "本地环境", "http://localhost:8080/api/"), DEV("dev", "开发环境", "http://192.168.1.140:8080/api/"), TEST("test", "体验环境", "https://epmet-dev.elinkservice.cn/api/"), - PROD("prod", "生产环境", "https://epmet-cloud.elinkservice.cn/api/"), + PROD("prod", "灵山街道", "https://epmet-cloud.elinkservice.cn/api/"), UN_KNOWN("un_known", "未知", "https://epmet-dev.elinkservice.cn/api/"), ; diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 301fb79a81..5059f095dd 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -507,12 +507,12 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 0841274180..5e9d427149 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -191,64 +191,64 @@ - epmet_gov_org_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_gov_issue_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_gov_project_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_resi_group_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_user_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_common_service_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_oper_crm_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_data_statistical_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_evaluation_index_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ @@ -259,35 +259,35 @@ - epmet_oper_customize_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_message_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_tduck_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_heart_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_resi_partymember_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 @@ -336,96 +336,96 @@ - epmet_gov_org_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_gov_issue_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_gov_project_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_resi_group_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_user_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_common_service_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_oper_crm_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_data_statistical_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_evaluation_index_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_oper_customize_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_message_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_tduck_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_heart_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_resi_partymember_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 @@ -611,109 +611,109 @@ - + - epmet_gov_org_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_gov_issue_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_gov_project_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_resi_group_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_user_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_common_service_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_oper_crm_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_data_statistical - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_evaluation_index_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_oper_customize_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_message_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_tduck - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_heart_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_resi_partymember_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 37f3f887ff..50b9721035 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -152,21 +152,21 @@ - epmet_data_statistical_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_data_stats_display_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_evaluation_index_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 @@ -215,21 +215,21 @@ - epmet_data_statistical_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_data_stats_display_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_evaluation_index_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 @@ -339,32 +339,32 @@ - + - epmet_data_statistical - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_data_stats_display_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_evaluation_index_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index f2fac0ba34..8641ce2ab5 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -191,62 +191,62 @@ - epmet_data_statistical_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_gov_org_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_gov_issue_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_gov_project_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_gov_voice_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_oper_crm_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_resi_group_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_user_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_data_stats_display_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_evaluation_index_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ @@ -257,27 +257,27 @@ - epmet_resi_partymember_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_heart_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_point_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_oper_customize_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 @@ -329,62 +329,62 @@ - epmet_data_statistical_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_gov_org_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_gov_issue_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_gov_project_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_gov_voice_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_oper_crm_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_resi_group_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_user_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_data_stats_display_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_evaluation_index_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ @@ -395,27 +395,27 @@ - epmet_resi_partymember_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_heart_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_point_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - epmet_oper_customize_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 @@ -599,103 +599,103 @@ - + - epmet_data_statistical - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_gov_org_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_gov_issue_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_gov_project_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_gov_voice_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_oper_crm_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_resi_group_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_user_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_data_stats_display_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_evaluation_index_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_cloud_viewer + epmet EpmEtclOUdvIEwEr@w - + - epmet_resi_partymember_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_heart_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_point_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ - + - epmet_oper_customize_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -722,7 +722,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.16.80.50:9876 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index e83d67b9d0..f54b143ceb 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -166,8 +166,8 @@ - epmet_activiti_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -209,8 +209,8 @@ - epmet_activiti_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -287,18 +287,18 @@ - + - epmet_activiti_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 4fd20dca7f..cec0f74b49 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -108,8 +108,8 @@ - epmet_common_service_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -165,8 +165,8 @@ - epmet_common_service_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -270,18 +270,18 @@ - + - epmet_common_service_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index 8a38624e35..7f2975f359 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -136,8 +136,8 @@ - epmet_demo_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 30ff3e0292..1edac9a30b 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -200,8 +200,8 @@ - epmet_third_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -250,8 +250,8 @@ - epmet_third_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -349,18 +349,18 @@ - + - epmet_third_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index e9f257a3e5..74b9c12d47 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -165,8 +165,8 @@ - epmet_heart_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -221,8 +221,8 @@ - epmet_heart_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -331,18 +331,18 @@ - + - epmet_heart_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -364,7 +364,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.16.80.50:9876 true diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 1e0d00c9ba..7b58b4270f 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -156,8 +156,8 @@ - epmet_job_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -193,8 +193,8 @@ - epmet_job_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -262,18 +262,18 @@ - + - epmet_job_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index daa811ed8e..3917f18202 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -162,8 +162,8 @@ - epmet_message_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -216,8 +216,8 @@ - epmet_message_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -319,18 +319,18 @@ - + - epmet_message_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -359,7 +359,7 @@ - 192.168.11.187:9876;192.168.11.184:9876 + 172.16.80.50:9876 epmet_message diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 70b1540633..123d8a0ccf 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -132,8 +132,8 @@ - epmet_oss_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -182,8 +182,8 @@ - epmet_oss_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -275,18 +275,18 @@ - + - epmet_oss_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 47de506c6b..00e5e641c5 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -139,8 +139,8 @@ - epmet_point_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -190,8 +190,8 @@ - epmet_point_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -290,18 +290,18 @@ - + - epmet_point_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -327,7 +327,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.16.80.50:9876 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 81e7bf071b..7350fd1625 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -214,8 +214,8 @@ - epmet_third_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -275,8 +275,8 @@ - epmet_third_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -394,18 +394,18 @@ - + - epmet_third_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -435,7 +435,7 @@ + 172.16.80.50:9876--> false diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index ddeab2c6c4..816130af05 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -109,8 +109,8 @@ - epmet_gov_access_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -157,8 +157,8 @@ - epmet_gov_access_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -248,18 +248,18 @@ - + - epmet_gov_access_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index fa921c4400..863c2824f3 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -234,12 +234,12 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 8deb3007f5..ade7249954 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -151,8 +151,8 @@ - epmet_gov_issue_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -205,8 +205,8 @@ - epmet_gov_issue_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -303,18 +303,18 @@ - + - epmet_gov_issue_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -344,7 +344,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.16.80.50:9876 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index 484ae11334..b7cc735614 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -248,12 +248,12 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 18b7d897f0..16ed0a372b 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -202,8 +202,8 @@ - epmet_gov_org_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -256,8 +256,8 @@ - epmet_gov_org_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -359,18 +359,18 @@ - + - epmet_gov_org_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -399,7 +399,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.16.80.50:9876 epmet_message diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 282d044073..4fadcf287a 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -203,8 +203,8 @@ - epmet_gov_project_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -255,8 +255,8 @@ - epmet_gov_project_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -350,18 +350,18 @@ - + - epmet_gov_project_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index b841e6f0c8..9c14e7fa1f 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -114,8 +114,8 @@ - epmet_gov_voice_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -164,8 +164,8 @@ - epmet_gov_voice_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -259,18 +259,18 @@ - + - epmet_gov_voice_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index 2dd8408185..f20249f71c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -122,8 +122,8 @@ - epmet_open_data_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -174,8 +174,8 @@ - epmet_open_data_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -273,18 +273,18 @@ - + - epmet_open_data_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -311,7 +311,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.16.80.50:9876 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 823111ea48..36cdcf0515 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -102,8 +102,8 @@ - epmet_oper_access_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -151,8 +151,8 @@ - epmet_oper_access_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -244,18 +244,18 @@ - + - epmet_oper_access_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 0df193618f..44f243974f 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -153,8 +153,8 @@ - epmet_oper_crm_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -202,8 +202,8 @@ - epmet_oper_crm_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -298,18 +298,18 @@ - + - epmet_oper_crm_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 697a8b84ab..1e1098f1b0 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -142,8 +142,8 @@ - epmet_oper_customize_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -196,8 +196,8 @@ - epmet_oper_customize_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -299,18 +299,18 @@ - + - epmet_oper_customize_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -339,7 +339,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.16.80.50:9876 epmet_message diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 5260d57e47..f0ce53a8ab 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -166,8 +166,8 @@ - epmet_resi_group_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -228,8 +228,8 @@ - epmet_resi_group_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -344,18 +344,18 @@ - + - epmet_resi_group_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -392,7 +392,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.16.80.50:9876 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 19f3f71eb9..4fe8a5cd3f 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -123,8 +123,8 @@ - epmet_resi_guide_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -172,8 +172,8 @@ - epmet_resi_guide_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -265,18 +265,18 @@ - + - epmet_resi_guide_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index 8ecca5fe37..c435b8fbd3 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -217,12 +217,12 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index c4fa8d2560..3a81efc107 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -238,12 +238,12 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 8d2ae439e5..6457702a55 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -254,12 +254,12 @@ prod 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 0314e973e5..5e1e75a610 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -182,8 +182,8 @@ - epmet_resi_partymember_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -236,8 +236,8 @@ - epmet_resi_partymember_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -339,18 +339,18 @@ - + - epmet_resi_partymember_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -381,7 +381,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.16.80.50:9876 diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index f2e494aa7f..a739b44bef 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -217,12 +217,12 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index bd236cc3ee..8afc7839fd 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -219,12 +219,12 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 9ed2a7a8e8..3c540f6cd5 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -194,8 +194,8 @@ - epmet_user_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -247,8 +247,8 @@ - epmet_user_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -349,18 +349,18 @@ - + - epmet_user_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com + 172.16.80.51:6379 6379 - EpmEtclOUdrEdIs!Q2w + EpmEtrEdIs@lsjd true - 192.168.11.180:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -381,7 +381,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.16.80.50:9876 true From 5e6f62c0403c36dad94c8ee58017537722fd3f00 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 27 Feb 2023 15:24:15 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E9=92=88=E5=AF=B9=E7=81=B5=E5=B1=B1?= =?UTF-8?q?=E8=A1=97=E9=81=93=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 8 +- epmet-auth/pom.xml | 4 +- .../tools/filter/LogMsgSendFilter.java | 2 +- .../tools/utils/DingdingMsgSender.java | 135 +++++++++--------- epmet-gateway/pom.xml | 4 +- .../data-aggregator-server/pom.xml | 32 ++--- .../data-report/data-report-server/pom.xml | 10 +- .../data-statistical-server/pom.xml | 36 ++--- .../epmet-activiti-server/pom.xml | 6 +- .../common-service-server/pom.xml | 6 +- .../epmet-ext/epmet-ext-server/pom.xml | 6 +- .../epmet-heart/epmet-heart-server/pom.xml | 8 +- .../epmet-job/epmet-job-server/pom.xml | 6 +- .../epmet-message-server/pom.xml | 8 +- .../epmet-oss/epmet-oss-server/pom.xml | 6 +- .../epmet-point/epmet-point-server/pom.xml | 8 +- .../epmet-third/epmet-third-server/pom.xml | 8 +- .../gov-access/gov-access-server/pom.xml | 6 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 4 +- .../gov-issue/gov-issue-server/pom.xml | 8 +- epmet-module/gov-mine/gov-mine-server/pom.xml | 4 +- epmet-module/gov-org/gov-org-server/pom.xml | 8 +- .../gov-project/gov-project-server/pom.xml | 6 +- .../gov-voice/gov-voice-server/pom.xml | 6 +- .../open-data-worker-server/pom.xml | 8 +- .../oper-access/oper-access-server/pom.xml | 6 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 6 +- .../oper-customize-server/pom.xml | 8 +- .../resi-group/resi-group-server/pom.xml | 8 +- .../resi-guide/resi-guide-server/pom.xml | 6 +- .../resi-hall/resi-hall-server/pom.xml | 4 +- .../resi-home/resi-home-server/pom.xml | 4 +- .../resi-mine/resi-mine-server/pom.xml | 4 +- .../resi-partymember-server/pom.xml | 8 +- .../resi-voice/resi-voice-server/pom.xml | 4 +- epmet-openapi/epmet-openapi-scan/pom.xml | 4 +- epmet-user/epmet-user-server/pom.xml | 8 +- 37 files changed, 207 insertions(+), 206 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 3c9652cee8..0e0ba0adda 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -254,18 +254,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -279,7 +279,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 7a61b3e883..ed6c10e513 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -376,12 +376,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java index bec26ea89d..c4e8481483 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java @@ -81,7 +81,7 @@ public class LogMsgSendFilter extends LevelFilter { stringBuilder.append("\n"); } - stringBuilder.append("故障时间：").append(DateUtils.format(new Date(event.getTimeStamp()),DateUtils.DATE_TIME_PATTERN)); + stringBuilder.append("故障时间：").append(DateUtils.format(new Date(event.getTimeStamp()), DateUtils.DATE_TIME_PATTERN)); stringBuilder.append("\n"); stringBuilder.append("TraceId：").append(MDC.get(AppClientConstant.TRANSACTION_SERIAL_KEY)); stringBuilder.append("\n"); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java index 044b1d393c..34659460f3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java @@ -55,7 +55,8 @@ public class DingdingMsgSender { //阻塞取元素 msg = msgQueue.take(); if (msg != null) { - sendMsg(msg); + //sendMsg(msg); + sendMsgSdk(msg); } else { Thread.sleep(1000); } @@ -88,7 +89,7 @@ public class DingdingMsgSender { DingTalkTextMsg param = new DingTalkTextMsg(); param.setContent("待发送消息队列已满,当前队列个数" + msgQueue.size() + "\n" + "最新消息内容:" + JSON.toJSONString(messageParam)); param.setWebHook(messageParam.getWebHook()); - sendMsg(param); + sendMsgSdk(param); } return flag; } @@ -121,71 +122,71 @@ public class DingdingMsgSender { running = false; } - /** - * 发送POST 请求 - * - * @param param 请求参数，JSON格式 - * @return - */ - @Deprecated - private Result sendMsg(DingTalkTextMsg param) { - if (StringUtils.isBlank(param.getWebHook())) { - param.setWebHook(webHook); - } - if (StringUtils.isBlank(param.getSecret())) { - param.setSecret(secret); - } - Result result = new Result().error(); - try { - String url = getUrlString(param, System.currentTimeMillis()); - String jsonStrParam = param.getMsgContent(); - result = HttpClientManager.getInstance().sendPostByJSON(url, jsonStrParam); - } catch (Exception e) { - logger.warn("sendPostByJSON error", e); - } - return result; - } - - @NotNull - private String getUrlString(DingTalkTextMsg param, Long timestamp) throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException { - String stringToSign = timestamp + "\n" + param.getSecret(); - Mac mac = Mac.getInstance("HmacSHA256"); - mac.init(new SecretKeySpec(param.getSecret().getBytes(StandardCharsets.UTF_8), "HmacSHA256")); - byte[] signData = mac.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8)); - String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8"); - String url = param.getWebHook(); - url = url.concat("×tamp=" + timestamp + "&sign=" + sign); - return url; - } - - /** - * 发送POST 请求 - * - * @param param 请求参数，JSON格式 - * @return - */ - public Result sendMsgSdk(DingTalkTextMsg param) { - if (StringUtils.isBlank(param.getWebHook())) { - param.setWebHook(webHook); - } - if (StringUtils.isBlank(param.getSecret())) { - param.setSecret(secret); - } - Result result = new Result().error(); - try { - String url = getUrlString(param, System.currentTimeMillis()); - DefaultDingTalkClient client = new DefaultDingTalkClient(url); - OapiRobotSendRequest request = new OapiRobotSendRequest(); - request.setMsgtype("text"); - OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text(); - text.setContent(param.getContent()); - request.setText(text); - client.execute(request); - } catch (Exception e) { - logger.warn("sendPostByJSON error", e); - } - return result; - } + /** + * 发送POST 请求 + * + * @param param 请求参数，JSON格式 + * @return + */ + @Deprecated + private Result sendMsg(DingTalkTextMsg param) { + if (StringUtils.isBlank(param.getWebHook())) { + param.setWebHook(webHook); + } + if (StringUtils.isBlank(param.getSecret())) { + param.setSecret(secret); + } + Result result = new Result().error(); + try { + String url = getUrlString(param, System.currentTimeMillis()); + String jsonStrParam = param.getMsgContent(); + result = HttpClientManager.getInstance().sendPostByJSON(url, jsonStrParam); + } catch (Exception e) { + logger.warn("sendPostByJSON error", e); + } + return result; + } + + @NotNull + private String getUrlString(DingTalkTextMsg param, Long timestamp) throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException { + String stringToSign = timestamp + "\n" + param.getSecret(); + Mac mac = Mac.getInstance("HmacSHA256"); + mac.init(new SecretKeySpec(param.getSecret().getBytes(StandardCharsets.UTF_8), "HmacSHA256")); + byte[] signData = mac.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8)); + String sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8"); + String url = param.getWebHook(); + url = url.concat("×tamp=" + timestamp + "&sign=" + sign); + return url; + } + + /** + * 发送POST 请求 + * + * @param param 请求参数，JSON格式 + * @return + */ + public Result sendMsgSdk(DingTalkTextMsg param) { + if (StringUtils.isBlank(param.getWebHook())) { + param.setWebHook(webHook); + } + if (StringUtils.isBlank(param.getSecret())) { + param.setSecret(secret); + } + Result result = new Result().error(); + try { + String url = getUrlString(param, System.currentTimeMillis()); + DefaultDingTalkClient client = new DefaultDingTalkClient(url); + OapiRobotSendRequest request = new OapiRobotSendRequest(); + request.setMsgtype("text"); + OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text(); + text.setContent(param.getContent()); + request.setText(text); + client.execute(request); + } catch (Exception e) { + logger.warn("sendPostByJSON error", e); + } + return result; + } public static void main(String[] args) { for (int i = 0; i < 50; i++) { diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 5059f095dd..32f70b48e4 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -507,12 +507,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 5e9d427149..63f590b43b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -611,109 +611,109 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 50b9721035..9d3a4efd46 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -339,32 +339,32 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 8641ce2ab5..64b18c4488 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -599,103 +599,103 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEtclOUdvIEwEr@w - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -722,7 +722,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index f54b143ceb..33164cd48a 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -287,18 +287,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index cec0f74b49..037902a450 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -270,18 +270,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 1edac9a30b..4d975e2c80 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -349,18 +349,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 74b9c12d47..15841b7f64 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -331,18 +331,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -364,7 +364,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 true diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 7b58b4270f..ba9a7781bd 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -262,18 +262,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 3917f18202..713f78b85f 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -319,18 +319,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -359,7 +359,7 @@ - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 123d8a0ccf..c919907267 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -275,18 +275,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 00e5e641c5..24b750bbfe 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -290,18 +290,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -327,7 +327,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 7350fd1625..e5b52a57ed 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -394,18 +394,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -435,7 +435,7 @@ + 10.0.0.4:9876--> false diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 816130af05..dbcae08915 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -248,18 +248,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 863c2824f3..9f81af20b2 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -234,12 +234,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index ade7249954..b419c69d1f 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -303,18 +303,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -344,7 +344,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index b7cc735614..9fe9215b8e 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -248,12 +248,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 16ed0a372b..45f2822bb2 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -359,18 +359,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -399,7 +399,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 4fadcf287a..4cdd96861b 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -350,18 +350,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 9c14e7fa1f..d52b79a73e 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -259,18 +259,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index f20249f71c..cf42c8d76f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -273,18 +273,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -311,7 +311,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 36cdcf0515..80e4ae3a66 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -244,18 +244,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 44f243974f..7d5f68b362 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -298,18 +298,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 1e1098f1b0..b982cd3e62 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -299,18 +299,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -339,7 +339,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index f0ce53a8ab..a72dc87944 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -344,18 +344,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -392,7 +392,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 4fe8a5cd3f..b4453419c0 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -265,18 +265,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index c435b8fbd3..ea5f9567a9 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -217,12 +217,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 3a81efc107..1ecca5cb5e 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -238,12 +238,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 6457702a55..d460b84d4b 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -254,12 +254,12 @@ prod 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 5e1e75a610..5b7702d116 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -339,18 +339,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -381,7 +381,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index a739b44bef..2816860ea0 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -217,12 +217,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 8afc7839fd..725763d9d9 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -219,12 +219,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 3c540f6cd5..ded8a4478e 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -349,18 +349,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -381,7 +381,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 true From f7f818d7664f91347e3ba6f23190eda7d113ad85 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 11 Apr 2023 19:09:23 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=B1=B1=E8=A1=97?= =?UTF-8?q?=E9=81=93=E3=80=91=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E6=A0=8F=E7=9B=AEcurd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-voice/gov-voice-server/pom.xml | 4 ++-- .../java/com/epmet/controller/CategoryDictController.java | 2 ++ .../src/main/java/com/epmet/service/CategoryDictService.java | 2 +- .../java/com/epmet/service/impl/CategoryDictServiceImpl.java | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index d52b79a73e..561b92a4d6 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -164,8 +164,8 @@ - epmet - EpmEt_lsjd@@ + root + root 0 192.168.1.140 diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/CategoryDictController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/CategoryDictController.java index fae386fced..4bb60ce451 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/CategoryDictController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/CategoryDictController.java @@ -24,6 +24,8 @@ import java.util.List; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.List; +import java.util.Map; /** diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/CategoryDictService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/CategoryDictService.java index 40fb125ae6..a2932c37b2 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/CategoryDictService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/CategoryDictService.java @@ -87,4 +87,4 @@ public interface CategoryDictService extends BaseService { List list(Integer pageNo, Integer pageSize); List listSubCategories(String parentCategoryId); -} \ No newline at end of file +} diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java index f0f2cb5d58..8708e64250 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java @@ -139,6 +139,7 @@ public class CategoryDictServiceImpl extends BaseServiceImpl idList = Arrays.asList(ids); List idList2Del = idList.stream().map(id -> { @@ -155,6 +156,7 @@ public class CategoryDictServiceImpl extends BaseServiceImpl list(Integer pageNo, Integer pageSize) { + List list = baseDao.selectList(null); LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(CategoryDictEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); List list = baseDao.selectList(query); @@ -169,4 +171,4 @@ public class CategoryDictServiceImpl extends BaseServiceImpl list = baseDao.selectList(query); return ConvertUtils.sourceToTarget(list, CategoryDictDTO.class); } -} \ No newline at end of file +} From 39b4a5659240a250a4544507406b23a16cf1bd85 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 24 Apr 2023 11:23:39 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E4=BA=BA=E7=BE=A4?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E8=B0=83=E6=95=B4=EF=BC=8C=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/enums/ZhzlResiCategoryEnum.java | 6 +++--- .../dataaggre/service/epmetuser/impl/IcResiServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ZhzlResiCategoryEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ZhzlResiCategoryEnum.java index 90709fe179..a48305ec1c 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ZhzlResiCategoryEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ZhzlResiCategoryEnum.java @@ -14,10 +14,10 @@ public enum ZhzlResiCategoryEnum { // zhaoshizhaohuojingshenbing 肇事肇祸精神病 // jiedurenyuan 吸毒人员 - resi_xfry("resi_xfry", "信访人员", "equal", "ic_resi_user", "IS_XFRY", "1", 1), + xinfangrenyuan("xinfangrenyuan", "信访人员", "equal", "ic_resi_user", "IS_XFRY", "1", 1), anzhibangjiao("anzhibangjiao", "安置帮教", "list_equal", "ic_special", "SPECIAL_RQLB", "anzhibangjiao", 2), - xiejiaorenyuan("xiejiaorenyuan", "邪教人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xiejiaorenyuan", 3), - buliangqingshaonian("buliangqingshaonian", "不良青少年", "list_equal", "ic_special", "SPECIAL_RQLB", "buliangqingshaonian", 4), + // xiejiaorenyuan("xiejiaorenyuan", "邪教人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xiejiaorenyuan", 3), + // buliangqingshaonian("buliangqingshaonian", "不良青少年", "list_equal", "ic_special", "SPECIAL_RQLB", "buliangqingshaonian", 4), shequjiaozheng("shequjiaozheng", "社区矫正", "list_equal", "ic_special", "SPECIAL_RQLB", "shequjiaozheng", 5), zhaoshizhaohuojingshenbing("zhaoshizhaohuojingshenbing", "肇事肇祸精神病", "list_equal", "ic_special", "SPECIAL_RQLB", "zhaoshizhaohuojingshenbing", 6), jiedurenyuan("jiedurenyuan", "戒毒人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xidurenyuan", 7); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java index 2fceaabfd6..a44cac48d8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java @@ -75,7 +75,7 @@ public class IcResiServiceImpl implements IcResiService { query.eq(IcResiUserEntity::getStatus, "0"); // 只查询0 正常的居民。 query.and(q -> q.eq(IcResiUserEntity::getAgencyId, agencyId).or().likeRight(IcResiUserEntity::getPids, queryPids)); query.eq(StringUtils.isNotBlank(gridId), IcResiUserEntity::getGridId, gridId); - if ("resi_xfry".equals(categoryKey)) { + if ("xinfangrenyuan".equals(categoryKey)) { // 信访人员 query.eq(IcResiUserEntity::getIsXfry, true); } else if ("resi_snry".equals(categoryKey)) { From 03704b76b682541e7d2ede76d64d9bc169ceebb1 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 22 May 2023 18:45:01 +0800 Subject: [PATCH 06/19] - --- .../com/epmet/service/impl/LingShanAgentServiceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java index 0627b52782..267c42b3aa 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java @@ -695,7 +695,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ // 3.组合数据 ArrayList dataList = new ArrayList<>(); dataList.add(new AgentServiceTrendAnalysisRstDTO.DataObj<>("受理数", acceptCount)); - dataList.add(new AgentServiceTrendAnalysisRstDTO.DataObj<>("办结率", closedRatio)); + dataList.add(new AgentServiceTrendAnalysisRstDTO.DataObj<>("办结率", closedRatio * 100)); AgentServiceTrendAnalysisRstDTO rd = new AgentServiceTrendAnalysisRstDTO(monthName, dataList); return rd; }).collect(Collectors.toList()); From 0368cf51714b86a6007a2408a993305543f229e1 Mon Sep 17 00:00:00 2001 From: wxz Date: Sun, 26 Feb 2023 21:40:17 +0800 Subject: [PATCH 07/19] =?UTF-8?q?mariadb=E3=80=81redis=E3=80=81rocketmq?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 8 ++-- epmet-auth/pom.xml | 14 +++---- epmet-gateway/pom.xml | 4 +- .../data-aggregator-server/pom.xml | 37 ++++++++--------- .../data-report/data-report-server/pom.xml | 15 +++---- .../data-statistical-server/pom.xml | 36 ++++++++-------- .../epmet-activiti-server/pom.xml | 6 +-- .../common-service-server/pom.xml | 6 +-- .../epmet-ext/epmet-ext-server/pom.xml | 6 +-- .../epmet-heart/epmet-heart-server/pom.xml | 8 ++-- .../epmet-job/epmet-job-server/pom.xml | 6 +-- .../epmet-message-server/pom.xml | 13 ++++-- .../epmet-oss/epmet-oss-server/pom.xml | 12 ++---- .../epmet-point/epmet-point-server/pom.xml | 8 ++-- .../epmet-third/epmet-third-server/pom.xml | 41 ++++++------------- .../gov-access/gov-access-server/pom.xml | 6 +-- epmet-module/gov-grid/gov-grid-server/pom.xml | 4 +- .../gov-issue/gov-issue-server/pom.xml | 8 ++-- epmet-module/gov-mine/gov-mine-server/pom.xml | 4 +- epmet-module/gov-org/gov-org-server/pom.xml | 8 ++-- .../gov-project/gov-project-server/pom.xml | 18 ++------ .../gov-voice/gov-voice-server/pom.xml | 10 ++--- .../open-data-worker-server/pom.xml | 8 ++-- .../oper-access/oper-access-server/pom.xml | 6 +-- epmet-module/oper-crm/oper-crm-server/pom.xml | 6 +-- .../oper-customize-server/pom.xml | 8 ++-- .../resi-group/resi-group-server/pom.xml | 8 ++-- .../resi-guide/resi-guide-server/pom.xml | 6 +-- .../resi-hall/resi-hall-server/pom.xml | 4 +- .../resi-home/resi-home-server/pom.xml | 4 +- .../resi-mine/resi-mine-server/pom.xml | 4 +- .../resi-partymember-server/pom.xml | 15 ++----- .../resi-voice/resi-voice-server/pom.xml | 4 +- epmet-openapi/epmet-openapi-scan/pom.xml | 4 +- epmet-user/epmet-user-server/pom.xml | 8 ++-- 35 files changed, 159 insertions(+), 204 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 0e0ba0adda..3c9652cee8 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -254,18 +254,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -279,7 +279,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 epmet_message diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index ed6c10e513..153fdfb475 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -138,11 +138,11 @@ epmet-auth-client 2.0.0 - - - - - + + dingtalk-spring-boot-starter + com.taobao + 1.0.0 + commons-codec commons-codec @@ -376,12 +376,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 32f70b48e4..5059f095dd 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -507,12 +507,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 63f590b43b..4d18805298 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -138,11 +138,6 @@ 2.0.0 compile - - com.epmet - epmet-admin-client - 2.0.0 - @@ -611,109 +606,109 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 9d3a4efd46..946e14f0a6 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -100,11 +100,6 @@ 2.0.0 compile - - org.apache.commons - commons-collections4 - 4.4 - @@ -339,32 +334,32 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 64b18c4488..8641ce2ab5 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -599,103 +599,103 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEtclOUdvIEwEr@w - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -722,7 +722,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index 33164cd48a..f54b143ceb 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -287,18 +287,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 037902a450..cec0f74b49 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -270,18 +270,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 4d975e2c80..1edac9a30b 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -349,18 +349,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 15841b7f64..74b9c12d47 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -331,18 +331,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -364,7 +364,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 true diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index ba9a7781bd..7b58b4270f 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -262,18 +262,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 713f78b85f..1524143130 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -101,6 +101,11 @@ flyway-core + + com.epmet + epmet-user-client + 2.0.0 + com.epmet epmet-third-client @@ -319,18 +324,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -359,7 +364,7 @@ - 10.0.0.4:9876 + 172.16.80.50:9876 epmet_message diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index c919907267..7dd65ef4b0 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -90,12 +90,6 @@ org.springframework spring-test - - - io.minio - minio - 8.4.2 - @@ -275,18 +269,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 24b750bbfe..00e5e641c5 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -290,18 +290,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -327,7 +327,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index e5b52a57ed..0a37236f13 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -157,27 +157,16 @@ rocketmq-acl 4.9.2 - - - - - - - - - - + + dingtalk-spring-boot-starter + com.taobao + 1.0.0 + commons-codec commons-codec 1.15 - - - com.github.xiaoymin - knife4j-spring-boot-starter - 2.0.5 - @@ -239,8 +228,7 @@ 20 60 epmet-third - callerRunsPolicy - + callerRunsPolicy false @@ -300,8 +288,7 @@ 20 60 epmet-third - callerRunsPolicy - + callerRunsPolicy false @@ -360,8 +347,7 @@ 20 60 epmet-third - callerRunsPolicy - + callerRunsPolicy true @@ -394,18 +380,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -421,8 +407,7 @@ 20 60 epmet-third - callerRunsPolicy - + callerRunsPolicy true @@ -435,7 +420,7 @@ + 172.16.80.50:9876--> false diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index dbcae08915..816130af05 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -248,18 +248,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 9f81af20b2..863c2824f3 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -234,12 +234,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index b419c69d1f..ade7249954 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -303,18 +303,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -344,7 +344,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index 9fe9215b8e..b7cc735614 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -248,12 +248,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 45f2822bb2..16ed0a372b 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -359,18 +359,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -399,7 +399,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 epmet_message diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 4cdd96861b..660b3a5af4 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -33,12 +33,6 @@ com.epmet epmet-commons-tools 2.0.0 - - - objenesis - org.objenesis - - com.epmet @@ -65,12 +59,6 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - - - guava - com.google.guava - - com.alibaba.cloud @@ -350,18 +338,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 561b92a4d6..9c14e7fa1f 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -164,8 +164,8 @@ - root - root + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -259,18 +259,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index cf42c8d76f..f20249f71c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -273,18 +273,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -311,7 +311,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 80e4ae3a66..36cdcf0515 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -244,18 +244,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 7d5f68b362..44f243974f 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -298,18 +298,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index b982cd3e62..1e1098f1b0 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -299,18 +299,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -339,7 +339,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 epmet_message diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index a72dc87944..f0ce53a8ab 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -344,18 +344,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -392,7 +392,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index b4453419c0..4fe8a5cd3f 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -265,18 +265,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index ea5f9567a9..c435b8fbd3 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -217,12 +217,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 1ecca5cb5e..3a81efc107 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -238,12 +238,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index d460b84d4b..6457702a55 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -254,12 +254,12 @@ prod 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 5b7702d116..eb8b9cf2bc 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -12,13 +12,6 @@ jar - - com.epmet - epmet-heart-client - - 2.0.0 - - com.epmet resi-partymember-client @@ -339,18 +332,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -381,7 +374,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index 2816860ea0..a739b44bef 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -217,12 +217,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 725763d9d9..8afc7839fd 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -219,12 +219,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index ded8a4478e..3c540f6cd5 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -349,18 +349,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -381,7 +381,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 true From 32be5311e83d497f16732d1ecaf274c71059caa7 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 27 Feb 2023 15:24:15 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E9=92=88=E5=AF=B9=E7=81=B5=E5=B1=B1?= =?UTF-8?q?=E8=A1=97=E9=81=93=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 8 ++--- epmet-auth/pom.xml | 4 +-- epmet-gateway/pom.xml | 4 +-- .../data-aggregator-server/pom.xml | 32 ++++++++--------- .../data-report/data-report-server/pom.xml | 10 +++--- .../data-statistical-server/pom.xml | 36 +++++++++---------- .../epmet-activiti-server/pom.xml | 6 ++-- .../common-service-server/pom.xml | 6 ++-- .../epmet-ext/epmet-ext-server/pom.xml | 6 ++-- .../epmet-heart/epmet-heart-server/pom.xml | 8 ++--- .../epmet-job/epmet-job-server/pom.xml | 6 ++-- .../epmet-message-server/pom.xml | 8 ++--- .../epmet-oss/epmet-oss-server/pom.xml | 6 ++-- .../epmet-point/epmet-point-server/pom.xml | 8 ++--- .../epmet-third/epmet-third-server/pom.xml | 8 ++--- .../gov-access/gov-access-server/pom.xml | 6 ++-- epmet-module/gov-grid/gov-grid-server/pom.xml | 4 +-- .../gov-issue/gov-issue-server/pom.xml | 8 ++--- epmet-module/gov-mine/gov-mine-server/pom.xml | 4 +-- epmet-module/gov-org/gov-org-server/pom.xml | 8 ++--- .../gov-project/gov-project-server/pom.xml | 6 ++-- .../gov-voice/gov-voice-server/pom.xml | 6 ++-- .../open-data-worker-server/pom.xml | 8 ++--- .../oper-access/oper-access-server/pom.xml | 6 ++-- epmet-module/oper-crm/oper-crm-server/pom.xml | 6 ++-- .../oper-customize-server/pom.xml | 8 ++--- .../resi-group/resi-group-server/pom.xml | 8 ++--- .../resi-guide/resi-guide-server/pom.xml | 6 ++-- .../resi-hall/resi-hall-server/pom.xml | 4 +-- .../resi-home/resi-home-server/pom.xml | 4 +-- .../resi-mine/resi-mine-server/pom.xml | 4 +-- .../resi-partymember-server/pom.xml | 8 ++--- .../resi-voice/resi-voice-server/pom.xml | 4 +-- epmet-openapi/epmet-openapi-scan/pom.xml | 4 +-- epmet-user/epmet-user-server/pom.xml | 8 ++--- 35 files changed, 138 insertions(+), 138 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 3c9652cee8..0e0ba0adda 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -254,18 +254,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -279,7 +279,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 153fdfb475..67ee59978f 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -376,12 +376,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 5059f095dd..32f70b48e4 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -507,12 +507,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 4d18805298..f542be70ff 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -606,109 +606,109 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 946e14f0a6..4beaf875c2 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -334,32 +334,32 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 8641ce2ab5..64b18c4488 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -599,103 +599,103 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEtclOUdvIEwEr@w - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -722,7 +722,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index f54b143ceb..33164cd48a 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -287,18 +287,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index cec0f74b49..037902a450 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -270,18 +270,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 1edac9a30b..4d975e2c80 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -349,18 +349,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 74b9c12d47..15841b7f64 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -331,18 +331,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -364,7 +364,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 true diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 7b58b4270f..ba9a7781bd 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -262,18 +262,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 1524143130..816fa7abad 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -324,18 +324,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -364,7 +364,7 @@ - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 7dd65ef4b0..8cf84ed6da 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -269,18 +269,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 00e5e641c5..24b750bbfe 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -290,18 +290,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -327,7 +327,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 0a37236f13..ae368d1906 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -380,18 +380,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -420,7 +420,7 @@ + 10.0.0.4:9876--> false diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 816130af05..dbcae08915 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -248,18 +248,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 863c2824f3..9f81af20b2 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -234,12 +234,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index ade7249954..b419c69d1f 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -303,18 +303,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -344,7 +344,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index b7cc735614..9fe9215b8e 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -248,12 +248,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 16ed0a372b..45f2822bb2 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -359,18 +359,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -399,7 +399,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 660b3a5af4..5c6d2c07a7 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -338,18 +338,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 9c14e7fa1f..d52b79a73e 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -259,18 +259,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index f20249f71c..cf42c8d76f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -273,18 +273,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -311,7 +311,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 36cdcf0515..80e4ae3a66 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -244,18 +244,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 44f243974f..7d5f68b362 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -298,18 +298,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 1e1098f1b0..b982cd3e62 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -299,18 +299,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -339,7 +339,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index f0ce53a8ab..a72dc87944 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -344,18 +344,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -392,7 +392,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 4fe8a5cd3f..b4453419c0 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -265,18 +265,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index c435b8fbd3..ea5f9567a9 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -217,12 +217,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 3a81efc107..1ecca5cb5e 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -238,12 +238,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 6457702a55..d460b84d4b 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -254,12 +254,12 @@ prod 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index eb8b9cf2bc..43457e8458 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -332,18 +332,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -374,7 +374,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index a739b44bef..2816860ea0 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -217,12 +217,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 8afc7839fd..725763d9d9 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -219,12 +219,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 3c540f6cd5..ded8a4478e 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -349,18 +349,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -381,7 +381,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 true From 06f32eff04dcf0c74ca46e1873f4d812d6a3551e Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 11 Apr 2023 19:09:23 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=B1=B1=E8=A1=97?= =?UTF-8?q?=E9=81=93=E3=80=91=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E6=A0=8F=E7=9B=AEcurd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-voice/gov-voice-server/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index d52b79a73e..561b92a4d6 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -164,8 +164,8 @@ - epmet - EpmEt_lsjd@@ + root + root 0 192.168.1.140 From 5d8ecefcd9c2a0636f151a733dabbde0ada96682 Mon Sep 17 00:00:00 2001 From: luyan Date: Tue, 23 May 2023 11:04:27 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CategoryDictServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java index 8708e64250..05078cc5ed 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java @@ -156,7 +156,6 @@ public class CategoryDictServiceImpl extends BaseServiceImpl list(Integer pageNo, Integer pageSize) { - List list = baseDao.selectList(null); LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(CategoryDictEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); List list = baseDao.selectList(query); From ba7416aedfcd88eb50101cbbc15da197e6558d41 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 11 Apr 2023 19:09:23 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=B1=B1=E8=A1=97?= =?UTF-8?q?=E9=81=93=E3=80=91=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E6=A0=8F=E7=9B=AEcurd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CategoryDictServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java index 05078cc5ed..8708e64250 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java @@ -156,6 +156,7 @@ public class CategoryDictServiceImpl extends BaseServiceImpl list(Integer pageNo, Integer pageSize) { + List list = baseDao.selectList(null); LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(CategoryDictEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); List list = baseDao.selectList(query); From 5bb4c98cf1b4d98f1ad4962d1ef4d51a2959aa63 Mon Sep 17 00:00:00 2001 From: luyan Date: Tue, 23 May 2023 11:04:27 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CategoryDictServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java index 8708e64250..05078cc5ed 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java @@ -156,7 +156,6 @@ public class CategoryDictServiceImpl extends BaseServiceImpl list(Integer pageNo, Integer pageSize) { - List list = baseDao.selectList(null); LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(CategoryDictEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); List list = baseDao.selectList(query); From 7f2554efff82909736a096539db5847488103b7b Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 11 Apr 2023 19:09:23 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=B1=B1=E8=A1=97?= =?UTF-8?q?=E9=81=93=E3=80=91=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E6=A0=8F=E7=9B=AEcurd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CategoryDictServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java index 05078cc5ed..8708e64250 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java @@ -156,6 +156,7 @@ public class CategoryDictServiceImpl extends BaseServiceImpl list(Integer pageNo, Integer pageSize) { + List list = baseDao.selectList(null); LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(CategoryDictEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); List list = baseDao.selectList(query); From 61a8e760de84fd7236c14229c1ff3393bc048d69 Mon Sep 17 00:00:00 2001 From: luyan Date: Tue, 23 May 2023 11:04:27 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CategoryDictServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java index 8708e64250..05078cc5ed 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java @@ -156,7 +156,6 @@ public class CategoryDictServiceImpl extends BaseServiceImpl list(Integer pageNo, Integer pageSize) { - List list = baseDao.selectList(null); LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(CategoryDictEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); List list = baseDao.selectList(query); From ea5a0635ec5782bdb706e05268f0a86ea4272f23 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 11 Apr 2023 19:09:23 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=B1=B1=E8=A1=97?= =?UTF-8?q?=E9=81=93=E3=80=91=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E6=A0=8F=E7=9B=AEcurd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CategoryDictServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java index 05078cc5ed..8708e64250 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java @@ -156,6 +156,7 @@ public class CategoryDictServiceImpl extends BaseServiceImpl list(Integer pageNo, Integer pageSize) { + List list = baseDao.selectList(null); LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(CategoryDictEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); List list = baseDao.selectList(query); From 9ddf513ae507c62e4efcb3703e45445407061f04 Mon Sep 17 00:00:00 2001 From: wxz Date: Sun, 26 Feb 2023 21:40:17 +0800 Subject: [PATCH 16/19] =?UTF-8?q?mariadb=E3=80=81redis=E3=80=81rocketmq?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 8 ++--- epmet-auth/pom.xml | 4 +-- epmet-gateway/pom.xml | 4 +-- .../data-aggregator-server/pom.xml | 32 ++++++++--------- .../data-report/data-report-server/pom.xml | 10 +++--- .../data-statistical-server/pom.xml | 36 +++++++++---------- .../epmet-activiti-server/pom.xml | 6 ++-- .../common-service-server/pom.xml | 6 ++-- .../epmet-ext/epmet-ext-server/pom.xml | 6 ++-- .../epmet-heart/epmet-heart-server/pom.xml | 8 ++--- .../epmet-job/epmet-job-server/pom.xml | 6 ++-- .../epmet-message-server/pom.xml | 8 ++--- .../epmet-oss/epmet-oss-server/pom.xml | 6 ++-- .../epmet-point/epmet-point-server/pom.xml | 8 ++--- .../epmet-third/epmet-third-server/pom.xml | 8 ++--- .../gov-access/gov-access-server/pom.xml | 6 ++-- epmet-module/gov-grid/gov-grid-server/pom.xml | 4 +-- .../gov-issue/gov-issue-server/pom.xml | 8 ++--- epmet-module/gov-mine/gov-mine-server/pom.xml | 4 +-- epmet-module/gov-org/gov-org-server/pom.xml | 8 ++--- .../gov-project/gov-project-server/pom.xml | 6 ++-- .../gov-voice/gov-voice-server/pom.xml | 10 +++--- .../open-data-worker-server/pom.xml | 8 ++--- .../oper-access/oper-access-server/pom.xml | 6 ++-- epmet-module/oper-crm/oper-crm-server/pom.xml | 6 ++-- .../oper-customize-server/pom.xml | 8 ++--- .../resi-group/resi-group-server/pom.xml | 8 ++--- .../resi-guide/resi-guide-server/pom.xml | 6 ++-- .../resi-hall/resi-hall-server/pom.xml | 4 +-- .../resi-home/resi-home-server/pom.xml | 4 +-- .../resi-mine/resi-mine-server/pom.xml | 4 +-- .../resi-partymember-server/pom.xml | 8 ++--- .../resi-voice/resi-voice-server/pom.xml | 4 +-- epmet-openapi/epmet-openapi-scan/pom.xml | 4 +-- epmet-user/epmet-user-server/pom.xml | 8 ++--- 35 files changed, 140 insertions(+), 140 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 0e0ba0adda..3c9652cee8 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -254,18 +254,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -279,7 +279,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 epmet_message diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 67ee59978f..153fdfb475 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -376,12 +376,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 32f70b48e4..5059f095dd 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -507,12 +507,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index f542be70ff..4d18805298 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -606,109 +606,109 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 4beaf875c2..946e14f0a6 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -334,32 +334,32 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 64b18c4488..8641ce2ab5 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -599,103 +599,103 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEtclOUdvIEwEr@w - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -722,7 +722,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index 33164cd48a..f54b143ceb 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -287,18 +287,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 037902a450..cec0f74b49 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -270,18 +270,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 4d975e2c80..1edac9a30b 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -349,18 +349,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 15841b7f64..74b9c12d47 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -331,18 +331,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -364,7 +364,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 true diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index ba9a7781bd..7b58b4270f 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -262,18 +262,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 816fa7abad..1524143130 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -324,18 +324,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -364,7 +364,7 @@ - 10.0.0.4:9876 + 172.16.80.50:9876 epmet_message diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 8cf84ed6da..7dd65ef4b0 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -269,18 +269,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 24b750bbfe..00e5e641c5 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -290,18 +290,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -327,7 +327,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index ae368d1906..0a37236f13 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -380,18 +380,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -420,7 +420,7 @@ + 172.16.80.50:9876--> false diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index dbcae08915..816130af05 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -248,18 +248,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 9f81af20b2..863c2824f3 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -234,12 +234,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index b419c69d1f..ade7249954 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -303,18 +303,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -344,7 +344,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index 9fe9215b8e..b7cc735614 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -248,12 +248,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 45f2822bb2..16ed0a372b 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -359,18 +359,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -399,7 +399,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 epmet_message diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 5c6d2c07a7..660b3a5af4 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -338,18 +338,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 561b92a4d6..9c14e7fa1f 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -164,8 +164,8 @@ - root - root + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -259,18 +259,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index cf42c8d76f..f20249f71c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -273,18 +273,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -311,7 +311,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 80e4ae3a66..36cdcf0515 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -244,18 +244,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 7d5f68b362..44f243974f 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -298,18 +298,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index b982cd3e62..1e1098f1b0 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -299,18 +299,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -339,7 +339,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 epmet_message diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index a72dc87944..f0ce53a8ab 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -344,18 +344,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -392,7 +392,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index b4453419c0..4fe8a5cd3f 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -265,18 +265,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index ea5f9567a9..c435b8fbd3 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -217,12 +217,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 1ecca5cb5e..3a81efc107 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -238,12 +238,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index d460b84d4b..6457702a55 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -254,12 +254,12 @@ prod 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 43457e8458..eb8b9cf2bc 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -332,18 +332,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -374,7 +374,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index 2816860ea0..a739b44bef 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -217,12 +217,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 725763d9d9..8afc7839fd 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -219,12 +219,12 @@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index ded8a4478e..3c540f6cd5 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -349,18 +349,18 @@ - + epmet EpmEt_lsjd@@ 0 - 10.0.0.5 + 172.16.80.51:6379 6379 EpmEtrEdIs@lsjd true - 10.0.0.5:8848 + 172.16.80.51:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -381,7 +381,7 @@ true - 10.0.0.4:9876 + 172.16.80.50:9876 true From 7d4a7a25615ebc6762cf2c7cf8741b3924b73fd5 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 27 Feb 2023 15:24:15 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E9=92=88=E5=AF=B9=E7=81=B5=E5=B1=B1?= =?UTF-8?q?=E8=A1=97=E9=81=93=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 8 ++--- epmet-auth/pom.xml | 4 +-- epmet-gateway/pom.xml | 4 +-- .../data-aggregator-server/pom.xml | 32 ++++++++--------- .../data-report/data-report-server/pom.xml | 10 +++--- .../data-statistical-server/pom.xml | 36 +++++++++---------- .../epmet-activiti-server/pom.xml | 6 ++-- .../common-service-server/pom.xml | 6 ++-- .../epmet-ext/epmet-ext-server/pom.xml | 6 ++-- .../epmet-heart/epmet-heart-server/pom.xml | 8 ++--- .../epmet-job/epmet-job-server/pom.xml | 6 ++-- .../epmet-message-server/pom.xml | 8 ++--- .../epmet-oss/epmet-oss-server/pom.xml | 6 ++-- .../epmet-point/epmet-point-server/pom.xml | 8 ++--- .../epmet-third/epmet-third-server/pom.xml | 8 ++--- .../gov-access/gov-access-server/pom.xml | 6 ++-- epmet-module/gov-grid/gov-grid-server/pom.xml | 4 +-- .../gov-issue/gov-issue-server/pom.xml | 8 ++--- epmet-module/gov-mine/gov-mine-server/pom.xml | 4 +-- epmet-module/gov-org/gov-org-server/pom.xml | 8 ++--- .../gov-project/gov-project-server/pom.xml | 6 ++-- .../gov-voice/gov-voice-server/pom.xml | 6 ++-- .../open-data-worker-server/pom.xml | 8 ++--- .../oper-access/oper-access-server/pom.xml | 6 ++-- epmet-module/oper-crm/oper-crm-server/pom.xml | 6 ++-- .../oper-customize-server/pom.xml | 8 ++--- .../resi-group/resi-group-server/pom.xml | 8 ++--- .../resi-guide/resi-guide-server/pom.xml | 6 ++-- .../resi-hall/resi-hall-server/pom.xml | 4 +-- .../resi-home/resi-home-server/pom.xml | 4 +-- .../resi-mine/resi-mine-server/pom.xml | 4 +-- .../resi-partymember-server/pom.xml | 8 ++--- .../resi-voice/resi-voice-server/pom.xml | 4 +-- epmet-openapi/epmet-openapi-scan/pom.xml | 4 +-- epmet-user/epmet-user-server/pom.xml | 8 ++--- 35 files changed, 138 insertions(+), 138 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 3c9652cee8..0e0ba0adda 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -254,18 +254,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -279,7 +279,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 153fdfb475..67ee59978f 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -376,12 +376,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 5059f095dd..32f70b48e4 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -507,12 +507,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 4d18805298..f542be70ff 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -606,109 +606,109 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 946e14f0a6..4beaf875c2 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -334,32 +334,32 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 8641ce2ab5..64b18c4488 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -599,103 +599,103 @@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEtclOUdvIEwEr@w - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -722,7 +722,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index f54b143ceb..33164cd48a 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -287,18 +287,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index cec0f74b49..037902a450 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -270,18 +270,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 1edac9a30b..4d975e2c80 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -349,18 +349,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 74b9c12d47..15841b7f64 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -331,18 +331,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -364,7 +364,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 true diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 7b58b4270f..ba9a7781bd 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -262,18 +262,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 1524143130..816fa7abad 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -324,18 +324,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -364,7 +364,7 @@ - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 7dd65ef4b0..8cf84ed6da 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -269,18 +269,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 00e5e641c5..24b750bbfe 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -290,18 +290,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -327,7 +327,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 0a37236f13..ae368d1906 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -380,18 +380,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -420,7 +420,7 @@ + 10.0.0.4:9876--> false diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 816130af05..dbcae08915 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -248,18 +248,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 863c2824f3..9f81af20b2 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -234,12 +234,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index ade7249954..b419c69d1f 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -303,18 +303,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -344,7 +344,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index b7cc735614..9fe9215b8e 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -248,12 +248,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 16ed0a372b..45f2822bb2 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -359,18 +359,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -399,7 +399,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 660b3a5af4..5c6d2c07a7 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -338,18 +338,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 9c14e7fa1f..d52b79a73e 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -259,18 +259,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index f20249f71c..cf42c8d76f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -273,18 +273,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -311,7 +311,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 36cdcf0515..80e4ae3a66 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -244,18 +244,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 44f243974f..7d5f68b362 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -298,18 +298,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 1e1098f1b0..b982cd3e62 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -299,18 +299,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -339,7 +339,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 epmet_message diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index f0ce53a8ab..a72dc87944 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -344,18 +344,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -392,7 +392,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 4fe8a5cd3f..b4453419c0 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -265,18 +265,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index c435b8fbd3..ea5f9567a9 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -217,12 +217,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 3a81efc107..1ecca5cb5e 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -238,12 +238,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 6457702a55..d460b84d4b 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -254,12 +254,12 @@ prod 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index eb8b9cf2bc..43457e8458 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -332,18 +332,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -374,7 +374,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index a739b44bef..2816860ea0 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -217,12 +217,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 8afc7839fd..725763d9d9 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -219,12 +219,12 @@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 3c540f6cd5..ded8a4478e 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -349,18 +349,18 @@ - + epmet EpmEt_lsjd@@ 0 - 172.16.80.51:6379 + 10.0.0.5 6379 EpmEtrEdIs@lsjd true - 172.16.80.51:8848 + 10.0.0.5:8848 bd205d23-e696-47be-b995-916313f86e99 @@ -381,7 +381,7 @@ true - 172.16.80.50:9876 + 10.0.0.4:9876 true From 26092fe9a03198b533e651a7d06995bf0c1cf247 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 11 Apr 2023 19:09:23 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=B1=B1=E8=A1=97?= =?UTF-8?q?=E9=81=93=E3=80=91=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E6=A0=8F=E7=9B=AEcurd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-voice/gov-voice-server/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index d52b79a73e..561b92a4d6 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -164,8 +164,8 @@ - epmet - EpmEt_lsjd@@ + root + root 0 192.168.1.140 From 5c060364edbb682a90da9f456cfa05108e89f780 Mon Sep 17 00:00:00 2001 From: luyan Date: Tue, 23 May 2023 11:04:27 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CategoryDictServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java index 8708e64250..05078cc5ed 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java @@ -156,7 +156,6 @@ public class CategoryDictServiceImpl extends BaseServiceImpl list(Integer pageNo, Integer pageSize) { - List list = baseDao.selectList(null); LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(CategoryDictEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); List list = baseDao.selectList(query);