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

48
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;
@ -18,9 +24,10 @@ public static class DependencyInjectionExtensions
/// </summary>
/// <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);
// }
//}
}

4
QYZH.InteractiveMagazine.Models/Dto/Admin/AdminUserDto.cs
View File

@ -25,7 +25,7 @@ public class AdminUserInput
/// <summary>
/// 状态: Active, Inactive
/// </summary>
public string Status { get; set; } = "Active";
public int Status { get; set; } = 1;
}
/// <summary>
@ -51,7 +51,7 @@ public class AdminUserOutput
/// <summary>
/// 状态
/// </summary>
public string Status { get; set; } = string.Empty;
public int Status { get; set; }
/// <summary>
/// 创建人

2
QYZH.InteractiveMagazine.Models/Dto/Admin/AuthDto.cs
View File

@ -36,5 +36,5 @@ public class AdminUserInfoOutput
public string Type { get; set; } = string.Empty;
public string Status { get; set; } = string.Empty;
public int Status { get; set; }
}

220
QYZH.InteractiveMagazine.Models/Dto/BaseResponse.cs
View File

@ -1,55 +1,199 @@
using System.ComponentModel;
using System.DirectoryServices.Protocols;
namespace QYZH.InteractiveMagazine.Models.Dto;
/// <summary>
/// 统一响应模型
/// 操作响应基类
/// </summary>
/// <typeparam name="T">数据类型</typeparam>
public class BaseResponse<T>
public class BaseResponse
{
/// <summary>
/// 状态码
/// 构造函数，初始化操作响应基类
/// </summary>
public int Code { get; set; }
/// <summary>
/// 提示信息
/// </summary>
public string? Message { get; set; }
/// <summary>
/// 数据
/// </summary>
public T? Data { get; set; }
/// <summary>
/// 成功响应
/// </summary>
/// <param name="data">数据</param>
/// <param name="message">提示信息</param>
/// <returns>统一响应对象</returns>
public static BaseResponse<T> Success(T data, string message = "操作成功")
public BaseResponse()
{
return new BaseResponse<T>
Code = ResultCode.SUCCESS;
}
#region 公共属性
/// <summary>
/// 操作描述
/// </summary>
public string Message { get; set; }
/// <summary>
/// 结果Code
/// </summary>
public ResultCode Code { get; set; }
#endregion 公共属性
#region 公用方法
/// <summary>
/// 成功
/// </summary>
public static BaseResponse Success()
{
Code = 200,
Message = message,
Data = data
};
return new BaseResponse { Code = ResultCode.SUCCESS, Message = "操作成功。" };
}
/// <summary>
/// 失败响应
/// 成功
/// </summary>
/// <param name="message">提示信息</param>
/// <param name="code">状态码</param>
/// <returns>统一响应对象</returns>
public static BaseResponse<T> Fail(string message, int code = 500)
public static BaseResponse Success(string message = "操作成功。")
{
return new BaseResponse<T>
return new BaseResponse { Code = ResultCode.SUCCESS, Message = message };
}
/// <summary>
/// 失败
/// </summary>
public static BaseResponse Fail(string message, ResultCode code = ResultCode.FAIL)
{
Code = code,
Message = message,
Data = default
};
return new BaseResponse { Code = code, Message = message };
}
/// <summary>
/// 权限验证失败
/// </summary>
public static BaseResponse AuthFail(string message, ResultCode code = ResultCode.FAIL)
{
return new BaseResponse { Code = code, Message = message };
}
#endregion 公用方法
/// <summary>
/// 操作结果
/// </summary>
public bool IsSuccess => Code == ResultCode.SUCCESS;
}
/// <summary>
/// 响应结果类型
/// </summary>
/// <typeparam name="T">
/// </typeparam>
public class BaseResponse<T> : BaseResponse
{
/// <summary>
/// 操作结果
/// </summary>
public T? Result { get; set; }
#region 公用方法
/// <summary>
/// 成功
/// </summary>
public static BaseResponse<T> Success(T result)
{
return new BaseResponse<T> { Code = ResultCode.SUCCESS, Message = "", Result = result };
}
/// <summary>
/// 成功
/// </summary>
public static BaseResponse<T> Success(T result, string message = "操作成功。")
{
return new BaseResponse<T> { Code = ResultCode.SUCCESS, Message = message, Result = result };
}
/// <summary>
/// 失败
/// </summary>
public static BaseResponse<T> Fail(string message = "fail")
{
return new BaseResponse<T> { Code = ResultCode.FAIL, Message = message };
}
/// <summary>
/// 失败 自定义结果
/// </summary>
public static BaseResponse<T> Fail(ResultCode code, string message = "fail")
{
return new BaseResponse<T> { Code = code, Message = message };
}
public static BaseResponse<T> Fail(T result, string message = "操作失败,请稍后再试")
{
return new BaseResponse<T> { Code = ResultCode.FAIL, Message = message, Result = result };
}
/// <summary>
/// 权限验证失败
/// </summary>
public static BaseResponse<T> AuthFail(string message = "Permission authentication failed")
{
return new BaseResponse<T> { Code = ResultCode.OAUTH_FAIL, Message = message };
}
///// <summary>
///// 成功
///// </summary>
//public static BaseResponse<T> Assert(T result, string message = "")
//{
// if (result is bool b)
// return b ? BaseResponse<T>.Success(result) : BaseResponse<T>.Fail(message);
// if (result is object o)
// return (data == null || data.IsNull() == true) ? BaseResponse<T>.Success(result) : BaseResponse<T>.Fail(message);
// return new BaseResponse<T> { Code = ResultCode.SUCCESS, Message = message, Result = result };
//}
#endregion 公用方法
/// <summary>
/// 操作结果
/// </summary>
public bool IsSuccess => Code == ResultCode.SUCCESS;
}
public enum ResultCode
{
[Description("success")]
SUCCESS = 200,
[Description("没有更多数据")]
NO_DATA = 210,
[Description("参数错误")]
PARAM_ERROR = 101,
[Description("验证码错误")]
CAPTCHA_ERROR = 103,
[Description("登录错误")]
LOGIN_ERROR = 105,
[Description("操作失败")]
FAIL = 1,
[Description("服务端出错啦")]
GLOBAL_ERROR = 500,
[Description("自定义异常")]
CUSTOM_ERROR = 110,
[Description("非法请求")]
INVALID_REQUEST = 116,
[Description("授权失败")]
OAUTH_FAIL = 201,
[Description("请先绑定手机号")]
PHONE_BIND = 202,
[Description("未授权")]
DENY = 401,
[Description("授权访问失败")]
FORBIDDEN = 403,
[Description("Bad Request")]
BAD_REQUEST = 400
}

