From 8bfe96b6f370f1d2e79b739c7db50b95dab9a965 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 27 十二月 2024 11:39:01 +0800
Subject: [PATCH] add:阿里云短信模板获取签名和模板信息4
---
src/main/java/com/mzl/flower/web/v2/sms/SmsTemplateController.java | 4 ++--
src/main/java/com/mzl/flower/entity/SmsTaskDetailDO.java | 5 +++++
src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java | 12 +++++++++---
src/main/java/com/mzl/flower/entity/SmsTemplateDO.java | 1 -
4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/mzl/flower/entity/SmsTaskDetailDO.java b/src/main/java/com/mzl/flower/entity/SmsTaskDetailDO.java
index 13d296d..f15423f 100644
--- a/src/main/java/com/mzl/flower/entity/SmsTaskDetailDO.java
+++ b/src/main/java/com/mzl/flower/entity/SmsTaskDetailDO.java
@@ -38,5 +38,10 @@
*/
private String result;
+ /**
+ * 发送短信返回结果日志
+ */
+ private String responseResult;
+
}
diff --git a/src/main/java/com/mzl/flower/entity/SmsTemplateDO.java b/src/main/java/com/mzl/flower/entity/SmsTemplateDO.java
index 2de5ab0..0d6b60f 100644
--- a/src/main/java/com/mzl/flower/entity/SmsTemplateDO.java
+++ b/src/main/java/com/mzl/flower/entity/SmsTemplateDO.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.mzl.flower.base.BaseAutoEntity;
-import com.mzl.flower.base.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
diff --git a/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java
index accd06b..ffe5ad4 100644
--- a/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java
@@ -5,6 +5,7 @@
import com.aliyun.oss.OSSClientBuilder;
import com.aliyun.oss.OSSException;
import com.aliyun.oss.model.GetObjectRequest;
+import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mzl.flower.config.OssProperties;
@@ -34,7 +35,6 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -297,6 +297,7 @@
detail.setSmsTaskId(smsTaskDO.getId());
detail.setSmsTemplateId(smsTaskDO.getSmsTemplateId());
detail.setPhone(phone);
+ detail.create();
return detail;
}).collect(Collectors.toList());
}
@@ -306,8 +307,13 @@
String templateCode = smsTemplateDO.getCode();
for (SmsTaskDetailDO detail : smsTaskDetailDOList) {
try {
- SmsUtil.sendSms(detail.getPhone(), templateCode, null);
- detail.setResult(Constants.SMS_SEND_RESULT.success.name());
+ SendSmsResponse sendSmsResponse = SmsUtil.sendSms(detail.getPhone(), templateCode, null);
+ if("OK".equals(sendSmsResponse.getCode())){
+ detail.setResult(Constants.SMS_SEND_RESULT.success.name());
+ }else{
+ detail.setResult(Constants.SMS_SEND_RESULT.failure.name());
+ }
+ detail.setResponseResult(sendSmsResponse.toString());
} catch (Exception e) {
detail.setResult(Constants.SMS_SEND_RESULT.failure.name());
System.err.println("Failed to send SMS to " + detail.getPhone() + ": " + e.getMessage());
diff --git a/src/main/java/com/mzl/flower/web/v2/sms/SmsTemplateController.java b/src/main/java/com/mzl/flower/web/v2/sms/SmsTemplateController.java
index 9e2c9bc..ed779d3 100644
--- a/src/main/java/com/mzl/flower/web/v2/sms/SmsTemplateController.java
+++ b/src/main/java/com/mzl/flower/web/v2/sms/SmsTemplateController.java
@@ -88,8 +88,8 @@
return new Client(config);
}
- @GetMapping("/templateName/all")
- @ApiOperation(value = "短信模板下拉列表", httpMethod = "GET")
+ @GetMapping("/aliyun/all")
+ @ApiOperation(value = "阿里云短信模板下拉列表", httpMethod = "GET")
public ResponseEntity<ReturnDataDTO> getSmsTemplateNameList() {
List<SmsTemplateListVO> allTemplateName = smsTemplateService.getAllTemplateName();
return returnData(R.SUCCESS.getCode(), allTemplateName);
--
Gitblit v1.9.3