diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs index d17888502..84a58c51f 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs @@ -47,39 +47,13 @@ namespace LINYUN.Abp.Sms.Aliyun Action = Options.ActionName, Version = Options.DefaultVersion }; - if (smsMessage.Properties.TryGetValue("TemplateCode", out object template)) - { - request.AddQueryParameters("TemplateCode", template.ToString()); - smsMessage.Properties.Remove("TemplateCode"); - } - else - { - Check.NotNullOrWhiteSpace(Options.DefaultTemplateCode, nameof(Options.DefaultTemplateCode)); - request.AddQueryParameters("TemplateCode", Options.DefaultTemplateCode); - } - - if (smsMessage.Properties.TryGetValue("SignName", out object signName)) - { - request.AddQueryParameters("SignName", signName.ToString()); - smsMessage.Properties.Remove("SignName"); - } - else - { - Check.NotNullOrWhiteSpace(Options.DefaultSignName, nameof(Options.DefaultSignName)); - request.AddQueryParameters("SignName", Options.DefaultSignName); - } - if (Environment.IsDevelopment()) - { - Check.NotNullOrWhiteSpace(Options.DeveloperPhoneNumber, nameof(Options.DeveloperPhoneNumber)); - request.AddQueryParameters("PhoneNumbers", Options.DeveloperPhoneNumber); - } - else - { - request.AddQueryParameters("PhoneNumbers", smsMessage.PhoneNumber); - } + TryAddTemplateCode(request, smsMessage); + TryAddSignName(request, smsMessage); + TryAddSendPhone(request, smsMessage); var queryParamJson = JsonSerializer.Serialize(smsMessage.Properties); request.AddQueryParameters("TemplateParam", queryParamJson); + try { IClientProfile profile = DefaultProfile.GetProfile(Options.RegionId, Options.AccessKeyId, Options.AccessKeySecret); @@ -111,5 +85,46 @@ namespace LINYUN.Abp.Sms.Aliyun return Task.CompletedTask; } + + private void TryAddTemplateCode(CommonRequest request, SmsMessage smsMessage) + { + if (smsMessage.Properties.TryGetValue("TemplateCode", out object template)) + { + request.AddQueryParameters("TemplateCode", template.ToString()); + smsMessage.Properties.Remove("TemplateCode"); + } + else + { + Check.NotNullOrWhiteSpace(Options.DefaultTemplateCode, nameof(Options.DefaultTemplateCode)); + request.AddQueryParameters("TemplateCode", Options.DefaultTemplateCode); + } + } + + private void TryAddSignName(CommonRequest request, SmsMessage smsMessage) + { + if (smsMessage.Properties.TryGetValue("SignName", out object signName)) + { + request.AddQueryParameters("SignName", signName.ToString()); + smsMessage.Properties.Remove("SignName"); + } + else + { + Check.NotNullOrWhiteSpace(Options.DefaultSignName, nameof(Options.DefaultSignName)); + request.AddQueryParameters("SignName", Options.DefaultSignName); + } + } + + private void TryAddSendPhone(CommonRequest request, SmsMessage smsMessage) + { + if (Environment.IsDevelopment()) + { + Check.NotNullOrWhiteSpace(Options.DeveloperPhoneNumber, nameof(Options.DeveloperPhoneNumber)); + request.AddQueryParameters("PhoneNumbers", Options.DeveloperPhoneNumber); + } + else + { + request.AddQueryParameters("PhoneNumbers", smsMessage.PhoneNumber); + } + } } } diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN/Abp/IdentityServer/AbpIdentityServerSmValidatorModule.cs b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN/Abp/IdentityServer/AbpIdentityServerSmsValidatorModule.cs similarity index 93% rename from aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN/Abp/IdentityServer/AbpIdentityServerSmValidatorModule.cs rename to aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN/Abp/IdentityServer/AbpIdentityServerSmsValidatorModule.cs index 1a1bb6fe4..0a3d1975c 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN/Abp/IdentityServer/AbpIdentityServerSmValidatorModule.cs +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN/Abp/IdentityServer/AbpIdentityServerSmsValidatorModule.cs @@ -9,7 +9,7 @@ using Volo.Abp.VirtualFileSystem; namespace LINGYUN.Abp.IdentityServer { [DependsOn(typeof(AbpIdentityServerDomainModule))] - public class AbpIdentityServerSmValidatorModule : AbpModule + public class AbpIdentityServerSmsValidatorModule : AbpModule { public override void PreConfigureServices(ServiceConfigurationContext context) { @@ -23,7 +23,7 @@ namespace LINGYUN.Abp.IdentityServer { Configure(options => { - options.FileSets.AddEmbedded(); + options.FileSets.AddEmbedded(); }); Configure(options => diff --git a/aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.cs b/aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.cs index e370d890d..ab1d453a3 100644 --- a/aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.cs +++ b/aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.cs @@ -36,7 +36,7 @@ namespace AuthServer.Host typeof(AbpAutofacModule), typeof(AbpCAPEventBusModule), typeof(AbpIdentityAspNetCoreModule), - typeof(AbpIdentityServerSmValidatorModule), + typeof(AbpIdentityServerSmsValidatorModule), typeof(AbpEntityFrameworkCoreMySQLModule), typeof(AbpIdentityEntityFrameworkCoreModule), typeof(AbpIdentityServerEntityFrameworkCoreModule),