zhuyijun/zyjblogs-parent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
朱毅骏 2023-04-11 14:38:38 +08:00
parent cc7bdeb5a5
commit 261971a8de
2 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
server/zyjblogs-sms/src/main/java/cn/zyjblogs/sms/common/SmsRequest.java
View File

@ -1,19 +1,14 @@
package cn.zyjblogs.sms.common; package cn.zyjblogs.sms.common;
import lombok.AllArgsConstructor; import cn.zyjblogs.sms.task.po.SmsTaskPO;
import cn.zyjblogs.sms.task.po.SmsTemplatePO;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set;
@Data @Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class SmsRequest implements Serializable { public class SmsRequest implements Serializable {
/** /**
* 方法 * 方法
@ -72,4 +67,37 @@ public class SmsRequest implements Serializable {
private String region; private String region;
public SmsRequest(){
}
@Builder
public SmsRequest(SmsTaskPO smsTaskPO, SmsTemplatePO smsTemplate,List<String> telNums) {
this.templateParams = smsTaskPO.getTemplateParams();
this.taskId = smsTaskPO.getId();
this.appId = smsTemplate.getAppId();
this.templateCode = smsTemplate.getTemplateCode();
this.signName = smsTemplate.getSignName();
this.accessKey = smsTemplate.getAccessKey();
this.accessSecret = smsTemplate.getAccessSecret();
this.telNums = telNums;
this.region = smsTemplate.getRegion();
this.smsContent = smsTaskPO.getContent();
}
@Builder
public SmsRequest(String action, String taskId, List<String> telNums, String appId, String accessKey, String accessSecret, String signName, String templateCode, String endPoint, String templateParams, String smsContent, String templateContent, String region) {
this.action = action;
this.taskId = taskId;
this.telNums = telNums;
this.appId = appId;
this.accessKey = accessKey;
this.accessSecret = accessSecret;
this.signName = signName;
this.templateCode = templateCode;
this.endPoint = endPoint;
this.templateParams = templateParams;
this.smsContent = smsContent;
this.templateContent = templateContent;
this.region = region;
}
} }

18
server/zyjblogs-sms/src/main/java/cn/zyjblogs/sms/task/service/impl/SmsTaskServiceImpl.java
View File

@ -143,20 +143,10 @@ public class SmsTaskServiceImpl extends ServiceImpl<SmsTaskMapper,SmsTaskPO> imp
TaskResultDTO taskResultDTO = null; TaskResultDTO taskResultDTO = null;
boolean failFlag = false; boolean failFlag = false;
try { try {
SmsRequest request = SmsRequest.builder() taskResultDTO = smsGranter.sendSms(template.getProviderType(),SmsRequest.builder()
.smsContent(data.getContent()) .smsTaskPO(data)
.templateParams(data.getTemplateParams()) .smsTemplate(template).telNums(sendPhones)
.taskId(data.getId()) .build());
.appId(template.getAppId())
.templateCode(template.getTemplateCode())
.signName(template.getSignName())
.appId(template.getAppId())
.accessKey(template.getAccessKey())
.accessSecret(template.getAccessSecret())
.telNums(sendPhones)
.region(template.getRegion())
.build();
taskResultDTO = smsGranter.sendSms(template.getProviderType(),request);
}catch (Exception e){ }catch (Exception e){
log.warn("短信发送任务发送失败", e); log.warn("短信发送任务发送失败", e);
failFlag = true; failFlag = true;