修改短信实体 更改小部分逻辑

master
bynt 3 years ago
parent 96ef0bf799
commit 993e681a9e

@ -42,6 +42,7 @@ public class SendSmsMessageCovDTO {
@AllArgsConstructor
@NoArgsConstructor
public static class SmsData {
/**
* Base64
*/
@ -53,8 +54,8 @@ public class SendSmsMessageCovDTO {
/**
* Base64
*/
@JSONField(name = "list")
private List<String> phoneList;
@JSONField(name = "mobile")
private String mobile;
}
}

@ -3,8 +3,6 @@ package com.yuyou.openapi.openapi.model.dto;
import lombok.Data;
import java.util.List;
/**
* @author Enzo
* @date
@ -32,6 +30,6 @@ public class SendSmsMessageDTO {
/**
*
*/
private List<String> phoneList;
private String mobile;
}

@ -53,8 +53,8 @@ public class SendSmsClientMessageVo extends ABClientBaseVO implements Serializab
/**
* ID
*/
@JsonProperty("list")
private List<String> phoneList;
@JsonProperty("mobile")
private String mobile;
}

@ -3,7 +3,6 @@ package com.yuyou.openapi.openapi.task;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
@ -26,7 +25,6 @@ import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author Enzo
@ -65,16 +63,11 @@ public class SendSmsMessageTask {
// 号码解密发送
smsDTO.forEach(item -> {
/*List<String> stringList = item.getPhoneList().stream().map(Base64::decodeStr).collect(Collectors.toList());*/
List<String> stringList = item.getPhoneList().stream().map(phone -> {
if (phone.length() != DefaultConstant.ELEVEN_NUMBER) {
// 去除空字符串 解密
phone = Base64.decodeStr(phone.replaceAll(StrUtil.SPACE, StrUtil.EMPTY));
}
return phone;
}).collect(Collectors.toList());
SendSmsMessageCovDTO.SmsData smsData = new SendSmsMessageCovDTO.SmsData();
smsData.setActName(item.getActName());
smsData.setPhoneList(stringList);
if (item.getMobile().length() != DefaultConstant.ELEVEN_NUMBER) {
smsData.setMobile(Base64.decodeStr(item.getMobile()));
}
smsDataList.add(smsData);
});
// 进行设置

Loading…
Cancel
Save