diff --git a/Admin.NET/Admin.NET.Core/Utils/AdminResultProvider.cs b/Admin.NET/Admin.NET.Core/Utils/AdminResultProvider.cs index a9e1d959..7b3c0f48 100644 --- a/Admin.NET/Admin.NET.Core/Utils/AdminResultProvider.cs +++ b/Admin.NET/Admin.NET.Core/Utils/AdminResultProvider.cs @@ -97,11 +97,32 @@ public class AdminResultProvider : IUnifyResultProvider App.GetOptions()?.JsonSerializerOptions); } break; - - default: break; } } + /// + /// 返回成功结果集 + /// + /// + /// + /// + public static AdminResult Ok(string message, object data = default) + { + return RESTfulResult(StatusCodes.Status200OK, true, data, message); + } + + /// + /// 返回失败结果集 + /// + /// + /// + /// + /// + public static AdminResult Error(string message, int code = StatusCodes.Status400BadRequest, object data = default) + { + return RESTfulResult(code, false, data, message); + } + /// /// 返回 RESTful 风格结果集 /// @@ -132,45 +153,6 @@ public class AdminResultProvider : IUnifyResultProvider Time = DateTime.Now }; } - - /// - /// 返回成功结果集 - /// - /// - /// - /// - public static AdminResult Ok(string message, object data = default) - { - return new AdminResult - { - Code = StatusCodes.Status200OK, - Message = message, - Result = data, - Type = "success", - Extras = UnifyContext.Take(), - Time = DateTime.Now - }; - } - - /// - /// 返回失败结果集 - /// - /// - /// - /// - /// - public static AdminResult Error(string message, int code = StatusCodes.Status400BadRequest, object data = default) - { - return new AdminResult - { - Code = code, - Message = message, - Result = data, - Type = "error", - Extras = UnifyContext.Take(), - Time = DateTime.Now - }; - } } /// diff --git a/Admin.NET/Admin.NET.Core/Utils/ExcelHelper.cs b/Admin.NET/Admin.NET.Core/Utils/ExcelHelper.cs index fc67d8e1..1e6cc805 100644 --- a/Admin.NET/Admin.NET.Core/Utils/ExcelHelper.cs +++ b/Admin.NET/Admin.NET.Core/Utils/ExcelHelper.cs @@ -51,15 +51,7 @@ public class ExcelHelper catch (Exception ex) { App.HttpContext.Response.Headers.ContentType = "application/json; charset=utf-8"; - throw Oops.Oh(new AdminResult - { - Code = 500, - Message = ex.Message, - Result = null, - Type = "error", - Extras = UnifyContext.Take(), - Time = DateTime.Now - }.ToJson()); + throw Oops.Oh(AdminResultProvider.Error(ex.Message, 500).ToJson()); } }