19
QYZH.InteractiveMagazine.Models/Dto/WeChat/WeChatDto.cs
View File

@ -175,24 +175,5 @@ public class WxUserQueryInput : PageQueryModel
/// </summary>
public string? Phone { get; set; }
/// <summary>
/// 用户类型
/// </summary>
public string? Type { get; set; }
/// <summary>
/// 状态
/// </summary>
public string? Status { get; set; }
}
/// <summary>
/// 微信手机号获取输出
/// </summary>
public class WeChatPhoneNumberOutput
{
/// <summary>
/// 手机号
/// </summary>
public string PhoneNumber { get; set; } = string.Empty;
}

6
QYZH.InteractiveMagazine.Models/Entity/AdminUser.cs
View File

@ -34,11 +34,5 @@ namespace QYZH.InteractiveMagazine.Models.Entity
/// </summary>
public string Type {get;set;}
/// <summary>
/// Desc:状态: Active, Inactive
/// Default:Active
/// Nullable:False
/// </summary>
public string Status {get;set;}
}
}

7
QYZH.InteractiveMagazine.Models/Entity/SqlSugarBaseEntity.cs
View File

@ -11,6 +11,7 @@ namespace QYZH.InteractiveMagazine.Models.Entity
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey = true, ColumnName = "Id")]
public long Id { get; set; } = YitIdHelper.NextId();
/// <summary>
/// Desc:状态 0禁用 1启用
@ -18,7 +19,7 @@ namespace QYZH.InteractiveMagazine.Models.Entity
/// Nullable:False
/// </summary>
[SugarColumn(ColumnName = "Status")]
public string Status { get; set; }
public int Status { get; set; }
/// <summary>
/// Desc:是否删除
@ -49,7 +50,7 @@ namespace QYZH.InteractiveMagazine.Models.Entity
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "updatedBy", IsOnlyIgnoreInsert = true)]
[SugarColumn(ColumnName = "UpdatedBy")]
public string UpdatedBy { get; set; }
/// <summary>
@ -57,7 +58,7 @@ namespace QYZH.InteractiveMagazine.Models.Entity
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "UpdatedAt", IsOnlyIgnoreInsert = true)]
[SugarColumn(ColumnName = "UpdatedAt")]
public DateTime? UpdatedAt { get; set; }
}
}

58
QYZH.InteractiveMagazine.Models/Entity/User .cs Normal file
View File

@ -0,0 +1,58 @@
using SqlSugar;
namespace QYZH.InteractiveMagazine.Models.Entity
{
///<summary>
///用户表
///</summary>
[SugarTable("User")]
public partial class User : SqlSugarBaseEntity
{
/// <summary>
/// Desc:微信用户ID
/// Default:
/// Nullable:True
/// </summary>
public string WxUserId { get; set; }
/// <summary>
/// Desc:昵称
/// Default:
/// Nullable:True
/// </summary>
public string Name { get; set; }
/// <summary>
/// Desc:当前成长值
/// Default:0
/// Nullable:False
/// </summary>
public int GrowthPoints { get; set; }
/// <summary>
/// Desc:头像地址
/// Default:
/// Nullable:True
/// </summary>
public string AvatarUrl { get; set; }
/// <summary>
/// Desc:积分余额
/// Default:0
/// Nullable:False
/// </summary>
public int Points { get; set; }
/// <summary>
/// Desc:用户类型: Normal, VIP
/// Default:Normal
/// Nullable:False
/// </summary>
public string Type { get; set; }
/// <summary>
/// Desc:状态: Active, Disabled
/// Default:Active
/// Nullable:False
/// </summary>
public string Status { get; set; }
}
}

