修改 Apiresult 的返回 Success->ok

This commit is contained in:
chfei committed 2026-10-14 12:04:58 +08:00
1 parent db4f030c17
commit ecba3b7ee6
4 files changed
+11 -12

No files matched your search

@@ -18,7 +18,7 @@ namespace MAX.Framework.Commons
{ {
if (!IsAlreadyWrapped(objResult.Value)) if (!IsAlreadyWrapped(objResult.Value))
{ {
var apiResult = ApiResult<object>.Success(objResult.Value); var apiResult = ApiResult<object>.Ok(objResult.Value);
objResult.Value = apiResult; objResult.Value = apiResult;
objResult.DeclaredType = null; objResult.DeclaredType = null;
@@ -26,7 +26,7 @@ namespace MAX.Framework.Commons
} }
else if (context.Result is EmptyResult || context.Result is NoContentResult) else if (context.Result is EmptyResult || context.Result is NoContentResult)
{ {
context.Result = new ObjectResult(ApiResult.Success()); context.Result = new ObjectResult(ApiResult.Ok());
} }
} }
@@ -109,7 +109,7 @@ namespace MAX.Framework.Commons
} }
var result = statusCode >= 200 && statusCode < 300 var result = statusCode >= 200 && statusCode < 300
? ApiResult.Success() ? ApiResult.Ok()
: ApiResult.Fail(msg, code); : ApiResult.Fail(msg, code);
// 恢复原始流并写出 // 恢复原始流并写出
+3 -4
View File
@@ -1,5 +1,4 @@
using MAX.Framework.Commons; using MAX.Framework.Commons;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace MAX.Framework.Dtos namespace MAX.Framework.Dtos
{ {
@@ -47,7 +46,7 @@ namespace MAX.Framework.Dtos
{ {
public T? Data { get; set; } public T? Data { get; set; }
public static ApiResult<T> Success(T data, string msg = "操作成功") public static ApiResult<T> Ok(T data, string msg = "操作成功")
=> new ApiResult<T> { Code = ResultCode.Success, Data = data, Msg = msg }; => new ApiResult<T> { Code = ResultCode.Success, Data = data, Msg = msg };
public static ApiResult<T> Fail(string msg = "操作失败", int code = ResultCode.Fail, T? data = default) public static ApiResult<T> Fail(string msg = "操作失败", int code = ResultCode.Fail, T? data = default)
@@ -57,9 +56,9 @@ namespace MAX.Framework.Dtos
/// <summary> /// <summary>
/// 响应 /// 响应
/// </summary> /// </summary>
public class ApiResult : ApiResult<object> public class ApiResult : ApiResultBase
{ {
public static ApiResult Success(string msg = "操作成功") public static ApiResult Ok(string msg = "操作成功")
=> new ApiResult { Code = ResultCode.Success, Msg = msg }; => new ApiResult { Code = ResultCode.Success, Msg = msg };
public static ApiResult Fail(string msg = "操作失败", int code = ResultCode.Fail) public static ApiResult Fail(string msg = "操作失败", int code = ResultCode.Fail)
+5 -5
View File
@@ -30,7 +30,7 @@ namespace Store.Api.Controllers
/// </summary> /// </summary>
[HttpPost] [HttpPost]
[AllowAnonymous] [AllowAnonymous]
public async Task<ApiResult<object?>> Login([FromBody] LoginRequest request) public async Task<ApiResult> Login([FromBody] LoginRequest request)
{ {
if (request is null || string.IsNullOrWhiteSpace(request.UserName) || string.IsNullOrWhiteSpace(request.Password)) 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); //TokenResult token = _tokenService.CreateToken(claims);
return ApiResult<object?>.Success(111); return ApiResult.Ok();
} }
/// <summary> /// <summary>
@@ -65,7 +65,7 @@ namespace Store.Api.Controllers
_onlineUserStore.SignOut(username); _onlineUserStore.SignOut(username);
} }
return ApiResult<object?>.Success(null); return ApiResult<object?>.Ok(null);
} }
/// <summary> /// <summary>
@@ -75,7 +75,7 @@ namespace Store.Api.Controllers
[Authorize] [Authorize]
public ApiResult<object?> Me() public ApiResult<object?> Me()
{ {
return ApiResult<object?>.Success(new return ApiResult<object?>.Ok(new
{ {
UserName = _currentUser.UserName, UserName = _currentUser.UserName,
NickName = _currentUser.NickName, NickName = _currentUser.NickName,
@@ -90,7 +90,7 @@ namespace Store.Api.Controllers
public ApiResult<object?> OnlineUsers() public ApiResult<object?> OnlineUsers()
{ {
IReadOnlyList<OnlineUserInfo> users = _onlineUserStore.GetOnlineUsers(); IReadOnlyList<OnlineUserInfo> users = _onlineUserStore.GetOnlineUsers();
return ApiResult<object?>.Success(new return ApiResult<object?>.Ok(new
{ {
Count = users.Count, Count = users.Count,
Users = users, Users = users,