[修改]1. 修改HTTPJSON消息格式为基础框架库

Author: AlianBlank

GameFrameX.NetWork.HTTP/BaseHttpHandler.cs

@@ -1,4 +1,5 @@
-using GameFrameX.NetWork.Messages;
+using GameFrameX.Foundation.Http.Normalization;
+using GameFrameX.NetWork.Messages;
 using GameFrameX.Utility;
 using GameFrameX.Utility.Setting;
 
@@ -106,7 +107,7 @@ public bool CheckSign(Dictionary<string, object> paramMap, out string error)
         // 内部验证
         if (!paramMap.ContainsKey(GlobalConst.HttpSignKey) || !paramMap.ContainsKey(GlobalConst.HttpTimestampKey))
         {
-            error = HttpResult.ParamError;
+            error = HttpJsonResult.ValidationErrorString();
             return false;
         }
 
@@ -117,7 +118,7 @@ public bool CheckSign(Dictionary<string, object> paramMap, out string error)
         // 5分钟内有效
         if (span.TotalMinutes > 5)
         {
-            error = HttpResult.Create(HttpStatusCode.Illegal, "http命令已过期");
+            error = HttpJsonResult.IllegalString();
             return false;
         }
 
@@ -127,7 +128,7 @@ public bool CheckSign(Dictionary<string, object> paramMap, out string error)
             return true;
         }
 
-        error = HttpResult.CheckFailed;
+        error = HttpJsonResult.ValidationErrorString();
         return false;
     }
 }

GameFrameX.NetWork.HTTP/GameFrameX.NetWork.HTTP.csproj

@@ -37,6 +37,7 @@
         <OutputPath>..\bin\app</OutputPath>
     </PropertyGroup>
     <ItemGroup>
+      <PackageReference Include="GameFrameX.Foundation.Http.Normalization" Version="1.0.2" />
       <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     </ItemGroup>
 

GameFrameX.NetWork.HTTP/HttpHandler.cs

@@ -1,5 +1,6 @@
 using System.Buffers;
 using System.Diagnostics;
+using GameFrameX.Foundation.Http.Normalization;
 using GameFrameX.NetWork.Abstractions;
 using GameFrameX.NetWork.Messages;
 using GameFrameX.ProtoBuf.Net;
@@ -84,14 +85,14 @@ public static async Task HandleRequest(HttpContext context, Func<string, BaseHtt
                         if (!paramMap.TryAdd(keyValuePair.Key, keyValuePair.Value))
                         {
                             // 参数Key发生重复
-                            await context.Response.WriteAsync(HttpResult.CreateErrorParam("参数重复了:" + keyValuePair.Key));
+                            await context.Response.WriteAsync(HttpJsonResult.ErrorString(HttpStatusCode.ParamErr, "参数重复了:" + keyValuePair.Key));
                             return;
                         }
                     }
                 }
                 else
                 {
-                    await context.Response.WriteAsync(HttpResult.CreateErrorParam("不支持的Content Type: " + headContentType));
+                    await context.Response.WriteAsync(HttpJsonResult.ErrorString(HttpStatusCode.ParamErr, "不支持的Content Type: " + headContentType));
                     return;
                 }
             }
@@ -106,13 +107,13 @@ public static async Task HandleRequest(HttpContext context, Func<string, BaseHtt
             // 检查指令是否有效
             if (command.IsNullOrEmptyOrWhiteSpace())
             {
-                await context.Response.WriteAsync(HttpResult.Undefined);
+                await context.Response.WriteAsync(HttpJsonResult.ErrorString(HttpStatusCode.Undefined, HttpStatusMessage.UndefinedCommand));
                 return;
             }
 
             if (!GlobalSettings.IsAppRunning)
             {
-                await context.Response.WriteAsync(HttpResult.CreateActionFailed("服务器状态错误[正在起/关服]"));
+                await context.Response.WriteAsync(HttpJsonResult.ErrorString(HttpStatusCode.ActionFailed, "服务器状态错误[正在起/关服]"));
                 return;
             }
 
@@ -137,7 +138,7 @@ public static async Task HandleRequest(HttpContext context, Func<string, BaseHtt
             if (handler == null)
             {
                 LogHelper.Warn($"http cmd handler 不存在：{command}");
-                await context.Response.WriteAsync(HttpResult.NotFound);
+                await context.Response.WriteAsync(HttpJsonResult.NotFoundString());
                 return;
             }
 
@@ -179,7 +180,7 @@ public static async Task HandleRequest(HttpContext context, Func<string, BaseHtt
         catch (Exception e)
         {
             LogHelper.Error($"{logHeader}, 发生异常. {{0}} {{1}}", e.Message, e.StackTrace);
-            await context.Response.WriteAsync(HttpResult.Create(HttpStatusCode.ServerError, e.Message));
+            await context.Response.WriteAsync(HttpJsonResult.ServerErrorString());
         }
     }
 }

GameFrameX.NetWork.HTTP/HttpResult.cs

@@ -3,45 +3,25 @@ namespace GameFrameX.NetWork.HTTP;
 /// <summary>
 /// HTTP状态码
 /// </summary>
-public enum HttpStatusCode
+public static class HttpStatusCode
 {
-    /// <summary>
-    /// 成功
-    /// </summary>
-    Success = 0,
-
     /// <summary>
     /// 未定义的命令
     /// </summary>
-    Undefined = 11,
+    public const int Undefined = 11;
 
     /// <summary>
     /// 非法
     /// </summary>
-    Illegal = 12,
+    public const int Illegal = 12;
 
     /// <summary>
     /// 参数错误
     /// </summary>
-    ParamErr = 13,
-
-    /// <summary>
-    /// 验证失败
-    /// </summary>
-    CheckFailed = 14,
+    public const int ParamErr = 13;
 
     /// <summary>
     /// 操作失败
     /// </summary>
-    ActionFailed = 15,
-
-    /// <summary>
-    /// 未找到的命令
-    /// </summary>
-    NotFound = 16,
-
-    /// <summary>
-    /// 服务器错误
-    /// </summary>
-    ServerError = 17,
+    public const int ActionFailed = 15;
 }