6
QYZH.InteractiveMagazine.Models/Entity/WxUserBag.cs → QYZH.InteractiveMagazine.Models/Entity/UserBag.cs
View File

@ -5,10 +5,10 @@ namespace QYZH.InteractiveMagazine.Models.Entity
///<summary>
///用户背包表
///</summary>
[SugarTable("WxUserBag")]
public partial class WxUserBag : SqlSugarBaseEntity
[SugarTable("UserBag")]
public partial class UserBag : SqlSugarBaseEntity
{
public WxUserBag(){
public UserBag(){
}

6
QYZH.InteractiveMagazine.Models/Entity/WxUserMedal.cs → QYZH.InteractiveMagazine.Models/Entity/UserMedal.cs
View File

@ -5,10 +5,10 @@ namespace QYZH.InteractiveMagazine.Models.Entity
///<summary>
///用户勋章表
///</summary>
[SugarTable("WxUserMedal")]
public partial class WxUserMedal : SqlSugarBaseEntity
[SugarTable("UserMedal")]
public partial class UserMedal : SqlSugarBaseEntity
{
public WxUserMedal(){
public UserMedal(){
}

12
QYZH.InteractiveMagazine.Models/Entity/WxUser.cs
View File

@ -43,12 +43,6 @@ namespace QYZH.InteractiveMagazine.Models.Entity
/// </summary>
public string Phone { get; set; }
/// <summary>
/// Desc:积分余额
/// Default:0
/// Nullable:False
/// </summary>
public int Points { get; set; }
/// <summary>
/// Desc:用户类型: Normal, VIP
@ -70,11 +64,5 @@ namespace QYZH.InteractiveMagazine.Models.Entity
/// Nullable:False
/// </summary>
public string Pwd { get; set; }
/// <summary>
/// Desc:当前成长值
/// Default:0
/// Nullable:False
/// </summary>
public int GrowthPoints { get; set; }
}
}

4
QYZH.InteractiveMagazine.Repository/Core/SqlSugarExtension.cs
View File

@ -2,6 +2,7 @@
using SqlSugar;
using System.Linq.Expressions;
using System.Reflection;
using Yitter.IdGenerator;
namespace QYZH.InteractiveMagazine.Repository.Core
@ -112,7 +113,7 @@ namespace QYZH.InteractiveMagazine.Repository.Core
/// <param name="db"></param>
public static ISqlSugarClient SetDefaultValue(this ISqlSugarClient db)
{
#region 创建人 创建时间 更新人 更新时间 默认值
#region Id 创建人 创建时间 更新人 更新时间 默认值
db.Aop.DataExecuting = (oldValue, entityInfo) =>
{
var entityValue = entityInfo.EntityColumnInfo.PropertyInfo.GetValue(entityInfo.EntityValue)?.ToString();
@ -126,7 +127,6 @@ namespace QYZH.InteractiveMagazine.Repository.Core
entityInfo.SetValue(currnetUserName);//修改创建人字段
else if (entityInfo.PropertyName == "IsDeleted" && string.IsNullOrWhiteSpace(entityValue))
entityInfo.SetValue("0");//修改CreateTime字段
}
/*** update生效 ***/

2
QYZH.InteractiveMagazine.Service/AdminAuthService.cs
View File

@ -47,7 +47,7 @@ public class AdminAuthService(BaseRepository<AdminUser> adminUserRepository, ICo
throw new BusinessException("用户名或密码错误", 401);
}
if (adminUser.Status != "Active")
if (adminUser.Status != 1)
{
logger.LogWarning("管理员登录失败，账号已禁用: {UserName}", input.UserName);
throw new BusinessException("账号已被禁用，请联系系统管理员", 403);

51
QYZH.InteractiveMagazine.Service/AdminUserService.cs
View File

@ -64,7 +64,7 @@ public class AdminUserService(BaseRepository<AdminUser> adminUserRepository, ILo
logger.LogInformation("管理员创建成功，用户名: {UserName}, ID: {Id}", input.UserName, adminUser.Id);
return MapToOutput(adminUser);
return new AdminUserOutput { Id = adminUser.Id, UserName = adminUser.UserName, Type = adminUser.Type, Status = adminUser.Status, CreatedBy = adminUser.CreatedBy, CreatedAt = adminUser.CreatedAt, UpdatedBy = adminUser.UpdatedBy, UpdatedAt = adminUser.UpdatedAt };
}
/// <summary>
@ -105,10 +105,6 @@ public class AdminUserService(BaseRepository<AdminUser> adminUserRepository, ILo
adminUser.Type = input.Type;
}
if (!string.IsNullOrWhiteSpace(input.Status))
{
adminUser.Status = input.Status;
}
adminUser.UpdatedBy = "System";
adminUser.UpdatedAt = DateTime.Now;
@ -122,7 +118,7 @@ public class AdminUserService(BaseRepository<AdminUser> adminUserRepository, ILo
logger.LogInformation("管理员更新成功，ID: {Id}", id);
return MapToOutput(adminUser);
return new AdminUserOutput { Id = adminUser.Id, UserName = adminUser.UserName, Type = adminUser.Type, Status = adminUser.Status, CreatedBy = adminUser.CreatedBy, CreatedAt = adminUser.CreatedAt, UpdatedBy = adminUser.UpdatedBy, UpdatedAt = adminUser.UpdatedAt };
}
/// <summary>
@ -162,8 +158,17 @@ public class AdminUserService(BaseRepository<AdminUser> adminUserRepository, ILo
logger.LogWarning("未找到管理员，ID: {Id}", id);
throw new BusinessException("管理员不存在", 404);
}
return MapToOutput(adminUser);
return new AdminUserOutput
{
Id = adminUser.Id,
UserName = adminUser.UserName,
Type = adminUser.Type,
Status = adminUser.Status,
CreatedBy = adminUser.CreatedBy,
CreatedAt = adminUser.CreatedAt,
UpdatedBy = adminUser.UpdatedBy,
UpdatedAt = adminUser.UpdatedAt
};
}
/// <summary>
@ -186,26 +191,18 @@ public class AdminUserService(BaseRepository<AdminUser> adminUserRepository, ILo
var pageResult = await adminUserRepository.Queryable()
.WhereIF(!string.IsNullOrWhiteSpace(input.UserName), a => a.UserName == input.UserName)
.OrderByDescending(a => a.CreatedAt)
.Select(a => MapToOutput(a), true)
.Select(a => new AdminUserOutput
{
Id = a.Id,
UserName = a.UserName,
Type = a.Type,
Status = a.Status,
CreatedBy = a.CreatedBy,
CreatedAt = a.CreatedAt,
UpdatedBy = a.UpdatedBy,
UpdatedAt = a.UpdatedAt
}, true)
.ToPageListAsync(input.PageIndex, input.PageSize, totalNumber);
return new PageListModel<AdminUserOutput>(pageResult, input.PageIndex, input.PageSize, totalNumber);
}
/// <summary>
/// 将实体映射为输出DTO
/// </summary>
private static AdminUserOutput MapToOutput(AdminUser adminUser)
{
return new AdminUserOutput
{
Id = adminUser.Id,
UserName = adminUser.UserName,
Type = adminUser.Type,
Status = adminUser.Status,
CreatedBy = adminUser.CreatedBy,
CreatedAt = adminUser.CreatedAt,
UpdatedBy = adminUser.UpdatedBy,
UpdatedAt = adminUser.UpdatedAt
};
}
}

76
QYZH.InteractiveMagazine.Service/WxUserService.cs
View File

@ -37,11 +37,9 @@ public class WxUserService(BaseRepository<WxUser> wxUserRepository, ILogger<WxUs
NickName = input.NickName,
AvatarUrl = input.AvatarUrl,
Phone = input.Phone,
Points = input.Points,
Type = input.Type,
Status = input.Status,
Pwd = input.Pwd ?? string.Empty,
GrowthPoints = input.GrowthPoints,
CreatedBy = "System",
UpdatedBy = "System",
CreatedAt = DateTime.Now,
@ -58,7 +56,21 @@ public class WxUserService(BaseRepository<WxUser> wxUserRepository, ILogger<WxUs
_logger.LogInformation("微信用户创建成功，OpenId: {OpenId}, ID: {Id}", input.OpenId, wxUser.Id);
return MapToOutput(wxUser);
return new WxUserOutput
{
Id = wxUser.Id,
OpenId = wxUser.OpenId,
UnionId = wxUser.UnionId,
NickName = wxUser.NickName,
AvatarUrl = wxUser.AvatarUrl,
Phone = wxUser.Phone,
Type = wxUser.Type,
Status = wxUser.Status,
CreatedBy = wxUser.CreatedBy,
CreatedAt = wxUser.CreatedAt,
UpdatedBy = wxUser.UpdatedBy,
UpdatedAt = wxUser.UpdatedAt
};
}
public async Task<WxUserOutput> UpdateAsync(long id, WxUserInput input)
@ -88,11 +100,9 @@ public class WxUserService(BaseRepository<WxUser> wxUserRepository, ILogger<WxUs
wxUser.NickName = input.NickName ?? wxUser.NickName;
wxUser.AvatarUrl = input.AvatarUrl ?? wxUser.AvatarUrl;
wxUser.Phone = input.Phone ?? wxUser.Phone;
wxUser.Points = input.Points;
wxUser.Type = input.Type ?? wxUser.Type;
wxUser.Status = input.Status ?? wxUser.Status;
wxUser.Pwd = input.Pwd ?? wxUser.Pwd;
wxUser.GrowthPoints = input.GrowthPoints;
wxUser.UpdatedBy = "System";
wxUser.UpdatedAt = DateTime.Now;
@ -106,7 +116,21 @@ public class WxUserService(BaseRepository<WxUser> wxUserRepository, ILogger<WxUs
_logger.LogInformation("微信用户更新成功，ID: {Id}", id);
return MapToOutput(wxUser);
return new WxUserOutput
{
Id = wxUser.Id,
OpenId = wxUser.OpenId,
UnionId = wxUser.UnionId,
NickName = wxUser.NickName,
AvatarUrl = wxUser.AvatarUrl,
Phone = wxUser.Phone,
Type = wxUser.Type,
Status = wxUser.Status,
CreatedBy = wxUser.CreatedBy,
CreatedAt = wxUser.CreatedAt,
UpdatedBy = wxUser.UpdatedBy,
UpdatedAt = wxUser.UpdatedAt
};
}
public async Task DeleteAsync(long id)
@ -132,21 +156,32 @@ public class WxUserService(BaseRepository<WxUser> wxUserRepository, ILogger<WxUs
public async Task<WxUserOutput> GetByIdAsync(long id)
{
_logger.LogInformation("正在获取微信用户信息，ID: {Id}", id);
var wxUser = await wxUserRepository.GetByIdAsync(id);
if (wxUser == null)
{
_logger.LogWarning("未找到微信用户，ID: {Id}", id);
throw new BusinessException("微信用户不存在", 404);
}
return MapToOutput(wxUser);
return new WxUserOutput
{
Id = wxUser.Id,
OpenId = wxUser.OpenId,
UnionId = wxUser.UnionId,
NickName = wxUser.NickName,
AvatarUrl = wxUser.AvatarUrl,
Phone = wxUser.Phone,
Type = wxUser.Type,
Status = wxUser.Status,
CreatedBy = wxUser.CreatedBy,
CreatedAt = wxUser.CreatedAt,
UpdatedBy = wxUser.UpdatedBy,
UpdatedAt = wxUser.UpdatedAt
};
}
public async Task<PageListModel<WxUserOutput>> GetListAsync(WxUserQueryInput input)
{
_logger.LogInformation("正在查询微信用户列表，页码: {PageIndex}, 每页条数: {PageSize}", input.PageIndex, input.PageSize);
if (input.PageIndex <= 0)
{
@ -162,15 +197,7 @@ public class WxUserService(BaseRepository<WxUser> wxUserRepository, ILogger<WxUs
var pageResult = await wxUserRepository.Queryable()
.WhereIF(!string.IsNullOrWhiteSpace(input.NickName), a => a.NickName == input.NickName)
.OrderByDescending(a => a.CreatedAt)
.Select(a => MapToOutput(a), true)
.ToPageListAsync(input.PageIndex, input.PageSize, totalNumber);
return new PageListModel<WxUserOutput>(pageResult, input.PageIndex, input.PageSize, totalNumber);
}
private static WxUserOutput MapToOutput(WxUser wxUser)
{
return new WxUserOutput
.Select(wxUser => new WxUserOutput
{
Id = wxUser.Id,
OpenId = wxUser.OpenId,
@ -178,14 +205,17 @@ public class WxUserService(BaseRepository<WxUser> wxUserRepository, ILogger<WxUs
NickName = wxUser.NickName,
AvatarUrl = wxUser.AvatarUrl,
Phone = wxUser.Phone,
Points = wxUser.Points,
Type = wxUser.Type,
Status = wxUser.Status,
GrowthPoints = wxUser.GrowthPoints,
CreatedBy = wxUser.CreatedBy,
CreatedAt = wxUser.CreatedAt,
UpdatedBy = wxUser.UpdatedBy,
UpdatedAt = wxUser.UpdatedAt
};
}, true)
.ToPageListAsync(input.PageIndex, input.PageSize, totalNumber);
return new PageListModel<WxUserOutput>(pageResult, input.PageIndex, input.PageSize, totalNumber);
}
}

23
QYZH.InteractiveMagazine.WebApi/Controllers/AdminController.cs
View File

@ -8,6 +8,7 @@ using QYZH.InteractiveMagazine.Models.Enum;
namespace QYZH.InteractiveMagazine.WebApi.Controllers;
[Route("api/[controller]")]
[ApiController]
public class AdminController : BaseController
@ -63,7 +64,7 @@ public class AdminController : BaseController
var userId = GetCurrentUserId();
if (userId == null)
{
return BaseResponse<AdminUserInfoOutput>.Fail("未获取到用户信息", 401);
return BaseResponse<AdminUserInfoOutput>.Fail(ResultCode.DENY, "未获取到用户信息");
}
var result = await _adminAuthService.GetAdminInfoAsync(userId.Value);
@ -104,12 +105,12 @@ public class AdminController : BaseController
catch (BusinessException ex)
{
_logger.LogWarning(ex, "创建管理员业务异常: {Message}", ex.Message);
return BaseResponse<AdminUserOutput>.Fail(ex.Message, ex.Code);
return BaseResponse<AdminUserOutput>.Fail(ex.Message);
}
catch (Exception ex)
{
_logger.LogError(ex, "创建管理员系统异常，参数：{Input}", input);
return BaseResponse<AdminUserOutput>.Fail("创建管理员失败，请稍后重试", 500);
return BaseResponse<AdminUserOutput>.Fail("创建管理员失败，请稍后重试");
}
}
@ -130,12 +131,12 @@ public class AdminController : BaseController
catch (BusinessException ex)
{
_logger.LogWarning(ex, "更新管理员业务异常: {Message}", ex.Message);
return BaseResponse<AdminUserOutput>.Fail(ex.Message, ex.Code);
return BaseResponse<AdminUserOutput>.Fail(ex.Message);
}
catch (Exception ex)
{
_logger.LogError(ex, "更新管理员系统异常，ID：{Id}，参数：{Input}", id, input);
return BaseResponse<AdminUserOutput>.Fail("更新管理员失败，请稍后重试", 500);
return BaseResponse<AdminUserOutput>.Fail("更新管理员失败，请稍后重试");
}
}
@ -155,12 +156,12 @@ public class AdminController : BaseController
catch (BusinessException ex)
{
_logger.LogWarning(ex, "删除管理员业务异常: {Message}", ex.Message);
return BaseResponse<object>.Fail(ex.Message, ex.Code);
return BaseResponse<object>.Fail(ex.Message);
}
catch (Exception ex)
{
_logger.LogError(ex, "删除管理员系统异常，ID：{Id}", id);
return BaseResponse<object>.Fail("删除管理员失败，请稍后重试", 500);
return BaseResponse<object>.Fail("删除管理员失败，请稍后重试");
}
}
@ -180,12 +181,12 @@ public class AdminController : BaseController
catch (BusinessException ex)
{
_logger.LogWarning(ex, "获取管理员业务异常: {Message}", ex.Message);
return BaseResponse<AdminUserOutput>.Fail(ex.Message, ex.Code);
return BaseResponse<AdminUserOutput>.Fail(ex.Message);
}
catch (Exception ex)
{
_logger.LogError(ex, "获取管理员系统异常，ID：{Id}", id);
return BaseResponse<AdminUserOutput>.Fail("获取管理员信息失败，请稍后重试", 500);
return BaseResponse<AdminUserOutput>.Fail("获取管理员信息失败，请稍后重试");
}
}
@ -205,12 +206,12 @@ public class AdminController : BaseController
catch (BusinessException ex)
{
_logger.LogWarning(ex, "查询管理员列表业务异常: {Message}", ex.Message);
return BaseResponse<PageListModel<AdminUserOutput>>.Fail(ex.Message, ex.Code);
return BaseResponse<PageListModel<AdminUserOutput>>.Fail(ex.Message);
}
catch (Exception ex)
{
_logger.LogError(ex, "查询管理员列表系统异常，参数：{Input}", input);
return BaseResponse<PageListModel<AdminUserOutput>>.Fail("查询管理员列表失败，请稍后重试", 500);
return BaseResponse<PageListModel<AdminUserOutput>>.Fail("查询管理员列表失败，请稍后重试");
}
}
}

