From 426c67631a545d37899a1d1f71e8c323d7b91264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Fri, 28 Jun 2024 00:14:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Microsoft/AspNetCore/Middlewares/ApiInfoMiddleware.cs | 7 +++++-- .../Authorization/RefreshTokenMiddleware.cs | 2 ++ .../YiFrameworkSettingManagementApplicationModule.cs | 3 +++ Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs | 7 +++++-- .../Yi.Abp.Domain.Shared/Settings/TestSettingProvider.cs | 2 +- Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json | 1 + 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Middlewares/ApiInfoMiddleware.cs b/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Middlewares/ApiInfoMiddleware.cs index 5345ff89..3d89d729 100644 --- a/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Middlewares/ApiInfoMiddleware.cs +++ b/Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/Microsoft/AspNetCore/Middlewares/ApiInfoMiddleware.cs @@ -1,4 +1,5 @@ -using System.Net.Http; +using System.Diagnostics; +using System.Net.Http; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.DependencyInjection; @@ -8,11 +9,13 @@ using static System.Net.WebRequestMethods; namespace Yi.Framework.AspNetCore.Microsoft.AspNetCore.Middlewares { + [DebuggerStepThrough] public class ApiInfoMiddleware : IMiddleware, ITransientDependency { + public async Task InvokeAsync(HttpContext context, RequestDelegate next) { - context.Response.OnStarting(() => + context.Response.OnStarting([DebuggerStepThrough] () => { if (context.Response.StatusCode == StatusCodes.Status200OK && context.Response.Headers["Content-Type"].ToString() == "application/vnd.ms-excel") diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Authorization/RefreshTokenMiddleware.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Authorization/RefreshTokenMiddleware.cs index f3ec3d5c..cdd48832 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Authorization/RefreshTokenMiddleware.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Authorization/RefreshTokenMiddleware.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -14,6 +15,7 @@ using Yi.Framework.Rbac.Domain.Shared.Consts; namespace Yi.Framework.Rbac.Domain.Authorization { + [DebuggerStepThrough] public class RefreshTokenMiddleware : IMiddleware, ITransientDependency { private AccountManager _accountManager; diff --git a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Application/YiFrameworkSettingManagementApplicationModule.cs b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Application/YiFrameworkSettingManagementApplicationModule.cs index 6bb5d69a..d387566c 100644 --- a/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Application/YiFrameworkSettingManagementApplicationModule.cs +++ b/Yi.Abp.Net8/module/setting-management/Yi.Framework.SettingManagement.Application/YiFrameworkSettingManagementApplicationModule.cs @@ -2,13 +2,16 @@ using Volo.Abp.Modularity; using Volo.Abp.SettingManagement; using Volo.Abp.Timing; +using Yi.Framework.SettingManagement.Domain; namespace Yi.Framework.SettingManagement.Application; [DependsOn( typeof(AbpDddApplicationModule), typeof(AbpSettingManagementApplicationContractsModule), + typeof(YiFrameworkSettingManagementDomainModule), typeof(AbpTimingModule) + )] public class YiFrameworkSettingManagementApplicationModule : AbpModule { diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs b/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs index 7c2c0cc4..c3a35341 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Application/Services/TestService.cs @@ -1,4 +1,5 @@ -using Mapster; +using System.Xml.Linq; +using Mapster; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.RateLimiting; using Volo.Abp.Application.Services; @@ -155,7 +156,9 @@ namespace Yi.Abp.Application.Services var enableOrNull2 = await _settingManager.GetOrNullGlobalAsync("DDD"); //当然,他的独特地方,是支持来自多个模块,例如配置文件? - var result= await _settingManager.GetOrNullConfigurationAsync("Test"); + var result = await _settingManager.GetOrNullConfigurationAsync("Test"); + + return result ?? string.Empty; } diff --git a/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/Settings/TestSettingProvider.cs b/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/Settings/TestSettingProvider.cs index 7a4363e8..fe2859f2 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/Settings/TestSettingProvider.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Domain.Shared/Settings/TestSettingProvider.cs @@ -13,7 +13,7 @@ namespace Yi.Abp.Domain.Shared.Settings { context.Add( new SettingDefinition("DDD","127.0.0.1"), - new SettingDefinition("TTT", "127.0.0.1") + new SettingDefinition("Test", null) ); diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json b/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json index e4228458..5d34d6cd 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json @@ -15,6 +15,7 @@ "Settings": { "Test": "hello" }, + //数据库类型列表 "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ],