diff --git a/aspnet-core/gateways/Lion.AbpPro.WebGateway/WebGatewayModule.cs b/aspnet-core/gateways/Lion.AbpPro.WebGateway/AbpProWebGatewayModule.cs similarity index 94% rename from aspnet-core/gateways/Lion.AbpPro.WebGateway/WebGatewayModule.cs rename to aspnet-core/gateways/Lion.AbpPro.WebGateway/AbpProWebGatewayModule.cs index 46310645b..e40053263 100644 --- a/aspnet-core/gateways/Lion.AbpPro.WebGateway/WebGatewayModule.cs +++ b/aspnet-core/gateways/Lion.AbpPro.WebGateway/AbpProWebGatewayModule.cs @@ -1,8 +1,8 @@ namespace Lion.AbpPro.WebGateway { [DependsOn( - typeof(SharedHostingGatewayModule))] - public class WebGatewayModule : AbpModule + typeof(AbpProSharedHostingGatewayModule))] + public class AbpProWebGatewayModule : AbpModule { private const string DefaultCorsPolicyName = "Default"; diff --git a/aspnet-core/gateways/Lion.AbpPro.WebGateway/Startup.cs b/aspnet-core/gateways/Lion.AbpPro.WebGateway/Startup.cs index ccdd634a0..f366fd96f 100644 --- a/aspnet-core/gateways/Lion.AbpPro.WebGateway/Startup.cs +++ b/aspnet-core/gateways/Lion.AbpPro.WebGateway/Startup.cs @@ -4,7 +4,7 @@ public class Startup { public void ConfigureServices(IServiceCollection services) { - services.AddApplication(); + services.AddApplication(); } public void Configure(IApplicationBuilder app) diff --git a/aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/BasicManagementHttpApiHostModule.cs b/aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/BasicManagementHttpApiHostModule.cs index 5f5ca1cd7..18fa15c3f 100644 --- a/aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/BasicManagementHttpApiHostModule.cs +++ b/aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/BasicManagementHttpApiHostModule.cs @@ -34,7 +34,7 @@ namespace Lion.AbpPro.BasicManagement; typeof(AbpEntityFrameworkCoreMySQLModule), typeof(AbpAspNetCoreSerilogModule), typeof(AbpSwashbuckleModule), - typeof(SharedHostingMicroserviceModule) + typeof(AbpProSharedHostingMicroserviceModule) )] public class BasicManagementHttpApiHostModule : AbpModule { 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 c1337b97f..748ec0b6f 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs @@ -9,7 +9,7 @@ namespace Lion.AbpPro { [DependsOn( typeof(AbpProHttpApiModule), - typeof(SharedHostingMicroserviceModule), + typeof(AbpProSharedHostingMicroserviceModule), typeof(AbpAspNetCoreMvcUiMultiTenancyModule), typeof(AbpProEntityFrameworkCoreModule), typeof(AbpAspNetCoreAuthenticationJwtBearerModule), @@ -46,7 +46,7 @@ public override void ConfigureServices(ServiceConfigurationContext context) context.Services.Configure(options => { //options.RequestCultureProviders.RemoveAll(provider => provider is AcceptLanguageHeaderRequestCultureProvider); - options.RequestCultureProviders.Add(new LionAcceptLanguageHeaderRequestCultureProvider()); + options.RequestCultureProviders.Add(new AbpProAcceptLanguageHeaderRequestCultureProvider()); }); } diff --git a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Gateways/Lion/AbpPro/SharedHostingGatewayModule.cs b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Gateways/Lion/AbpPro/AbpProSharedHostingGatewayModule.cs similarity index 93% rename from aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Gateways/Lion/AbpPro/SharedHostingGatewayModule.cs rename to aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Gateways/Lion/AbpPro/AbpProSharedHostingGatewayModule.cs index 287c7c00e..e1c8c5f2b 100644 --- a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Gateways/Lion/AbpPro/SharedHostingGatewayModule.cs +++ b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Gateways/Lion/AbpPro/AbpProSharedHostingGatewayModule.cs @@ -3,7 +3,7 @@ namespace Lion.AbpPro [DependsOn( typeof(AbpSwashbuckleModule), typeof(AbpAutofacModule))] - public class SharedHostingGatewayModule : AbpModule + public class AbpProSharedHostingGatewayModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) diff --git a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Lion/AbpPro/SharedHostingMicroserviceModule.cs b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Lion/AbpPro/AbpProSharedHostingMicroserviceModule.cs similarity index 95% rename from aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Lion/AbpPro/SharedHostingMicroserviceModule.cs rename to aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Lion/AbpPro/AbpProSharedHostingMicroserviceModule.cs index 4f8f48888..f4983de60 100644 --- a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Lion/AbpPro/SharedHostingMicroserviceModule.cs +++ b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Lion/AbpPro/AbpProSharedHostingMicroserviceModule.cs @@ -9,7 +9,7 @@ namespace Lion.AbpPro; typeof(AbpSwashbuckleModule), typeof(AbpAutofacModule), typeof(AbpProCoreModule))] -public class SharedHostingMicroserviceModule : AbpModule +public class AbpProSharedHostingMicroserviceModule : AbpModule { private const string DefaultCorsPolicyName = "Default"; @@ -34,8 +34,8 @@ private void ConfigureAbpExceptions(ServiceConfigurationContext context) ( options => { - options.Filters.Add(typeof(LionExceptionFilter)); - options.Filters.Add(typeof(LionResultFilter)); + options.Filters.Add(typeof(AbpProExceptionFilter)); + options.Filters.Add(typeof(AbpProResultFilter)); } ); } 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 8be56a2a0..773a8d7d3 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 @@ -72,7 +72,7 @@ public static IApplicationBuilder UseLionRequestLocalization(this IApplicationBu // 移除自带header解析器 options.RequestCultureProviders.RemoveAll(provider=> provider is AcceptLanguageHeaderRequestCultureProvider); // 添加header解析器 - options.RequestCultureProviders.Add(new LionAcceptLanguageHeaderRequestCultureProvider()); + options.RequestCultureProviders.Add(new AbpProAcceptLanguageHeaderRequestCultureProvider()); }); } } diff --git a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Localization/LionAcceptLanguageHeaderRequestCultureProvider.cs b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Localization/AbpProAcceptLanguageHeaderRequestCultureProvider.cs similarity index 90% rename from aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Localization/LionAcceptLanguageHeaderRequestCultureProvider.cs rename to aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Localization/AbpProAcceptLanguageHeaderRequestCultureProvider.cs index 8719fc1a7..171e39d04 100644 --- a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Localization/LionAcceptLanguageHeaderRequestCultureProvider.cs +++ b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Localization/AbpProAcceptLanguageHeaderRequestCultureProvider.cs @@ -1,6 +1,6 @@ namespace Microsoft.AspNetCore.Localization; -public class LionAcceptLanguageHeaderRequestCultureProvider : AcceptLanguageHeaderRequestCultureProvider +public class AbpProAcceptLanguageHeaderRequestCultureProvider : AcceptLanguageHeaderRequestCultureProvider { public override async Task DetermineProviderCultureResult(HttpContext httpContext) { diff --git a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Mvc/Filters/LionExceptionFilter.cs b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Mvc/Filters/AbpProExceptionFilter.cs similarity index 93% rename from aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Mvc/Filters/LionExceptionFilter.cs rename to aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Mvc/Filters/AbpProExceptionFilter.cs index b46975296..6e5a48180 100644 --- a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Mvc/Filters/LionExceptionFilter.cs +++ b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Mvc/Filters/AbpProExceptionFilter.cs @@ -2,7 +2,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters; -public sealed class LionExceptionFilter : IAsyncExceptionFilter, ITransientDependency +public sealed class AbpProExceptionFilter : IAsyncExceptionFilter, ITransientDependency { public async Task OnExceptionAsync(ExceptionContext context) { @@ -45,7 +45,7 @@ private async Task HandleAndWrapException(ExceptionContext context) remoteServiceErrorInfoBuilder.AppendLine($"---------- {nameof(RemoteServiceErrorInfo)} ----------"); remoteServiceErrorInfoBuilder.AppendLine(context.GetRequiredService().Serialize(remoteServiceErrorInfo, indented: true)); - var logger = context.GetService>(NullLogger.Instance); + var logger = context.GetService>(NullLogger.Instance); logger.LogWithLevel(logLevel, remoteServiceErrorInfoBuilder.ToString()); diff --git a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Mvc/Filters/LionResultFilter.cs b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Mvc/Filters/AbpProResultFilter.cs similarity index 95% rename from aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Mvc/Filters/LionResultFilter.cs rename to aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Mvc/Filters/AbpProResultFilter.cs index bc7a122eb..aa30cf389 100644 --- a/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Mvc/Filters/LionResultFilter.cs +++ b/aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Mvc/Filters/AbpProResultFilter.cs @@ -2,7 +2,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters; -public class LionResultFilter : IResultFilter, ITransientDependency +public class AbpProResultFilter : IResultFilter, ITransientDependency { public void OnResultExecuting(ResultExecutingContext context) { diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index f2f1c6a55..bfe9a2b49 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -5,7 +5,7 @@ namespace MyCompanyName.MyProjectName { [DependsOn( typeof(MyProjectNameHttpApiModule), - typeof(SharedHostingMicroserviceModule), + typeof(AbpProSharedHostingMicroserviceModule), typeof(AbpAspNetCoreMvcUiMultiTenancyModule), typeof(MyProjectNameEntityFrameworkCoreModule), typeof(AbpAspNetCoreAuthenticationJwtBearerModule), diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/WebGatewayModule.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/WebGatewayModule.cs index f33c890ec..ae37cbbe7 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/WebGatewayModule.cs +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/WebGatewayModule.cs @@ -1,7 +1,7 @@ namespace MyCompanyName.MyProjectName.WebGateway { [DependsOn( - typeof(SharedHostingGatewayModule))] + typeof(AbpProSharedHostingGatewayModule))] public class WebGatewayModule : AbpModule { private const string DefaultCorsPolicyName = "Default"; diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 59d7c8be1..c4ca76928 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -2,7 +2,7 @@ namespace MyCompanyName.MyProjectName { [DependsOn( typeof(MyProjectNameHttpApiModule), - typeof(SharedHostingMicroserviceModule), + typeof(AbpProSharedHostingMicroserviceModule), typeof(AbpAspNetCoreMvcUiMultiTenancyModule), typeof(MyProjectNameEntityFrameworkCoreModule), typeof(AbpAspNetCoreAuthenticationJwtBearerModule),