From 6cfd5af71ad50af676368a9a1732de74e27003ce Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 17 Dec 2024 16:06:27 +0800 Subject: [PATCH] Added `Volo.Abp.Sms.TencentCloud` to `common.ps1`. --- .../TencentCloud/AbpTencentCloudSmsOptions.cs | 5 ++++- .../TencentCloud/TencentCloudSmsProperties.cs | 1 + .../Sms/TencentCloud/TencentCloudSmsSender.cs | 18 ++++++++++-------- .../AbpSmsTencentCloudTestsModule.cs | 4 +--- nupkg/common.ps1 | 1 + 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/framework/src/Volo.Abp.Sms.TencentCloud/Volo/Abp/Sms/TencentCloud/AbpTencentCloudSmsOptions.cs b/framework/src/Volo.Abp.Sms.TencentCloud/Volo/Abp/Sms/TencentCloud/AbpTencentCloudSmsOptions.cs index eb0158b78b..cec86d9b36 100644 --- a/framework/src/Volo.Abp.Sms.TencentCloud/Volo/Abp/Sms/TencentCloud/AbpTencentCloudSmsOptions.cs +++ b/framework/src/Volo.Abp.Sms.TencentCloud/Volo/Abp/Sms/TencentCloud/AbpTencentCloudSmsOptions.cs @@ -3,9 +3,12 @@ namespace Volo.Abp.Sms.TencentCloud; public class AbpTencentCloudSmsOptions { public string SmsSdkAppId { get; set; } = default!; + public string SecretKey { get; set; } = default!; + public string SecretId { get; set; } = default!; + public string Endpoint { get; set; } = "sms.tencentcloudapi.com"; - public string Region { get; set; } = "ap-guangzhou"; + public string Region { get; set; } = "ap-guangzhou"; } diff --git a/framework/src/Volo.Abp.Sms.TencentCloud/Volo/Abp/Sms/TencentCloud/TencentCloudSmsProperties.cs b/framework/src/Volo.Abp.Sms.TencentCloud/Volo/Abp/Sms/TencentCloud/TencentCloudSmsProperties.cs index ee198b71cc..7253a85ba6 100644 --- a/framework/src/Volo.Abp.Sms.TencentCloud/Volo/Abp/Sms/TencentCloud/TencentCloudSmsProperties.cs +++ b/framework/src/Volo.Abp.Sms.TencentCloud/Volo/Abp/Sms/TencentCloud/TencentCloudSmsProperties.cs @@ -3,5 +3,6 @@ public static class TencentCloudSmsProperties { public const string SignName = "SignName"; + public const string TemplateId = "TemplateId"; } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Sms.TencentCloud/Volo/Abp/Sms/TencentCloud/TencentCloudSmsSender.cs b/framework/src/Volo.Abp.Sms.TencentCloud/Volo/Abp/Sms/TencentCloud/TencentCloudSmsSender.cs index f0befb4af3..fa3c585576 100644 --- a/framework/src/Volo.Abp.Sms.TencentCloud/Volo/Abp/Sms/TencentCloud/TencentCloudSmsSender.cs +++ b/framework/src/Volo.Abp.Sms.TencentCloud/Volo/Abp/Sms/TencentCloud/TencentCloudSmsSender.cs @@ -18,11 +18,11 @@ public class TencentCloudSmsSender : ISmsSender, ITransientDependency Options = options.CurrentValue; } - public async Task SendAsync(SmsMessage smsMessage) + public virtual async Task SendAsync(SmsMessage smsMessage) { var client = CreateClient(); - var result = await client.SendSms(new SendSmsRequest() + await client.SendSms(new SendSmsRequest() { SmsSdkAppId = Options.SmsSdkAppId, SignName = smsMessage.Properties.GetOrDefault(TencentCloudSmsProperties.SignName) as string, @@ -30,20 +30,22 @@ public class TencentCloudSmsSender : ISmsSender, ITransientDependency TemplateParamSet = smsMessage.Text.Split(','), PhoneNumberSet = [smsMessage.PhoneNumber] }); - } protected virtual SmsClient CreateClient() { - var cred = new Credential { + var credential = new Credential + { SecretId = Options.SecretId, SecretKey = Options.SecretKey }; - var clientProfile = new ClientProfile(); - clientProfile.HttpProfile = new HttpProfile() + var clientProfile = new ClientProfile { - Endpoint = Options.Endpoint + HttpProfile = new HttpProfile + { + Endpoint = Options.Endpoint + } }; - return new SmsClient(cred,Options.Region,clientProfile); + return new SmsClient(credential, Options.Region, clientProfile); } } diff --git a/framework/test/Volo.Abp.Sms.TencenCloud.Tests/Volo/Abp/Sms/TencentCloud/AbpSmsTencentCloudTestsModule.cs b/framework/test/Volo.Abp.Sms.TencenCloud.Tests/Volo/Abp/Sms/TencentCloud/AbpSmsTencentCloudTestsModule.cs index f53cef85eb..5062c18867 100644 --- a/framework/test/Volo.Abp.Sms.TencenCloud.Tests/Volo/Abp/Sms/TencentCloud/AbpSmsTencentCloudTestsModule.cs +++ b/framework/test/Volo.Abp.Sms.TencenCloud.Tests/Volo/Abp/Sms/TencentCloud/AbpSmsTencentCloudTestsModule.cs @@ -10,8 +10,6 @@ public class AbpSmsTencentCloudTestsModule : AbpModule { var configuration = context.Services.GetConfiguration(); - Configure( - configuration.GetSection("AbpTencentCloudSms") - ); + Configure(configuration.GetSection("AbpTencentCloudSms")); } } diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index 860644dc4b..89264d0b07 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -232,6 +232,7 @@ $projects = ( "framework/src/Volo.Abp.Settings", "framework/src/Volo.Abp.Sms", "framework/src/Volo.Abp.Sms.Aliyun", + "framework/src/Volo.Abp.Sms.TencentCloud", "framework/src/Volo.Abp.Specifications", "framework/src/Volo.Abp.TestBase", "framework/src/Volo.Abp.TextTemplating",