From f200df131fda4ec48ef17477f42f8482395fee53 Mon Sep 17 00:00:00 2001 From: HanPaoPao <510423039@qq.com> Date: Wed, 16 Apr 2025 10:29:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=AF=E5=8A=A8=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=B3=A8=E9=87=8Acap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbpProHttpApiHostModule.Configure.cs | 39 ++++++------------- .../AbpProHttpApiHostModule.cs | 6 +-- .../Lion.AbpPro.HttpApi.Host/GlobalUsings.cs | 1 - .../Lion.AbpPro.HttpApi.Host.csproj | 2 - .../appsettings.Production.json | 1 - .../Lion.AbpPro.HttpApi.Host/appsettings.json | 1 - 6 files changed, 14 insertions(+), 36 deletions(-) diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.Configure.cs b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.Configure.cs index 3d3071ff..766bfdaa 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.Configure.cs @@ -211,39 +211,22 @@ public partial class AbpProHttpApiHostModule private void ConfigureCap(ServiceConfigurationContext context) { var configuration = context.Services.GetConfiguration(); - var enabled = configuration.GetValue("Cap:Enabled", false); - if (enabled) + context.AddAbpCap(capOptions => { - context.AddAbpCap(capOptions => + capOptions.SetCapDbConnectionString(configuration["ConnectionStrings:Default"]); + capOptions.UseEntityFramework(); + capOptions.UseRabbitMQ(option => { - capOptions.SetCapDbConnectionString(configuration["ConnectionStrings:Default"]); - capOptions.UseEntityFramework(); - capOptions.UseRabbitMQ(option => - { - option.HostName = configuration.GetValue("Cap:RabbitMq:HostName"); - option.UserName = configuration.GetValue("Cap:RabbitMq:UserName"); - option.Password = configuration.GetValue("Cap:RabbitMq:Password"); - option.Port = configuration.GetValue("Cap:RabbitMq:Port"); - }); - - var hostingEnvironment = context.Services.GetHostingEnvironment(); - capOptions.UseDashboard(options => - { - options.AuthorizationPolicy = AbpProCapPermissions.CapManagement.Cap; - }); + option.HostName = configuration.GetValue("Cap:RabbitMq:HostName"); + option.UserName = configuration.GetValue("Cap:RabbitMq:UserName"); + option.Password = configuration.GetValue("Cap:RabbitMq:Password"); + option.Port = configuration.GetValue("Cap:RabbitMq:Port"); }); - } - else - { - context.AddAbpCap(capOptions => + capOptions.UseDashboard(options => { - capOptions.UseInMemoryStorage(); - capOptions.UseInMemoryMessageQueue(); - var hostingEnvironment = context.Services.GetHostingEnvironment(); - var auth = !hostingEnvironment.IsDevelopment(); - capOptions.UseDashboard(); + options.AuthorizationPolicy = AbpProCapPermissions.CapManagement.Cap; }); - } + }); } /// 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 374c7c2d..4e22ee7e 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/AbpProHttpApiHostModule.cs @@ -12,8 +12,8 @@ namespace Lion.AbpPro typeof(AbpAspNetCoreSerilogModule), typeof(AbpAccountWebModule), typeof(AbpProApplicationModule), - typeof(AbpProCapModule), - typeof(AbpProCapEntityFrameworkCoreModule), + // typeof(AbpProCapModule), + // typeof(AbpProCapEntityFrameworkCoreModule), typeof(AbpAspNetCoreMvcUiBasicThemeModule), typeof(AbpCachingStackExchangeRedisModule), typeof(AbpDistributedLockingModule), @@ -39,7 +39,7 @@ namespace Lion.AbpPro //ConfigureHangfire(context); ConfigureMiniProfiler(context); ConfigureIdentity(context); - ConfigureCap(context); + //ConfigureCap(context); ConfigureAuditLog(context); ConfigurationSignalR(context); ConfigurationMultiTenancy(); 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 c31851b3..0261428a 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/GlobalUsings.cs +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/GlobalUsings.cs @@ -41,7 +41,6 @@ global using Microsoft.Extensions.Logging.Abstractions; global using Microsoft.Extensions.Options; global using Microsoft.IdentityModel.Tokens; global using Microsoft.OpenApi.Models; -global using Savorboard.CAP.InMemoryMessageQueue; global using Serilog; global using Serilog.Events; global using StackExchange.Redis; diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj index 4df1ce68..5e31a365 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj @@ -34,8 +34,6 @@ - - diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.Production.json b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.Production.json index 91a1e584..d3e28981 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.Production.json +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.Production.json @@ -52,7 +52,6 @@ "ExpirationTime": 2 }, "Cap": { - "Enabled": true, "RabbitMq": { "HostName": "rabbitmq", "UserName": "admin", diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json index d1452821..973fe4ac 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json @@ -52,7 +52,6 @@ "ExpirationTime": 2 }, "Cap": { - "Enabled": true, "RabbitMq": { "HostName": "localhost", "UserName": "admin",