From 6afd6ce42249977c92502386d3b72a428fe46c53 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 20 Mar 2020 14:54:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88resi-guide?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-demo/epmet-demo-server/pom.xml      |  5 +++++
 .../com/epmet/feign/GovOrgFeignClient.java    |  1 +
 .../fallback/GovOrgFeignClientFallBack.java   | 21 +++++++++++++++++++
 epmet-user/epmet-user-server/pom.xml          |  6 ------
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml
index 40fa935c52..94c098a1b6 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml
+++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml
@@ -67,6 +67,11 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-server</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index 5a854a7ef4..de3a3191d6 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -3,6 +3,7 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
+import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
index e69de29bb2..70e5f2e1cb 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
@@ -0,0 +1,21 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.feign.GovOrgFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description
+ * @Author yinzuomei
+ * @Date 2020/3/18 11:13
+ */
+@Component
+public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
+    @Override
+    public Result<CustomerGridDTO> getcustomergrid(String id) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getcustomergrid",id);
+    }
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 3662cbc04d..fbca8c6fdb 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -70,12 +70,6 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>gov-org-client</artifactId>
-            <version>2.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>