From 5b0f0d08fcef2f15f6c5a2b50ab38665ba5a2817 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 5 Aug 2021 16:44:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0ribbon=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/feign/OssFeignClient.java  | 13 +++++++++++-
 .../fallback/OssFeignClientFallback.java      |  5 +++++
 .../com/epmet/controller/TestController.java  | 20 +++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java
index b5c31ef82f..c6aee484ad 100644
--- a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java
+++ b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java
@@ -23,6 +23,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.net.UnknownHostException;
+
 /**
  * OSS
  *
@@ -32,7 +34,7 @@ import org.springframework.web.multipart.MultipartFile;
 @FeignClient(name = ServiceConstant.EPMET_OSS_SERVER, configuration = OssFeignClient.MultipartSupportConfig.class, fallbackFactory =
         OssFeignClientFallbackFactory.class)
 //@FeignClient(name = ServiceConstant.EPMET_OSS_SERVER, configuration = OssFeignClient.MultipartSupportConfig.class, fallbackFactory =
-//        OssFeignClientFallbackFactory.class)
+//        OssFeignClientFallbackFactory.class, url = "localhost:8083")
 public interface OssFeignClient {
     /**
      * 文件上传
@@ -64,4 +66,13 @@ public interface OssFeignClient {
         }
     }
 
+    /**
+     * @Description ribbon测试
+     * @return
+     * @author wxz
+     * @date 2021.08.05 16:28
+     */
+    @PostMapping("oss/file/test-ribbon-rcv")
+    Result testRibbonRcv();
+
 }
diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java
index b60e59cc19..9e5a1f5eb4 100644
--- a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java
+++ b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java
@@ -40,4 +40,9 @@ public class OssFeignClientFallback implements OssFeignClient {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "uploadQrCodeV2", file, customerId);
 	}
 
+	@Override
+	public Result testRibbonRcv() {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "testRibbonRcv", null);
+	}
+
 }
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java
index 8289c4a5bf..5b624a81b0 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java
@@ -10,6 +10,9 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 @RestController
 @RequestMapping("test")
@@ -43,4 +46,21 @@ public class TestController {
         }
         return new Result();
     }
+
+    /**
+     * @Description ribbon测试
+     * @return
+     * @author wxz
+     * @date 2021.08.05 16:28
+    */
+    @PostMapping("test-ribbon-rcv")
+    public Result testRibbonRcv() {
+        InetAddress localHost = null;
+        try {
+            localHost = Inet4Address.getLocalHost();
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+        return new Result().ok(localHost);
+    }
 }