Просмотр исходного кода

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202210

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
a26a835d1a
2 измененных файлов: 23 добавлений и 11 удалений
  1. +8
    -8
      mallinkService/src/main/java/com/iformall/sms/SMSFactory.java
  2. +15
    -3
      mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java

+ 8
- 8
mallinkService/src/main/java/com/iformall/sms/SMSFactory.java Просмотреть файл

@@ -35,14 +35,14 @@ public class SMSFactory {
smsFactory.aliyunSMS.setSmsConfig(smsFactory.smsConfig);
return smsFactory.aliyunSMS;
}else if(EnumSMSChannel.ALIYUN_ZDY.getCode().equals(wxMsgConfig.getSmsChannel())){
smsFactory.smsConfig = new AliyunSMSConfig();
smsFactory.smsConfig.setAccessKeyId(wxMsgConfig.getPublickey());
smsFactory.smsConfig.setAccessKeySecret(wxMsgConfig.getSecret());
smsFactory.smsConfig.setProduct(wxMsgConfig.getProduct());
smsFactory.smsConfig.setDomain(wxMsgConfig.getDomain());
smsFactory.smsConfig.setRegionId(wxMsgConfig.getRegionId());
smsFactory.smsConfig.setEndpointName(wxMsgConfig.getEndpointName());
smsFactory.aliyunSMS.setSmsConfig(smsFactory.smsConfig);
AliyunSMSConfig config = new AliyunSMSConfig();
config.setAccessKeyId(wxMsgConfig.getPublickey());
config.setAccessKeySecret(wxMsgConfig.getSecret());
config.setProduct(wxMsgConfig.getProduct());
config.setDomain(wxMsgConfig.getDomain());
config.setRegionId(wxMsgConfig.getRegionId());
config.setEndpointName(wxMsgConfig.getEndpointName());
smsFactory.aliyunSMS.setSmsConfig(config);
return smsFactory.aliyunSMS;
}else{
return smsFactory.wiwide;


+ 15
- 3
mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java Просмотреть файл

@@ -378,12 +378,12 @@ public class AliyunSMS implements SMSExcutor {
log.error("获取短信发送服务机发生错误。错误代码是 [{}],错误消息是 [{}],错误请求ID是 [{}],错误Msg是 [{}],错误类型是 [{}]",
e.getErrCode(), e.getMessage(), e.getRequestId(), e.getErrMsg(), e.getErrorType());
}
QuerySmsTemplateRequest request = new QuerySmsTemplateRequest();
request.setTemplateCode("SMS_244585929");

DefaultAcsClient acsClient = new DefaultAcsClient(profile);

QuerySmsTemplateResponse response = null;
try {
QuerySmsTemplateRequest request = new QuerySmsTemplateRequest();
request.setTemplateCode("SMS_257771840");
response = acsClient.getAcsResponse(request);
} catch (ClientException e) {
log.error("查询模板发生错误。错误代码是 [{}],错误消息是 [{}],错误请求ID是 [{}],错误Msg是 [{}],错误类型是 [{}]",
@@ -391,6 +391,18 @@ public class AliyunSMS implements SMSExcutor {
}
log.info(" 查询模板----" + response.getCode() + "----" + JSON.toJSONString(response));


// DeleteSmsTemplateResponse response = null;
// try {
// DeleteSmsTemplateRequest request = new DeleteSmsTemplateRequest();
// request.setTemplateCode("SMS_257771840");
// response = acsClient.getAcsResponse(request);
// } catch (ClientException e) {
// log.error("删除模板发生错误。错误代码是 [{}],错误消息是 [{}],错误请求ID是 [{}],错误Msg是 [{}],错误类型是 [{}]",
// e.getErrCode(), e.getMessage(), e.getRequestId(), e.getErrMsg(), e.getErrorType());
// }
// log.info(" 删除模板----" + response.getCode() + "----" + response.getMessage());

}

}

Загрузка…
Отмена
Сохранить