Merge pull request 'refactor: 😀代码优化' (#242) from jasondom/Admin.NET.Pro:v2 into v2

Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/242

Admin.NET/Admin.NET.Core/Utils/AdminResultProvider.cs

@@ -97,11 +97,32 @@ public class AdminResultProvider : IUnifyResultProvider
                         App.GetOptions<JsonOptions>()?.JsonSerializerOptions);
                 }
                 break;
-
-            default: break;
         }
     }
 
+    /// <summary>
+    /// 返回成功结果集
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="data"></param>
+    /// <returns></returns>
+    public static AdminResult<object> Ok(string message, object data = default)
+    {
+        return RESTfulResult(StatusCodes.Status200OK, true, data, message);
+    }
+
+    /// <summary>
+    /// 返回失败结果集
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="code"></param>
+    /// <param name="data"></param>
+    /// <returns></returns>
+    public static AdminResult<object> Error(string message, int code = StatusCodes.Status400BadRequest, object data = default)
+    {
+        return RESTfulResult(code, false, data, message);
+    }
+
     /// <summary>
     /// 返回 RESTful 风格结果集
     /// </summary>
@@ -132,45 +153,6 @@ public class AdminResultProvider : IUnifyResultProvider
             Time = DateTime.Now
         };
     }
-
-    /// <summary>
-    /// 返回成功结果集
-    /// </summary>
-    /// <param name="message"></param>
-    /// <param name="data"></param>
-    /// <returns></returns>
-    public static AdminResult<object> Ok(string message, object data = default)
-    {
-        return new AdminResult<object>
-        {
-            Code = StatusCodes.Status200OK,
-            Message = message,
-            Result = data,
-            Type = "success",
-            Extras = UnifyContext.Take(),
-            Time = DateTime.Now
-        };
-    }
-
-    /// <summary>
-    /// 返回失败结果集
-    /// </summary>
-    /// <param name="message"></param>
-    /// <param name="code"></param>
-    /// <param name="data"></param>
-    /// <returns></returns>
-    public static AdminResult<object> Error(string message, int code = StatusCodes.Status400BadRequest, object data = default)
-    {
-        return new AdminResult<object>
-        {
-            Code = code,
-            Message = message,
-            Result = data,
-            Type = "error",
-            Extras = UnifyContext.Take(),
-            Time = DateTime.Now
-        };
-    }
 }
 
 /// <summary>

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<object>
+            throw Oops.Oh(AdminResultProvider.Error(ex.Message, 500).ToJson());
-            {
-                Code = 500,
-                Message = ex.Message,
-                Result = null,
-                Type = "error",
-                Extras = UnifyContext.Take(),
-                Time = DateTime.Now
-            }.ToJson());
         }
     }