opt;

liquidnet-bus-common/liquidnet-common-sms/src/main/java/com/liquidnet/common/sms/processor/SmsProcessor.java

@@ -30,6 +30,8 @@ public class SmsProcessor {
         aliyunDysmsAcsClient = new Client(config);
     }
 
+    /* ================================================================== | aliyun dysms */
+
     /**
      * AliyunDysms.send
      * - link: https://help.aliyun.com/document_detail/101414.htm?spm=a2c4g.11186623.2.8.302f56958lnARh#t83759.html
@@ -38,30 +40,15 @@ public class SmsProcessor {
      * @param signName      短信签名名称
      * @param templateCode  短信模板ID
      * @param templateParam 短信模板变量对应的实际值，JSON格式(建议使用com.liquidnet.commons.lang.util.JsonUtils.OM().createObjectNode())
-     * @return boolean
+     * @return SendSmsResponse
      */
-    public boolean aliyunDysmsSend(String phoneNumber, String signName, String templateCode, String templateParam) {
+    private SendSmsResponse aliyunDysmsSend(String phoneNumber, String signName, String templateCode, String templateParam) throws Exception {
         SendSmsRequest smsRequest = new SendSmsRequest()
                 .setPhoneNumbers(phoneNumber)
                 .setSignName(signName)
                 .setTemplateCode(templateCode)
                 .setTemplateParam(templateParam);
-        try {
-            SendSmsResponse smsResponse = aliyunDysmsAcsClient.sendSms(smsRequest);
-
-            SendSmsResponseBody smsResponseBody = smsResponse.getBody();
-
-            boolean isSucc = null != smsResponseBody && "OK".equalsIgnoreCase(smsResponseBody.getCode());
-
-            if (!isSucc) {
-                log.warn("###短信服务发送失败[{}]", JsonUtils.toJson(smsResponse));
-            }
-
-            return isSucc;
-        } catch (Exception e) {
-            log.error("API处理异常", e);
-        }
-        return false;
+            return aliyunDysmsAcsClient.sendSms(smsRequest);
     }
 
     /**
@@ -73,30 +60,37 @@ public class SmsProcessor {
      * @param signNameJson      短信签名名称，JSON数组格式(建议使用com.liquidnet.commons.lang.util.JsonUtils.OM().createArrayNode())
      * @param templateCode      短信模板CODE
      * @param templateParamJson 短信模板变量对应的实际值，JSON格式(建议使用com.liquidnet.commons.lang.util.JsonUtils.OM().createObjectNode())
-     * @return boolean
+     * @return SendBatchSmsResponse
      */
-    public boolean aliyunDysmsSendBatch(String phoneNumberJson, String signNameJson, String templateCode, String templateParamJson) {
+    private SendBatchSmsResponse aliyunDysmsSendBatch(String phoneNumberJson, String signNameJson, String templateCode, String templateParamJson) throws Exception {
         SendBatchSmsRequest batchSmsRequest = new SendBatchSmsRequest()
                 .setPhoneNumberJson(phoneNumberJson)
                 .setSignNameJson(signNameJson)
                 .setTemplateCode(templateCode)
                 .setTemplateParamJson(templateParamJson);
+        return aliyunDysmsAcsClient.sendBatchSms(batchSmsRequest);
+    }
+
+    /* ================================================================== | sender */
+
+    public boolean send(String phoneNumber, String signName, String templateCode, String templateParam) {
         try {
-            SendBatchSmsResponse batchSmsResponse = aliyunDysmsAcsClient.sendBatchSms(batchSmsRequest);
-            log.info(JsonUtils.toJson(batchSmsResponse));
+            SendSmsResponse smsResponse = this.aliyunDysmsSend(phoneNumber, signName, templateCode, templateParam);
 
-            SendBatchSmsResponseBody batchSmsResponseBody = batchSmsResponse.getBody();
+            SendSmsResponseBody smsResponseBody = smsResponse.getBody();
 
-            boolean isSucc = null != batchSmsResponseBody && "OK".equalsIgnoreCase(batchSmsResponseBody.getCode());
+            boolean isSucc = null != smsResponseBody && "OK".equalsIgnoreCase(smsResponseBody.getCode());
 
             if (!isSucc) {
-                log.warn("###短信服务发送失败[{}]", JsonUtils.toJson(batchSmsResponse));
+                log.warn("###发送短信API处理失败[{}]", JsonUtils.toJson(smsResponse));
             }
 
             return isSucc;
         } catch (Exception e) {
-            log.error("API处理异常", e);
+            log.error("发送短信API处理异常", e);
         }
         return false;
     }
+
+    /* ================================================================== |  */
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -173,10 +173,13 @@ public class AdamLoginController {
 //            rabbitTemplate.convertAndSend(MQConst.EX_LNS_SMS_SENDER, MQConst.RK_SMS_CODE, smsMessage.toJson());
             ObjectNode msgNode = JsonUtils.OM().createObjectNode();
             msgNode.put("code", smsCode);
-            smsProcessor.aliyunDysmsSend(mobile, SmsEnum.ADSignName.M02.getVal(), SmsEnum.ADTemplate.SMS_109535335.name(), msgNode.asText());
-
+            boolean sendRst = smsProcessor.send(mobile, SmsEnum.ADSignName.M02.getVal(), SmsEnum.ADTemplate.SMS_109535335.name(), msgNode.asText());
+            if (sendRst) {
                 adamRdmService.setSmsCodeByMobile(mobile, smsCode);
+
                 return ResponseDto.success();
+            }
+            return ResponseDto.failure(ErrorMapping.get("10002"));
         } else {
             return ResponseDto.failure(ErrorMapping.get("10000"));
         }

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-adam/src/main/java/com/liquidnet/service/consumer/adam/service/processor/ConsumerAdamSmsProcessor.java

@@ -38,7 +38,7 @@ public class ConsumerAdamSmsProcessor {
         log.debug("CONSUMER SMS ==> Preparing:{}", msgBody);
         try {
             SmsMessage smsMessage = JsonUtils.fromJson(msgBody, SmsMessage.class);
-            boolean result = smsProcessor.aliyunDysmsSend(smsMessage.getPhone(), smsMessage.getSignName(), smsMessage.getTemplateCode(), smsMessage.getTemplateParam().toString());
+            boolean result = smsProcessor.send(smsMessage.getPhone(), smsMessage.getSignName(), smsMessage.getTemplateCode(), smsMessage.getTemplateParam().toString());
             log.debug("CONSUMER SMS result of execution:{}", result);
             if (result) {
                 channel.basicAck(deliveryTag, false);

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/service/processor/ConsumerKylinSmsProcessor.java

@@ -38,7 +38,7 @@ public class ConsumerKylinSmsProcessor {
         log.debug("CONSUMER SMS ==> Preparing:{}", msgBody);
         try {
             SmsMessage smsMessage = JsonUtils.fromJson(msgBody, SmsMessage.class);
-            boolean result = smsProcessor.aliyunDysmsSend(smsMessage.getPhone(), smsMessage.getSignName(), smsMessage.getTemplateCode(), smsMessage.getTemplateParam().toString());
+            boolean result = smsProcessor.send(smsMessage.getPhone(), smsMessage.getSignName(), smsMessage.getTemplateCode(), smsMessage.getTemplateParam().toString());
             log.debug("CONSUMER SMS result of execution:{}", result);
             if (result) {
                 channel.basicAck(deliveryTag, false);