glz/QYZH.InteractiveMagazine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 完成系统基础架构重构与业务逻辑优化

Browse Source 
本次提交包含多项核心变更：
1.  **用户体系重构**：将管理员用户状态从字符串改为整型枚举，移除微信用户冗余字段Points和GrowthPoints，新增通用基础实体主键配置
2.  **代码清理**：删除HealthController、WxUserMedal、WxUserBag等废弃文件，移除WeChatDto中冗余查询字段
3.  **响应格式统一**：重构BaseResponse与ResultCode枚举，标准化全局响应格式
4.  **权限与验证优化**：添加JWT认证与开发环境免认证逻辑，新增模型验证过滤器，统一控制器认证配置
5.  **工具与配置更新**：新增dotnet-tools.json配置EF工具，调整Swagger与压缩中间件配置，优化SqlSugar默认值处理逻辑
6.  **业务逻辑简化**：移除AutoMapper映射，改为手动映射DTO以提升性能，修复异常处理与响应返回逻辑
This commit is contained in:
glz
2026-06-02 17:58:10 +08:00
parent 8ed012bba8
commit 0a32754740
24 changed files with 551 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
QYZH.InteractiveMagazine.Infrastructure/Extensions/DependencyInjectionExtensions.cs
View File

@ -1,10 +1,16 @@
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.IdentityModel.Tokens;
using QYZH.InteractiveMagazine.Infrastructure.Middleware;
using QYZH.InteractiveMagazine.Models.Settings;
using System.Text;
using System.Text.Encodings.Web;
namespace QYZH.InteractiveMagazine.Infrastructure.Extensions;
@ -16,11 +22,12 @@ public static class DependencyInjectionExtensions
/// <summary>
/// 注册基础设施服务
/// </summary>
/// <param name="services">服务集合</param>
/// <param name="services">服务集合</param>
/// <param name="configuration">配置</param>
public static void AddInfrastructureServices(this IServiceCollection services, IConfiguration configuration)
/// <param name="environment">运行环境</param>
public static void AddInfrastructureServices(this IServiceCollection services, IConfiguration configuration, IWebHostEnvironment? environment = null)
{
AddJwtAuthentication(services, configuration);
AddJwtAuthentication(services, configuration, environment);
services.AddTransient<GlobalExceptionMiddleware>();
services.AddTransient<OperationLogMiddleware>();
@ -32,8 +39,17 @@ public static class DependencyInjectionExtensions
/// </summary>
/// <param name="services">服务集合</param>
/// <param name="configuration">配置</param>
private static void AddJwtAuthentication(IServiceCollection services, IConfiguration configuration)
/// <param name="environment">运行环境</param>
private static void AddJwtAuthentication(IServiceCollection services, IConfiguration configuration, IWebHostEnvironment? environment = null)
{
// 开发环境下跳过 JWT 验证
if (environment?.IsDevelopment() == true)
{
services.AddAuthentication("NoAuth")
.AddScheme<AuthenticationSchemeOptions, NoAuthHandler>("NoAuth", options => { });
return;
}
var jwtSettings = configuration.GetSection("JwtSettings").Get<JwtSettings>()!;
services.AddSingleton(jwtSettings);
@ -55,3 +71,29 @@ public static class DependencyInjectionExtensions
});
}
}
/// <summary>
/// 开发环境免认证处理器
/// </summary>
public class NoAuthHandler : AuthenticationHandler<AuthenticationSchemeOptions>
{
public NoAuthHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock)
: base(options, logger, encoder, clock)
{
}
protected override Task<AuthenticateResult> HandleAuthenticateAsync()
{
// 开发环境下始终认证成功
var claims = new[]
{
new System.Security.Claims.Claim(System.Security.Claims.ClaimTypes.Name, "DevUser"),
new System.Security.Claims.Claim(System.Security.Claims.ClaimTypes.NameIdentifier, "0")
};
var identity = new System.Security.Claims.ClaimsIdentity(claims, Scheme.Name);
var principal = new System.Security.Claims.ClaimsPrincipal(identity);
var ticket = new AuthenticationTicket(principal, Scheme.Name);
return Task.FromResult(AuthenticateResult.Success(ticket));
}
}

2
QYZH.InteractiveMagazine.Infrastructure/Middleware/GlobalExceptionMiddleware.cs
View File

@ -55,7 +55,7 @@ public class GlobalExceptionMiddleware : IMiddleware
context.Response.ContentType = "application/json";
context.Response.StatusCode = StatusCodes.Status400BadRequest;
var response = BaseResponse<object>.Fail(ex.Message, ex.Code);
var response = BaseResponse<object>.Fail(ResultCode.FAIL,ex.Message);
var json = JsonSerializer.Serialize(response);
await context.Response.WriteAsync(json);

45
QYZH.InteractiveMagazine.Infrastructure/Middleware/ModelValidActionFilter.cs Normal file
View File

@ -0,0 +1,45 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using QYZH.InteractiveMagazine.Models.Dto;
namespace QYZH.InteractiveMagazine.Infrastructure.Middleware;
/// <summary>
/// 数据验证过滤器
/// </summary>
public class ModelValidActionFilterAttribute : ActionFilterAttribute
{
public override void OnActionExecuting(ActionExecutingContext context)
{
if (!context.ModelState.IsValid)
{
Dictionary<string, string> errorDic = new Dictionary<string, string>();
foreach (var key in context.ModelState.Keys)
{
var modelstate = context.ModelState[key];
if (modelstate.Errors.Any())
{
string errorStr = string.Join(",", modelstate.Errors.Select(e => e.ErrorMessage).ToList());
errorDic.Add(key, errorStr);
}
}
var result = new BaseResponse<Dictionary<string, string>>() { Code = ResultCode.FAIL };
result.Message = string.Join("|", errorDic.Select(e => e.Value).Distinct());
result.Result = errorDic;
context.Result = new JsonResult(result);
}
}
//public override void OnActionExecuted(ActionExecutedContext context)
//{
// if (context.Exception != null)
// {
// BaseResponse result = new BaseResponse() { Code = ResultCode.Fail };
// result.Message = context.Exception.Message;
// context.Result = new JsonResult(result);
// }
//}
}