Skip to content

Commit 67c758c

Browse files
committed
[更新]1. 更新新版本的接口适配和DEMO同步
1 parent 68c17e2 commit 67c758c

File tree

3 files changed

+29
-28
lines changed

3 files changed

+29
-28
lines changed

GameFrameX.Hotfix/Logic/Http/ReqLoginHttpHandler.cs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using GameFrameX.Hotfix.Common;
44
using GameFrameX.Monitor.Account;
55
using GameFrameX.NetWork.HTTP;
6+
using GameFrameX.NetWork.Messages;
67

78
namespace GameFrameX.Hotfix.Logic.Http;
89

@@ -12,13 +13,14 @@ namespace GameFrameX.Hotfix.Logic.Http;
1213
[HttpMessageMapping(typeof(ReqLoginHttpHandler))]
1314
public sealed class ReqLoginHttpHandler : BaseHttpHandler
1415
{
15-
public override async Task<string> Action(string ip, string url, Dictionary<string, object> paramMap)
16+
public override async Task<MessageObject> Action(string ip, string url, Dictionary<string, object> parameters, MessageObject messageObject)
1617
{
17-
ReqLogin reqLogin = JsonHelper.Deserialize<ReqLogin>(JsonHelper.Serialize(paramMap));
18-
18+
ReqLogin reqLogin = messageObject as ReqLogin;
19+
var respLogin = new RespLogin();
1920
if (reqLogin.UserName.IsNullOrEmpty() || reqLogin.Password.IsNullOrEmpty())
2021
{
21-
return HttpResult.Create((int)ResultCode.Failed);
22+
respLogin.ErrorCode = (int)ResultCode.Failed;
23+
return null;
2224
}
2325

2426
MetricsAccountRegister.LoginCounterOptions.Inc();
@@ -31,15 +33,12 @@ public override async Task<string> Action(string ip, string url, Dictionary<stri
3133
}
3234

3335
// 构建账号登录返回信息
34-
var respLogin = new RespLogin
35-
{
36-
Code = loginState.State,
37-
CreateTime = loginState.CreateTime,
38-
Level = loginState.Level,
39-
Id = loginState.Id,
40-
RoleName = loginState.NickName,
41-
};
42-
return HttpResult.Create(JsonHelper.Serialize(respLogin));
36+
respLogin.Code = loginState.State;
37+
respLogin.CreateTime = loginState.CreateTime;
38+
respLogin.Level = loginState.Level;
39+
respLogin.Id = loginState.Id;
40+
respLogin.RoleName = loginState.NickName;
41+
return respLogin;
4342
}
4443

4544
public async Task<LoginState> OnLogin(ReqLogin reqLogin)

GameFrameX.Hotfix/Logic/Http/ReqPlayerCreateHttpHandler.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using GameFrameX.Monitor.Account;
66
using GameFrameX.Monitor.Player;
77
using GameFrameX.NetWork.HTTP;
8+
using GameFrameX.NetWork.Messages;
89

910
namespace GameFrameX.Hotfix.Logic.Http;
1011

@@ -14,9 +15,9 @@ namespace GameFrameX.Hotfix.Logic.Http;
1415
[HttpMessageMapping(typeof(ReqPlayerCreateHttpHandler))]
1516
public sealed class ReqPlayerCreateHttpHandler : BaseHttpHandler
1617
{
17-
public override async Task<string> Action(string ip, string url, Dictionary<string, object> paramMap)
18+
public override async Task<MessageObject> Action(string ip, string url, Dictionary<string, object> paramMap, MessageObject messageObject)
1819
{
19-
var reqPlayerCreate = JsonHelper.Deserialize<ReqPlayerCreate>(JsonHelper.Serialize(paramMap));
20+
var reqPlayerCreate = messageObject as ReqPlayerCreate;
2021

2122
var playerState = await OnPlayerCreate(reqPlayerCreate);
2223
var respPlayerCreate = new RespPlayerCreate
@@ -31,7 +32,7 @@ public override async Task<string> Action(string ip, string url, Dictionary<stri
3132
Avatar = playerState.Avatar,
3233
},
3334
};
34-
return HttpResult.Create(JsonHelper.Serialize(respPlayerCreate));
35+
return respPlayerCreate;
3536
}
3637

3738
private async Task<PlayerState> OnPlayerCreate(ReqPlayerCreate reqPlayerCreate)

GameFrameX.Hotfix/Logic/Http/ReqPlayerListHttpHandler.cs

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using GameFrameX.DataBase;
33
using GameFrameX.Monitor.Player;
44
using GameFrameX.NetWork.HTTP;
5+
using GameFrameX.NetWork.Messages;
56

67
namespace GameFrameX.Hotfix.Logic.Http;
78

@@ -11,22 +12,22 @@ namespace GameFrameX.Hotfix.Logic.Http;
1112
[HttpMessageMapping(typeof(ReqPlayerListHttpHandler))]
1213
public sealed class ReqPlayerListHttpHandler : BaseHttpHandler
1314
{
14-
public override async Task<string> Action(string ip, string url, Dictionary<string, object> paramMap)
15+
public override async Task<MessageObject> Action(string ip, string url, Dictionary<string, object> paramMap, MessageObject messageObject)
1516
{
16-
ReqPlayerList reqPlayerList = JsonHelper.Deserialize<ReqPlayerList>(JsonHelper.Serialize(paramMap));
17+
ReqPlayerList reqPlayerList = messageObject as ReqPlayerList;
1718

19+
var respPlayerList = new RespPlayerList
20+
{
21+
UniqueId = reqPlayerList.UniqueId,
22+
PlayerList = new List<PlayerInfo>(),
23+
};
1824
if (reqPlayerList.Id == default)
1925
{
20-
return HttpResult.Create(HttpStatusCode.NotFound, "账号不存在");
26+
return respPlayerList;
2127
}
2228

2329
var playerList = await GetPlayerList(reqPlayerList);
2430

25-
var respPlayerList = new RespPlayerList
26-
{
27-
UniqueId = reqPlayerList.UniqueId,
28-
PlayerList = new List<PlayerInfo>(),
29-
};
3031
if (playerList != null)
3132
{
3233
foreach (var playerState in playerList)
@@ -35,15 +36,15 @@ public override async Task<string> Action(string ip, string url, Dictionary<stri
3536
{
3637
Id = playerState.Id,
3738
Name = playerState.Name,
39+
Level = playerState.Level,
40+
State = playerState.State,
41+
Avatar = playerState.Avatar,
3842
};
39-
playerInfo.Level = playerState.Level;
40-
playerInfo.State = playerState.State;
41-
playerInfo.Avatar = playerState.Avatar;
4243
respPlayerList.PlayerList.Add(playerInfo);
4344
}
4445
}
4546

46-
return HttpResult.Create(JsonHelper.Serialize(respPlayerList));
47+
return respPlayerList;
4748
}
4849

4950
private async Task<List<PlayerState>> GetPlayerList(ReqPlayerList reqPlayerList)

0 commit comments

Comments
 (0)