diff --git a/aspnet-core/LINGYUN.MicroService.sln b/aspnet-core/LINGYUN.MicroService.sln index c829406c9..d4be5e08b 100644 --- a/aspnet-core/LINGYUN.MicroService.sln +++ b/aspnet-core/LINGYUN.MicroService.sln @@ -215,6 +215,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "account", "account", "{6851 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.IdentityServer4.HttpApi.Host", "services\identity-server\LINGYUN.Abp.IdentityServer4.HttpApi.Host\LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj", "{F85552D4-D22E-483A-B1F8-3DFB840F6F7C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.Settings", "modules\common\LINGYUN.Abp.Settings\LINGYUN.Abp.Settings.csproj", "{6AA0785D-9B6C-4EAE-AB83-0C4CF2B6B473}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -569,6 +571,10 @@ Global {F85552D4-D22E-483A-B1F8-3DFB840F6F7C}.Debug|Any CPU.Build.0 = Debug|Any CPU {F85552D4-D22E-483A-B1F8-3DFB840F6F7C}.Release|Any CPU.ActiveCfg = Release|Any CPU {F85552D4-D22E-483A-B1F8-3DFB840F6F7C}.Release|Any CPU.Build.0 = Release|Any CPU + {6AA0785D-9B6C-4EAE-AB83-0C4CF2B6B473}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6AA0785D-9B6C-4EAE-AB83-0C4CF2B6B473}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6AA0785D-9B6C-4EAE-AB83-0C4CF2B6B473}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6AA0785D-9B6C-4EAE-AB83-0C4CF2B6B473}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -677,6 +683,7 @@ Global {6FE7E243-2D99-4567-8786-6C9283D608EF} = {52B5D4F7-237B-4E0A-A167-68442164F70A} {685188AC-A145-4A27-BF5F-9C970A59AA9C} = {672E1170-7B18-474B-85C7-1961BF2A48AE} {F85552D4-D22E-483A-B1F8-3DFB840F6F7C} = {E2408063-FB1F-4513-B4A7-1FE50667C6E8} + {6AA0785D-9B6C-4EAE-AB83-0C4CF2B6B473} = {8AC72641-30D3-4ACF-89FA-808FADC55C2E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C95FDF91-16F2-4A8B-A4BE-0E62D1B66718} diff --git a/aspnet-core/configuration/admin/LINGYUN.BackendAdminApp.Host/appsettings.Development.json b/aspnet-core/configuration/admin/LINGYUN.BackendAdminApp.Host/appsettings.Development.json index a8d83e330..39129c934 100644 --- a/aspnet-core/configuration/admin/LINGYUN.BackendAdminApp.Host/appsettings.Development.json +++ b/aspnet-core/configuration/admin/LINGYUN.BackendAdminApp.Host/appsettings.Development.json @@ -22,12 +22,14 @@ } }, "Aliyun": { + "Auth": { + "AccessKeyId": "你自己的阿里云Sms服务Key", + "AccessKeySecret": "你自己的阿里云Sms服务KeySecret", + }, "Sms": { "RegionId": "cn-hangzhou", "Domain": "dysmsapi.aliyuncs.com", "Version": "2017-05-25", - "AccessKeyId": "你自己的阿里云Sms服务Key", - "AccessKeySecret": "你自己的阿里云Sms服务KeySecret", "DefaultSignName": "你自己的阿里云Sms服务签名", "DefaultTemplateCode": "你自己的阿里云Sms服务模板", "DeveloperPhoneNumber": "你自己的手机号码,用于开发模式统一接收短信的手机号", diff --git a/aspnet-core/configuration/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json b/aspnet-core/configuration/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json index 06dd9caa9..7b87d8c43 100644 --- a/aspnet-core/configuration/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/configuration/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json @@ -27,6 +27,21 @@ "RequireConfirmedPhoneNumber": false } }, + "Aliyun": { + "Auth": { + "AccessKeyId": "你自己的阿里云Sms服务Key", + "AccessKeySecret": "你自己的阿里云Sms服务KeySecret", + }, + "Sms": { + "RegionId": "cn-hangzhou", + "Domain": "dysmsapi.aliyuncs.com", + "Version": "2017-05-25", + "DefaultSignName": "你自己的阿里云Sms服务签名", + "DefaultTemplateCode": "你自己的阿里云Sms服务模板", + "DeveloperPhoneNumber": "你自己的手机号码,用于开发模式统一接收短信的手机号", + "VisableErrorToClient": true + } + }, "CAP": { "EventBus": { "DefaultGroup": "IdentityServer4Admin", diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj index 01adf3216..02a8aedcb 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj @@ -11,6 +11,7 @@ + diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/AccountAppService.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/AccountAppService.cs index be926b0c1..b2b54e631 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/AccountAppService.cs +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/AccountAppService.cs @@ -189,7 +189,7 @@ namespace LINGYUN.Abp.Account case PhoneNumberVerifyType.Register: var phoneVerifyCode = new Random().Next(100000, 999999); verifyCacheItem.VerifyCode = phoneVerifyCode.ToString(); - var templateCode = await SettingProvider.GetOrNullAsync(AccountSettingNames.SmsRegisterTemplateCode); + var templateCode = await SettingProvider.GetOrDefaultAsync(AccountSettingNames.SmsRegisterTemplateCode, ServiceProvider); await SendPhoneVerifyMessageAsync(templateCode, input.PhoneNumber, phoneVerifyCode.ToString()); return; case PhoneNumberVerifyType.Signin: @@ -221,7 +221,7 @@ namespace LINGYUN.Abp.Account // 查找用户信息 var user = await GetUserByPhoneNumberAsync(phoneNumber); // 获取登录验证码模板号 - var templateCode = await SettingProvider.GetOrNullAsync(AccountSettingNames.SmsSigninTemplateCode); + var templateCode = await SettingProvider.GetOrDefaultAsync(AccountSettingNames.SmsSigninTemplateCode, ServiceProvider); // 生成手机验证码 var phoneVerifyCode = await PhoneNumberTokenProvider.GenerateAsync("phone_verify", UserManager, user); // 发送短信验证码 @@ -235,7 +235,7 @@ namespace LINGYUN.Abp.Account // 查找用户信息 var user = await GetUserByPhoneNumberAsync(phoneNumber); // 获取登录验证码模板号 - var templateCode = await SettingProvider.GetOrNullAsync(AccountSettingNames.SmsResetPasswordTemplateCode); + var templateCode = await SettingProvider.GetOrDefaultAsync(AccountSettingNames.SmsResetPasswordTemplateCode, ServiceProvider); // 生成重置密码验证码 var phoneVerifyToken = await UserManager.GeneratePasswordResetTokenAsync(user); // 发送短信验证码 diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN.Abp.Account.Domain.Shared.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN.Abp.Account.Domain.Shared.csproj index a201952be..a67d7b8db 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN.Abp.Account.Domain.Shared.csproj +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN.Abp.Account.Domain.Shared.csproj @@ -5,6 +5,16 @@ + + + + + + + + + + diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN/Abp/Account/AbpAccountDomainSharedModule.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN/Abp/Account/AbpAccountDomainSharedModule.cs index b30dde284..3cfc71775 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN/Abp/Account/AbpAccountDomainSharedModule.cs +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN/Abp/Account/AbpAccountDomainSharedModule.cs @@ -1,6 +1,7 @@ using LINGYUN.Abp.Account.Localization; using Volo.Abp.Localization; using Volo.Abp.Modularity; +using Volo.Abp.VirtualFileSystem; namespace LINGYUN.Abp.Account { @@ -9,10 +10,16 @@ namespace LINGYUN.Abp.Account { public override void ConfigureServices(ServiceConfigurationContext context) { + Configure(options => + { + options.FileSets.AddEmbedded(); + }); + Configure(options => { options.Resources - .Add("zh-Hans"); + .Add("zh-Hans") + .AddVirtualJson("/LINGYUN/Abp/Account/Localization/Resources"); }); } } diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN/Abp/Account/AbpAccountSettingDefinitionProvider.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN/Abp/Account/AccountSettingDefinitionProvider.cs similarity index 97% rename from aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN/Abp/Account/AbpAccountSettingDefinitionProvider.cs rename to aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN/Abp/Account/AccountSettingDefinitionProvider.cs index b3a7df3c9..d4e3ccf0b 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN/Abp/Account/AbpAccountSettingDefinitionProvider.cs +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN/Abp/Account/AccountSettingDefinitionProvider.cs @@ -4,7 +4,7 @@ using Volo.Abp.Settings; namespace LINGYUN.Abp.Account { - public class AbpAccountSettingDefinitionProvider : SettingDefinitionProvider + public class AccountSettingDefinitionProvider : SettingDefinitionProvider { public override void Define(ISettingDefinitionContext context) { diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN/Abp/Account/Localization/Resources/en.json b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN/Abp/Account/Localization/Resources/en.json similarity index 100% rename from aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN/Abp/Account/Localization/Resources/en.json rename to aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN/Abp/Account/Localization/Resources/en.json diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN/Abp/Account/Localization/Resources/zh-Hans.json b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN/Abp/Account/Localization/Resources/zh-Hans.json similarity index 100% rename from aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN/Abp/Account/Localization/Resources/zh-Hans.json rename to aspnet-core/modules/account/LINGYUN.Abp.Account.Domain.Shared/LINGYUN/Abp/Account/Localization/Resources/zh-Hans.json diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN.Abp.Account.Domain.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN.Abp.Account.Domain.csproj index 862abd744..7f2b884af 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN.Abp.Account.Domain.csproj +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN.Abp.Account.Domain.csproj @@ -5,16 +5,6 @@ - - - - - - - - - - diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN/Abp/Account/AbpAccountDomainModule.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN/Abp/Account/AbpAccountDomainModule.cs index 26100b96d..5226add4a 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN/Abp/Account/AbpAccountDomainModule.cs +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Domain/LINGYUN/Abp/Account/AbpAccountDomainModule.cs @@ -1,33 +1,9 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Domain.Entities.Events.Distributed; -using Volo.Abp.Identity; -using Volo.Abp.Localization; -using Volo.Abp.Modularity; -using Volo.Abp.VirtualFileSystem; +using Volo.Abp.Modularity; namespace LINGYUN.Abp.Account { [DependsOn(typeof(AbpAccountDomainSharedModule))] public class AbpAccountDomainModule : AbpModule { - public override void ConfigureServices(ServiceConfigurationContext context) - { - Configure(options => - { - options.FileSets.AddEmbedded(); - }); - - Configure(options => - { - options.Resources - .Get() - .AddVirtualJson("/LINGYUN/Abp/Account/Localization/Resources"); - }); - - Configure(options => - { - options.AutoEventSelectors.AddNamespace("Volo.Abp.Identity"); - }); - } } } diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Settings/LINGYUN.Abp.Settings.csproj b/aspnet-core/modules/common/LINGYUN.Abp.Settings/LINGYUN.Abp.Settings.csproj new file mode 100644 index 000000000..527f834bb --- /dev/null +++ b/aspnet-core/modules/common/LINGYUN.Abp.Settings/LINGYUN.Abp.Settings.csproj @@ -0,0 +1,12 @@ + + + + netstandard2.0 + + + + + + + + diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Settings/Volo/Abp/Settings/ISettingProviderExtensions.cs b/aspnet-core/modules/common/LINGYUN.Abp.Settings/Volo/Abp/Settings/ISettingProviderExtensions.cs new file mode 100644 index 000000000..fda1463bb --- /dev/null +++ b/aspnet-core/modules/common/LINGYUN.Abp.Settings/Volo/Abp/Settings/ISettingProviderExtensions.cs @@ -0,0 +1,28 @@ +using JetBrains.Annotations; +using Microsoft.Extensions.DependencyInjection; +using System; +using System.Threading.Tasks; + +namespace Volo.Abp.Settings +{ + public static class ISettingProviderExtensions + { + public static async Task GetOrDefaultAsync( + [NotNull] this ISettingProvider settingProvider, + [NotNull] string name, + [NotNull] IServiceProvider serviceProvider) + { + Check.NotNull(settingProvider, nameof(settingProvider)); + Check.NotNull(serviceProvider, nameof(serviceProvider)); + Check.NotNullOrWhiteSpace(name, nameof(name)); + var value = await settingProvider.GetOrNullAsync(name); + if (value.IsNullOrWhiteSpace()) + { + var settingDefintionManager = serviceProvider.GetRequiredService(); + var setting = settingDefintionManager.Get(name); + return setting.DefaultValue; + } + return value; + } + } +} 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 7f87d2a2f..f4d57211f 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 @@ -90,7 +90,7 @@ namespace LINYUN.Abp.Sms.Aliyun private void TryAddTemplateCode(CommonRequest request, SmsMessage smsMessage) { - if (smsMessage.Properties.TryGetValue("TemplateCode", out object template)) + if (smsMessage.Properties.TryGetValue("TemplateCode", out object template) && template != null) { request.AddQueryParameters("TemplateCode", template.ToString()); smsMessage.Properties.Remove("TemplateCode"); @@ -104,7 +104,7 @@ namespace LINYUN.Abp.Sms.Aliyun private void TryAddSignName(CommonRequest request, SmsMessage smsMessage) { - if (smsMessage.Properties.TryGetValue("SignName", out object signName)) + if (smsMessage.Properties.TryGetValue("SignName", out object signName) && signName != null) { request.AddQueryParameters("SignName", signName.ToString()); smsMessage.Properties.Remove("SignName"); diff --git a/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.HttpApi/LINGYUN.Abp.FileManagement.HttpApi.csproj b/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.HttpApi/LINGYUN.Abp.FileManagement.HttpApi.csproj index 087a5f0f0..8cce7a42c 100644 --- a/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.HttpApi/LINGYUN.Abp.FileManagement.HttpApi.csproj +++ b/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.HttpApi/LINGYUN.Abp.FileManagement.HttpApi.csproj @@ -10,6 +10,7 @@ + diff --git a/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.HttpApi/LINGYUN/Abp/FileManagement/FileSystemController.cs b/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.HttpApi/LINGYUN/Abp/FileManagement/FileSystemController.cs index e155ab1b2..136530588 100644 --- a/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.HttpApi/LINGYUN/Abp/FileManagement/FileSystemController.cs +++ b/aspnet-core/modules/file-management/LINGYUN.Abp.FileManagement.HttpApi/LINGYUN/Abp/FileManagement/FileSystemController.cs @@ -74,11 +74,7 @@ namespace LINGYUN.Abp.FileManagement // 文件扩展名 var fileExtensionName = FileHelper.GetExtension(fileName); var fileAllowExtension = await SettingProvider - .GetOrNullAsync(AbpFileManagementSettingNames.AllowFileExtensions); - if (fileAllowExtension.IsNullOrWhiteSpace()) - { - fileAllowExtension = AbpFileManagementSettingNames.DefaultAllowFileExtensions; - } + .GetOrDefaultAsync(AbpFileManagementSettingNames.AllowFileExtensions, ServiceProvider); // 检查文件扩展名 if (!fileAllowExtension.Split(',') .Any(fe => fe.Equals(fileExtensionName, StringComparison.CurrentCultureIgnoreCase))) diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingAppService.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingAppService.cs index 3492de673..6d8cad325 100644 --- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingAppService.cs +++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingAppService.cs @@ -39,15 +39,6 @@ namespace LINGYUN.Abp.SettingManagement foreach (var setting in input.Settings) { await SettingManager.SetGlobalAsync(setting.Name, setting.Value); - var settingDefinition = SettingDefinitionManager.GetOrNull(setting.Name); - if (settingDefinition != null) - { - foreach (var provider in settingDefinition.Providers) - { - // 同步变更缓存配置 - await SetCacheItemAsync(setting.Name, setting.Value, provider, null); - } - } } await CurrentUnitOfWork.SaveChangesAsync(); @@ -61,8 +52,6 @@ namespace LINGYUN.Abp.SettingManagement foreach (var setting in input.Settings) { await SettingManager.SetForTenantAsync(CurrentTenant.GetId(), setting.Name, setting.Value); - // 同步变更缓存配置 - await SetCacheItemAsync(setting.Name, setting.Value, TenantSettingValueProvider.ProviderName, CurrentTenant.GetId().ToString()); } await CurrentUnitOfWork.SaveChangesAsync(); @@ -75,8 +64,6 @@ namespace LINGYUN.Abp.SettingManagement foreach (var setting in input.Settings) { await SettingManager.SetForUserAsync(userId, setting.Name, setting.Value); - // 同步变更缓存配置 - await SetCacheItemAsync(setting.Name, setting.Value, UserSettingValueProvider.ProviderName, userId.ToString()); } await CurrentUnitOfWork.SaveChangesAsync(); @@ -88,8 +75,6 @@ namespace LINGYUN.Abp.SettingManagement foreach (var setting in input.Settings) { await SettingManager.SetForUserAsync(CurrentUser.GetId(), setting.Name, setting.Value); - // 同步变更缓存配置 - await SetCacheItemAsync(setting.Name, setting.Value, UserSettingValueProvider.ProviderName, CurrentUser.GetId().ToString()); } await CurrentUnitOfWork.SaveChangesAsync(); @@ -176,17 +161,5 @@ namespace LINGYUN.Abp.SettingManagement return new ListResultDto(settingsDto); } - - protected virtual string CalculateCacheKey(string name, string providerName, string providerKey) - { - return SettingCacheItem.CalculateCacheKey(name, providerName, providerKey); - } - - protected virtual async Task SetCacheItemAsync(string name, string value, string providerName, string providerKey) - { - var settingCacheKey = CalculateCacheKey(name, providerName, providerKey); - var settignCacheItem = new SettingCacheItem(value); - await Cache.SetAsync(settingCacheKey, settignCacheItem); - } } } diff --git a/aspnet-core/services/admin/LINGYUN.BackendAdminApp.Host/BackendAdminHostModule.cs b/aspnet-core/services/admin/LINGYUN.BackendAdminApp.Host/BackendAdminHostModule.cs index 0943de97c..bb6555580 100644 --- a/aspnet-core/services/admin/LINGYUN.BackendAdminApp.Host/BackendAdminHostModule.cs +++ b/aspnet-core/services/admin/LINGYUN.BackendAdminApp.Host/BackendAdminHostModule.cs @@ -16,7 +16,6 @@ using LINYUN.Abp.Sms.Aliyun; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Caching.StackExchangeRedis; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -65,7 +64,8 @@ namespace LINGYUN.BackendAdmin typeof(ApiGatewayApplicationContractsModule), typeof(AbpFileManagementApplicationContractsModule), typeof(AbpMessageServiceApplicationContractsModule), - typeof(LINGYUN.Abp.Identity.AbpIdentityApplicationContractsModule),// 引用类似的包主要用于聚合权限管理 + typeof(LINGYUN.Abp.Account.AbpAccountApplicationContractsModule),// 引用类似的包主要用于聚合权限管理和设置 + typeof(LINGYUN.Abp.Identity.AbpIdentityApplicationContractsModule), typeof(LINGYUN.Abp.IdentityServer.AbpIdentityServerApplicationContractsModule), typeof(AbpSettingManagementApplicationModule), typeof(AbpSettingManagementHttpApiModule), @@ -107,11 +107,6 @@ namespace LINGYUN.BackendAdmin }) .UseDashboard(); }); - - PreConfigure(builder => - { - builder.AddDefaultTokenProviders(); - }); } public override void ConfigureServices(ServiceConfigurationContext context) diff --git a/aspnet-core/services/admin/LINGYUN.BackendAdminApp.Host/LINGYUN.BackendAdminApp.Host.csproj b/aspnet-core/services/admin/LINGYUN.BackendAdminApp.Host/LINGYUN.BackendAdminApp.Host.csproj index d89fb907e..f968bd0a3 100644 --- a/aspnet-core/services/admin/LINGYUN.BackendAdminApp.Host/LINGYUN.BackendAdminApp.Host.csproj +++ b/aspnet-core/services/admin/LINGYUN.BackendAdminApp.Host/LINGYUN.BackendAdminApp.Host.csproj @@ -59,6 +59,7 @@ + diff --git a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.cs b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.cs index e4d3bb688..b79432c67 100644 --- a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.cs +++ b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.cs @@ -4,9 +4,11 @@ using LINGYUN.Abp.EventBus.CAP; using LINGYUN.Abp.ExceptionHandling; using LINGYUN.Abp.ExceptionHandling.Emailing; using LINGYUN.Abp.MultiTenancy.DbFinder; +using LINYUN.Abp.Sms.Aliyun; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Caching.StackExchangeRedis; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -59,6 +61,7 @@ namespace LINGYUN.Abp.IdentityServer4 typeof(AbpAspNetCoreAuthenticationJwtBearerModule), typeof(AbpEmailingExceptionHandlingModule), typeof(AbpCAPEventBusModule), + typeof(AbpAliyunSmsModule), typeof(AbpDbFinderMultiTenancyModule), typeof(AbpCachingStackExchangeRedisModule), typeof(AbpAutofacModule) @@ -79,6 +82,11 @@ namespace LINGYUN.Abp.IdentityServer4 }) .UseDashboard(); }); + + PreConfigure(builder => + { + builder.AddDefaultTokenProviders(); + }); } public override void ConfigureServices(ServiceConfigurationContext context) diff --git a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj index 5582d076f..8de7ac6b4 100644 --- a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj +++ b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -51,6 +51,7 @@ +