From dc8f65dc0e16d38a68d9b8f741337fcd78e585dd Mon Sep 17 00:00:00 2001 From: wxz Date: Sun, 26 Feb 2023 21:40:17 +0800 Subject: [PATCH 1/7] =?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 1822235cdc..153fdfb475 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 33b3dcea12..4d18805298 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -186,64 +186,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@@ @@ -254,35 +254,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 @@ -331,96 +331,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 @@ -606,109 +606,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 dd4ade5343..946e14f0a6 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -147,21 +147,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 @@ -210,21 +210,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 @@ -334,32 +334,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 fef8b6bded..1524143130 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -167,8 +167,8 @@ - epmet_message_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -221,8 +221,8 @@ - epmet_message_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -324,18 +324,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 @@ -364,7 +364,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 951ea10bce..7dd65ef4b0 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -126,8 +126,8 @@ - epmet_oss_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -176,8 +176,8 @@ - epmet_oss_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -269,18 +269,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 a70d2ac789..0a37236f13 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -203,8 +203,8 @@ - epmet_third_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -263,8 +263,8 @@ - epmet_third_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -380,18 +380,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 @@ -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 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 abb978b7ce..660b3a5af4 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -191,8 +191,8 @@ - epmet_gov_project_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -243,8 +243,8 @@ - epmet_gov_project_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -338,18 +338,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 194ec74de1..eb8b9cf2bc 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -175,8 +175,8 @@ - epmet_resi_partymember_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -229,8 +229,8 @@ - epmet_resi_partymember_user - EpmEt-db-UsEr + epmet + EpmEt_lsjd@@ 0 192.168.1.140 @@ -332,18 +332,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 @@ -374,7 +374,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 19e1a0273f53b002a65cf850c2b0e9131213af76 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 27 Feb 2023 15:24:15 +0800 Subject: [PATCH 2/7] =?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 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-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 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 464dcc1d6ac98f247c22b070bfc66fe7fe80f8d4 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 11 Apr 2023 19:09:23 +0800 Subject: [PATCH 3/7] =?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 --- .../src/main/resources/application.yml | 2 +- .../java/com/epmet/dto/CategoryDictDTO.java | 74 +++++++++ .../gov-voice/gov-voice-server/pom.xml | 4 +- .../controller/CategoryDictController.java | 72 +++++++++ .../java/com/epmet/dao/CategoryDictDao.java | 16 ++ .../com/epmet/entity/CategoryDictEntity.java | 44 ++++++ .../epmet/service/CategoryDictService.java | 88 +++++++++++ .../service/impl/CategoryDictServiceImpl.java | 149 ++++++++++++++++++ .../main/resources/mapper/CategoryDictDao.xml | 21 +++ 9 files changed, 467 insertions(+), 3 deletions(-) create mode 100644 epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/CategoryDictDTO.java create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/CategoryDictController.java create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/CategoryDictDao.java create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/CategoryDictEntity.java create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/CategoryDictService.java create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/CategoryDictDao.xml diff --git a/epmet-cloud-generator/src/main/resources/application.yml b/epmet-cloud-generator/src/main/resources/application.yml index 86b39b69c8..28e9fae188 100644 --- a/epmet-cloud-generator/src/main/resources/application.yml +++ b/epmet-cloud-generator/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://118.190.150.119:43306/epmet_gov_org?useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://192.168.1.140:3306/epmet_gov_voice?useUnicode=true&characterEncoding=UTF-8&useSSL=false username: root password: root #oracle配置 diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/CategoryDictDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/CategoryDictDTO.java new file mode 100644 index 0000000000..bbbce73e60 --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/CategoryDictDTO.java @@ -0,0 +1,74 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 文章栏目表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-04-11 + */ +@Data +public class CategoryDictDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * 分类栏目名称 + */ + private String categoryName; + + /** + * 父栏目ID + */ + private String pid; + + /** + * 排序 + */ + private Integer sort; + + /** + * 删除标识 0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file 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 new file mode 100644 index 0000000000..40d67f975f --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/CategoryDictController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.CategoryDictDTO; +import com.epmet.service.CategoryDictService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 文章栏目表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-04-11 + */ +@RestController +@RequestMapping("categoryDict") +public class CategoryDictController { + + @Autowired + private CategoryDictService categoryDictService; + + @RequestMapping("list") + public Result> list(@RequestParam Integer pageNo, @RequestParam Integer pageSize){ + List list = categoryDictService.list(pageNo, pageSize); + return new Result>().ok(list); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + CategoryDictDTO data = categoryDictService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody CategoryDictDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + categoryDictService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody CategoryDictDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + categoryDictService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + categoryDictService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/CategoryDictDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/CategoryDictDao.java new file mode 100644 index 0000000000..6797882a8a --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/CategoryDictDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.CategoryDictEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 文章栏目表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-04-11 + */ +@Mapper +public interface CategoryDictDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/CategoryDictEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/CategoryDictEntity.java new file mode 100644 index 0000000000..e6cd84571c --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/CategoryDictEntity.java @@ -0,0 +1,44 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 文章栏目表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-04-11 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("category_dict") +public class CategoryDictEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 分类栏目名称 + */ + private String categoryName; + + /** + * 父栏目ID + */ + private String pid; + + /** + * 排序 + */ + private Integer sort; + +} 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 new file mode 100644 index 0000000000..b070fd1c34 --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/CategoryDictService.java @@ -0,0 +1,88 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.CategoryDictDTO; +import com.epmet.entity.CategoryDictEntity; + +import java.util.List; +import java.util.Map; + +/** + * 文章栏目表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-04-11 + */ +public interface CategoryDictService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2023-04-11 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2023-04-11 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return CategoryDictDTO + * @author generator + * @date 2023-04-11 + */ + CategoryDictDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2023-04-11 + */ + void save(CategoryDictDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2023-04-11 + */ + void update(CategoryDictDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2023-04-11 + */ + void delete(String[] ids); + + /** + * @description: 列表 + * @param pageNo: + * @param pageSize: + * @return java.util.List + * @author: WangXianZhang + * @date: 2023/4/11 7:06 PM + */ + List list(Integer pageNo, Integer pageSize); +} \ 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 new file mode 100644 index 0000000000..e48f6fd893 --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java @@ -0,0 +1,149 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.distributedlock.DistributedLock; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.dao.CategoryDictDao; +import com.epmet.dto.CategoryDictDTO; +import com.epmet.entity.CategoryDictEntity; +import com.epmet.service.CategoryDictService; +import org.apache.commons.lang3.StringUtils; +import org.redisson.api.RLock; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 文章栏目表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-04-11 + */ +@Service +public class CategoryDictServiceImpl extends BaseServiceImpl implements CategoryDictService { + + @Autowired + private DistributedLock distributedLock; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, CategoryDictDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, CategoryDictDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public CategoryDictDTO get(String id) { + CategoryDictEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, CategoryDictDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(CategoryDictDTO dto) { + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + + // 重名检查,客户下不能重名 + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(CategoryDictEntity::getCustomerId, customerId); + query.eq(CategoryDictEntity::getCategoryName, dto.getCategoryName()); + + // 加锁 + RLock lock = distributedLock.getLock("voice:categorydict"); + try { + if (baseDao.selectCount(query) > 0) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "栏目名称已存在"); + } + + dto.setCustomerId(customerId); + CategoryDictEntity entity = ConvertUtils.sourceToTarget(dto, CategoryDictEntity.class); + insert(entity); + + } catch (EpmetException ee) { + throw ee; + } catch (Exception e) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "【文章】新增文章栏目失败:" + ExceptionUtils.getErrorStackTrace(e)); + } finally { + // 解锁 + lock.unlock(); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(CategoryDictDTO dto) { + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + + // 重名检查,客户下不能重名 + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(CategoryDictEntity::getCustomerId, customerId); + query.eq(CategoryDictEntity::getCategoryName, dto.getCategoryName()); + + RLock lock = distributedLock.getLock("voice:categorydict"); + try { + CategoryDictEntity inDb = null; + // 能查询到一条数据，并且该条数据的ID不是当前修改的这条数据的ID，说明已存在同名的其他标签，该名字已被其他标签占用 + if ((inDb = baseDao.selectOne(query)) != null + && !inDb.getId().equals(dto.getId())) { + + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "栏目名称已存在"); + } + + dto.setCustomerId(customerId); + CategoryDictEntity entity = ConvertUtils.sourceToTarget(dto, CategoryDictEntity.class); + updateById(entity); + + } catch (EpmetException ee) { + throw ee; + } catch (Exception e) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "【文章】新增文章栏目失败:" + ExceptionUtils.getErrorStackTrace(e)); + } finally { + // 解锁 + lock.unlock(); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public List list(Integer pageNo, Integer pageSize) { + List list = baseDao.selectList(null); + return ConvertUtils.sourceToTarget(list, CategoryDictDTO.class); + } +} \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/CategoryDictDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/CategoryDictDao.xml new file mode 100644 index 0000000000..5a7231a4c7 --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/CategoryDictDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 25ce4f1c4117a4faca38c1ba4a2fea8a4b869dc1 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 24 Apr 2023 11:23:39 +0800 Subject: [PATCH 4/7] =?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 --- .../commons/tools/enums/ZhzlResiCategoryEnum.java | 11 ++++++----- .../service/epmetuser/impl/IcResiServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 6 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 b57baedf5e..6e9c97a00f 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,13 +14,14 @@ public enum ZhzlResiCategoryEnum { // zhaoshizhaohuojingshenbing 肇事肇祸精神病 // xidurenyuan 吸毒人员 - 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), - xidurenyuan("xidurenyuan", "吸毒人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xidurenyuan", 7); + // zhaoshizhaohuojingshenbing("zhaoshizhaohuojingshenbing", "肇事肇祸精神病", "list_equal", "ic_special", "SPECIAL_RQLB", "zhaoshizhaohuojingshenbing", 6), + jingzhanghuanzhe("jingzhanghuanzhe", "精障患者", "list_equal", "ic_special", "SPECIAL_RQLB", "jingzhanghuanzhe", 6), + jiedurenyuan("jiedurenyuan", "戒毒人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xidurenyuan", 7); private String code; private String name; 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 dfb5bc18366575643a8af6e6e7cd655c2eb4a31b Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 10 May 2023 17:10:17 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ....xlsx => special_crowd_jiedurenyuan_import.xlsx} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/excel/lingshan/{special_crowd_xidurenyuan_import.xlsx => special_crowd_jiedurenyuan_import.xlsx} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/special_crowd_xidurenyuan_import.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/lingshan/special_crowd_jiedurenyuan_import.xlsx similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/excel/lingshan/special_crowd_xidurenyuan_import.xlsx rename to epmet-user/epmet-user-server/src/main/resources/excel/lingshan/special_crowd_jiedurenyuan_import.xlsx From 6250b8418d10b395dac3adaa03acc61d81eef5c7 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 15 May 2023 14:29:47 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/utils/ScanContentUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java index bf0bfb5ba5..36f1d8ba12 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; public class ScanContentUtils { // 内容审核是否可用。烟台是政务网，无法使用互联网，所以该功能不可用 - public static final Boolean USABLE = true; + public static final Boolean USABLE = false; /** * 模拟sync成功的结果(可以用来模拟，也可以适用于无法使用互联网的环境) From d4758e0dad07e3b011c9262400b04f47fa41a9ed Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 22 May 2023 18:45:01 +0800 Subject: [PATCH 7/7] - --- .../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());