From ba3d8e7eeed3e50a68d774d6928cae9b42ff09b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=89=8D=E7=A6=8F?= Date: Mon, 10 Jul 2023 15:45:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=9C=B0=E5=9D=80=E6=94=B9=E6=88=90?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/axzo/msg/center/api/MNSNoticesApi.java | 4 +++- .../msg/center/notices/http/api/api/MessageNotifyApi.java | 2 +- .../msg/center/notices/service/impl/MNSNoticesApiImpl.java | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/MNSNoticesApi.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/MNSNoticesApi.java index c413df0b..7cee0a4a 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/MNSNoticesApi.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/MNSNoticesApi.java @@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import javax.validation.Valid; + /** * 短信消息相关接口 */ @@ -28,7 +30,7 @@ public interface MNSNoticesApi { * @return */ @PostMapping("mns/send/sms") - CommonResponse sendMessage(SendMessageRequestDto request); + CommonResponse sendMessage(@RequestBody @Valid SendMessageRequestDto request); /** * 发送验证码2.0(返回的是数字） diff --git a/msg-notices/msg-notices-http-api/src/main/java/cn/axzo/msg/center/notices/http/api/api/MessageNotifyApi.java b/msg-notices/msg-notices-http-api/src/main/java/cn/axzo/msg/center/notices/http/api/api/MessageNotifyApi.java index ec78304c..cdb3691f 100644 --- a/msg-notices/msg-notices-http-api/src/main/java/cn/axzo/msg/center/notices/http/api/api/MessageNotifyApi.java +++ b/msg-notices/msg-notices-http-api/src/main/java/cn/axzo/msg/center/notices/http/api/api/MessageNotifyApi.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMethod; */ @FeignClient( name = "msg-center", - url = "http://msg-center:10086" + url = "${server.serviceUrl}" ) public interface MessageNotifyApi { diff --git a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/impl/MNSNoticesApiImpl.java b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/impl/MNSNoticesApiImpl.java index 2441848b..537efcd4 100644 --- a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/impl/MNSNoticesApiImpl.java +++ b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/impl/MNSNoticesApiImpl.java @@ -69,6 +69,9 @@ public class MNSNoticesApiImpl implements MNSNoticesApi { BeanUtils.copyProperties(req,request); SendCodeRes temp = smsService.sendPhoneCodeV2(request); MnsSendCodeRes result=new MnsSendCodeRes(); + if(temp == null){ + return CommonResponse.success(result); + } BeanUtils.copyProperties(temp,result); return CommonResponse.success(result); }