Merge remote-tracking branch 'origin/develop' into develop

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();
+
 }

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);
+	}
+
 }

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);
+    }
 }