From 02bc3ab3de963e9f47e32bb5d974be8d5a83f374 Mon Sep 17 00:00:00 2001
From: wanggaofeng <15601716045@163.com>
Date: Wed, 3 Jan 2024 10:27:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WebApp/BaseResultTest.cs                  | 57 +++++++++++++++++++
 HttpClientStudy.WebApp/BaseResult.cs          | 10 ++--
 2 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/HttpClientStudy.UnitTest/WebApp/BaseResultTest.cs b/HttpClientStudy.UnitTest/WebApp/BaseResultTest.cs
index 0ab2c5b..20fe5e3 100644
--- a/HttpClientStudy.UnitTest/WebApp/BaseResultTest.cs
+++ b/HttpClientStudy.UnitTest/WebApp/BaseResultTest.cs
@@ -118,19 +118,76 @@
         [Fact]
         public void BaseResultUtil_Error_Test()
         {
+            var result = BaseResultUtil.Error<string>();
+            Assert.NotNull(result);
+            Assert.Null(result.Data);
+            Assert.Equal(0, result.Code);
+            Assert.Equal("错误", result.Message);
+
+            var result2 = BaseResultUtil.Error<int>();
+            Assert.NotNull(result2);
+            Assert.IsType<int>(result2.Data);
+            Assert.Equal(0, result2.Data);
+            Assert.Equal(0, result2.Code);
+            Assert.Equal("错误", result2.Message);
 
+
+            var result3 = BaseResultUtil.Error(new { Name = "匿名类" }, 0, "错误");
+            Assert.NotNull(result3);
+            Assert.IsType(result3.Data!.GetType(), result3.Data);
+            Assert.Equal("匿名类", result3.Data!.Name);
+            Assert.Equal(0, result3.Code);
+            Assert.Equal("错误", result3.Message);
         }
 
         [Fact]
         public void BaseResultUtil_Fail_Test()
         {
+            var result = BaseResultUtil.Fail<string>();
+            Assert.NotNull(result);
+            Assert.Null(result.Data);
+            Assert.Equal(0, result.Code);
+            Assert.Equal("失败", result.Message);
+
+            var result2 = BaseResultUtil.Fail<int>();
+            Assert.NotNull(result2);
+            Assert.IsType<int>(result2.Data);
+            Assert.Equal(0, result2.Data);
+            Assert.Equal(0, result2.Code);
+            Assert.Equal("失败", result2.Message);
+
 
+            var result3 = BaseResultUtil.Fail(new { Name = "匿名类" }, 0, "失败");
+            Assert.NotNull(result3);
+            Assert.IsType(result3.Data!.GetType(), result3.Data);
+            Assert.Equal("匿名类", result3.Data!.Name);
+            Assert.Equal(0, result3.Code);
+            Assert.Equal("失败", result3.Message);
         }
 
         [Fact]
         public void BaseResultUtil_Exception_Test()
         {
+            var result = BaseResultUtil.Exception<string>(new Exception("测试异常"));
+            Assert.NotNull(result);
+            Assert.Null(result.Data);
+            Assert.Equal(0, result.Code);
+            Assert.Contains("异常", result.Message);
 
+            var result2 = BaseResultUtil.Exception<int>(new Exception("测试异常"),0);
+            Assert.NotNull(result2);
+            Assert.IsType<int>(result2.Data);
+            Assert.Equal(0, result2.Data);
+            Assert.Equal(0, result2.Code);
+            Assert.Contains("异常", result2.Message);
+
+
+            var result3 = BaseResultUtil.Exception(new Exception("测试异常"),new { Name = "匿名类" }, 0);
+            Assert.NotNull(result3);
+            Assert.IsType(result3.Data!.GetType(), result3.Data);
+            Assert.Equal("匿名类", result3.Data!.Name);
+            Assert.Equal(0, result3.Code);
+            Assert.Contains("异常", result3.Message);
         }
     }
 }
diff --git a/HttpClientStudy.WebApp/BaseResult.cs b/HttpClientStudy.WebApp/BaseResult.cs
index 09a64b7..0fe2df0 100644
--- a/HttpClientStudy.WebApp/BaseResult.cs
+++ b/HttpClientStudy.WebApp/BaseResult.cs
@@ -94,9 +94,9 @@ namespace HttpClientStudy.WebApp
         /// <summary>
         /// 创建 泛型错误返回基类
         /// </summary>
-        public static BaseResult<TData> Error<TData>(TData? data, string message = "错误") 
+        public static BaseResult<TData> Error<TData>(TData? data) 
         {
-            return Error(data, 0, message);
+            return Error(data, 0, "错误");
         }
 
         /// <summary>
@@ -104,7 +104,7 @@ namespace HttpClientStudy.WebApp
         /// </summary>
         public static BaseResult<TData> Error<TData>(TData? data, int code = 0, string message = "错误") 
         {
-            return Error(data, code, message);
+            return new BaseResult<TData>() { Data = data, Code = code, Message = message };
         }
 
         /// <summary>
@@ -118,9 +118,9 @@ namespace HttpClientStudy.WebApp
         /// <summary>
         /// 创建 泛型失败返回基类
         /// </summary>
-        public static BaseResult<TData> Fail<TData>(TData? data, string message = "失败") 
+        public static BaseResult<TData> Fail<TData>(TData? data) 
         {
-            return Fail(data, 0, message);
+            return Fail(data, 0, "失败");
         }
 
         /// <summary>