Crazy 8 сар өмнө
parent
commit
8cf6e9bb9f

+ 5 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsTemplateMapper.java

@@ -29,4 +29,9 @@ public interface SmsTemplateMapper extends BaseMapperX<SmsTemplateDO> {
     default Long selectCountByChannelId(Long channelId) {
         return selectCount(SmsTemplateDO::getChannelId, channelId);
     }
+
+    default SmsTemplateDO selectSmsTemplateByApiTemplateId(String apiTemplateId){
+        return selectOne(new LambdaQueryWrapperX<SmsTemplateDO>()
+                .eqIfPresent(SmsTemplateDO::getApiTemplateId,apiTemplateId));
+    }
 }

+ 4 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/SmsClient.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsReceiveRespDTO;
 import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsSendRespDTO;
 import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsTemplateRespDTO;
+import cn.iocoder.yudao.module.system.service.sms.SmsTemplateService;
 
 import java.util.List;
 
@@ -34,6 +35,9 @@ public interface SmsClient {
     SmsSendRespDTO sendSms(Long logId, String mobile, String apiTemplateId,
                            List<KeyValue<String, Object>> templateParams) throws Throwable;
 
+    SmsSendRespDTO sendSmsLsq(Long logId, String mobile, String apiTemplateId,
+                              List<KeyValue<String, Object>> templateParams, SmsTemplateService smsTemplateService) throws Throwable;
+
     /**
      * 解析接收短信的接收结果
      *

+ 17 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/AliyunSmsClient.java

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsSendRespD
 import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsTemplateRespDTO;
 import cn.iocoder.yudao.module.system.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
 import cn.iocoder.yudao.module.system.framework.sms.core.property.SmsChannelProperties;
+import cn.iocoder.yudao.module.system.service.sms.SmsTemplateService;
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;
 import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateRequest;
@@ -83,6 +84,22 @@ public class AliyunSmsClient extends AbstractSmsClient {
                 .setApiRequestId(response.getRequestId()).setApiCode(response.getCode()).setApiMsg(response.getMessage());
     }
 
+    @Override
+    public SmsSendRespDTO sendSmsLsq(Long sendLogId, String mobile, String apiTemplateId,//
+                                     List<KeyValue<String, Object>> templateParams, SmsTemplateService smsTemplateService) throws Throwable {
+        // 构建请求
+        SendSmsRequest request = new SendSmsRequest();
+        request.setPhoneNumbers(mobile);
+        request.setSignName(properties.getSignature());
+        request.setTemplateCode(apiTemplateId);//
+        request.setTemplateParam(JsonUtils.toJsonString(MapUtils.convertMap(templateParams)));
+        request.setOutId(String.valueOf(sendLogId));
+        // 执行请求
+        SendSmsResponse response = client.getAcsResponse(request);
+        return new SmsSendRespDTO().setSuccess(Objects.equals(response.getCode(), API_CODE_SUCCESS)).setSerialNo(response.getBizId())
+                .setApiRequestId(response.getRequestId()).setApiCode(response.getCode()).setApiMsg(response.getMessage());
+    }
+
     @Override
     public List<SmsReceiveRespDTO> parseSmsReceiveStatus(String text) {
         List<SmsReceiveStatus> statuses = JsonUtils.parseArray(text, SmsReceiveStatus.class);

+ 29 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/DebugDingTalkSmsClient.java

@@ -10,12 +10,16 @@ import cn.hutool.http.HttpUtil;
 import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
+import cn.iocoder.yudao.module.system.dal.dataobject.sms.SmsTemplateDO;
+import cn.iocoder.yudao.module.system.dal.mysql.sms.SmsTemplateMapper;
 import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsReceiveRespDTO;
 import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsSendRespDTO;
 import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsTemplateRespDTO;
 import cn.iocoder.yudao.module.system.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
 import cn.iocoder.yudao.module.system.framework.sms.core.property.SmsChannelProperties;
+import cn.iocoder.yudao.module.system.service.sms.SmsTemplateService;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -30,6 +34,7 @@ import java.util.Objects;
  */
 public class DebugDingTalkSmsClient extends AbstractSmsClient {
 
+
     public DebugDingTalkSmsClient(SmsChannelProperties properties) {
         super(properties);
         Assert.notEmpty(properties.getApiKey(), "apiKey 不能为空");
@@ -49,8 +54,31 @@ public class DebugDingTalkSmsClient extends AbstractSmsClient {
         String url = buildUrl("robot/send");
         Map<String, Object> params = new HashMap<>();
         params.put("msgtype", "text");
+//        SmsTemplateDO template =smsTemplateService.selectSmsTemplateByApiTemplateId(apiTemplateId);
+//        String originContent = smsTemplateService.formatSmsTemplateContent(template.getContent(), MapUtils.convertMap(templateParams));
         String content = String.format("【模拟短信】\n手机号:%s\n短信日志编号:%d\n模板参数:%s",
-                mobile, sendLogId, MapUtils.convertMap(templateParams));
+                mobile, sendLogId,MapUtils.convertMap(templateParams));
+        params.put("text", MapUtil.builder().put("content", content).build());
+        // 执行请求
+        String responseText = HttpUtil.post(url, JsonUtils.toJsonString(params));
+        // 解析结果
+        Map<?, ?> responseObj = JsonUtils.parseObject(responseText, Map.class);
+        String errorCode = MapUtil.getStr(responseObj, "errcode");
+        return new SmsSendRespDTO().setSuccess(Objects.equals(errorCode, "0")).setSerialNo(StrUtil.uuid())
+                .setApiCode(errorCode).setApiMsg(MapUtil.getStr(responseObj, "errorMsg"));
+    }
+
+    @Override
+    public SmsSendRespDTO sendSmsLsq(Long sendLogId, String mobile,
+                                  String apiTemplateId, List<KeyValue<String, Object>> templateParams,SmsTemplateService smsTemplateService) throws Throwable {
+        // 构建请求
+        String url = buildUrl("robot/send");
+        Map<String, Object> params = new HashMap<>();
+        params.put("msgtype", "text");
+        SmsTemplateDO template =smsTemplateService.selectSmsTemplateByApiTemplateId(apiTemplateId);
+        String originContent = smsTemplateService.formatSmsTemplateContent(template.getContent(), MapUtils.convertMap(templateParams));
+        String content = String.format("【模拟短信】\n手机号:%s\n短信日志编号:%d\n消息内容:%s",
+                mobile, sendLogId,originContent);
         params.put("text", MapUtil.builder().put("content", content).build());
         // 执行请求
         String responseText = HttpUtil.post(url, JsonUtils.toJsonString(params));

+ 83 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/HuaweiSmsClient.java

@@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsSendRespD
 import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsTemplateRespDTO;
 import cn.iocoder.yudao.module.system.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
 import cn.iocoder.yudao.module.system.framework.sms.core.property.SmsChannelProperties;
+import cn.iocoder.yudao.module.system.service.sms.SmsTemplateService;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
@@ -141,6 +142,88 @@ public class HuaweiSmsClient extends AbstractSmsClient {
         return new SmsSendRespDTO().setSuccess(Objects.equals(response.getStatusLine().getReasonPhrase(), API_CODE_SUCCESS)).setSerialNo(Integer.toString(response.getStatusLine().getStatusCode()))
                 .setApiRequestId(null).setApiCode(null).setApiMsg(null);
     }
+    @Override
+    public SmsSendRespDTO sendSmsLsq(Long sendLogId, String mobile, String apiTemplateId,
+                                     List<KeyValue<String, Object>> templateParams, SmsTemplateService smsTemplateService) throws Throwable {
+        // TODO @scholar:https://smsapi.cn-north-4.myhuaweicloud.com:443 是不是枚举成静态变量
+        String url = "https://smsapi.cn-north-4.myhuaweicloud.com:443/sms/batchSendSms/v1"; //APP接入地址+接口访问URI
+        // 相比较阿里短信,华为短信发送的时候需要额外的参数“通道号”,考虑到不破坏原有的的结构
+        // 所以将 通道号 拼接到 apiTemplateId 字段中,格式为 "apiTemplateId 通道号"。空格为分隔符。
+        // TODO @scholar:暂时只考虑中国大陆,所以不需要 sender 哈
+        String sender = StrUtil.subAfter(apiTemplateId, " ", true); //中国大陆短信签名通道号或全球短信通道号
+        String templateId = StrUtil.subBefore(apiTemplateId, " ", true); //模板ID
+
+        // 选填,短信状态报告接收地址,推荐使用域名,为空或者不填表示不接收状态报告
+        String statusCallBack = properties.getCallbackUrl();
+
+        // TODO @scholar:1)是不是用  LocalDateTimeUtil.format();这样 3 行变成一行
+        // TODO @scholar:singerDate 叫 sdkDate 会更合适哈,这样理解起来简单。另外,singer 应该是 signed 么?
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'", Locale.ENGLISH);
+        sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+        String singerDate = sdf.format(new Date());
+
+        // TODO @scholar:整个处理加密的过程,是不是应该抽成一个 private 方法哈。这样整个调用的主干更清晰。
+        // ************* 步骤 1:拼接规范请求串 *************
+        String httpRequestMethod = "POST";
+        String canonicalUri = "/sms/batchSendSms/v1/";
+        String canonicalQueryString = ""; // 查询参数为空
+        String canonicalHeaders = "content-type:application/x-www-form-urlencoded\n"
+                + "host:smsapi.cn-north-4.myhuaweicloud.com:443\n"
+                + "x-sdk-date:" + singerDate + "\n";
+        // TODO @scholar:静态枚举了
+        String signedHeaders = "content-type;host;x-sdk-date";
+        // TODO @scholar:下面的注释,可以考虑去掉
+        /*
+         * 选填,使用无变量模板时请赋空值 String templateParas = "";
+         * 单变量模板示例:模板内容为"您的验证码是${NUM_6}"时,templateParas可填写为"[\"111111\"]"
+         * 双变量模板示例:模板内容为"您有${NUM_2}件快递请到${TXT_20}领取"时,templateParas可填写为"[\"3\",\"人民公园正门\"]"
+         */
+        // TODO @scholar:CollectionUtils.convertList 可以把 4 行变成 1 行。
+        // TODO @scholar:templateParams 拼写错误哈
+        List<String> templateParas = new ArrayList<>();
+        for (KeyValue<String, Object> kv : templateParams) {
+            templateParas.add(String.valueOf(kv.getValue()));
+        }
+
+        // 请求Body,不携带签名名称时,signature请填null
+        String body = buildRequestBody(sender, mobile, templateId, templateParas, statusCallBack, null);
+        // TODO @scholar:Assert 断言,抛出异常
+        if (null == body || body.isEmpty()) {
+            return null;
+        }
+        String hashedRequestBody = HexUtil.encodeHexStr(DigestUtil.sha256(body));
+        String canonicalRequest = httpRequestMethod + "\n" + canonicalUri + "\n" + canonicalQueryString + "\n"
+                + canonicalHeaders + "\n" + signedHeaders + "\n" + hashedRequestBody;
+
+        // ************* 步骤 2:拼接待签名字符串 *************
+        // TODO @scholar:sha256Hex 是不是更简洁哈
+        String hashedCanonicalRequest = HexUtil.encodeHexStr(DigestUtil.sha256(canonicalRequest));
+        String stringToSign = "SDK-HMAC-SHA256" + "\n" + singerDate + "\n" + hashedCanonicalRequest;
+
+        // ************* 步骤 3:计算签名 *************
+        String signature = SecureUtil.hmacSha256(properties.getApiSecret()).digestHex(stringToSign);
+
+        // ************* 步骤 4:拼接 Authorization *************
+        String authorization = "SDK-HMAC-SHA256" + " " + "Access=" + properties.getApiKey() + ", "
+                + "SignedHeaders=" + signedHeaders + ", " + "Signature=" + signature;
+
+        // ************* 步骤 5:构造HttpRequest 并执行request请求,获得response *************
+        // TODO @scholar:考虑了下,还是换 hutool 的 httpUtils。因为未来 httpclient 我们可能会移除掉
+        HttpUriRequest postMethod = RequestBuilder.post()
+                .setUri(url)
+                .setEntity(new StringEntity(body, StandardCharsets.UTF_8))
+                .setHeader("Content-Type","application/x-www-form-urlencoded")
+                .setHeader("X-Sdk-Date", singerDate)
+                .setHeader("Authorization", authorization)
+                .build();
+        // TODO @scholar:这种不太适合一直 new 的哈
+        CloseableHttpClient client = HttpClientBuilder.create().build();
+        HttpResponse response = client.execute(postMethod);
+        // TODO @scholar:失败的情况下的处理
+        // TODO @scholar:setSerialNo(Integer.toString(response.getStatusLine().getStatusCode())) 这部分,空一行。一行代码太多了,阅读性不太好哈
+        return new SmsSendRespDTO().setSuccess(Objects.equals(response.getStatusLine().getReasonPhrase(), API_CODE_SUCCESS)).setSerialNo(Integer.toString(response.getStatusLine().getStatusCode()))
+                .setApiRequestId(null).setApiCode(null).setApiMsg(null);
+    }
 
     static String buildRequestBody(String sender, String receiver, String templateId, List<String> templateParas,
                                    String statusCallBack, @SuppressWarnings("SameParameterValue") String signature) throws UnsupportedEncodingException {

+ 19 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/TencentSmsClient.java

@@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsSendRespD
 import cn.iocoder.yudao.module.system.framework.sms.core.client.dto.SmsTemplateRespDTO;
 import cn.iocoder.yudao.module.system.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
 import cn.iocoder.yudao.module.system.framework.sms.core.property.SmsChannelProperties;
+import cn.iocoder.yudao.module.system.service.sms.SmsTemplateService;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.annotations.VisibleForTesting;
@@ -110,6 +111,24 @@ public class TencentSmsClient extends AbstractSmsClient {
                 .setApiRequestId(response.getRequestId()).setApiCode(status.getCode()).setApiMsg(status.getMessage());
     }
 
+    @Override
+    public SmsSendRespDTO sendSmsLsq(Long sendLogId, String mobile,
+                                     String apiTemplateId, List<KeyValue<String, Object>> templateParams, SmsTemplateService smsTemplateService) throws Throwable {
+        // 构建请求
+        SendSmsRequest request = new SendSmsRequest();
+        request.setSmsSdkAppId(getSdkAppId());
+        request.setPhoneNumberSet(new String[]{mobile});
+        request.setSignName(properties.getSignature());
+        request.setTemplateId(apiTemplateId);
+        request.setTemplateParamSet(ArrayUtils.toArray(templateParams, e -> String.valueOf(e.getValue())));
+        request.setSessionContext(JsonUtils.toJsonString(new SessionContext().setLogId(sendLogId)));
+        // 执行请求
+        SendSmsResponse response = client.SendSms(request);
+        SendStatus status = response.getSendStatusSet()[0];
+        return new SmsSendRespDTO().setSuccess(Objects.equals(status.getCode(), API_CODE_SUCCESS)).setSerialNo(status.getSerialNo())
+                .setApiRequestId(response.getRequestId()).setApiCode(status.getCode()).setApiMsg(status.getMessage());
+    }
+
     @Override
     public List<SmsReceiveRespDTO> parseSmsReceiveStatus(String text) {
         List<SmsReceiveStatus> callback = JsonUtils.parseArray(text, SmsReceiveStatus.class);

+ 6 - 5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsSendServiceImpl.java

@@ -157,13 +157,13 @@ public class SmsSendServiceImpl implements SmsSendService {
 
     @Override
     public void doSendSms(SmsSendMessage message) {
-        // 获得渠道对应的 SmsClient 客户端
+        // TODO获得渠道对应的 SmsClient 客户端//
         SmsClient smsClient = smsChannelService.getSmsClient(message.getChannelId());//获取渠道
         Assert.notNull(smsClient, "短信客户端({}) 不存在", message.getChannelId());
-        // 发送短信
-        try {
-            SmsSendRespDTO sendResponse = smsClient.sendSms(message.getLogId(), message.getMobile(),
-                    message.getApiTemplateId(), message.getTemplateParams());
+        // 通过对应渠道发送短信
+        try {//修改了方法sendSmsLsq
+            SmsSendRespDTO sendResponse = smsClient.sendSmsLsq(message.getLogId(), message.getMobile(),
+                    message.getApiTemplateId(), message.getTemplateParams(),smsTemplateService);
             smsLogService.updateSmsSendResult(message.getLogId(), sendResponse.getSuccess(),
                     sendResponse.getApiCode(), sendResponse.getApiMsg(),
                     sendResponse.getApiRequestId(), sendResponse.getSerialNo());
@@ -174,6 +174,7 @@ public class SmsSendServiceImpl implements SmsSendService {
         }
     }
 
+
     @Override
     public void receiveSmsStatus(String channelCode, String text) throws Throwable {
         // 获得渠道对应的 SmsClient 客户端

+ 1 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateService.java

@@ -79,4 +79,5 @@ public interface SmsTemplateService {
      */
     String formatSmsTemplateContent(String content, Map<String, Object> params);
 
+    SmsTemplateDO selectSmsTemplateByApiTemplateId(String apiTemplateId);
 }

+ 4 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java

@@ -196,4 +196,8 @@ public class SmsTemplateServiceImpl implements SmsTemplateService {
         return ReUtil.findAllGroup1(PATTERN_PARAMS, content);
     }
 
+    @Override
+    public  SmsTemplateDO selectSmsTemplateByApiTemplateId(String apiTemplateId){
+        return smsTemplateMapper.selectSmsTemplateByApiTemplateId(apiTemplateId);
+    }
 }