From 38ad893a5c24f6b4d6e36136db9be581b054b626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com> Date: Mon, 18 Mar 2024 09:51:02 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E5=8D=87=E7=BA=A7=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=8C=85=EF=BC=8Cabp=208.0.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SwaggerAddExtensions.cs | 1 + .../Yi.Framework.AspNetCore.csproj | 4 ++-- .../Yi.Framework.Caching.FreeRedis.csproj | 4 ++-- .../Yi.Framework.Core.csproj | 2 +- ...Framework.Ddd.Application.Contracts.csproj | 2 +- .../Yi.Framework.Ddd.Application.csproj | 2 +- .../Yi.Framework.Mapster.csproj | 2 +- ...Framework.SqlSugarCore.Abstractions.csproj | 4 ++-- .../Yi.Framework.SqlSugarCore.csproj | 2 +- ...ramework.AuditLogging.Domain.Shared.csproj | 2 +- .../Yi.Framework.AuditLogging.Domain.csproj | 4 ++-- .../YiFrameworkBbsDomainModule.cs | 5 +++++ .../Yi.Framework.CodeGen.Domain.Shared.csproj | 2 +- .../Yi.Framework.CodeGen.Domain.csproj | 2 +- .../Yi.Framework.Rbac.Application.csproj | 4 ++-- .../Yi.Framework.Rbac.Domain.Shared.csproj | 2 +- .../Yi.Framework.Rbac.Domain.csproj | 8 +++---- ...antManagement.Application.Contracts.csproj | 2 +- ...i.Framework.TenantManagement.Domain.csproj | 4 ++-- .../Acme.BookStore.Domain.Shared.csproj | 2 +- .../Acme.BookStore.Domain.csproj | 4 ++-- .../Acme.BookStore.Web.csproj | 14 ++++++------- .../Yi.Abp.Domain.Shared.csproj | 2 +- .../src/Yi.Abp.Domain/Yi.Abp.Domain.csproj | 4 ++-- Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj | 18 ++++++++-------- .../test/Yi.Abp.Test/Yi.Abp.Test.csproj | 21 +++++++++++-------- 26 files changed, 66 insertions(+), 57 deletions(-) diff --git a/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/SwaggerAddExtensions.cs b/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/SwaggerAddExtensions.cs index 260cb64f..0476e169 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/SwaggerAddExtensions.cs +++ b/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Microsoft/Extensions/DependencyInjection/SwaggerAddExtensions.cs @@ -16,6 +16,7 @@ namespace Yi.Framework.AspNetCore.Microsoft.Extensions.DependencyInjection { public static IServiceCollection AddYiSwaggerGen(this IServiceCollection services, Action? action=null) { + var serviceProvider = services.BuildServiceProvider(); var mvcOptions = serviceProvider.GetRequiredService>(); diff --git a/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj b/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj index c5d09c60..db64952c 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj +++ b/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/Yi.Framework.Caching.FreeRedis.csproj b/Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/Yi.Framework.Caching.FreeRedis.csproj index fe61ba31..a3a47765 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/Yi.Framework.Caching.FreeRedis.csproj +++ b/Yi.Abp.Net8/framework/Yi.Framework.Caching.FreeRedis/Yi.Framework.Caching.FreeRedis.csproj @@ -8,9 +8,9 @@ - + - + diff --git a/Yi.Abp.Net8/framework/Yi.Framework.Core/Yi.Framework.Core.csproj b/Yi.Abp.Net8/framework/Yi.Framework.Core/Yi.Framework.Core.csproj index c7a99b05..e7856a01 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.Core/Yi.Framework.Core.csproj +++ b/Yi.Abp.Net8/framework/Yi.Framework.Core/Yi.Framework.Core.csproj @@ -5,7 +5,7 @@ - + diff --git a/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application.Contracts/Yi.Framework.Ddd.Application.Contracts.csproj b/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application.Contracts/Yi.Framework.Ddd.Application.Contracts.csproj index 76774a98..14f19bc9 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application.Contracts/Yi.Framework.Ddd.Application.Contracts.csproj +++ b/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application.Contracts/Yi.Framework.Ddd.Application.Contracts.csproj @@ -3,7 +3,7 @@ - + diff --git a/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/Yi.Framework.Ddd.Application.csproj b/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/Yi.Framework.Ddd.Application.csproj index 3915da9e..47eec898 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/Yi.Framework.Ddd.Application.csproj +++ b/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/Yi.Framework.Ddd.Application.csproj @@ -5,7 +5,7 @@ - + diff --git a/Yi.Abp.Net8/framework/Yi.Framework.Mapster/Yi.Framework.Mapster.csproj b/Yi.Abp.Net8/framework/Yi.Framework.Mapster/Yi.Framework.Mapster.csproj index 04a5fcd3..e0cc29e3 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.Mapster/Yi.Framework.Mapster.csproj +++ b/Yi.Abp.Net8/framework/Yi.Framework.Mapster/Yi.Framework.Mapster.csproj @@ -4,7 +4,7 @@ - + diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/Yi.Framework.SqlSugarCore.Abstractions.csproj b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/Yi.Framework.SqlSugarCore.Abstractions.csproj index b04cadf3..9ee18785 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/Yi.Framework.SqlSugarCore.Abstractions.csproj +++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/Yi.Framework.SqlSugarCore.Abstractions.csproj @@ -3,8 +3,8 @@ - - + + diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Yi.Framework.SqlSugarCore.csproj b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Yi.Framework.SqlSugarCore.csproj index 9b032976..0270f293 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Yi.Framework.SqlSugarCore.csproj +++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Yi.Framework.SqlSugarCore.csproj @@ -4,7 +4,7 @@ - + diff --git a/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.Domain.Shared/Yi.Framework.AuditLogging.Domain.Shared.csproj b/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.Domain.Shared/Yi.Framework.AuditLogging.Domain.Shared.csproj index 1c82bea3..bd7f52ce 100644 --- a/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.Domain.Shared/Yi.Framework.AuditLogging.Domain.Shared.csproj +++ b/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.Domain.Shared/Yi.Framework.AuditLogging.Domain.Shared.csproj @@ -7,7 +7,7 @@ - + diff --git a/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.Domain/Yi.Framework.AuditLogging.Domain.csproj b/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.Domain/Yi.Framework.AuditLogging.Domain.csproj index a9119698..46e14339 100644 --- a/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.Domain/Yi.Framework.AuditLogging.Domain.csproj +++ b/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.Domain/Yi.Framework.AuditLogging.Domain.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/YiFrameworkBbsDomainModule.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/YiFrameworkBbsDomainModule.cs index e8bf78f3..bc8bfae1 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/YiFrameworkBbsDomainModule.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/YiFrameworkBbsDomainModule.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using Mapster; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using Volo.Abp; using Volo.Abp.Caching; using Volo.Abp.Domain.Repositories; @@ -24,10 +25,14 @@ namespace Yi.Framework.Bbs.Domain { //加载等级缓存 var services = context.ServiceProvider; + + var logger = services.GetRequiredService>(); + logger.LogInformation("正在初始化【BBS-等级数据】......"); var levelRepository = services.GetRequiredService>(); var levelCache = services.GetRequiredService>>(); var cacheItem = (await levelRepository.GetListAsync()).Adapt>(); await levelCache.SetAsync(LevelConst.LevelCacheKey, cacheItem); + logger.LogInformation("已完成初始化【BBS-等级数据】"); } } } \ No newline at end of file diff --git a/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain.Shared/Yi.Framework.CodeGen.Domain.Shared.csproj b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain.Shared/Yi.Framework.CodeGen.Domain.Shared.csproj index ee49c085..cf8440a1 100644 --- a/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain.Shared/Yi.Framework.CodeGen.Domain.Shared.csproj +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain.Shared/Yi.Framework.CodeGen.Domain.Shared.csproj @@ -7,7 +7,7 @@ - + diff --git a/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Yi.Framework.CodeGen.Domain.csproj b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Yi.Framework.CodeGen.Domain.csproj index 0c6fcd5b..e8e51c87 100644 --- a/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Yi.Framework.CodeGen.Domain.csproj +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Yi.Framework.CodeGen.Domain.csproj @@ -10,7 +10,7 @@ - + diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Yi.Framework.Rbac.Application.csproj b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Yi.Framework.Rbac.Application.csproj index ea8c94ba..7176ad9f 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Yi.Framework.Rbac.Application.csproj +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Yi.Framework.Rbac.Application.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Yi.Framework.Rbac.Domain.Shared.csproj b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Yi.Framework.Rbac.Domain.Shared.csproj index c02b5e25..90ec79f1 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Yi.Framework.Rbac.Domain.Shared.csproj +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Yi.Framework.Rbac.Domain.Shared.csproj @@ -7,7 +7,7 @@ - + diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Yi.Framework.Rbac.Domain.csproj b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Yi.Framework.Rbac.Domain.csproj index 3617a7e8..ddfa870a 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Yi.Framework.Rbac.Domain.csproj +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Yi.Framework.Rbac.Domain.csproj @@ -8,14 +8,14 @@ - + - + - - + + diff --git a/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Application.Contracts/Yi.Framework.TenantManagement.Application.Contracts.csproj b/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Application.Contracts/Yi.Framework.TenantManagement.Application.Contracts.csproj index b683f5d6..6c8d77bf 100644 --- a/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Application.Contracts/Yi.Framework.TenantManagement.Application.Contracts.csproj +++ b/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Application.Contracts/Yi.Framework.TenantManagement.Application.Contracts.csproj @@ -6,7 +6,7 @@ enable - + diff --git a/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/Yi.Framework.TenantManagement.Domain.csproj b/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/Yi.Framework.TenantManagement.Domain.csproj index a8cfb482..6b1554ef 100644 --- a/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/Yi.Framework.TenantManagement.Domain.csproj +++ b/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/Yi.Framework.TenantManagement.Domain.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/Yi.Abp.Net8/sample/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj b/Yi.Abp.Net8/sample/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj index 70cfebd4..c5e6a46a 100644 --- a/Yi.Abp.Net8/sample/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj +++ b/Yi.Abp.Net8/sample/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj @@ -2,7 +2,7 @@ - + diff --git a/Yi.Abp.Net8/sample/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj b/Yi.Abp.Net8/sample/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj index 2054a637..b9b666db 100644 --- a/Yi.Abp.Net8/sample/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj +++ b/Yi.Abp.Net8/sample/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj @@ -1,8 +1,8 @@ - - + + diff --git a/Yi.Abp.Net8/sample/Acme.BookStore.Web/Acme.BookStore.Web.csproj b/Yi.Abp.Net8/sample/Acme.BookStore.Web/Acme.BookStore.Web.csproj index 24aadf59..f7e49a1a 100644 --- a/Yi.Abp.Net8/sample/Acme.BookStore.Web/Acme.BookStore.Web.csproj +++ b/Yi.Abp.Net8/sample/Acme.BookStore.Web/Acme.BookStore.Web.csproj @@ -4,14 +4,14 @@ - - - + + + - - - - + + + + diff --git a/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/Yi.Abp.Domain.Shared.csproj b/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/Yi.Abp.Domain.Shared.csproj index 5cf21b41..7035470e 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/Yi.Abp.Domain.Shared.csproj +++ b/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/Yi.Abp.Domain.Shared.csproj @@ -2,7 +2,7 @@ - + diff --git a/Yi.Abp.Net8/src/Yi.Abp.Domain/Yi.Abp.Domain.csproj b/Yi.Abp.Net8/src/Yi.Abp.Domain/Yi.Abp.Domain.csproj index 7a593f0c..2141dbef 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Domain/Yi.Abp.Domain.csproj +++ b/Yi.Abp.Net8/src/Yi.Abp.Domain/Yi.Abp.Domain.csproj @@ -1,8 +1,8 @@ - - + + diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj b/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj index e18343b9..1d3d33fd 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj @@ -8,16 +8,16 @@ - - - - + + + + - - - - - + + + + + diff --git a/Yi.Abp.Net8/test/Yi.Abp.Test/Yi.Abp.Test.csproj b/Yi.Abp.Net8/test/Yi.Abp.Test/Yi.Abp.Test.csproj index 4c335790..116a0b77 100644 --- a/Yi.Abp.Net8/test/Yi.Abp.Test/Yi.Abp.Test.csproj +++ b/Yi.Abp.Net8/test/Yi.Abp.Test/Yi.Abp.Test.csproj @@ -16,19 +16,22 @@ - + - - - + + + all runtime; build; native; contentfiles; analyzers - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive +