|
|
@ -1,14 +1,11 @@ |
|
|
using Aliyun.Acs.Core; |
|
|
using AlibabaCloud.SDK.Dypnsapi20170525.Models; |
|
|
using Aliyun.Acs.Core.Exceptions; |
|
|
using AlibabaCloud.SDK.Dysmsapi20170525.Models; |
|
|
using Aliyun.Acs.Core.Http; |
|
|
|
|
|
using LINGYUN.Abp.Aliyun; |
|
|
|
|
|
using LINGYUN.Abp.Aliyun.Features; |
|
|
using LINGYUN.Abp.Aliyun.Features; |
|
|
using LINGYUN.Abp.Aliyun.Settings; |
|
|
using LINGYUN.Abp.Aliyun.Settings; |
|
|
using LINGYUN.Abp.Features.LimitValidation; |
|
|
using LINGYUN.Abp.Features.LimitValidation; |
|
|
using Microsoft.Extensions.DependencyInjection; |
|
|
using Microsoft.Extensions.DependencyInjection; |
|
|
using System; |
|
|
using System; |
|
|
using System.Linq; |
|
|
using System.Linq; |
|
|
using System.Text; |
|
|
|
|
|
using System.Threading.Tasks; |
|
|
using System.Threading.Tasks; |
|
|
using Volo.Abp; |
|
|
using Volo.Abp; |
|
|
using Volo.Abp.DependencyInjection; |
|
|
using Volo.Abp.DependencyInjection; |
|
|
@ -30,17 +27,20 @@ public class AliyunSmsSender : ISmsSender, IAliyunSmsVerifyCodeSender |
|
|
protected IJsonSerializer JsonSerializer { get; } |
|
|
protected IJsonSerializer JsonSerializer { get; } |
|
|
protected ISettingProvider SettingProvider { get; } |
|
|
protected ISettingProvider SettingProvider { get; } |
|
|
protected IServiceProvider ServiceProvider { get; } |
|
|
protected IServiceProvider ServiceProvider { get; } |
|
|
protected IAcsClientFactory AcsClientFactory { get; } |
|
|
protected IDypnsClientFactory DypnsClientFactory { get; } |
|
|
|
|
|
protected IDysmsClientFactory DysmsClientFactory { get; } |
|
|
public AliyunSmsSender( |
|
|
public AliyunSmsSender( |
|
|
IJsonSerializer jsonSerializer, |
|
|
IJsonSerializer jsonSerializer, |
|
|
ISettingProvider settingProvider, |
|
|
ISettingProvider settingProvider, |
|
|
IServiceProvider serviceProvider, |
|
|
IServiceProvider serviceProvider, |
|
|
IAcsClientFactory acsClientFactory) |
|
|
IDypnsClientFactory dypnsClientFactory, |
|
|
|
|
|
IDysmsClientFactory dysmsClientFactory) |
|
|
{ |
|
|
{ |
|
|
JsonSerializer = jsonSerializer; |
|
|
JsonSerializer = jsonSerializer; |
|
|
SettingProvider = settingProvider; |
|
|
SettingProvider = settingProvider; |
|
|
ServiceProvider = serviceProvider; |
|
|
ServiceProvider = serviceProvider; |
|
|
AcsClientFactory = acsClientFactory; |
|
|
DypnsClientFactory = dypnsClientFactory; |
|
|
|
|
|
DysmsClientFactory = dysmsClientFactory; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
[RequiresLimitFeature( |
|
|
[RequiresLimitFeature( |
|
|
@ -74,41 +74,23 @@ public class AliyunSmsSender : ISmsSender, IAliyunSmsVerifyCodeSender |
|
|
Check.NotNullOrWhiteSpace(action, AliyunSettingNames.Sms.ActionName); |
|
|
Check.NotNullOrWhiteSpace(action, AliyunSettingNames.Sms.ActionName); |
|
|
Check.NotNullOrWhiteSpace(version, AliyunSettingNames.Sms.Version); |
|
|
Check.NotNullOrWhiteSpace(version, AliyunSettingNames.Sms.Version); |
|
|
|
|
|
|
|
|
var request = new CommonRequest |
|
|
var request = new SendSmsRequest(); |
|
|
{ |
|
|
|
|
|
Method = MethodType.POST, |
|
|
|
|
|
Domain = domain, |
|
|
|
|
|
Action = action, |
|
|
|
|
|
Version = version |
|
|
|
|
|
}; |
|
|
|
|
|
await TryAddTemplateCodeAsync(request, smsMessage); |
|
|
await TryAddTemplateCodeAsync(request, smsMessage); |
|
|
await TryAddSignNameAsync(request, smsMessage); |
|
|
await TryAddSignNameAsync(request, smsMessage); |
|
|
await TryAddSendPhoneAsync(request, smsMessage); |
|
|
await TryAddSendPhoneAsync(request, smsMessage); |
|
|
|
|
|
|
|
|
TryAddTemplateParam(request, smsMessage); |
|
|
TryAddTemplateParam(request, smsMessage); |
|
|
|
|
|
|
|
|
try |
|
|
|
|
|
|
|
|
var dysmsClient = await DysmsClientFactory.CreateAsync(); |
|
|
|
|
|
var response = await dysmsClient.SendSmsAsync(request); |
|
|
|
|
|
if (!string.Equals(response.Body.Code, "OK", StringComparison.CurrentCultureIgnoreCase)) |
|
|
{ |
|
|
{ |
|
|
var client = await AcsClientFactory.CreateAsync(); |
|
|
if (await SettingProvider.IsTrueAsync(AliyunSettingNames.Sms.VisableErrorToClient)) |
|
|
var response = client.GetCommonResponse(request); |
|
|
|
|
|
var responseContent = Encoding.Default.GetString(response.HttpResponse.Content); |
|
|
|
|
|
var aliyunResponse = JsonSerializer.Deserialize<AliyunSmsResponse>(responseContent); |
|
|
|
|
|
if (!aliyunResponse.IsSuccess()) |
|
|
|
|
|
{ |
|
|
{ |
|
|
if (await SettingProvider.IsTrueAsync(AliyunSettingNames.Sms.VisableErrorToClient)) |
|
|
throw new UserFriendlyException(response.Body.Code, response.Body.Message); |
|
|
{ |
|
|
|
|
|
throw new UserFriendlyException(aliyunResponse.Code, aliyunResponse.Message); |
|
|
|
|
|
} |
|
|
|
|
|
throw new AliyunSmsException(aliyunResponse.Code, $"Text message sending failed, code:{aliyunResponse.Code}, message:{aliyunResponse.Message}!"); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
throw new AliyunSmsException(response.Body.Code, $"Text message sending failed, code:{response.Body.Code}, message:{response.Body.Message}!"); |
|
|
catch(ServerException se) |
|
|
|
|
|
{ |
|
|
|
|
|
throw new AliyunSmsException(se.ErrorCode, $"Sending text messages to aliyun server is abnormal,type: {se.ErrorType}, error: {se.ErrorMessage}"); |
|
|
|
|
|
} |
|
|
|
|
|
catch(ClientException ce) |
|
|
|
|
|
{ |
|
|
|
|
|
throw new AliyunSmsException(ce.ErrorCode, $"A client exception occurred in sending SMS messages,type: {ce.ErrorType}, error: {ce.ErrorMessage}"); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -132,75 +114,58 @@ public class AliyunSmsSender : ISmsSender, IAliyunSmsVerifyCodeSender |
|
|
Check.NotNullOrWhiteSpace(signName, AliyunSettingNames.SmsVerifyCode.DefaultSignName); |
|
|
Check.NotNullOrWhiteSpace(signName, AliyunSettingNames.SmsVerifyCode.DefaultSignName); |
|
|
Check.NotNullOrWhiteSpace(templateCode, AliyunSettingNames.SmsVerifyCode.DefaultTemplateCode); |
|
|
Check.NotNullOrWhiteSpace(templateCode, AliyunSettingNames.SmsVerifyCode.DefaultTemplateCode); |
|
|
|
|
|
|
|
|
var request = new CommonRequest |
|
|
var dypnsClient = await DypnsClientFactory.CreateAsync(); |
|
|
|
|
|
|
|
|
|
|
|
var request = new SendSmsVerifyCodeRequest |
|
|
{ |
|
|
{ |
|
|
Domain = domain, |
|
|
PhoneNumber = message.PhoneNumber, |
|
|
Version = version, |
|
|
SignName = signName, |
|
|
Product = "Dypnsapi", |
|
|
TemplateCode = templateCode, |
|
|
Method = MethodType.POST, |
|
|
TemplateParam = JsonSerializer.Serialize(message.TemplateParam), |
|
|
Action = "SendSmsVerifyCode", |
|
|
|
|
|
}; |
|
|
}; |
|
|
request.AddBodyParameters("PhoneNumber", message.PhoneNumber); |
|
|
|
|
|
request.AddBodyParameters("SignName", signName); |
|
|
|
|
|
request.AddBodyParameters("TemplateCode", templateCode); |
|
|
|
|
|
request.AddBodyParameters("TemplateParam", JsonSerializer.Serialize(message.TemplateParam)); |
|
|
|
|
|
|
|
|
|
|
|
try |
|
|
var response = await dypnsClient.SendSmsVerifyCodeAsync(request); |
|
|
|
|
|
if (response.Body.Success == false) |
|
|
{ |
|
|
{ |
|
|
var client = await AcsClientFactory.CreateAsync(); |
|
|
if (await SettingProvider.IsTrueAsync(AliyunSettingNames.Sms.VisableErrorToClient)) |
|
|
var response = client.GetCommonResponse(request); |
|
|
|
|
|
var responseContent = Encoding.Default.GetString(response.HttpResponse.Content); |
|
|
|
|
|
var aliyunResponse = JsonSerializer.Deserialize<AliyunSmsVerifyCodeResponse>(responseContent); |
|
|
|
|
|
if (!aliyunResponse.Success) |
|
|
|
|
|
{ |
|
|
{ |
|
|
if (await SettingProvider.IsTrueAsync(AliyunSettingNames.Sms.VisableErrorToClient)) |
|
|
throw new UserFriendlyException(response.Body.Code, response.Body.Message); |
|
|
{ |
|
|
|
|
|
throw new UserFriendlyException(aliyunResponse.Code, aliyunResponse.Message); |
|
|
|
|
|
} |
|
|
|
|
|
throw new AliyunSmsException(aliyunResponse.Code, $"Text message sending failed, code:{aliyunResponse.Code}, message:{aliyunResponse.Message}!"); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
throw new AliyunSmsException(response.Body.Code, $"Text message sending failed, code:{response.Body.Code}, message:{response.Body.Message}!"); |
|
|
catch (ServerException se) |
|
|
|
|
|
{ |
|
|
|
|
|
throw new AliyunSmsException(se.ErrorCode, $"Sending text messages to aliyun server is abnormal,type: {se.ErrorType}, error: {se.ErrorMessage}"); |
|
|
|
|
|
} |
|
|
|
|
|
catch (ClientException ce) |
|
|
|
|
|
{ |
|
|
|
|
|
throw new AliyunSmsException(ce.ErrorCode, $"A client exception occurred in sending SMS messages,type: {ce.ErrorType}, error: {ce.ErrorMessage}"); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private async Task TryAddTemplateCodeAsync(CommonRequest request, SmsMessage smsMessage) |
|
|
private async Task TryAddTemplateCodeAsync(SendSmsRequest request, SmsMessage smsMessage) |
|
|
{ |
|
|
{ |
|
|
if (smsMessage.Properties.TryGetValue("TemplateCode", out object template) && template != null) |
|
|
if (smsMessage.Properties.TryGetValue("TemplateCode", out var template) && template != null) |
|
|
{ |
|
|
{ |
|
|
request.AddQueryParameters("TemplateCode", template.ToString()); |
|
|
request.TemplateCode = template.ToString(); |
|
|
smsMessage.Properties.Remove("TemplateCode"); |
|
|
smsMessage.Properties.Remove("TemplateCode"); |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
var defaultTemplateCode = await SettingProvider.GetOrNullAsync(AliyunSettingNames.Sms.DefaultTemplateCode); |
|
|
var defaultTemplateCode = await SettingProvider.GetOrNullAsync(AliyunSettingNames.Sms.DefaultTemplateCode); |
|
|
Check.NotNullOrWhiteSpace(defaultTemplateCode, "TemplateCode"); |
|
|
Check.NotNullOrWhiteSpace(defaultTemplateCode, "TemplateCode"); |
|
|
request.AddQueryParameters("TemplateCode", defaultTemplateCode); |
|
|
request.TemplateCode = defaultTemplateCode; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private async Task TryAddSignNameAsync(CommonRequest request, SmsMessage smsMessage) |
|
|
private async Task TryAddSignNameAsync(SendSmsRequest request, SmsMessage smsMessage) |
|
|
{ |
|
|
{ |
|
|
if (smsMessage.Properties.TryGetValue("SignName", out object signName) && signName != null) |
|
|
if (smsMessage.Properties.TryGetValue("SignName", out var signName) && signName != null) |
|
|
{ |
|
|
{ |
|
|
request.AddQueryParameters("SignName", signName.ToString()); |
|
|
request.SignName = signName.ToString(); |
|
|
smsMessage.Properties.Remove("SignName"); |
|
|
smsMessage.Properties.Remove("SignName"); |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
var defaultSignName = await SettingProvider.GetOrNullAsync(AliyunSettingNames.Sms.DefaultSignName); |
|
|
var defaultSignName = await SettingProvider.GetOrNullAsync(AliyunSettingNames.Sms.DefaultSignName); |
|
|
Check.NotNullOrWhiteSpace(defaultSignName, "SignName"); |
|
|
Check.NotNullOrWhiteSpace(defaultSignName, "SignName"); |
|
|
request.AddQueryParameters("SignName", defaultSignName); |
|
|
request.SignName = defaultSignName; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private async Task TryAddSendPhoneAsync(CommonRequest request, SmsMessage smsMessage) |
|
|
private async Task TryAddSendPhoneAsync(SendSmsRequest request, SmsMessage smsMessage) |
|
|
{ |
|
|
{ |
|
|
if (smsMessage.PhoneNumber.IsNullOrWhiteSpace()) |
|
|
if (smsMessage.PhoneNumber.IsNullOrWhiteSpace()) |
|
|
{ |
|
|
{ |
|
|
@ -210,20 +175,20 @@ public class AliyunSmsSender : ISmsSender, IAliyunSmsVerifyCodeSender |
|
|
defaultPhoneNumber, |
|
|
defaultPhoneNumber, |
|
|
AliyunSettingNames.Sms.DefaultPhoneNumber, |
|
|
AliyunSettingNames.Sms.DefaultPhoneNumber, |
|
|
maxLength: 11, minLength: 11); |
|
|
maxLength: 11, minLength: 11); |
|
|
request.AddQueryParameters("PhoneNumbers", defaultPhoneNumber); |
|
|
request.PhoneNumbers = defaultPhoneNumber; |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
request.AddQueryParameters("PhoneNumbers", smsMessage.PhoneNumber); |
|
|
request.PhoneNumbers = smsMessage.PhoneNumber; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void TryAddTemplateParam(CommonRequest request, SmsMessage smsMessage) |
|
|
private void TryAddTemplateParam(SendSmsRequest request, SmsMessage smsMessage) |
|
|
{ |
|
|
{ |
|
|
if (smsMessage.Properties.Any()) |
|
|
if (smsMessage.Properties.Any()) |
|
|
{ |
|
|
{ |
|
|
var queryParamJson = JsonSerializer.Serialize(smsMessage.Properties); |
|
|
var queryParamJson = JsonSerializer.Serialize(smsMessage.Properties); |
|
|
request.AddQueryParameters("TemplateParam", queryParamJson); |
|
|
request.TemplateParam = queryParamJson; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
colin
4 months ago