From 98e7b6aa2fabd46b8980740dd54fc336c3be9ab5 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 3 Apr 2020 10:19:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E4=B8=BAurl=E4=BC=A0=E5=8F=82=E3=80=82=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9A=84feign=20client?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/feign/MessageFeignClient.java | 9 +++++++-- .../epmet/feign/fallback/MessageFeignClientFallback.java | 6 ++++++ .../main/java/com/epmet/controller/SmsController.java | 5 ++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java index cfa79bf8cc..3098601d8e 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.SysSmsDTO; import com.epmet.feign.fallback.MessageFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -18,7 +19,11 @@ public interface MessageFeignClient { @PostMapping(value = "message/sms/send") Result send(@RequestBody SysSmsDTO smsDTO); - //@PostMapping(value = "message/sms/send", consumes = "application/x-www-form-urlencoded") - //Result send(Map entityBody); + /** + * 发送短信验证码 + * @return + */ + @GetMapping(value = "message/sms/captcha/{mobile}") + Result sendSmsCaptcha(String mobile); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java index 3010195b34..d9ba149f15 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java @@ -18,4 +18,10 @@ public class MessageFeignClientFallback implements MessageFeignClient { public Result send(SysSmsDTO smsDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "send", smsDTO); } + + @Override + public Result sendSmsCaptcha(String mobile) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "sendSmsCaptcha", mobile); + } + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java index ea698fa6e5..f2eabce66e 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java @@ -119,14 +119,13 @@ public class SmsController { * 发送短信验证码 * @return */ - @PostMapping("captcha") + @GetMapping("captcha/{mobile}") @ApiOperation("发送短信验证码") //@LogOperation("发送短信验证码") @ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机号", paramType = "query", required = true, dataType="String") }) - public Result sendSmsCaptcha(@RequestBody SysSmsDTO sysSmsDTO) { - String mobile = sysSmsDTO.getMobile(); + public Result sendSmsCaptcha(@PathVariable("mobile") String mobile) { String captcha = sysSmsService.sendSmsCaptcha(mobile); HashMap map = new HashMap<>(); map.put("code", captcha);