[修改]1. 修改返回接口类型

Author: AlianBlank

GameFrameX.Client.Api/Controllers/GameAppVersionController.cs

@@ -25,7 +25,7 @@ public GameAppVersionController(BaseService<ClientAppVersion> service) : base(se
         /// <returns></returns>
         [ProducesResponseType(typeof(GameAppVersionResponse), 200)]
         [HttpPost]
-        public async Task<ResultModel> GetInfo([FromBody] GameAppVersionRequest gameAppVersionRequest)
+        public async Task<HttpResult> GetInfo([FromBody] GameAppVersionRequest gameAppVersionRequest)
         {
             var response = new GameAppVersionResponse();
             ClientAppVersion gameAppVersion = await PBaseService.GetAsync(m =>
@@ -81,15 +81,15 @@ public async Task<ResultModel> GetInfo([FromBody] GameAppVersionRequest gameAppV
 
             if (gameAppVersion == null)
             {
-                return ResultModel.Create(ResultCode.NotFound, "not found");
+                return HttpResult.Create(HttpStatusCode.NotFound, "not found");
             }
 
             response.IsForce = gameAppVersion.IsForce;
             response.IsUpgrade = gameAppVersionRequest.AppVersion != gameAppVersion.Version;
             response.UpdateAnnouncement = gameAppVersion.Announcement;
             response.AppDownloadUrl = gameAppVersion.DownloadUrl;
 
-            return ResultModel.Create(JsonConvert.SerializeObject(response));
+            return HttpResult.Create(JsonConvert.SerializeObject(response));
         }
     }
 }

GameFrameX.Client.Api/Controllers/GameAssetPackageVersionController.cs

@@ -25,7 +25,7 @@ public GameAssetPackageVersionController(BaseService<ClientAssetPackageVersion>
         /// <returns></returns>
         [ProducesResponseType(typeof(AssetPackageVersionResponse), 200)]
         [HttpPost]
-        public async Task<ResultModel> GetInfo([FromBody] AssetPackageVersionRequest request)
+        public async Task<HttpResult> GetInfo([FromBody] AssetPackageVersionRequest request)
         {
             var response = new AssetPackageVersionResponse();
 
@@ -99,7 +99,7 @@ public async Task<ResultModel> GetInfo([FromBody] AssetPackageVersionRequest req
 
             if (gameResourceVersion == null)
             {
-                return ResultModel.Create(ResultCode.NotFound, "not found");
+                return HttpResult.Create(HttpStatusCode.NotFound, "not found");
             }
 
             response.Language = gameResourceVersion.Language;
@@ -111,7 +111,7 @@ public async Task<ResultModel> GetInfo([FromBody] AssetPackageVersionRequest req
             response.PackageName = gameResourceVersion.Package;
             response.AppVersion = gameResourceVersion.AppVersion;
 
-            return ResultModel.Create(JsonConvert.SerializeObject(response));
+            return HttpResult.Create(JsonConvert.SerializeObject(response));
         }
     }
 }

GameFrameX.Client.Api/Controllers/GameGlobalInfoController.cs

@@ -25,7 +25,7 @@ public GameGlobalInfoController(BaseService<ClientGlobalInfo> service) : base(se
         /// <returns></returns>
         [ProducesResponseType(typeof(GlobalInfoResponse), 200)]
         [HttpPost]
-        public async Task<ResultModel> GetInfo([FromBody] GlobalInfoRequest globalInfoRequest)
+        public async Task<HttpResult> GetInfo([FromBody] GlobalInfoRequest globalInfoRequest)
         {
             var response = new GlobalInfoResponse();
             ClientGlobalInfo gameGlobalInfo = await PBaseService.GetAsync(m =>
@@ -93,14 +93,14 @@ public async Task<ResultModel> GetInfo([FromBody] GlobalInfoRequest globalInfoRe
 
             if (gameGlobalInfo == null)
             {
-                return ResultModel.Create(ResultCode.NotFound, "not found");
+                return HttpResult.Create(HttpStatusCode.NotFound, "not found");
             }
 
             response.Content = gameGlobalInfo.Content;
             response.CheckAppVersionUrl = gameGlobalInfo.CheckAppVersionUrl;
             response.CheckResourceVersionUrl = gameGlobalInfo.CheckResourceUrl;
             response.AotCodeList = gameGlobalInfo.AotCodeList;
-            return ResultModel.Create(JsonConvert.SerializeObject(response));
+            return HttpResult.Create(JsonConvert.SerializeObject(response));
         }
     }
 }

GameFrameX.Client.Api/Result/HttpResult.cs

@@ -0,0 +1,64 @@
+namespace GameFrameX.Client.Api.Result;
+
+/// <summary>
+/// 消息返回统一结构
+/// </summary>
+public class HttpResult
+{
+    /// <summary>
+    /// 消息码
+    /// </summary>
+    public HttpStatusCode code { get; set; }
+
+    /// <summary>
+    /// 消息内容
+    /// </summary>
+    public string message { get; set; }
+
+    /// <summary>
+    /// 实际数据
+    /// </summary>
+    public object data { get; set; }
+
+    /// <summary>
+    /// 创建一个带有指定代码、消息和数据的 ResultModel 实例
+    /// </summary>
+    /// <param name="code">结果代码</param>
+    /// <param name="message">结果消息</param>
+    /// <param name="data">结果数据</param>
+    /// <returns>带有指定代码、消息和数据的 ResultModel 实例</returns>
+    public static HttpResult Create(HttpStatusCode code, string message, object data)
+    {
+        return new HttpResult() { code = code, message = message, data = data };
+    }
+
+    /// <summary>
+    /// 创建一个默认的 ResultModel 实例
+    /// </summary>
+    /// <returns>默认的 ResultModel 实例</returns>
+    public static HttpResult Create()
+    {
+        return new HttpResult() { code = HttpStatusCode.Ok, message = HttpStatusCode.Ok.GetString() };
+    }
+
+    /// <summary>
+    /// 创建一个带有指定代码和消息的 ResultModel 实例
+    /// </summary>
+    /// <param name="code">结果代码</param>
+    /// <param name="message">结果消息</param>
+    /// <returns>带有指定代码和消息的 ResultModel 实例</returns>
+    public static HttpResult Create(HttpStatusCode code, string message)
+    {
+        return new HttpResult() { code = code, message = message };
+    }
+
+    /// <summary>
+    /// 创建一个带有指定数据的 ResultModel 实例
+    /// </summary>
+    /// <param name="data">结果数据</param>
+    /// <returns>带有指定数据的 ResultModel 实例</returns>
+    public static HttpResult Create(object data)
+    {
+        return new HttpResult() { code = HttpStatusCode.Ok, message = HttpStatusCode.Ok.GetString(), data = data };
+    }
+}

GameFrameX.Client.Api/Result/HttpStatusCode.cs

@@ -0,0 +1,22 @@
+namespace GameFrameX.Client.Api.Result;
+
+/// <summary>
+/// 消息码常量定义
+/// </summary>
+public enum HttpStatusCode
+{
+    /// <summary>
+    /// 成功
+    /// </summary>
+    Ok = 0,
+
+    /// <summary>
+    /// 没有找到
+    /// </summary>
+    NotFound = 200001,
+
+    /// <summary>
+    /// 账号或密码错误
+    /// </summary>
+    AccountOrPasswordError = 602004,
+}

GameFrameX.Client.Api/Result/HttpStatusMessage.cs

@@ -0,0 +1,32 @@
+namespace GameFrameX.Client.Api.Result;
+
+/// <summary>
+/// HTTP状态消息
+/// </summary>
+public static class HttpStatusMessage
+{
+    /// <summary>
+    /// 成功
+    /// </summary>
+    public const string Success = "ok";
+
+    /// <summary>
+    /// 未定义的命令
+    /// </summary>
+    public const string UndefinedCommand = "undefined command";
+
+    /// <summary>
+    /// 未找到的命令
+    /// </summary>
+    public const string NotFoundCommand = "not found command";
+
+    /// <summary>
+    /// 验证失败的命令
+    /// </summary>
+    public const string CheckFailedCommand = "check failed command";
+
+    /// <summary>
+    /// 服务器错误
+    /// </summary>
+    public const string ServerError = "server error";
+}

GameFrameX.Client.Api/Result/ResultCode.cs

@@ -1,25 +1,24 @@
-namespace GameFrameX.Client.Api.Result
+namespace GameFrameX.Client.Api.Result;
+
+/// <summary>
+/// 返回码扩展
+/// </summary>
+public static class ResultCodeExtension
 {
+    private static readonly Dictionary<HttpStatusCode, string> CodeDictionary = new Dictionary<HttpStatusCode, string>()
+    {
+        { HttpStatusCode.Ok, "ok" },
+        { HttpStatusCode.AccountOrPasswordError, "账号或密码错误" },
+    };
+
     /// <summary>
-    /// 返回码扩展
+    /// 获取返回码的消息内容
     /// </summary>
-    public static class ResultCodeExtension
+    /// <param name="code"></param>
+    /// <returns></returns>
+    public static string GetString(this HttpStatusCode code)
     {
-        private static readonly Dictionary<ResultCode, string> CodeDictionary = new Dictionary<ResultCode, string>()
-        {
-            { ResultCode.Ok, "ok" },
-            { ResultCode.AccountOrPasswordError, "账号或密码错误" },
-        };
-
-        /// <summary>
-        /// 获取返回码的消息内容
-        /// </summary>
-        /// <param name="code"></param>
-        /// <returns></returns>
-        public static string GetString(this ResultCode code)
-        {
-            CodeDictionary.TryGetValue(code, out var desc);
-            return desc ?? string.Empty;
-        }
+        CodeDictionary.TryGetValue(code, out var desc);
+        return desc ?? string.Empty;
     }
 }