From ecba3b7ee6936221981585200928da722069a28a Mon Sep 17 00:00:00 2001 From: chfei Date: Wed, 14 Oct 2026 12:04:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20Apiresult=20=E7=9A=84?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=20Success->ok?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Core/MAX.Framework/Commons/UnifyResultFilter.cs | 4 ++-- .../MAX.Framework/Commons/UnifyStatusCodeMiddleware.cs | 2 +- Core/MAX.Framework/Dtos/ApiResult.cs | 7 +++---- Store.API/Controllers/AuthController.cs | 10 +++++----- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Core/MAX.Framework/Commons/UnifyResultFilter.cs b/Core/MAX.Framework/Commons/UnifyResultFilter.cs index f4aa54f..912855f 100644 --- a/Core/MAX.Framework/Commons/UnifyResultFilter.cs +++ b/Core/MAX.Framework/Commons/UnifyResultFilter.cs @@ -18,7 +18,7 @@ namespace MAX.Framework.Commons { if (!IsAlreadyWrapped(objResult.Value)) { - var apiResult = ApiResult.Success(objResult.Value); + var apiResult = ApiResult.Ok(objResult.Value); objResult.Value = apiResult; objResult.DeclaredType = null; @@ -26,7 +26,7 @@ namespace MAX.Framework.Commons } else if (context.Result is EmptyResult || context.Result is NoContentResult) { - context.Result = new ObjectResult(ApiResult.Success()); + context.Result = new ObjectResult(ApiResult.Ok()); } } diff --git a/Core/MAX.Framework/Commons/UnifyStatusCodeMiddleware.cs b/Core/MAX.Framework/Commons/UnifyStatusCodeMiddleware.cs index 4c39f1d..e948483 100644 --- a/Core/MAX.Framework/Commons/UnifyStatusCodeMiddleware.cs +++ b/Core/MAX.Framework/Commons/UnifyStatusCodeMiddleware.cs @@ -109,7 +109,7 @@ namespace MAX.Framework.Commons } var result = statusCode >= 200 && statusCode < 300 - ? ApiResult.Success() + ? ApiResult.Ok() : ApiResult.Fail(msg, code); // 恢复原始流并写出 diff --git a/Core/MAX.Framework/Dtos/ApiResult.cs b/Core/MAX.Framework/Dtos/ApiResult.cs index 54987de..c821136 100644 --- a/Core/MAX.Framework/Dtos/ApiResult.cs +++ b/Core/MAX.Framework/Dtos/ApiResult.cs @@ -1,5 +1,4 @@ using MAX.Framework.Commons; -using static System.Runtime.InteropServices.JavaScript.JSType; namespace MAX.Framework.Dtos { @@ -47,7 +46,7 @@ namespace MAX.Framework.Dtos { public T? Data { get; set; } - public static ApiResult Success(T data, string msg = "操作成功") + public static ApiResult Ok(T data, string msg = "操作成功") => new ApiResult { Code = ResultCode.Success, Data = data, Msg = msg }; public static ApiResult Fail(string msg = "操作失败", int code = ResultCode.Fail, T? data = default) @@ -57,9 +56,9 @@ namespace MAX.Framework.Dtos /// /// 响应 /// - public class ApiResult : ApiResult + public class ApiResult : ApiResultBase { - public static ApiResult Success(string msg = "操作成功") + public static ApiResult Ok(string msg = "操作成功") => new ApiResult { Code = ResultCode.Success, Msg = msg }; public static ApiResult Fail(string msg = "操作失败", int code = ResultCode.Fail) diff --git a/Store.API/Controllers/AuthController.cs b/Store.API/Controllers/AuthController.cs index 73a8bfc..d51369a 100644 --- a/Store.API/Controllers/AuthController.cs +++ b/Store.API/Controllers/AuthController.cs @@ -30,7 +30,7 @@ namespace Store.Api.Controllers /// [HttpPost] [AllowAnonymous] - public async Task> Login([FromBody] LoginRequest request) + public async Task Login([FromBody] LoginRequest request) { if (request is null || string.IsNullOrWhiteSpace(request.UserName) || string.IsNullOrWhiteSpace(request.Password)) { @@ -50,7 +50,7 @@ namespace Store.Api.Controllers //}; //TokenResult token = _tokenService.CreateToken(claims); - return ApiResult.Success(111); + return ApiResult.Ok(); } /// @@ -65,7 +65,7 @@ namespace Store.Api.Controllers _onlineUserStore.SignOut(username); } - return ApiResult.Success(null); + return ApiResult.Ok(null); } /// @@ -75,7 +75,7 @@ namespace Store.Api.Controllers [Authorize] public ApiResult Me() { - return ApiResult.Success(new + return ApiResult.Ok(new { UserName = _currentUser.UserName, NickName = _currentUser.NickName, @@ -90,7 +90,7 @@ namespace Store.Api.Controllers public ApiResult OnlineUsers() { IReadOnlyList users = _onlineUserStore.GetOnlineUsers(); - return ApiResult.Success(new + return ApiResult.Ok(new { Count = users.Count, Users = users,