From d5d73bfd718fa7a8e1acb63e373b13cded9f3bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=89=8D=E7=A6=8F?= <liucaifu@axzo.cn>
Date: Mon, 10 Jul 2023 16:26:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E7=94=A8service?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notices/service/manager/SmsManager.java    | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/manager/SmsManager.java b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/manager/SmsManager.java
index 8d12050f..f66da784 100644
--- a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/manager/SmsManager.java
+++ b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/manager/SmsManager.java
@@ -5,11 +5,11 @@ import cn.axzo.basics.common.constant.ConstStringPool;
 import cn.axzo.basics.common.exception.ServiceException;
 import cn.axzo.core.constant.RedisNameConstants;
 import cn.axzo.msg.center.common.redis.IAxzoJedisManager;
-import cn.axzo.msg.center.domain.enums.MnsTemplateEnum;
 import cn.axzo.msg.center.domain.enums.InsideSmsCodeEnum;
+import cn.axzo.msg.center.domain.enums.MnsTemplateEnum;
 import cn.axzo.msg.center.notices.common.properties.SmsProperties;
-import cn.axzo.msg.center.notices.http.api.api.MessageNotifyApi;
-import cn.axzo.msg.center.notices.http.api.request.SendMobileMessageRequest;
+import cn.axzo.msg.center.notices.manager.api.dto.request.MnsRequestDto;
+import cn.axzo.msg.center.notices.service.api.MessageService;
 import cn.axzo.msg.center.notices.service.gateway.SmsGateway;
 import cn.axzo.msg.center.notices.service.request.CaptchaParam;
 import cn.axzo.msg.center.notices.service.response.SmsCodeInfoRes;
@@ -50,7 +50,7 @@ public class SmsManager extends BaseManager implements SmsGateway {
   @Resource
   private SmsProperties smsProperties;
   @Resource
-  private MessageNotifyApi messageNotifyApi;
+  private MessageService messageService;
 
   @Value("${phone.isSendMnsCode}")
   private boolean isSendMnsCode;
@@ -197,18 +197,12 @@ public class SmsManager extends BaseManager implements SmsGateway {
     if (!isSendMnsCode) {
       return;
     }
-    SendMobileMessageRequest request = new SendMobileMessageRequest();
+    MnsRequestDto request = new MnsRequestDto();
     request.setAppCode(mns.appCode);
     request.setPhoneNo(phoneNumber);
     request.setTemplateNo(mns.templateNo);
     request.setParams(param);
     request.setRequestNo(UUID.randomUUID().toString());
-    cn.azxo.framework.common.model.CommonResponse commonResponse = messageNotifyApi
-        .sendMobileMessage(request);
-    if (!commonResponse.getCode().equals(SUCCESS)) {
-      log.warn("发送验证码失败 request:{},commonResponse:{}",
-          JSON.toJSONString(request), JSON.toJSONString(commonResponse));
-//      throw new ServiceException(commonResponse.getMsg());
-    }
+    messageService.sendMessage(request);
   }
 }