9
QYZH.InteractiveMagazine.WebApi/Controllers/BaseController.cs
View File

@ -1,12 +1,15 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using QYZH.InteractiveMagazine.Models.Dto;
using QYZH.InteractiveMagazine.Models.Enum;
using System.Security.Claims;
namespace QYZH.InteractiveMagazine.WebApi.Controllers;
/// <summary>
/// 基础控制器
/// </summary>
[Authorize]
[ApiController]
[Route("api/[controller]")]
[ApiExplorerSettings(GroupName = nameof(ApiVersionEnum.Platform))]
@ -18,7 +21,7 @@ public abstract class BaseController : ControllerBase
/// <returns>用户ID</returns>
protected long? GetCurrentUserId()
{
var userIdClaim = User.Claims.FirstOrDefault(c => c.Type == "userId");
var userIdClaim = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier);
if (userIdClaim != null && long.TryParse(userIdClaim.Value, out var userId))
{
return userId;
@ -32,7 +35,7 @@ public abstract class BaseController : ControllerBase
/// <returns>用户名</returns>
protected string? GetCurrentUserName()
{
return User.Claims.FirstOrDefault(c => c.Type == "userName")?.Value;
return User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name)?.Value;
}
/// <summary>
@ -55,6 +58,6 @@ public abstract class BaseController : ControllerBase
/// <returns>统一响应对象</returns>
protected BaseResponse<object> Fail(string message, int code = 500)
{
return BaseResponse<object>.Fail(message, code);
return BaseResponse<object>.Fail(ResultCode.GLOBAL_ERROR, message);
}
}

