diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs index 5ae07c6df..f8ef3d104 100644 --- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs +++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs @@ -24,6 +24,7 @@ namespace LINGYUN.Abp.Aliyun.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -35,6 +36,7 @@ namespace LINGYUN.Abp.Aliyun.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -46,6 +48,7 @@ namespace LINGYUN.Abp.Aliyun.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -57,6 +60,7 @@ namespace LINGYUN.Abp.Aliyun.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -68,6 +72,7 @@ namespace LINGYUN.Abp.Aliyun.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -78,6 +83,7 @@ namespace LINGYUN.Abp.Aliyun.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -89,6 +95,7 @@ namespace LINGYUN.Abp.Aliyun.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -100,6 +107,7 @@ namespace LINGYUN.Abp.Aliyun.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), }; diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Sms.Tencent/LINGYUN/Abp/Sms/Tencent/Settings/TencentCloudSmsSettingProvider.cs b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Sms.Tencent/LINGYUN/Abp/Sms/Tencent/Settings/TencentCloudSmsSettingProvider.cs index 0c4a4e72f..7421de34c 100644 --- a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Sms.Tencent/LINGYUN/Abp/Sms/Tencent/Settings/TencentCloudSmsSettingProvider.cs +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Sms.Tencent/LINGYUN/Abp/Sms/Tencent/Settings/TencentCloudSmsSettingProvider.cs @@ -24,6 +24,7 @@ namespace LINGYUN.Abp.Sms.Tencent.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -35,6 +36,7 @@ namespace LINGYUN.Abp.Sms.Tencent.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -46,6 +48,7 @@ namespace LINGYUN.Abp.Sms.Tencent.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), }; diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Sms.Tencent/LINGYUN/Abp/Sms/Tencent/TencentCloudSmsSender.cs b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Sms.Tencent/LINGYUN/Abp/Sms/Tencent/TencentCloudSmsSender.cs index fb10946b1..2b0f3a7a0 100644 --- a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Sms.Tencent/LINGYUN/Abp/Sms/Tencent/TencentCloudSmsSender.cs +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Sms.Tencent/LINGYUN/Abp/Sms/Tencent/TencentCloudSmsSender.cs @@ -56,22 +56,21 @@ namespace LINGYUN.Abp.Sms.Tencent signName = await SettingProvider.GetOrNullAsync(TencentCloudSmsSettingNames.DefaultSignName); } - if (!smsMessage.Properties.TryGetValue("TemplateParam", out var templateParam)) - { - templateParam = await SettingProvider.GetOrNullAsync(TencentCloudSmsSettingNames.DefaultSignName); - } - - var smsClient = await TencentCloudClientFactory.CreateAsync(); - var request = new SendSmsRequest { SmsSdkAppId = appId, SignName = signName?.ToString(), TemplateId = templateId?.ToString(), PhoneNumberSet = smsMessage.PhoneNumber.Split(';'), - TemplateParamSet = templateParam?.ToString()?.Split(';'), }; + if (smsMessage.Properties.Any()) + { + request.TemplateParamSet = smsMessage.Properties.Select(x => x.Value.ToString()).ToArray(); + } + + var smsClient = await TencentCloudClientFactory.CreateAsync(); + var response = await smsClient.SendSms(request); var warningMessage = response.SendStatusSet diff --git a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Settings/TencentCloudSettingDefinitionProvider.cs b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Settings/TencentCloudSettingDefinitionProvider.cs index f7a152a92..670e41d9b 100644 --- a/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Settings/TencentCloudSettingDefinitionProvider.cs +++ b/aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent/LINYUN/Abp/Tencent/Settings/TencentCloudSettingDefinitionProvider.cs @@ -26,6 +26,7 @@ public class TencentCloudSettingDefinitionProvider : SettingDefinitionProvider ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -37,6 +38,7 @@ public class TencentCloudSettingDefinitionProvider : SettingDefinitionProvider ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -48,6 +50,7 @@ public class TencentCloudSettingDefinitionProvider : SettingDefinitionProvider ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -59,6 +62,7 @@ public class TencentCloudSettingDefinitionProvider : SettingDefinitionProvider ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -71,6 +75,7 @@ public class TencentCloudSettingDefinitionProvider : SettingDefinitionProvider ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -83,6 +88,7 @@ public class TencentCloudSettingDefinitionProvider : SettingDefinitionProvider ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -93,6 +99,7 @@ public class TencentCloudSettingDefinitionProvider : SettingDefinitionProvider ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), }; diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs index c886b97e4..85566aa19 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/AliyunSmsSender.cs @@ -5,6 +5,8 @@ using LINGYUN.Abp.Aliyun; using LINGYUN.Abp.Sms.Aliyun.Settings; using Microsoft.Extensions.DependencyInjection; using System; +using System.Collections.Generic; +using System.Linq; using System.Text; using System.Threading.Tasks; using Volo.Abp; @@ -133,17 +135,11 @@ namespace LINGYUN.Abp.Sms.Aliyun private void TryAddTemplateParam(CommonRequest request, SmsMessage smsMessage) { - // 统一一下模板参数名称 - if (smsMessage.Properties.TryGetValue("TemplateParam", out var templateParam)) + if (smsMessage.Properties.Any()) { - request.AddQueryParameters("TemplateParam", templateParam.ToString()); + var queryParamJson = JsonSerializer.Serialize(smsMessage.Properties); + request.AddQueryParameters("TemplateParam", queryParamJson); } - - //if (smsMessage.Properties.Count > 0) - //{ - // var queryParamJson = JsonSerializer.Serialize(smsMessage.Properties); - // request.AddQueryParameters("TemplateParam", queryParamJson); - //} } } } diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs index c248abd80..fdb5fa212 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs @@ -24,6 +24,7 @@ namespace LINGYUN.Abp.Sms.Aliyun.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -35,6 +36,7 @@ namespace LINGYUN.Abp.Sms.Aliyun.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -46,6 +48,7 @@ namespace LINGYUN.Abp.Sms.Aliyun.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -56,6 +59,7 @@ namespace LINGYUN.Abp.Sms.Aliyun.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -67,6 +71,7 @@ namespace LINGYUN.Abp.Sms.Aliyun.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -78,6 +83,7 @@ namespace LINGYUN.Abp.Sms.Aliyun.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -89,6 +95,7 @@ namespace LINGYUN.Abp.Sms.Aliyun.Settings ) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName) }; diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN/Abp/Identity/Settings/IdentitySettingDefinitionProvider.cs b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN/Abp/Identity/Settings/IdentitySettingDefinitionProvider.cs index 98b7aff87..4accf3743 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN/Abp/Identity/Settings/IdentitySettingDefinitionProvider.cs +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN/Abp/Identity/Settings/IdentitySettingDefinitionProvider.cs @@ -17,6 +17,7 @@ namespace LINGYUN.Abp.Identity.Settings isVisibleToClients: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -27,6 +28,7 @@ namespace LINGYUN.Abp.Identity.Settings isVisibleToClients: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -37,6 +39,7 @@ namespace LINGYUN.Abp.Identity.Settings isVisibleToClients: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -47,6 +50,7 @@ namespace LINGYUN.Abp.Identity.Settings isVisibleToClients: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -57,6 +61,7 @@ namespace LINGYUN.Abp.Identity.Settings isVisibleToClients: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName) ); diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN/Abp/MessageService/Settings/MessageServiceSettingDefinitionProvider.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN/Abp/MessageService/Settings/MessageServiceSettingDefinitionProvider.cs index 232088bf3..3bfa4b29b 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN/Abp/MessageService/Settings/MessageServiceSettingDefinitionProvider.cs +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN/Abp/MessageService/Settings/MessageServiceSettingDefinitionProvider.cs @@ -18,6 +18,7 @@ namespace LINGYUN.Abp.MessageService.Settings isEncrypted: false) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName) ); diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain.Shared/LINGYUN/Abp/OssManagement/Settings/AbpOssManagementSettingDefinitionProvider.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain.Shared/LINGYUN/Abp/OssManagement/Settings/AbpOssManagementSettingDefinitionProvider.cs index fcec77225..59c81ee68 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain.Shared/LINGYUN/Abp/OssManagement/Settings/AbpOssManagementSettingDefinitionProvider.cs +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain.Shared/LINGYUN/Abp/OssManagement/Settings/AbpOssManagementSettingDefinitionProvider.cs @@ -23,6 +23,7 @@ namespace LINGYUN.Abp.OssManagement.Settings isVisibleToClients: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -33,6 +34,7 @@ namespace LINGYUN.Abp.OssManagement.Settings isVisibleToClients: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), }; diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/Settings/PlatformSettingDefinitionProvider.cs b/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/Settings/PlatformSettingDefinitionProvider.cs index 08410d3c8..b061be178 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/Settings/PlatformSettingDefinitionProvider.cs +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/Settings/PlatformSettingDefinitionProvider.cs @@ -24,6 +24,7 @@ namespace LINGYUN.Platform.Settings isVisibleToClients: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -34,6 +35,7 @@ namespace LINGYUN.Platform.Settings isVisibleToClients: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), }; diff --git a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.MiniProgram/LINGYUN/Abp/WeChat/MiniProgram/Settings/WeChatMiniProgramSettingDefinitionProvider.cs b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.MiniProgram/LINGYUN/Abp/WeChat/MiniProgram/Settings/WeChatMiniProgramSettingDefinitionProvider.cs index 79c5e95aa..f5bb7ec4d 100644 --- a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.MiniProgram/LINGYUN/Abp/WeChat/MiniProgram/Settings/WeChatMiniProgramSettingDefinitionProvider.cs +++ b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.MiniProgram/LINGYUN/Abp/WeChat/MiniProgram/Settings/WeChatMiniProgramSettingDefinitionProvider.cs @@ -17,6 +17,7 @@ namespace LINGYUN.Abp.WeChat.MiniProgram.Settings isEncrypted: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -27,6 +28,7 @@ namespace LINGYUN.Abp.WeChat.MiniProgram.Settings isEncrypted: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -37,6 +39,7 @@ namespace LINGYUN.Abp.WeChat.MiniProgram.Settings isEncrypted: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -47,6 +50,7 @@ namespace LINGYUN.Abp.WeChat.MiniProgram.Settings isEncrypted: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName) ); diff --git a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Settings/WeChatOfficialSettingDefinitionProvider.cs b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Settings/WeChatOfficialSettingDefinitionProvider.cs index 3b6131f62..9c803963e 100644 --- a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Settings/WeChatOfficialSettingDefinitionProvider.cs +++ b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Settings/WeChatOfficialSettingDefinitionProvider.cs @@ -17,6 +17,7 @@ namespace LINGYUN.Abp.WeChat.Official.Settings isEncrypted: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -27,6 +28,7 @@ namespace LINGYUN.Abp.WeChat.Official.Settings isEncrypted: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -37,6 +39,7 @@ namespace LINGYUN.Abp.WeChat.Official.Settings isEncrypted: false) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -47,6 +50,7 @@ namespace LINGYUN.Abp.WeChat.Official.Settings isEncrypted: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName), new SettingDefinition( @@ -57,6 +61,7 @@ namespace LINGYUN.Abp.WeChat.Official.Settings isEncrypted: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName) ); diff --git a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat/LINGYUN/Abp/WeChat/Settings/WeChatSettingDefinitionProvider.cs b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat/LINGYUN/Abp/WeChat/Settings/WeChatSettingDefinitionProvider.cs index 7638a6f9d..51142d1d3 100644 --- a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat/LINGYUN/Abp/WeChat/Settings/WeChatSettingDefinitionProvider.cs +++ b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat/LINGYUN/Abp/WeChat/Settings/WeChatSettingDefinitionProvider.cs @@ -19,6 +19,7 @@ namespace LINGYUN.Abp.WeChat.Settings isEncrypted: false) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName) ); diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Settings/AccountSettingDefinitionProvider.cs b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Settings/AccountSettingDefinitionProvider.cs index fd9cf3bbb..846f56b13 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Settings/AccountSettingDefinitionProvider.cs +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Settings/AccountSettingDefinitionProvider.cs @@ -19,6 +19,7 @@ public class AccountSettingDefinitionProvider : SettingDefinitionProvider isVisibleToClients: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName) ); @@ -32,6 +33,7 @@ public class AccountSettingDefinitionProvider : SettingDefinitionProvider isVisibleToClients: true) .WithProviders( DefaultValueSettingValueProvider.ProviderName, + ConfigurationSettingValueProvider.ProviderName, GlobalSettingValueProvider.ProviderName, TenantSettingValueProvider.ProviderName) );