From 4e93952cb61785a57e70a133eabfacdb324a06f5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 10 Jun 2021 09:39:06 +0800 Subject: [PATCH 1/6] =?UTF-8?q?sql=E8=84=9A=E6=9C=AC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.15__update_project.sql | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.15__update_project.sql diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.15__update_project.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.15__update_project.sql new file mode 100644 index 0000000000..e0fae9cbed --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.15__update_project.sql @@ -0,0 +1,19 @@ +update project set locate_address = NULL,locate_longitude = NULL,locate_dimension = NULL; + +UPDATE + project a, + ( + SELECT + address a, + longitude b, + dimension c, + issue_id d + FROM epmet_resi_group.resi_topic + ) b +SET + a.locate_address = b.a, + a.locate_longitude = b.b, + a.locate_dimension = b.c +WHERE + a.origin = 'issue' +AND a.origin_id = b.d; \ No newline at end of file From 2b55a893b92999d6d3dc619186eb0a1a8702cf1d Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 10 Jun 2021 14:04:07 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E5=90=8E=20=20=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E7=9A=84=E9=A1=B9=E7=9B=AE=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=BB=8F=E7=BA=AC=E5=BA=A6=E5=92=8C=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=20=E5=90=8C=E6=AD=A5=E5=88=B0=E6=8C=87=E6=A0=87=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../toscreen/impl/ScreenProjectSettleServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java index afd8256f26..6da4882ef5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -83,10 +84,17 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic meta.setProjectCreateTime(projectInfo.getCreatedTime()); meta.setProjectTitle(projectInfo.getTitle()); meta.setOrigin(projectInfo.getOrigin()); - //直接立项的话 项目内容是项目背景 + //直接立项的话 项目内容是项目背景 经纬度添加 if (ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(projectInfo.getOrigin())){ meta.setProjectContent(projectInfo.getBackGround()); meta.setLinkName(projectInfo.getCreatedBy()); + if (StringUtils.isNotBlank(projectInfo.getLocateDimension())){ + meta.setLatitude(new BigDecimal(projectInfo.getLocateDimension())); + } + if (StringUtils.isNotBlank(projectInfo.getLocateLongitude())){ + meta.setLongitude(new BigDecimal(projectInfo.getLocateLongitude())); + } + meta.setProjectAddress(projectInfo.getLocateAddress()); } return meta; })).collect(Collectors.toList()); From 4fc06e20b0ad97287e9d66c47ecc4c9ef5088f51 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 10 Jun 2021 17:45:48 +0800 Subject: [PATCH 3/6] =?UTF-8?q?sql=E8=84=9A=E6=9C=AC=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V0.0.14__alter_project_location.sql | 18 ------------------ .../db/migration/V0.0.15__update_project.sql | 17 ----------------- 2 files changed, 35 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql index fd3b7ffcfa..02284815d2 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.14__alter_project_location.sql @@ -4,21 +4,3 @@ ADD COLUMN `LOCATE_LONGITUDE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4 ADD COLUMN `LOCATE_DIMENSION` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '定位维度' AFTER `LOCATE_LONGITUDE`; - -UPDATE - project a, - ( - SELECT - locate_address a, - locate_longitude b, - locate_dimension c, - issue_id d - FROM epmet_resi_group.resi_topic - ) b -SET - a.locate_address = b.a, - a.locate_longitude = b.b, - a.locate_dimension = b.c -WHERE - a.origin = 'issue' -AND a.origin_id = b.d \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.15__update_project.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.15__update_project.sql index e0fae9cbed..66e3aed7a3 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.15__update_project.sql +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.15__update_project.sql @@ -1,19 +1,2 @@ update project set locate_address = NULL,locate_longitude = NULL,locate_dimension = NULL; -UPDATE - project a, - ( - SELECT - address a, - longitude b, - dimension c, - issue_id d - FROM epmet_resi_group.resi_topic - ) b -SET - a.locate_address = b.a, - a.locate_longitude = b.b, - a.locate_dimension = b.c -WHERE - a.origin = 'issue' -AND a.origin_id = b.d; \ No newline at end of file From b3bc252be77523ffd20dae063147501ea9821fb5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 10 Jun 2021 18:02:08 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8A=A0=E5=BC=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/user/impl/StaffPatrolDetailServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java index fb205ff276..1acaf678ce 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java @@ -124,7 +124,7 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService { result.forEach(r -> { if (!r.getLlStatus()){ finalGrids.forEach(g -> { - if (StringUtils.isNotBlank(g.getCenterMark())){ + if (StringUtils.isNotBlank(g.getCenterMark())&& !"[]".equals(g.getCenterMark())){ r.setLongitude(getLL(g.getCenterMark(),PatrolConstant.LONGITUDE)); r.setLatitude(getLL(g.getCenterMark(),PatrolConstant.LATITUDE)); } @@ -191,4 +191,4 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService { } -} \ No newline at end of file +} From d91fa2bc84912ed8a3ab40eaa1b4dbc1eabfca0c Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 10 Jun 2021 21:56:39 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=B0=86130=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=BF=E6=8D=A2=E4=B8=BA140?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy/docker-compose-dev.yml | 2 +- epmet-admin/epmet-admin-server/pom.xml | 12 ++-- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 8 +-- .../src/main/resources/application.yml | 2 +- .../epmet/commons/tools/enums/EnvEnum.java | 2 +- .../epmet/commons/tools/utils/WebUtil.java | 2 +- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- .../data-aggregator-server/pom.xml | 44 ++++++------- .../deploy/docker-compose-dev.yml | 2 +- .../data-report/data-report-server/pom.xml | 20 +++--- .../deploy/docker-compose-dev.yml | 2 +- .../data-statistical-server/pom.xml | 64 +++++++++---------- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-activiti-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../common-service-server/pom.xml | 12 ++-- .../epmet-demo/epmet-demo-server/pom.xml | 6 +- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-ext/epmet-ext-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-heart/epmet-heart-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-job/epmet-job-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-message-server/pom.xml | 16 ++--- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-oss/epmet-oss-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-point/epmet-point-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-third/epmet-third-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../gov-access/gov-access-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- .../gov-issue/gov-issue-server/pom.xml | 16 ++--- .../deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-mine/gov-mine-server/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 16 ++--- .../deploy/docker-compose-dev.yml | 2 +- .../gov-project/gov-project-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../gov-voice/gov-voice-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../oper-access/oper-access-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../oper-customize-server/pom.xml | 16 ++--- .../deploy/docker-compose-dev.yml | 2 +- .../resi-group/resi-group-server/pom.xml | 16 ++--- .../deploy/docker-compose-dev.yml | 2 +- .../resi-guide/resi-guide-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../resi-hall/resi-hall-server/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- .../resi-home/resi-home-server/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- .../resi-mine/resi-mine-server/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- .../resi-partymember-server/pom.xml | 12 ++-- .../deploy/docker-compose-dev.yml | 2 +- .../resi-voice/resi-voice-server/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-openapi-adv-server/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- epmet-openapi/epmet-openapi-scan/pom.xml | 8 +-- .../deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 12 ++-- .../src/main/resources/bootstrap.yml | 2 +- 75 files changed, 288 insertions(+), 288 deletions(-) diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml index 408ecd1fa8..ee8461e06f 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-admin-server:version_placeholder ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index df371df8a9..e6058449fb 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -90,18 +90,18 @@ - + epmet_admin_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -122,18 +122,18 @@ - + epmet_admin_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index 1239aa8ac7..f721a6164f 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-auth:version_placeholder ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 87fe58c7a8..7c2240005d 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -167,12 +167,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -222,12 +222,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-cloud-generator/src/main/resources/application.yml b/epmet-cloud-generator/src/main/resources/application.yml index 76cfc7865d..cc5174da7b 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://192.168.1.130:3306/epmet_data_statistical?useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://192.168.1.140:3306/epmet_data_statistical?useUnicode=true&characterEncoding=UTF-8&useSSL=false username: epmet_dba password: EpmEt-dbA-UsEr #oracle配置 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 31d5faaa34..29a416dfea 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 @@ -15,7 +15,7 @@ public enum EnvEnum { * 环境变量枚举 */ LOCAL("local", "本地环境", "http://localhost:8080/api/"), - DEV("dev", "开发环境", "http://192.168.1.130: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/"), UN_KNOWN("un_known", "未知", "https://epmet-dev.elinkservice.cn/api/"), diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/WebUtil.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/WebUtil.java index f1e2c53382..56d892202f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/WebUtil.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/WebUtil.java @@ -36,7 +36,7 @@ public class WebUtil { * 可是，如果通过了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP值，究竟哪个才是真正的用户端的真实IP呢？ * 答案是取X-Forwarded-For中第一个非unknown的有效IP字符串。 *

- * 如：X-Forwarded-For：192.168.1.110, 192.168.1.120, 192.168.1.130, + * 如：X-Forwarded-For：192.168.1.110, 192.168.1.120, 192.168.1.140, * 192.168.1.100 *

* 用户真实IP为： 192.168.1.110 diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index 45db293a98..625089b478 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-gateway:version_placeholder ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index af02a2054c..2558c294d7 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -117,12 +117,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -242,12 +242,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml index e26e72451c..0973856c00 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-aggregator-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/data-aggregator-server:version_placeholder ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 71880e1591..4865af478f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -110,76 +110,76 @@ - + epmet_gov_org_user EpmEt-db-UsEr - + epmet_gov_issue_user EpmEt-db-UsEr - + epmet_gov_project_user EpmEt-db-UsEr - + epmet_resi_group_user EpmEt-db-UsEr - + epmet_user_user EpmEt-db-UsEr - + epmet_common_service_user EpmEt-db-UsEr - + epmet_oper_crm_user EpmEt-db-UsEr - + epmet_data_statistical_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -205,76 +205,76 @@ - + epmet_gov_org_user EpmEt-db-UsEr - + epmet_gov_issue_user EpmEt-db-UsEr - + epmet_gov_project_user EpmEt-db-UsEr - + epmet_resi_group_user EpmEt-db-UsEr - + epmet_user_user EpmEt-db-UsEr - + epmet_common_service_user EpmEt-db-UsEr - + epmet_oper_crm_user EpmEt-db-UsEr - + epmet_data_statistical_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml index a98722271e..9f0dfb863a 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/data-report-server:version_placeholder ports: - "8109:8109" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index e29b4feea7..429d6d8982 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -135,33 +135,33 @@ - + epmet_data_statistical_user EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -187,33 +187,33 @@ - + epmet_data_statistical_user EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml index 818776c83a..09d626e7c5 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/data-statistical-server:version_placeholder ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 79d0fb2130..6a4c799cfe 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -151,91 +151,91 @@ - + epmet_data_statistical_user 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_resi_partymember_user EpmEt-db-UsEr - + epmet_heart_user EpmEt-db-UsEr - + epmet_point_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -256,7 +256,7 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 @@ -270,91 +270,91 @@ - + epmet_data_statistical_user 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_resi_partymember_user EpmEt-db-UsEr - + epmet_heart_user EpmEt-db-UsEr - + epmet_point_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -375,7 +375,7 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml index e79e2ccfc3..1cd58359a9 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-activiti-server: container_name: epmet-activiti-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-activiti-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-activiti-server:version_placeholder ports: - "8086:8086" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index 06d167aab2..ff6b020fac 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -164,18 +164,18 @@ - + epmet_activiti_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -196,18 +196,18 @@ - + epmet_activiti_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index 691e0700f5..7a83d38429 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/common-service-server:version_placeholder ports: - "8103:8103" network_mode: host # 使用现有网络 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 ac1a2a2010..4d6d38808c 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -104,7 +104,7 @@ - + @@ -112,12 +112,12 @@ EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -150,7 +150,7 @@ - + @@ -158,12 +158,12 @@ EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index 26c8afd2fc..62701e05ad 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -110,18 +110,18 @@ - + epmet_demo_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml index 2b3437321d..d9a9fdea13 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-ext-server: container_name: epmet-ext-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-ext-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-ext-server:version_placeholder ports: - "8113:8113" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 96e1997664..77e44416a2 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -198,18 +198,18 @@ - + epmet_third_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -237,18 +237,18 @@ - + epmet_third_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index c9324e7eaa..8602660d10 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-heart-server:version_placeholder ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 0b80268b87..e9d61c6855 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -116,18 +116,18 @@ - + epmet_heart_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -157,18 +157,18 @@ - + epmet_heart_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index de0601f085..1f21893994 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-job-server:version_placeholder ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index ec12f75a35..1e61a7a7e3 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -119,18 +119,18 @@ - + epmet_job_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -154,18 +154,18 @@ - + epmet_job_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml index 846f37b811..4c672bbdc6 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-message-server:version_placeholder ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 6af8aed5e8..db46cd844b 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -159,18 +159,18 @@ - + epmet_message_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -193,7 +193,7 @@ - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message @@ -208,18 +208,18 @@ - + epmet_message_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -241,7 +241,7 @@ - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml index d99d59a73c..4f5d73ca1a 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml @@ -3,7 +3,7 @@ services: epmet-oss-server: container_name: epmet-oss-server-dev # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2 - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-oss-server:version_placeholder ports: - "8083:8083" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 1e85dd5506..b269ad5a2b 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -124,18 +124,18 @@ - + epmet_oss_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -163,18 +163,18 @@ - + epmet_oss_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index cc0bd873d0..8a4c242e3b 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-point-server:version_placeholder ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index bf68f5ae99..e27f58c806 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -127,18 +127,18 @@ - + epmet_point_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -168,18 +168,18 @@ - + epmet_point_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 535e927003..58694a45a2 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-third-server:version_placeholder ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index a632182918..7f45e46879 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -175,18 +175,18 @@ - + epmet_third_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -214,18 +214,18 @@ - + epmet_third_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml index 93bb414efe..df08fa34bc 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/gov-access-server:version_placeholder ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index cb78960c44..60a356fae8 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -107,18 +107,18 @@ - + epmet_gov_access_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -140,18 +140,18 @@ - + epmet_gov_access_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml index 42030e9322..6082d0021f 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/gov-grid-server:version_placeholder ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 29518e765e..dc40415627 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -105,12 +105,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -137,12 +137,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index f953f16888..ccf13bda1a 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/gov-issue-server:version_placeholder ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index d33f114297..5a7558cd4b 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -149,18 +149,18 @@ - + epmet_gov_issue_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -175,7 +175,7 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 @@ -189,18 +189,18 @@ - + epmet_gov_issue_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -215,7 +215,7 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml index 11c377e5dc..fb69e6294e 100644 --- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-mine-server: container_name: gov-mine-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/gov-mine-server:version_placeholder ports: - "8098:8098" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index a1db3409c8..43418618c5 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -125,12 +125,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -155,12 +155,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index abdd0d45e1..0da84fc37e 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/gov-org-server:version_placeholder ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 5c38be1f82..c1188671ae 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -143,18 +143,18 @@ - + epmet_gov_org_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -170,7 +170,7 @@ - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message @@ -185,18 +185,18 @@ - + epmet_gov_org_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -212,7 +212,7 @@ - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 2293705079..1ce320b4cd 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/gov-project-server:version_placeholder ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index c81475c4e6..34f7f97e23 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -148,18 +148,18 @@ - + epmet_gov_project_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -188,18 +188,18 @@ - + epmet_gov_project_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml index be773bc448..e55caf1b80 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/gov-voice-server:version_placeholder ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 58caa1237e..a6086e5b8a 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -112,18 +112,18 @@ - + epmet_gov_voice_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -151,18 +151,18 @@ - + epmet_gov_voice_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml index 94f4886466..97bcee075e 100644 --- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-access-server: container_name: oper-access-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-access-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/oper-access-server:version_placeholder ports: - "8093:8093" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 8b9d4a4282..d2f959aedb 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -100,18 +100,18 @@ - + epmet_oper_access_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -138,18 +138,18 @@ - + epmet_oper_access_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml index 603196b2b6..0a12a58e1e 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/oper-crm-server:version_placeholder ports: - "8090:8090" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index b98700ffef..13c7ef0ff8 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -145,18 +145,18 @@ - + epmet_oper_crm_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -183,18 +183,18 @@ - + epmet_oper_crm_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml index 9d936ebb6b..56861b1710 100644 --- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/oper-customize-server:version_placeholder ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 386dbbc7f1..548b2c9c16 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -111,18 +111,18 @@ - + epmet_oper_customize_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -138,7 +138,7 @@ - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message @@ -153,18 +153,18 @@ - + epmet_oper_customize_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -180,7 +180,7 @@ - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index dc0e3a442f..bfe0391be1 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/resi-group-server:version_placeholder ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 45fa3f7dfb..52c92b707b 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -158,18 +158,18 @@ - + epmet_resi_group_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -199,7 +199,7 @@ - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 epmet_message @@ -214,18 +214,18 @@ - + epmet_resi_group_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -254,7 +254,7 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd - 192.168.1.130:9876;192.168.1.132:9876 + 192.168.1.140:9876;192.168.1.141:9876 diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml index a487c1147c..46c73ee371 100644 --- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/resi-guide-server:version_placeholder ports: - "8091:8091" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index f609520583..4df4414a7a 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -121,18 +121,18 @@ - + epmet_resi_guide_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -159,18 +159,18 @@ - + epmet_resi_guide_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml index 3e87863bb2..d5d83fb58b 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/resi-hall-server:version_placeholder ports: - "8100:8100" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index 81af7c324d..ca65519ace 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -91,12 +91,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -123,12 +123,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml index 2f8b97a10b..d576ed8a28 100644 --- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-home-server: container_name: resi-home-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/resi-home-server:version_placeholder ports: - "8104:8104" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 7000ac0f1a..25a40e2cf2 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -105,12 +105,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -135,12 +135,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml index 1ef428be1a..cef4c0f867 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/resi-mine-server:version_placeholder ports: - "8094:8094" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 10f96765b7..7806a37e17 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -134,12 +134,12 @@ dev 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -163,12 +163,12 @@ local 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index 9013f7458b..d549dfa605 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/resi-partymember-server:version_placeholder ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 05efd9c573..6debcb9e08 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -127,18 +127,18 @@ - + epmet_resi_partymember_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -166,18 +166,18 @@ - + epmet_resi_partymember_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml index 99ab9465a8..63cb2415e8 100644 --- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-voice-server: container_name: resi-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-voice-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/resi-voice-server:version_placeholder ports: - "8106:8106" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index c3f56f99d9..e1a846be6f 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -91,12 +91,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -122,12 +122,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-dev.yml index 55c505363d..79721a6cb7 100644 --- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-dev.yml +++ b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-adv-server: container_name: epmet-openapi-adv-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-adv-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-openapi-adv-server:version_placeholder ports: - "8015:8015" network_mode: host # 不会创建新的网络 diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml index 1461d20edf..735cef420e 100644 --- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml +++ b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml @@ -82,18 +82,18 @@ - + epmet_adv_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -131,7 +131,7 @@ 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml index 4e86ab5e89..e0ebfada9a 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-scan: container_name: epmet-openapi-scan-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-openapi-scan:version_placeholder ports: - "8107:8107" network_mode: host # 不会创建新的网络 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 2f33ea5000..ce261419b5 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -93,12 +93,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -124,12 +124,12 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 50bed534ed..1db18cea79 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:version_placeholder + image: 192.168.1.140:5000/epmet-cloud-dev/epmet-user-server:version_placeholder ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index d8cd0af54c..fd4a772652 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -154,18 +154,18 @@ - + epmet_user_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 @@ -193,18 +193,18 @@ - + epmet_user_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 + 192.168.1.140:8848 6ceab336-d004-4acf-89c6-e121d06f4988 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 bb127328eb..667b9ba7c2 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -148,7 +148,7 @@ dingTalk: secret: @dingTalk.robot.secret@ rocketmq: - name-server: 192.168.1.130:9876;192.168.1.132:9876 + name-server: 192.168.1.140:9876;192.168.1.141:9876 # 停机选项 shutdown: From 865c1c302d0ec5082836901e5b2251d8160cef78 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 10 Jun 2021 22:01:08 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=B0=86=E5=BC=80=E5=8F=91=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8E=9F=E6=9C=89=E7=9A=84namespace=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E4=B8=BA=E6=96=B0=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E7=9A=84?= =?UTF-8?q?namespace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 4 ++-- epmet-auth/pom.xml | 4 ++-- epmet-gateway/pom.xml | 4 ++-- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 4 ++-- epmet-module/data-report/data-report-server/pom.xml | 4 ++-- epmet-module/data-statistical/data-statistical-server/pom.xml | 4 ++-- epmet-module/epmet-activiti/epmet-activiti-server/pom.xml | 4 ++-- .../epmet-common-service/common-service-server/pom.xml | 4 ++-- epmet-module/epmet-demo/epmet-demo-server/pom.xml | 2 +- epmet-module/epmet-ext/epmet-ext-server/pom.xml | 4 ++-- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 4 ++-- epmet-module/epmet-job/epmet-job-server/pom.xml | 4 ++-- epmet-module/epmet-message/epmet-message-server/pom.xml | 4 ++-- epmet-module/epmet-oss/epmet-oss-server/pom.xml | 4 ++-- epmet-module/epmet-point/epmet-point-server/pom.xml | 4 ++-- epmet-module/epmet-third/epmet-third-server/pom.xml | 4 ++-- epmet-module/gov-access/gov-access-server/pom.xml | 4 ++-- epmet-module/gov-grid/gov-grid-server/pom.xml | 4 ++-- epmet-module/gov-issue/gov-issue-server/pom.xml | 4 ++-- epmet-module/gov-mine/gov-mine-server/pom.xml | 4 ++-- epmet-module/gov-org/gov-org-server/pom.xml | 4 ++-- epmet-module/gov-project/gov-project-server/pom.xml | 4 ++-- epmet-module/gov-voice/gov-voice-server/pom.xml | 4 ++-- epmet-module/oper-access/oper-access-server/pom.xml | 4 ++-- epmet-module/oper-crm/oper-crm-server/pom.xml | 4 ++-- epmet-module/oper-customize/oper-customize-server/pom.xml | 4 ++-- epmet-module/resi-group/resi-group-server/pom.xml | 4 ++-- epmet-module/resi-guide/resi-guide-server/pom.xml | 4 ++-- epmet-module/resi-hall/resi-hall-server/pom.xml | 4 ++-- epmet-module/resi-home/resi-home-server/pom.xml | 4 ++-- epmet-module/resi-mine/resi-mine-server/pom.xml | 4 ++-- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 4 ++-- epmet-module/resi-voice/resi-voice-server/pom.xml | 4 ++-- .../epmet-openapi-adv/epmet-openapi-adv-server/pom.xml | 4 ++-- epmet-openapi/epmet-openapi-scan/pom.xml | 4 ++-- epmet-user/epmet-user-server/pom.xml | 4 ++-- 36 files changed, 71 insertions(+), 71 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index e6058449fb..a60082e436 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -102,7 +102,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -134,7 +134,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 7c2240005d..f0ae525285 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -173,7 +173,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -228,7 +228,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 2558c294d7..7ebcad9bde 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -123,7 +123,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -248,7 +248,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 4865af478f..f075b3c427 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -180,7 +180,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -275,7 +275,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 429d6d8982..f1ab408d0a 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -162,7 +162,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -214,7 +214,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 6a4c799cfe..d1b4c185c8 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -236,7 +236,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -355,7 +355,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index ff6b020fac..b87470fd09 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -176,7 +176,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -208,7 +208,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 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 4d6d38808c..204c98cfb0 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -118,7 +118,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -164,7 +164,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index 62701e05ad..b877c0df18 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -122,7 +122,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 77e44416a2..dd2c955279 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -210,7 +210,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -249,7 +249,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index e9d61c6855..2be2091ca1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -128,7 +128,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -169,7 +169,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 1e61a7a7e3..725a7342eb 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -131,7 +131,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -166,7 +166,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index db46cd844b..9cf8dfab0e 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -171,7 +171,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -220,7 +220,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index b269ad5a2b..e3178a703e 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -136,7 +136,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -175,7 +175,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index e27f58c806..b84752a530 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -139,7 +139,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -180,7 +180,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 7f45e46879..bd811cf03e 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -187,7 +187,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -226,7 +226,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 60a356fae8..d1052635a9 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -119,7 +119,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -152,7 +152,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index dc40415627..ad73cacdaa 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -111,7 +111,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -143,7 +143,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 5a7558cd4b..b266f10c0c 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -161,7 +161,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -201,7 +201,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index 43418618c5..325ef169c4 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -131,7 +131,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -161,7 +161,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index c1188671ae..9c353b0f90 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -155,7 +155,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -197,7 +197,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 34f7f97e23..4b1b8389fc 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -160,7 +160,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -200,7 +200,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index a6086e5b8a..8494159692 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -124,7 +124,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -163,7 +163,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index d2f959aedb..3fd8e4ff1c 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -112,7 +112,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -150,7 +150,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 13c7ef0ff8..ee643299c2 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -157,7 +157,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -195,7 +195,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 548b2c9c16..e3eb48b48f 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -123,7 +123,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -165,7 +165,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 52c92b707b..018f200219 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -170,7 +170,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -226,7 +226,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 4df4414a7a..ab8cfe3179 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -133,7 +133,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -171,7 +171,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index ca65519ace..f3475bf89c 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -97,7 +97,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -129,7 +129,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 25a40e2cf2..5bfd93548c 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -111,7 +111,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -141,7 +141,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 7806a37e17..3c90bc99a7 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -140,7 +140,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -169,7 +169,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 6debcb9e08..dcd85a76ce 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -139,7 +139,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -178,7 +178,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index e1a846be6f..3ec248aebc 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -97,7 +97,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -128,7 +128,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml index 735cef420e..14d5226105 100644 --- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml +++ b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml @@ -94,7 +94,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -132,7 +132,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index ce261419b5..f8641772b6 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -99,7 +99,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -130,7 +130,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index fd4a772652..0139688d8e 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -166,7 +166,7 @@ true 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -205,7 +205,7 @@ false 192.168.1.140:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 1fecc730-5e6e-464c-aae9-7567944e7936 false