From de993d2802399a21ec6e1f69345463c55283603c Mon Sep 17 00:00:00 2001 From: duanliangtao Date: Mon, 5 Jun 2023 16:07:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=97=A5=E7=85=A7?= =?UTF-8?q?=E6=94=BF=E5=8A=A1=E4=BA=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 26 +-- .../src/main/resources/bootstrap.yml | 2 +- epmet-auth/pom.xml | 8 +- epmet-auth/src/main/resources/bootstrap.yml | 2 +- .../commons/tools/aop/NoRepeatSubmitAop.java | 5 +- epmet-gateway/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 2 +- .../data-aggregator-server/pom.xml | 148 +++++++++--------- .../src/main/resources/bootstrap.yml | 2 +- .../data-report/data-report-server/pom.xml | 14 +- .../src/main/resources/bootstrap.yml | 2 +- .../data-statistical-server/pom.xml | 40 ++--- .../src/main/resources/bootstrap.yml | 2 +- .../epmet-activiti-server/pom.xml | 16 +- .../common-service-server/pom.xml | 24 +-- .../src/main/resources/bootstrap.yml | 2 +- .../epmet-demo/epmet-demo-server/pom.xml | 6 +- .../epmet-ext/epmet-ext-server/pom.xml | 24 +-- .../src/main/resources/bootstrap.yml | 2 +- .../epmet-heart/epmet-heart-server/pom.xml | 16 +- ...cCommunitySelfOrganizationServiceImpl.java | 21 ++- .../src/main/resources/bootstrap.yml | 2 +- .../epmet-job/epmet-job-server/pom.xml | 24 +-- .../src/main/resources/bootstrap.yml | 2 +- .../epmet-message-server/pom.xml | 26 +-- .../src/main/resources/bootstrap.yml | 2 +- .../epmet-oss/epmet-oss-server/pom.xml | 26 +-- .../src/main/resources/bootstrap.yml | 2 +- .../epmet-point/epmet-point-server/pom.xml | 18 +-- .../src/main/resources/bootstrap.yml | 2 +- .../epmet-third/epmet-third-server/pom.xml | 24 +-- .../src/main/resources/bootstrap.yml | 2 +- .../gov-access/gov-access-server/pom.xml | 24 +-- .../src/main/resources/bootstrap.yml | 2 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 2 +- .../gov-issue/gov-issue-server/pom.xml | 26 +-- .../src/main/resources/bootstrap.yml | 2 +- epmet-module/gov-mine/gov-mine-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 26 +-- .../impl/CustomerAgencyServiceImpl.java | 6 +- .../service/impl/IcHouseServiceImpl.java | 48 ++++++ .../src/main/resources/bootstrap.yml | 2 +- .../gov-project/gov-project-server/pom.xml | 24 +-- .../src/main/resources/bootstrap.yml | 2 +- .../gov-voice/gov-voice-server/pom.xml | 24 +-- .../src/main/resources/bootstrap.yml | 2 +- .../open-data-worker-server/pom.xml | 26 +-- .../src/main/resources/bootstrap.yml | 2 +- .../oper-access/oper-access-server/pom.xml | 24 +-- .../src/main/resources/bootstrap.yml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 24 +-- .../src/main/resources/bootstrap.yml | 2 +- .../oper-customize-server/pom.xml | 26 +-- .../src/main/resources/bootstrap.yml | 2 +- .../main/resources/mapper/IcFormItemDao.xml | 2 +- .../resi-group/resi-group-server/pom.xml | 26 +-- .../src/main/resources/bootstrap.yml | 2 +- .../resi-guide/resi-guide-server/pom.xml | 24 +-- .../src/main/resources/bootstrap.yml | 2 +- .../resi-hall/resi-hall-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 2 +- .../resi-home/resi-home-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 2 +- .../resi-mine/resi-mine-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 2 +- .../resi-partymember-server/pom.xml | 26 +-- .../src/main/resources/bootstrap.yml | 2 +- .../resi-voice/resi-voice-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 2 +- epmet-openapi/epmet-openapi-scan/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 26 +-- .../impl/IcResiUserImportServiceImpl.java | 2 + .../src/main/resources/bootstrap.yml | 2 +- .../resources/mapper/CustomerStaffDao.xml | 2 +- .../main/resources/mapper/IcResiUserDao.xml | 26 +-- pom.xml | 16 ++ 79 files changed, 555 insertions(+), 471 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 835036af05..a838d7acaf 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -165,8 +165,8 @@ - epmet_admin_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -211,7 +211,7 @@ - epmet + root elink@833066 0 @@ -254,24 +254,24 @@ - + - epmet_admin_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 single 3 rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false @@ -284,7 +284,7 @@ true - 172.16.3.86:9876;172.16.3.87:9876 + 10.1.26.46:9876;10.1.26.48:9876 epmet_message diff --git a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml index 77327d7b1f..0c00caac80 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml +++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index b319b36151..35c64b7951 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -377,9 +377,9 @@ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -387,8 +387,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml index 3f11ee9eba..2d3ced0fe6 100644 --- a/epmet-auth/src/main/resources/bootstrap.yml +++ b/epmet-auth/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java index 87b6eec666..7fa4fd4ca7 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java @@ -49,7 +49,8 @@ public class NoRepeatSubmitAop { Object result = null; RLock lock = null; try { - try { + // 日照的单机节点，不需要分布式锁，锁不住直接放行 + /*try { //key 为空则直接跳过 不加锁 if (key != null) { long leaseTime = noRepeatSubmit.leaseTime(); @@ -62,7 +63,7 @@ public class NoRepeatSubmitAop { log.warn("noRepeatSubmit key:{},msg:{}", key, error); //"未获取到锁，重复提交了 throw new RenException(EpmetErrorCode.REPEAT_SUBMIT.getCode()); - } + }*/ //执行业务代码 result = pjp.proceed(); diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 9eae5455a0..3e45527e8d 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -508,9 +508,9 @@ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -518,8 +518,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 281cae6482..521a13cfe3 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -20,7 +20,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 0e17abc15d..53391c6dce 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -187,63 +187,63 @@ epmet_gov_org_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_gov_issue_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_gov_project_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_resi_group_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_user_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_common_service_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_oper_crm_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_data_statistical_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_evaluation_index_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ @@ -255,34 +255,34 @@ epmet_oper_customize_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_message_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_tduck_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_heart_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_resi_partymember_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ 0 @@ -332,95 +332,95 @@ epmet_gov_org_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_gov_issue_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_gov_project_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_resi_group_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_user_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_common_service_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_oper_crm_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_data_statistical_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_evaluation_index_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_oper_customize_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_message_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_tduck_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_heart_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ epmet_resi_partymember_user - EpmEt-db-UsEr + Zhsq@Szrz%2023_ 0 @@ -606,106 +606,106 @@ - + - epmet_gov_org_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ - + - epmet_gov_issue_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ - + - epmet_gov_project_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ - + - epmet_resi_group_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ - + - epmet_user_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ - + - epmet_common_service_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ - + - epmet_oper_crm_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ - + - epmet_data_statistical - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ - + - epmet_evaluation_index_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ - + - epmet_oper_customize_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ - + - epmet_message_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ - + - epmet_tduck - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ - + - epmet_heart_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ - + - epmet_resi_partymember_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -714,8 +714,8 @@ true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml index 74d41ea992..216f9eb555 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml @@ -12,7 +12,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 6b90e7d972..6753176ff9 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -334,19 +334,19 @@ - + epmet_data_statistical EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr @@ -354,9 +354,9 @@ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -365,8 +365,8 @@ true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml index 85acb5be93..76c4d97200 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml @@ -18,7 +18,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 1ac3cf5630..ab8cd006b7 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -619,69 +619,69 @@ - + epmet_data_statistical EpmEt-db-UsEr - + epmet_gov_org_user EpmEt-db-UsEr - + epmet_gov_issue_user EpmEt-db-UsEr - + epmet_gov_project_user EpmEt-db-UsEr - + epmet_gov_voice_user EpmEt-db-UsEr - + epmet_oper_crm_user EpmEt-db-UsEr - + epmet_resi_group_user EpmEt-db-UsEr - + epmet_user_user EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr - + epmet_cloud_viewer @@ -689,26 +689,26 @@ - + epmet_resi_partymember_user EpmEt-db-UsEr - + epmet_heart_user EpmEt-db-UsEr - + epmet_point_user EpmEt-db-UsEr - + epmet_oper_customize_user @@ -717,9 +717,9 @@ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -727,8 +727,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false @@ -758,7 +758,7 @@ true - 172.16.3.86:9876;172.16.3.87:9876 + 10.1.26.46:9876;10.1.26.48:9876 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml index c7e0e37749..4d3272f49e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml @@ -18,7 +18,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index ee3132d1da..68c9899935 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -209,8 +209,8 @@ - epmet_activiti_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -249,7 +249,7 @@ - epmet + root elink@833066 0 @@ -289,8 +289,8 @@ - epmet_activiti_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com @@ -299,7 +299,7 @@ true 192.168.11.180:8848 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false 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 b027a92095..fd1e785b22 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -165,8 +165,8 @@ - epmet_common_service_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -220,7 +220,7 @@ - epmet + root elink@833066 0 @@ -270,16 +270,16 @@ - + - epmet_common_service_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -287,8 +287,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml index acb0f0c03a..16ce214504 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index 8a38624e35..1fd0948096 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -168,7 +168,7 @@ - epmet + root elink@833066 0 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index ae90eaae42..84deeb07f0 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -250,8 +250,8 @@ - epmet_third_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -300,7 +300,7 @@ - epmet + root elink@833066 0 @@ -348,16 +348,16 @@ - + - epmet_third_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -365,8 +365,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml index 211d16bc8e..da1e0544ab 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml @@ -18,7 +18,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 918991dbfe..8d5b79cd9a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -331,16 +331,16 @@ - + - epmet_heart_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -348,8 +348,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false @@ -370,7 +370,7 @@ true - 172.16.3.86:9876;172.16.3.87:9876 + 10.1.26.46:9876;10.1.26.48:9876 true diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java index bdfe777e7c..24dc4586e0 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java @@ -488,7 +488,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl { @@ -618,7 +618,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl persons = new ArrayList<>(); AtomicReference bl = new AtomicReference<>(false); StringBuffer msg = new StringBuffer(""); - if (CollectionUtils.isNotEmpty(l.getPersons())){ + if (CollectionUtils.isNotEmpty(l.getPersons()) && l.getPersons().size()>0){ /*l.getPersons().forEach(p -> { boolean m = PhoneValidatorUtils.isMobile(p.getPersonPhone()); boolean t = PhoneValidatorUtils.isTel(p.getPersonPhone()); @@ -631,7 +631,16 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl> groupByPhone = CollectionUtils.isNotEmpty(persons) ? persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone)) : new HashMap<>(); + + //Map> groupByPhone = CollectionUtils.isNotEmpty(persons) ? persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone)) : new HashMap<>(); + + Map> groupByPhone = new HashMap<>(); + try{ + groupByPhone = persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone)); + }catch (Exception e1){ + log.error("自组织下的成员信息导入出错，但不影响主体流程，予以放行"); + } + List phones = new ArrayList<>(); groupByPhone.forEach((k,v) -> { if (v.size() > NumConstant.ONE){ @@ -662,10 +671,14 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl { + if(p.getPersonName() == null || p.getPersonPhone()==null){ + return; + } p.setCustomerId(tokenDto.getCustomerId()); p.setOrgId(e.getId()); + personnelService.insert(p); }); - personnelService.insertBatch(persons); +// personnelService.insertBatch(persons); } }); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml index 7dee840cd6..6276388852 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml @@ -18,7 +18,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 9e392bb536..bb83f374fc 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -193,8 +193,8 @@ - epmet_job_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -230,7 +230,7 @@ - epmet + root elink@833066 0 @@ -262,16 +262,16 @@ - + - epmet_job_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -279,8 +279,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml index b68eaa7982..9b7bbc2562 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index cb746a3362..75dc920366 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -216,8 +216,8 @@ - epmet_message_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -270,7 +270,7 @@ - epmet + root elink@833066 0 @@ -319,24 +319,24 @@ - + - epmet_message_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 single 3 rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false @@ -364,7 +364,7 @@ - 172.16.3.86:9876;172.16.3.87:9876 + 10.1.26.46:9876;10.1.26.48:9876 epmet_message diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml index 34383adb04..4e9f30a5cc 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index ef083b51c7..d677482c63 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -99,6 +99,8 @@ com.inspurcloud oss + system + /Users/duanliangtao/.m2/repository-rizhao/com/inspurcloud/oss/1.1.8/oss-1.1.8.jar @@ -136,8 +138,8 @@ - epmet_oss_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -186,8 +188,8 @@ - epmet_oss_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -235,7 +237,7 @@ - epmet + root elink@833066 0 @@ -279,16 +281,16 @@ - + - epmet_oss_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -296,8 +298,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml index 64fe7d2efb..ec0f94ed63 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 8fa54d262d..8d04cc7123 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -250,7 +250,7 @@ EpmEtrEdIs!q@w true - 172.16.3.87 + 10.1.26.46 67e3c350-533e-4d7c-9f8f-faf1b4aa82ae @@ -290,16 +290,16 @@ - + - epmet_point_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -307,8 +307,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false @@ -333,7 +333,7 @@ true - 172.16.3.86:9876;172.16.3.87:9876 + 10.1.26.46:9876;10.1.26.48:9876 diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml index 3b4bca61df..b52c1a3697 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml @@ -18,7 +18,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 0be39bcec0..4f790998ea 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -263,8 +263,8 @@ - epmet_third_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -322,7 +322,7 @@ - epmet + root elink@833066 0 @@ -380,16 +380,16 @@ - + - epmet_third_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -397,8 +397,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml index 8c2f2d040b..b6d67cd5e6 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml @@ -18,7 +18,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 403ed2528e..8be8b21d4f 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -157,8 +157,8 @@ - epmet_gov_access_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -205,7 +205,7 @@ - epmet + root elink@833066 0 @@ -248,16 +248,16 @@ - + - epmet_gov_access_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -265,8 +265,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml index 872472699f..743c00ef5a 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml @@ -18,7 +18,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index da0a553188..779eddeeb7 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -235,9 +235,9 @@ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -245,8 +245,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml b/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml index 4b88552964..56fe0f4090 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 5b27d4af79..5077c862fe 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -205,8 +205,8 @@ - epmet_gov_issue_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -257,7 +257,7 @@ - epmet + root elink@833066 0 @@ -303,16 +303,16 @@ - + - epmet_gov_issue_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -320,8 +320,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false @@ -350,7 +350,7 @@ true - 172.16.3.86:9876;172.16.3.87:9876 + 10.1.26.46:9876;10.1.26.48:9876 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml index 290b412362..31facce6d5 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml @@ -18,7 +18,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index 2036cb9430..7191da5aaa 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -249,9 +249,9 @@ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -259,8 +259,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml b/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml index bb2ff26517..23e65cb347 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml @@ -18,7 +18,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 4d466cd162..3b7f296137 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -256,8 +256,8 @@ - epmet_gov_org_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -310,7 +310,7 @@ - epmet + root elink@833066 0 @@ -359,16 +359,16 @@ - + - epmet_gov_org_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -376,8 +376,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false @@ -405,7 +405,7 @@ true - 172.16.3.86:9876;172.16.3.87:9876 + 10.1.26.46:9876;10.1.26.48:9876 epmet_message diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 87f0555690..0182fc4e6d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1688,12 +1688,14 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl - epmet_gov_project_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -243,8 +243,8 @@ - epmet_gov_project_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -293,7 +293,7 @@ - epmet + root elink@833066 0 @@ -338,16 +338,16 @@ - + - epmet_gov_project_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -355,8 +355,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml index 4bae7e888c..b0d6232194 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml @@ -18,7 +18,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index ae9ea115fc..611147e2aa 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -164,8 +164,8 @@ - epmet_gov_voice_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -214,7 +214,7 @@ - epmet + root elink@833066 0 @@ -259,16 +259,16 @@ - + - epmet_gov_voice_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -276,8 +276,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml index eb59702799..f6d44e250f 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml @@ -18,7 +18,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 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 ee376b71fc..efef0d2588 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -174,8 +174,8 @@ - epmet_open_data_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -226,7 +226,7 @@ - epmet + root elink@833066 0 @@ -273,16 +273,16 @@ - + - epmet_open_data_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -290,8 +290,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false @@ -317,7 +317,7 @@ true - 172.16.3.86:9876;172.16.3.87:9876 + 10.1.26.46:9876;10.1.26.48:9876 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml index 07e311190d..2de28e6b62 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml @@ -18,7 +18,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index f1dec2d0be..033ae0ee3e 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -151,8 +151,8 @@ - epmet_oper_access_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -200,7 +200,7 @@ - epmet + root elink@833066 0 @@ -244,16 +244,16 @@ - + - epmet_oper_access_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -261,8 +261,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml index 093f8b8752..40475f0e68 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 9cc9c3cdd8..091b3b5b8e 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -202,8 +202,8 @@ - epmet_oper_crm_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -251,7 +251,7 @@ - epmet + root elink@833066 0 @@ -298,16 +298,16 @@ - + - epmet_oper_crm_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -315,8 +315,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml index 53eb988991..f86a41f5dd 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 951455c3b9..0a4e14b0ce 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -196,8 +196,8 @@ - epmet_oper_customize_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -250,7 +250,7 @@ - epmet + root elink@833066 0 @@ -299,16 +299,16 @@ - + - epmet_oper_customize_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -316,8 +316,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false @@ -345,7 +345,7 @@ true - 172.16.3.86:9876;172.16.3.87:9876 + 10.1.26.46:9876;10.1.26.48:9876 epmet_message diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml index 20615e417f..160a2d5126 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index 02070f1b63..548b57a477 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -114,7 +114,7 @@ l.WIDTH, i.LABEL, i.COLUMN_NAME, - I.ITEM_TYPE + i.ITEM_TYPE FROM ic_form_list_item l LEFT JOIN ic_form_item i diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 5591ab5900..6e32ad4c23 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -228,8 +228,8 @@ - epmet_resi_group_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -288,7 +288,7 @@ - epmet + root elink@833066 0 @@ -344,16 +344,16 @@ - + - epmet_resi_group_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -361,8 +361,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false @@ -398,7 +398,7 @@ true - 172.16.3.86:9876;172.16.3.87:9876 + 10.1.26.46:9876;10.1.26.48:9876 diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml index ddb537d7fe..592551a67f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 0cbc189e3c..ff2c05248c 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -172,8 +172,8 @@ - epmet_resi_guide_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -221,7 +221,7 @@ - epmet + root elink@833066 0 @@ -265,16 +265,16 @@ - + - epmet_resi_guide_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -282,8 +282,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml index 7e0fef4095..15b9af0a1f 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index 7b4c993d81..f376d89dd1 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -218,9 +218,9 @@ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -228,8 +228,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml index 6ed51e10cc..9222d12537 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 5fec93fa2d..59f84e7d85 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -239,9 +239,9 @@ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -249,8 +249,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml index 1a9395470b..dce3f48c08 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index d3a051ed7e..deff8d195c 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -255,9 +255,9 @@ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -265,8 +265,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml index dfd4216fc8..f09c56fbbc 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index aa0e64e7fb..2d63b46297 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -229,8 +229,8 @@ - epmet_resi_partymember_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -283,7 +283,7 @@ - epmet + root elink@833066 0 @@ -332,16 +332,16 @@ - + - epmet_resi_partymember_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -349,8 +349,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false @@ -380,7 +380,7 @@ true - 172.16.3.86:9876;172.16.3.87:9876 + 10.1.26.46:9876;10.1.26.48:9876 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml index f94b55453d..d004b10cc2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index 7f04082e7c..6f351e4015 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -218,9 +218,9 @@ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -228,8 +228,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml b/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml index 3680029d0b..ad073bd84d 100644 --- a/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml @@ -18,7 +18,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index e46dfd616c..e875caf0ed 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -219,9 +219,9 @@ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -229,8 +229,8 @@ rEdIs@yAntAI_666 true - 172.16.3.87 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + 10.1.26.46 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false diff --git a/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml b/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml index 5b9574ec37..5c1d90c2fa 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml +++ b/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 4c8c9a7a94..48bf2bdfbf 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 + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -247,8 +247,8 @@ - epmet_user_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 192.168.1.140 @@ -301,7 +301,7 @@ - epmet + root elink@833066 0 @@ -349,16 +349,16 @@ - + - epmet_user_user - EpmEt-db-UsEr + root + Zhsq@Szrz%2023_ 0 - 172.16.3.87:6379 + 10.1.26.45:6379 - 172.16.3.87 + 10.1.26.45 6379 single @@ -366,10 +366,10 @@ rEdIs@yAntAI_666 true - 172.16.3.87 + 10.1.26.46 - bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 + f12ffa83-730f-4814-b2ac-89e9132fbb7c false @@ -388,7 +388,7 @@ true - 172.16.3.86:9876;172.16.3.87:9876 + 10.1.26.46:9876;10.1.26.48:9876 true diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 80d337f65d..9cc3921e7a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -1030,6 +1030,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res superOptions.put(superColumnValue, options); } + log.error("【为了排错打印导入居民信息】columnWrapper:{}",columnWrapper.toString()); + String colValue = options.get(cellContent); columnWrapper.setColValue(colValue); } else { diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index 8552f698c7..3c70f4cfee 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: # 地址 - host: 172.16.3.87 + host: 10.1.26.45 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index bed43d0aa6..412fc1e2aa 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -443,7 +443,7 @@ diff --git a/pom.xml b/pom.xml index e9f647dd7e..4a22e0e6dc 100644 --- a/pom.xml +++ b/pom.xml @@ -100,6 +100,22 @@ + + + public + aliyun nexus + http://maven.aliyun.com/nexus/content/groups/public/ + + true + + + + epmet + maven-releases + https://nexus.elinkservice.cn/repository/maven-releases/ + + + public