diff --git a/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/dto/form/TestFormDTO.java b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/dto/form/TestFormDTO.java new file mode 100644 index 0000000000..c78ca8d074 --- /dev/null +++ b/epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/dto/form/TestFormDTO.java @@ -0,0 +1,14 @@ +package com.epmet.dto.form; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class TestFormDTO { + + private Long sleepPeriod; + +} 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 c6aee484ad..98142da53a 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 @@ -10,6 +10,7 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.TestFormDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.feign.fallback.OssFeignClientFallback; import com.epmet.feign.fallback.OssFeignClientFallbackFactory; @@ -19,6 +20,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.context.annotation.Bean; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; @@ -72,7 +74,7 @@ public interface OssFeignClient { * @author wxz * @date 2021.08.05 16:28 */ - @PostMapping("oss/file/test-ribbon-rcv") - Result testRibbonRcv(); + @PostMapping("/oss/test/test-ribbon-rcv") + Result testRibbonRcv(@RequestBody TestFormDTO input); } 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 9e5a1f5eb4..f5e51ee96c 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 @@ -11,9 +11,11 @@ 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.form.TestFormDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.feign.OssFeignClient; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.multipart.MultipartFile; /** @@ -41,7 +43,7 @@ public class OssFeignClientFallback implements OssFeignClient { } @Override - public Result testRibbonRcv() { + public Result testRibbonRcv(@RequestBody TestFormDTO input) { 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 5b624a81b0..a1ebfe9f7b 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 @@ -1,6 +1,7 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.TestFormDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.service.OssService; import org.apache.commons.io.FileUtils; @@ -54,12 +55,15 @@ public class TestController { * @date 2021.08.05 16:28 */ @PostMapping("test-ribbon-rcv") - public Result testRibbonRcv() { + public Result testRibbonRcv(@RequestBody TestFormDTO input) { InetAddress localHost = null; try { + Thread.sleep(input.getSleepPeriod()); localHost = Inet4Address.getLocalHost(); } catch (UnknownHostException e) { e.printStackTrace(); + } catch (InterruptedException e) { + e.printStackTrace(); } return new Result().ok(localHost); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java index c86286bfc5..6e7c165532 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java @@ -2,6 +2,9 @@ package com.epmet.modules.test; import com.epmet.commons.tools.utils.HttpContextUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.TestFormDTO; +import com.epmet.feign.OssFeignClient; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,6 +15,9 @@ import javax.servlet.http.HttpServletRequest; @RequestMapping("test") public class TestController { + @Autowired + private OssFeignClient ossFeignClient; + @PostMapping("get-req-info") public Result testDomain(HttpServletRequest request) { String requestServerNameAndPort = HttpContextUtils.getRequestServerNameAndPort(); @@ -27,4 +33,11 @@ public class TestController { return new Result(); } + @PostMapping("test-ribbon-sender") + public Result testRibbonSender() { + TestFormDTO form = new TestFormDTO(40000l); + Result result = ossFeignClient.testRibbonRcv(form); + return result; + } + }