From 79b8822acc28af3fde03628b1caeb44a81b2624d Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gmail.com>
Date: Sun, 17 Nov 2024 18:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AccountController.cs                |  9 +++++----
 .../Code/CloudGaming.Code/Account/AccountExtend.cs  | 13 +++++++------
 .../MiddlewareExtend/SignMiddleware.cs              |  7 ++-----
 .../CloudGaming.DtoModel/SevenSign/SevenDayDto.cs   |  2 +-
 .../DbSqlServer/Db_Phone/T_GameCBT.cs               |  2 +-
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/CloudGaming/Api/CloudGaming.Api/Controllers/AccountController.cs b/src/CloudGaming/Api/CloudGaming.Api/Controllers/AccountController.cs
index c54c225..14c70e4 100644
--- a/src/CloudGaming/Api/CloudGaming.Api/Controllers/AccountController.cs
+++ b/src/CloudGaming/Api/CloudGaming.Api/Controllers/AccountController.cs
@@ -71,7 +71,7 @@ public class AccountController : CloudGamingControllerBase
     }
 
     /// <summary>
-    /// 获取用户信息
+    /// 实名认证接口（需要登录）
     /// </summary>
     /// <returns></returns>
     [HttpPost]
@@ -83,9 +83,9 @@ public class AccountController : CloudGamingControllerBase
     }
 
     /// <summary>
-    /// 资产收入、支出
+    /// 资产收入、支出（需要登录）
     /// </summary>
-    /// <param name="consumeType">0支出，收入</param>
+    /// <param name="consumeType">0支出，1收入</param>
     /// <returns></returns>
     [HttpGet]
     [Authorize]
@@ -96,11 +96,12 @@ public class AccountController : CloudGamingControllerBase
     }
 
     /// <summary>
-    /// 修改用户昵称
+    /// 修改用户昵称（需要登录）
     /// </summary>
     /// <param name="accountNickNameRequest"></param>
     /// <returns></returns>
     [HttpPost]
+    [Authorize]
     public async Task<BaseResponse<bool>> UpdateUserNickName([FromBody] AccountNickNameRequest accountNickNameRequest)
     {
         AccountBLL account = new AccountBLL(ServiceProvider);
diff --git a/src/CloudGaming/Code/CloudGaming.Code/Account/AccountExtend.cs b/src/CloudGaming/Code/CloudGaming.Code/Account/AccountExtend.cs
index 41c0c26..ff35583 100644
--- a/src/CloudGaming/Code/CloudGaming.Code/Account/AccountExtend.cs
+++ b/src/CloudGaming/Code/CloudGaming.Code/Account/AccountExtend.cs
@@ -35,6 +35,12 @@ namespace CloudGaming.Code.Account
         /// <returns></returns>
         public static IUserAccount? GetUserAccount(string jsonString, CloudGamingBase cloudGamingBase)
         {
+            var jwt = cloudGamingBase.HttpContextAccessor.HttpContext.Request.Headers.GetAuthorization();
+            if (!string.IsNullOrEmpty(jwt))
+            {
+                IUserAccount authorizationUserLogin = new AuthorizationUserLogin(jwt, cloudGamingBase);
+                return authorizationUserLogin;
+            }
             if (!string.IsNullOrEmpty(jsonString))
             {
                 JObject jsonObject = JObject.Parse(jsonString);
@@ -45,12 +51,7 @@ namespace CloudGaming.Code.Account
                     return phoneUserLogin;
                 }  //检测是否还有jwt登录
             }
-            var jwt = cloudGamingBase.HttpContextAccessor.HttpContext.Request.Headers.GetAuthorization();
-            if (!string.IsNullOrEmpty(jwt))
-            {
-                IUserAccount authorizationUserLogin = new AuthorizationUserLogin(jwt, cloudGamingBase);
-                return authorizationUserLogin;
-            }
+
 
             return null;
         }
diff --git a/src/CloudGaming/Code/CloudGaming.Code/MiddlewareExtend/SignMiddleware.cs b/src/CloudGaming/Code/CloudGaming.Code/MiddlewareExtend/SignMiddleware.cs
index 4e85b85..f343ae4 100644
--- a/src/CloudGaming/Code/CloudGaming.Code/MiddlewareExtend/SignMiddleware.cs
+++ b/src/CloudGaming/Code/CloudGaming.Code/MiddlewareExtend/SignMiddleware.cs
@@ -84,15 +84,12 @@ public class SignMiddleware
 
     private static string GetSignError(HttpContext context)
     {
-        var settings = new JsonSerializerSettings
-        {
-            ContractResolver = new CamelCasePropertyNamesContractResolver()
-        };
+
         // 返回 500 错误
         context.Response.StatusCode = 200;
         BaseResponse<object> baseResponse = new BaseResponse<object>(ResonseCode.SignError, "sign加密验证失败", null)
         { };
-        var json = JsonConvert.SerializeObject(baseResponse, settings);
+        var json = baseResponse.ToString();
         return json;
     }
 }
diff --git a/src/CloudGaming/Model/CloudGaming.DtoModel/SevenSign/SevenDayDto.cs b/src/CloudGaming/Model/CloudGaming.DtoModel/SevenSign/SevenDayDto.cs
index 0c3d97f..42ea46c 100644
--- a/src/CloudGaming/Model/CloudGaming.DtoModel/SevenSign/SevenDayDto.cs
+++ b/src/CloudGaming/Model/CloudGaming.DtoModel/SevenSign/SevenDayDto.cs
@@ -14,7 +14,7 @@ public class SevenDayDto
     /// <summary>
     /// 每日签到信息列表
     /// </summary>
-    public List<SevenDay> List = new List<SevenDay>();
+    public List<SevenDay> List { get; set; } = new List<SevenDay>();
     /// <summary>
     /// 今天是否签到
     /// </summary>
diff --git a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_GameCBT.cs b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_GameCBT.cs
index 1d3c9e3..4521537 100644
--- a/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_GameCBT.cs
+++ b/src/CloudGaming/Model/CloudGaming.Model/DbSqlServer/Db_Phone/T_GameCBT.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace CloudGaming.Model.DbSqlServer.Db_Phone;