22
QYZH.InteractiveMagazine.WebApi/Controllers/HealthController.cs
View File

@ -1,22 +0,0 @@
using Microsoft.AspNetCore.Mvc;
using QYZH.InteractiveMagazine.Models.Dto;
namespace QYZH.InteractiveMagazine.WebApi.Controllers;
/// <summary>
/// 健康检查控制器
/// </summary>
[Route("api/[controller]")]
[ApiController]
public class HealthController : BaseController
{
/// <summary>
/// 健康检查
/// </summary>
/// <returns>pong</returns>
[HttpGet("ping")]
public BaseResponse<string> Ping()
{
return Success("pong");
}
}

52
QYZH.InteractiveMagazine.WebApi/Controllers/WxUserController.cs
View File

@ -6,6 +6,9 @@ using QYZH.InteractiveMagazine.Models.Dto;
namespace QYZH.InteractiveMagazine.WebApi.Controllers;
/// <summary>
/// 微信用户控制器
/// </summary>
[Route("api/[controller]")]
[ApiController]
public class WxUserController : BaseController
@ -19,6 +22,11 @@ public class WxUserController : BaseController
_logger = logger;
}
/// <summary>
/// 创建微信用户
/// </summary>
/// <param name="input">创建微信用户输入参数</param>
/// <returns>创建的微信用户输出参数</returns>
[HttpPost("users")]
public async Task<BaseResponse<WxUserOutput>> CreateUserAsync([FromBody] WxUserInput input)
{
@ -30,15 +38,21 @@ public class WxUserController : BaseController
catch (BusinessException ex)
{
_logger.LogWarning(ex, "创建微信用户业务异常: {Message}", ex.Message);
return BaseResponse<WxUserOutput>.Fail(ex.Message, ex.Code);
return BaseResponse<WxUserOutput>.Fail(ex.Message);
}
catch (Exception ex)
{
_logger.LogError(ex, "创建微信用户系统异常，参数：{Input}", input);
return BaseResponse<WxUserOutput>.Fail("创建微信用户失败，请稍后重试", 500);
return BaseResponse<WxUserOutput>.Fail("创建微信用户失败，请稍后重试");
}
}
/// <summary>
/// 更新微信用户
/// </summary>
/// <param name="id">微信用户ID</param>
/// <param name="input">更新微信用户输入参数</param>
/// <returns>更新的微信用户输出参数</returns>
[HttpPut("users/{id}")]
public async Task<BaseResponse<WxUserOutput>> UpdateUserAsync(long id, [FromBody] WxUserInput input)
{
@ -50,15 +64,19 @@ public class WxUserController : BaseController
catch (BusinessException ex)
{
_logger.LogWarning(ex, "更新微信用户业务异常: {Message}", ex.Message);
return BaseResponse<WxUserOutput>.Fail(ex.Message, ex.Code);
return BaseResponse<WxUserOutput>.Fail(ex.Message);
}
catch (Exception ex)
{
_logger.LogError(ex, "更新微信用户系统异常，ID：{Id}，参数：{Input}", id, input);
return BaseResponse<WxUserOutput>.Fail("更新微信用户失败，请稍后重试", 500);
return BaseResponse<WxUserOutput>.Fail("更新微信用户失败，请稍后重试");
}
}
/// <summary>
/// 删除微信用户
/// </summary>
/// <param name="id">微信用户ID</param>
/// <returns>删除的微信用户输出参数</returns>
[HttpDelete("users/{id}")]
public async Task<BaseResponse<object>> DeleteUserAsync(long id)
{
@ -70,15 +88,19 @@ public class WxUserController : BaseController
catch (BusinessException ex)
{
_logger.LogWarning(ex, "删除微信用户业务异常: {Message}", ex.Message);
return BaseResponse<object>.Fail(ex.Message, ex.Code);
return BaseResponse<object>.Fail(ex.Message);
}
catch (Exception ex)
{
_logger.LogError(ex, "删除微信用户系统异常，ID：{Id}", id);
return BaseResponse<object>.Fail("删除微信用户失败，请稍后重试", 500);
return BaseResponse<object>.Fail("删除微信用户失败，请稍后重试");
}
}
/// <summary>
/// 获取微信用户信息
/// </summary>
/// <param name="id">微信用户ID</param>
/// <returns>微信用户信息输出参数</returns>
[HttpGet("users/{id}")]
public async Task<BaseResponse<WxUserOutput>> GetUserByIdAsync(long id)
{
@ -90,15 +112,19 @@ public class WxUserController : BaseController
catch (BusinessException ex)
{
_logger.LogWarning(ex, "获取微信用户业务异常: {Message}", ex.Message);
return BaseResponse<WxUserOutput>.Fail(ex.Message, ex.Code);
return BaseResponse<WxUserOutput>.Fail(ex.Message);
}
catch (Exception ex)
{
_logger.LogError(ex, "获取微信用户系统异常，ID：{Id}", id);
return BaseResponse<WxUserOutput>.Fail("获取微信用户信息失败，请稍后重试", 500);
return BaseResponse<WxUserOutput>.Fail("获取微信用户信息失败，请稍后重试");
}
}
/// <summary>
/// 获取微信用户列表
/// </summary>
/// <param name="input">查询微信用户列表输入参数</param>
/// <returns>微信用户列表输出参数</returns>
[HttpPost("users/list")]
public async Task<BaseResponse<PageListModel<WxUserOutput>>> GetUsersListAsync([FromBody] WxUserQueryInput input)
{
@ -110,12 +136,12 @@ public class WxUserController : BaseController
catch (BusinessException ex)
{
_logger.LogWarning(ex, "查询微信用户列表业务异常: {Message}", ex.Message);
return BaseResponse<PageListModel<WxUserOutput>>.Fail(ex.Message, ex.Code);
return BaseResponse<PageListModel<WxUserOutput>>.Fail(ex.Message);
}
catch (Exception ex)
{
_logger.LogError(ex, "查询微信用户列表系统异常，参数：{Input}", input);
return BaseResponse<PageListModel<WxUserOutput>>.Fail("查询微信用户列表失败，请稍后重试", 500);
return BaseResponse<PageListModel<WxUserOutput>>.Fail("查询微信用户列表失败，请稍后重试");
}
}
}

