From a6a1a8c001cd252832b2508887adf1f8508f950d Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 30 Nov 2020 16:24:06 +0800
Subject: [PATCH] =?UTF-8?q?wxz=E6=B5=8B=E8=AF=95=E8=B4=9F=E8=BD=BD?=
 =?UTF-8?q?=E5=9D=87=E8=A1=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-lb-test/pom.xml                         |  6 +++++-
 .../epmet/lbtest/controller/LbController.java | 19 +++++++++----------
 .../lbtest/feign/TestCallFeignClient.java     |  2 --
 ...logback-spring.xml => logback-spring-.xml} |  0
 4 files changed, 14 insertions(+), 13 deletions(-)
 rename epmet-lb-test/src/main/resources/{logback-spring.xml => logback-spring-.xml} (100%)

diff --git a/epmet-lb-test/pom.xml b/epmet-lb-test/pom.xml
index 8e6b30b65b..8266cdb279 100644
--- a/epmet-lb-test/pom.xml
+++ b/epmet-lb-test/pom.xml
@@ -44,10 +44,14 @@
             <version>10.3.0</version>
         </dependency>
         <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <!--<dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <build>
diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java
index 5af5549dfb..2065228c57 100644
--- a/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java
+++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/controller/LbController.java
@@ -7,6 +7,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 @RestController
 @RequestMapping("lb")
@@ -16,16 +18,13 @@ public class LbController {
     private TestCallFeignClient testCallFeignClient;
 
     @GetMapping("test")
-    public String test(HttpServletRequest request) {
-        String localAddr = request.getServerName();
+    public String test() {
+        String localAddr = null;
+        try {
+            localAddr = InetAddress.getLocalHost().getHostAddress();
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
         return localAddr;
     }
-
-    @GetMapping("test-cal")
-    public String testCall() {
-        String result = testCallFeignClient.test();
-        System.out.println("调用结果:" + result);
-        return result;
-    }
-
 }
diff --git a/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java b/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java
index 4ce7336045..32c7e50873 100644
--- a/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java
+++ b/epmet-lb-test/src/main/java/com/epmet/lbtest/feign/TestCallFeignClient.java
@@ -3,8 +3,6 @@ package com.epmet.lbtest.feign;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
-import javax.servlet.http.HttpServletRequest;
-
 @FeignClient(name = "lb-test", fallback = TestCallFeignClientFallback.class)
 public interface TestCallFeignClient {
     @GetMapping("/lbtest/lb/test")
diff --git a/epmet-lb-test/src/main/resources/logback-spring.xml b/epmet-lb-test/src/main/resources/logback-spring-.xml
similarity index 100%
rename from epmet-lb-test/src/main/resources/logback-spring.xml
rename to epmet-lb-test/src/main/resources/logback-spring-.xml