diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.CAP/GlobalUsings.cs b/aspnet-core/frameworks/src/Lion.AbpPro.CAP/GlobalUsings.cs index 056c7aa6..58c771cc 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.CAP/GlobalUsings.cs +++ b/aspnet-core/frameworks/src/Lion.AbpPro.CAP/GlobalUsings.cs @@ -8,4 +8,21 @@ global using Lion.AbpPro.Localization; global using Microsoft.Extensions.DependencyInjection.Extensions; global using Volo.Abp.Authorization.Permissions; global using Volo.Abp.Json; -global using Volo.Abp.Localization; \ No newline at end of file +global using Volo.Abp.Localization; +global using System; +global using System.Collections.Generic; +global using System.Linq; +global using System.Reflection; +global using DotNetCore.CAP; +global using DotNetCore.CAP.Internal; +global using Microsoft.Extensions.DependencyInjection; +global using Microsoft.Extensions.Options; +global using Volo.Abp.DependencyInjection; +global using Volo.Abp.EventBus; +global using Volo.Abp.EventBus.Distributed; +global using System.Collections.Concurrent; +global using Volo.Abp; +global using Volo.Abp.MultiTenancy; +global using Volo.Abp.Threading; +global using Volo.Abp.Uow; +global using Volo.Abp.Modularity; \ No newline at end of file diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.CAP/Lion/AbpPro/CAP/GlobalUsings.cs b/aspnet-core/frameworks/src/Lion.AbpPro.CAP/Lion/AbpPro/CAP/GlobalUsings.cs deleted file mode 100644 index 325bcdc2..00000000 --- a/aspnet-core/frameworks/src/Lion.AbpPro.CAP/Lion/AbpPro/CAP/GlobalUsings.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Global using directives - -global using System; -global using System.Collections.Generic; -global using System.Linq; -global using System.Reflection; -global using DotNetCore.CAP; -global using DotNetCore.CAP.Internal; -global using Microsoft.Extensions.DependencyInjection; -global using Microsoft.Extensions.Options; -global using Volo.Abp.DependencyInjection; -global using Volo.Abp.EventBus; -global using Volo.Abp.EventBus.Distributed; -global using System.Collections.Concurrent; -global using Volo.Abp; -global using Volo.Abp.MultiTenancy; -global using Volo.Abp.Threading; -global using Volo.Abp.Uow; -global using Volo.Abp.Modularity; \ No newline at end of file diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.ElasticSearch/GlobalUsings.cs b/aspnet-core/frameworks/src/Lion.AbpPro.ElasticSearch/GlobalUsings.cs index cbd6b075..a628a95b 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.ElasticSearch/GlobalUsings.cs +++ b/aspnet-core/frameworks/src/Lion.AbpPro.ElasticSearch/GlobalUsings.cs @@ -3,6 +3,7 @@ global using System.Collections.Concurrent; global using System.Runtime.Serialization; global using Elasticsearch.Net; +global using Lion.AbpPro.ElasticSearch.Exceptions; global using Microsoft.Extensions.Logging; global using Microsoft.Extensions.Options; global using Nest; diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.ElasticSearch/Lion/AbpPro/ElasticSearch/ElasticSearchRepository.cs b/aspnet-core/frameworks/src/Lion.AbpPro.ElasticSearch/Lion/AbpPro/ElasticSearch/ElasticSearchRepository.cs index de72c699..dcc07f74 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.ElasticSearch/Lion/AbpPro/ElasticSearch/ElasticSearchRepository.cs +++ b/aspnet-core/frameworks/src/Lion.AbpPro.ElasticSearch/Lion/AbpPro/ElasticSearch/ElasticSearchRepository.cs @@ -1,6 +1,4 @@ -using Lion.AbpPro.ElasticSearch.Exceptions; - -namespace Lion.AbpPro.ElasticSearch; +namespace Lion.AbpPro.ElasticSearch; public abstract class ElasticSearchRepository : IBasicElasticSearchRepository where TEntity : class, IElasticSearchEntity diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.ElasticSearch/Lion/AbpPro/ElasticSearch/IBasicElasticSearchRepository.cs b/aspnet-core/frameworks/src/Lion.AbpPro.ElasticSearch/Lion/AbpPro/ElasticSearch/IBasicElasticSearchRepository.cs index ce42973c..a7277a92 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.ElasticSearch/Lion/AbpPro/ElasticSearch/IBasicElasticSearchRepository.cs +++ b/aspnet-core/frameworks/src/Lion.AbpPro.ElasticSearch/Lion/AbpPro/ElasticSearch/IBasicElasticSearchRepository.cs @@ -1,6 +1,4 @@ -using Lion.AbpPro.ElasticSearch.Exceptions; - -namespace Lion.AbpPro.ElasticSearch; +namespace Lion.AbpPro.ElasticSearch; public interface IBasicElasticSearchRepository where TEntity : class, IElasticSearchEntity { diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/ApplicationConfigurations/LionAbpApplicationConfigurationAppService.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/ApplicationConfigurations/AbpProApplicationConfigurationAppService.cs similarity index 98% rename from aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/ApplicationConfigurations/LionAbpApplicationConfigurationAppService.cs rename to aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/ApplicationConfigurations/AbpProApplicationConfigurationAppService.cs index 4994df34..05749f97 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/ApplicationConfigurations/LionAbpApplicationConfigurationAppService.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/ApplicationConfigurations/AbpProApplicationConfigurationAppService.cs @@ -3,7 +3,7 @@ namespace Lion.AbpPro.BasicManagement.ApplicationConfigurations; [Dependency(ReplaceServices = true)] -public class LionAbpApplicationConfigurationAppService : ApplicationService, IAbpApplicationConfigurationAppService +public class AbpProApplicationConfigurationAppService : ApplicationService, IAbpApplicationConfigurationAppService { private readonly AbpLocalizationOptions _localizationOptions; private readonly AbpMultiTenancyOptions _multiTenancyOptions; @@ -21,7 +21,7 @@ public class LionAbpApplicationConfigurationAppService : ApplicationService, IAb private readonly AbpClockOptions _abpClockOptions; private readonly ICachedObjectExtensionsDtoService _cachedObjectExtensionsDtoService; - public LionAbpApplicationConfigurationAppService( + public AbpProApplicationConfigurationAppService( IOptions localizationOptions, IOptions multiTenancyOptions, IAbpAuthorizationPolicyProvider abpAuthorizationPolicyProvider, diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj index d989a156..7c1e60b8 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj @@ -24,4 +24,11 @@ + + + + + + + diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs index 748ec0b6..ceb0446c 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs @@ -1,10 +1,3 @@ -using Hangfire.Redis; -using Lion.AbpPro.CAP.EntityFrameworkCore; -using Microsoft.AspNetCore.Localization; -using Swagger; -using Volo.Abp.BackgroundJobs.Hangfire; -using Volo.Abp.Timing; - namespace Lion.AbpPro { [DependsOn( @@ -43,25 +36,20 @@ namespace Lion.AbpPro ConfigureCap(context); ConfigureAuditLog(context); ConfigurationSignalR(context); - context.Services.Configure(options => - { - //options.RequestCultureProviders.RemoveAll(provider => provider is AcceptLanguageHeaderRequestCultureProvider); - options.RequestCultureProviders.Add(new AbpProAcceptLanguageHeaderRequestCultureProvider()); - }); + ConfigurationMultiTenancy(); } public override void OnApplicationInitialization(ApplicationInitializationContext context) { var app = context.GetApplicationBuilder(); var configuration = context.GetConfiguration(); - app.UseLionRequestLocalization(); + app.UseAbpProRequestLocalization(); app.UseCorrelationId(); app.UseStaticFiles(); if (configuration.GetValue("MiniProfiler:Enabled", false)) { app.UseMiniProfiler(); } - app.UseRouting(); app.UseCors(AbpProHttpApiHostConst.DefaultCorsPolicyName); app.UseAuthentication(); @@ -82,7 +70,6 @@ namespace Lion.AbpPro app.UseAuditing(); app.UseAbpSerilogEnrichers(); - app.UseUnitOfWork(); app.UseConfiguredEndpoints(endpoints => { endpoints.MapHealthChecks("/health"); }); app.UseHangfireDashboard("/hangfire", new DashboardOptions() @@ -367,6 +354,10 @@ namespace Lion.AbpPro }); } + private void ConfigurationMultiTenancy() + { + Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); + } #endregion } } \ No newline at end of file diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/GlobalUsings.cs b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/GlobalUsings.cs index 88738174..6c50ca58 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/GlobalUsings.cs +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/GlobalUsings.cs @@ -10,9 +10,11 @@ global using System.Threading.Tasks; global using Hangfire; global using Hangfire.Common; global using Hangfire.Dashboard; +global using Hangfire.Redis; global using Hangfire.States; global using Hangfire.Storage; global using Lion.AbpPro.CAP; +global using Lion.AbpPro.CAP.EntityFrameworkCore; global using Lion.AbpPro.EntityFrameworkCore; global using Lion.AbpPro.Core; global using Lion.AbpPro.Extensions; @@ -41,6 +43,7 @@ global using Microsoft.OpenApi.Models; global using Savorboard.CAP.InMemoryMessageQueue; global using Serilog; global using StackExchange.Redis; +global using Swagger; global using Swashbuckle.AspNetCore.SwaggerUI; global using Volo.Abp; global using Volo.Abp.Account.Web; @@ -63,5 +66,6 @@ global using Volo.Abp.ExceptionHandling; global using Volo.Abp.Http; global using Volo.Abp.Json; global using Volo.Abp.Modularity; +global using Volo.Abp.MultiTenancy; global using Volo.Abp.Users; global using Volo.Abp.Validation; \ No newline at end of file diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/AbpProApplicationContractsModule.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/AbpProApplicationContractsModule.cs index 21f99d72..04f62a8f 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/AbpProApplicationContractsModule.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/AbpProApplicationContractsModule.cs @@ -1,6 +1,3 @@ -using Lion.AbpPro.BasicManagement; -using Lion.AbpPro.LanguageManagement; - namespace Lion.AbpPro { [DependsOn( diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/GlobalUsings.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/GlobalUsings.cs index c48184fc..57cd7dfa 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/GlobalUsings.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/GlobalUsings.cs @@ -2,8 +2,10 @@ global using System; global using System.Threading.Tasks; +global using Lion.AbpPro.BasicManagement; global using Lion.AbpPro.DataDictionaryManagement; global using Lion.AbpPro.Core; +global using Lion.AbpPro.LanguageManagement; global using Volo.Abp.Application.Services; global using Volo.Abp.Authorization.Permissions; global using Volo.Abp.DependencyInjection; diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/AbpProApplicationModule.cs b/aspnet-core/services/src/Lion.AbpPro.Application/AbpProApplicationModule.cs index d1a68476..3ef98aa6 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/AbpProApplicationModule.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/AbpProApplicationModule.cs @@ -1,5 +1,3 @@ -using Lion.AbpPro.LanguageManagement; - namespace Lion.AbpPro { [DependsOn( diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/GlobalUsings.cs b/aspnet-core/services/src/Lion.AbpPro.Application/GlobalUsings.cs index 6ec3f6af..5aa5f83e 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/GlobalUsings.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/GlobalUsings.cs @@ -8,6 +8,7 @@ global using Lion.AbpPro.BasicManagement; global using Lion.AbpPro.DataDictionaryManagement; global using Lion.AbpPro.Core; global using Lion.AbpPro.FreeSqlRepository; +global using Lion.AbpPro.LanguageManagement; global using Lion.AbpPro.NotificationManagement; global using Lion.AbpPro.Permissions; global using Microsoft.AspNetCore.Authorization; diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain/AbpProDomainModule.cs b/aspnet-core/services/src/Lion.AbpPro.Domain/AbpProDomainModule.cs index 23bdb17c..9e1ef5cb 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain/AbpProDomainModule.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Domain/AbpProDomainModule.cs @@ -1,5 +1,3 @@ -using Lion.AbpPro.LanguageManagement; - namespace Lion.AbpPro { [DependsOn( @@ -14,7 +12,6 @@ namespace Lion.AbpPro { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); Configure(options => { options.AddMaps(); }); } } diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain/GlobalUsings.cs b/aspnet-core/services/src/Lion.AbpPro.Domain/GlobalUsings.cs index e660d8cb..8a5421c2 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain/GlobalUsings.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Domain/GlobalUsings.cs @@ -9,6 +9,7 @@ global using System.Runtime.InteropServices; global using System.Threading.Tasks; global using Lion.AbpPro.BasicManagement; global using Lion.AbpPro.DataDictionaryManagement; +global using Lion.AbpPro.LanguageManagement; global using Lion.AbpPro.MultiTenancy; global using Lion.AbpPro.NotificationManagement; global using Lion.AbpPro.Users.Dto; diff --git a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Builder/ApplicationBuilderExtensions.cs b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Builder/ApplicationBuilderExtensions.cs index 773a8d7d..d5146536 100644 --- a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Builder/ApplicationBuilderExtensions.cs +++ b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Builder/ApplicationBuilderExtensions.cs @@ -57,10 +57,10 @@ namespace Microsoft.AspNetCore.Builder /// 多语言中间件 /// 浏览器传递的请求头:Accept-Language: zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6而abp钟简体中文为:zh-Hans /// - /// app.UseLionRequestLocalization(); + /// app.UseAbpProRequestLocalization(); /// /// - public static IApplicationBuilder UseLionRequestLocalization(this IApplicationBuilder app) + public static IApplicationBuilder UseAbpProRequestLocalization(this IApplicationBuilder app) { if (app == null) {