46
QYZH.InteractiveMagazine.WebApi/Program.cs
View File

@ -2,7 +2,9 @@ using Autofac;
using Autofac.Extensions.DependencyInjection;
using BCrypt.Net;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.ResponseCompression;
using Microsoft.OpenApi;
using Microsoft.OpenApi.Models;
using QYZH.InteractiveMagazine.Common.Extensions;
using QYZH.InteractiveMagazine.Common.Helpers;
using QYZH.InteractiveMagazine.Infrastructure.Autofacs;
@ -46,9 +48,12 @@ builder.Host.UseSerilog();
builder.Services.AddControllers(options =>
{
options.SuppressImplicitRequiredAttributeForNonNullableReferenceTypes = true;//Required 不作为必填
options.Filters.Add<ModelValidActionFilterAttribute>();//添加自定义模型验证
})
.AddJsonOptions(options =>
{
// 配置 JSON 不区分大小写（支持 camelCase 和 PascalCase）
options.JsonSerializerOptions.PropertyNameCaseInsensitive = true;
// 配置返回时间格式转换
options.JsonSerializerOptions.Converters.Add(new JsonConverterUtil.DateTimeConverter());
options.JsonSerializerOptions.ReferenceHandler = ReferenceHandler.IgnoreCycles;
@ -94,7 +99,20 @@ builder.Services.AddSwaggerGen(option =>
BearerFormat = "JWT",
Scheme = "Bearer"
});
option.AddSecurityRequirement(new OpenApiSecurityRequirement
{
{
new OpenApiSecurityScheme
{
Reference = new OpenApiReference
{
Type = ReferenceType.SecurityScheme,
Id = "Bearer"
}
},
new string[] { }
}
});
// 过滤文档/路径/方法筛选接口的响应结果
option.DocInclusionPredicate((docName, apiDesc) =>
@ -112,7 +130,7 @@ builder.Services.AddSwaggerGen(option =>
});
});
builder.Services.AddInfrastructureServices(builder.Configuration);
builder.Services.AddInfrastructureServices(builder.Configuration, builder.Environment);
//注册 HttpContextAccessor
builder.Services.AddHttpContextAccessor();
@ -128,7 +146,30 @@ builder.Services.AddCors(options =>
.AllowAnyHeader();
});
});
#region 配置数据压缩选项
// 1.首先配置压缩选项的Options>
builder.Services.Configure<BrotliCompressionProviderOptions>(options =>
{
options.Level = System.IO.Compression.CompressionLevel.Optimal;
});
builder.Services.Configure<GzipCompressionProviderOptions>(options =>
{
options.Level = System.IO.Compression.CompressionLevel.Fastest;
});
// 2.在服务容器中注册响应压缩服务
builder.Services.AddResponseCompression(options =>
{
// 可以在这里进行详细配置
options.EnableForHttps = true; // 启用对HTTPS响应的压缩（请注意安全风险）
options.Providers.Add<BrotliCompressionProvider>();
options.Providers.Add<GzipCompressionProvider>();
//指定哪些类型的响应应该被压缩。默认列表包含常见的文本类类型，如 text/html, text/css, application/javascript, application/json, text/plain等
options.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(["image/svg+xml", "application/json", "text/plain"]);
});
#endregion
var app = builder.Build();
{
@ -143,6 +184,7 @@ var app = builder.Build();
c.DocExpansion(DocExpansion.None); // ->修改界面打开时自动折叠
});
}
app.UseServiceContext();
app.UseHttpsRedirection();
app.UseCors("AllowAll");

3
QYZH.InteractiveMagazine.WebApi/QYZH.InteractiveMagazine.WebApi.csproj
View File

@ -11,8 +11,7 @@
<PackageReference Include="Autofac" Version="9.1.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="11.0.0" />
<PackageReference Include="BCrypt.Net-Next" Version="4.2.0" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.27" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.2.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
</ItemGroup>
<ItemGroup>

13
QYZH.InteractiveMagazine.WebApi/dotnet-tools.json Normal file
View File

@ -0,0 +1,13 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "10.0.8",
"commands": [
"dotnet-ef"
],
"rollForward": false
}
}
}