From df2b22cf5a510262bf3a13cc1b5e7e4cff250d2a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 15 May 2020 16:21:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../gov-grid/gov-grid-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +-
.../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +-
.../gov-mine/gov-mine-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/gov-mine/gov-mine-server/pom.xml | 2 +-
.../src/main/java/com/epmet/feign/GovIssueFeignClient.java | 3 ++-
.../gov-project-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/gov-project/gov-project-server/pom.xml | 2 +-
.../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/resi-group/resi-group-server/pom.xml | 2 +-
.../resi-hall/resi-hall-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/resi-hall/resi-hall-server/pom.xml | 2 +-
.../resi-mine/resi-mine-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/resi-mine/resi-mine-server/pom.xml | 2 +-
.../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +-
epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +-
17 files changed, 18 insertions(+), 17 deletions(-)
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 bba4cc4cb9..6137c13b6f 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:0.3.16
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.17
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 9a1b48aa86..d254e41dab 100644
--- a/epmet-module/gov-grid/gov-grid-server/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-server/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- 0.3.16
+ 0.3.17
com.epmet
gov-grid
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 a549be7509..442d1e4435 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:0.3.3
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.4
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 43d709813d..38432d91d1 100644
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@@ -2,7 +2,7 @@
- 0.3.3
+ 0.3.4
gov-issue
com.epmet
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 3aca7b592a..9384100069 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:0.3.13
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.14
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 45bc38c28f..ec553d4044 100644
--- a/epmet-module/gov-mine/gov-mine-server/pom.xml
+++ b/epmet-module/gov-mine/gov-mine-server/pom.xml
@@ -2,7 +2,7 @@
- 0.3.13
+ 0.3.14
com.epmet
gov-mine
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
index a1a86b35a4..342faa01e1 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
@@ -16,7 +16,8 @@ import java.util.List;
* @Author yinzuomei
* @Date 2020/5/13 15:45
*/
-@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class)
+//
+@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class,url = "http://localhost:")
public interface GovIssueFeignClient {
/**
* @param gridIdList
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 7a356440b8..fbb60a07ad 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:0.3.3
+ image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.4
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 a4f4fd5ffb..7710f148ee 100644
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@@ -2,7 +2,7 @@
- 0.3.3
+ 0.3.4
gov-project
com.epmet
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 2b883c7c94..98037170d8 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:0.3.19
+ image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.20
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 018fc70677..5f172068b3 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.19
+ 0.3.20
com.epmet
resi-group
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 d2d61e3145..becd5c31ec 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:0.3.3
+ image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.4
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 cf9e75f2e4..7fc55c1573 100644
--- a/epmet-module/resi-hall/resi-hall-server/pom.xml
+++ b/epmet-module/resi-hall/resi-hall-server/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- 0.3.3
+ 0.3.4
resi-hall
com.epmet
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 9d9246e7d1..6535e604b8 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:0.3.10
+ image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.11
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 c366ff0dae..0263d0a15c 100644
--- a/epmet-module/resi-mine/resi-mine-server/pom.xml
+++ b/epmet-module/resi-mine/resi-mine-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.10
+ 0.3.11
com.epmet
resi-mine
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 1d6d61a52f..48005eb3a2 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:0.3.20
+ image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.21
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 d4f2df77a1..dbb51c1bdc 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.20
+ 0.3.21
com.epmet
resi-partymember