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 1a304f68f7..8efabd48a9 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -90,19 +90,19 @@ - + epmet_admin_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -122,19 +122,19 @@ - + epmet_admin_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 7a53adb9cf..07d993b821 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -167,13 +167,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -222,13 +222,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 0e0c85cefc..90780a08d0 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -117,13 +117,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -242,13 +242,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 8bd9d3cf49..8d8745ce78 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -111,77 +111,77 @@ - + 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 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -206,77 +206,77 @@ - + 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 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 8e927e30cb..7e0664ce1f 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -135,34 +135,34 @@ - + 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 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -187,34 +187,34 @@ - + 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 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 7df0816ce4..16c6e79539 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -151,92 +151,92 @@ - + 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 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -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,92 +270,92 @@ - + 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 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -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..b87470fd09 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -164,19 +164,19 @@ - + epmet_activiti_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -196,19 +196,19 @@ - + epmet_activiti_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 47d5246e56..7d32a60962 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,13 +112,13 @@ EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -150,7 +150,7 @@ - + @@ -158,13 +158,13 @@ EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 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 26c8afd2fc..b877c0df18 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -110,19 +110,19 @@ - + epmet_demo_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 70504e3795..c0defda468 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -198,19 +198,19 @@ - + epmet_third_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -237,19 +237,19 @@ - + epmet_third_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 db04f35713..97f33b3c5a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -116,19 +116,19 @@ - + epmet_heart_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -157,19 +157,19 @@ - + epmet_heart_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 3bd4ea3af6..8c2bbf1174 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -119,19 +119,19 @@ - + epmet_job_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -154,19 +154,19 @@ - + epmet_job_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 e5162a91e2..eb728ed8c6 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -159,19 +159,19 @@ - + epmet_message_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -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,19 +208,19 @@ - + epmet_message_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -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 3d7dd7bd0d..f2ae58f3bf 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -124,19 +124,19 @@ - + epmet_oss_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -163,19 +163,19 @@ - + epmet_oss_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 5edc26e65c..7d1309b335 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -127,19 +127,19 @@ - + epmet_point_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -168,19 +168,19 @@ - + epmet_point_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 25803330fc..a019eeaf71 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -175,19 +175,19 @@ - + epmet_third_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -214,19 +214,19 @@ - + epmet_third_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 e98c2d2d26..23c7e5cabc 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -107,19 +107,19 @@ - + epmet_gov_access_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -140,19 +140,19 @@ - + epmet_gov_access_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 63d575cded..7698d89df1 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -105,13 +105,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -137,13 +137,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 8dc14678b9..b37d147c5b 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -149,19 +149,19 @@ - + epmet_gov_issue_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -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,19 +189,19 @@ - + epmet_gov_issue_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -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 25d570969a..6f0e8adcf1 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -125,13 +125,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -155,13 +155,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 60e45a4b1e..bc76d441f2 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -143,19 +143,19 @@ - + epmet_gov_org_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -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,19 +185,19 @@ - + epmet_gov_org_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -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 bfa08ce2c5..01414bcf88 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -148,19 +148,19 @@ - + epmet_gov_project_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -188,19 +188,19 @@ - + epmet_gov_project_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 22380358da..a297a29de0 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -112,19 +112,19 @@ - + epmet_gov_voice_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -151,19 +151,19 @@ - + epmet_gov_voice_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 7942ba854d..2e4a4304db 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -100,19 +100,19 @@ - + epmet_oper_access_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -138,19 +138,19 @@ - + epmet_oper_access_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 33d4e42a57..883b8069ea 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -145,19 +145,19 @@ - + epmet_oper_crm_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -183,19 +183,19 @@ - + epmet_oper_crm_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 a11535c034..26601b9f92 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -111,19 +111,19 @@ - + epmet_oper_customize_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -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,19 +153,19 @@ - + epmet_oper_customize_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -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 4ae34c3b38..235654d179 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -158,19 +158,19 @@ - + epmet_resi_group_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -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,19 +214,19 @@ - + epmet_resi_group_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -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 d3f79e77a9..02d7270925 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -121,19 +121,19 @@ - + epmet_resi_guide_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -159,19 +159,19 @@ - + epmet_resi_guide_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 34a4490734..706332c260 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -91,13 +91,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -123,13 +123,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 482f54ab6d..fe0abc9e81 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -105,13 +105,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -135,13 +135,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 b13233ffc3..6e339ea824 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -134,13 +134,13 @@ dev 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -163,13 +163,13 @@ local 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 6e42341409..ebf9b5c196 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -127,19 +127,19 @@ - + epmet_resi_partymember_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -166,19 +166,19 @@ - + epmet_resi_partymember_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 517eb5af7d..3b3e1ed8b0 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -91,13 +91,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -122,13 +122,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 00d1cb3b06..b0f69ee255 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,19 +82,19 @@ - + epmet_adv_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -131,8 +131,8 @@ 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 c82e317c18..4be9a9bd32 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -93,13 +93,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -124,13 +124,13 @@ 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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 1437b84fc5..86e17d5a4e 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -154,19 +154,19 @@ - + epmet_user_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 true - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false @@ -193,19 +193,19 @@ - + epmet_user_user EpmEt-db-UsEr 0 - 192.168.1.130 + 192.168.1.140 6379 123456 false - 192.168.1.130:8848 - 6ceab336-d004-4acf-89c6-e121d06f4988 + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 false 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: