Skip to content

Commit 7752d5f

Browse files
committed
refactor(discovery): 统一服务器地址字段命名从Ip改为Host
修改服务器地址相关字段命名,将Ip后缀改为Host以更准确描述字段用途 更新相关proto定义及调用代码保持一致性
1 parent 1255e34 commit 7752d5f

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

GameFrameX.Hotfix/StartUp/AppStartUpHotfixGameByDiscoveryCenter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ protected override void GameAppClientOnConnected()
4545
ServerName = Setting.ServerName,
4646
ServerType = Setting.ServerType,
4747
ServerInstanceId = Setting.ServerInstanceId,
48-
InnerIp = Setting.InnerIp,
48+
InnerHost = Setting.InnerIp,
4949
InnerPort = Setting.InnerPort,
50-
OuterIp = Setting.OuterIp,
50+
OuterHost = Setting.OuterIp,
5151
OuterPort = Setting.OuterPort,
5252
};
5353
Send(reqRegisterServer);

GameFrameX.Launcher/StartUp/Discovery/AppStartUpDiscoveryCenter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ protected override ValueTask PackageHandler(IAppSession session, IMessage messag
152152
ServerType = serverInfo.Type,
153153
ServerName = serverInfo.Name,
154154
ServerId = serverInfo.ServerId,
155-
TargetIp = serverInfo.ExternalHost,
155+
TargetHost = serverInfo.ExternalHost,
156156
TargetPort = serverInfo.ExternalPort,
157157
};
158158
SendMessage(session, respConnectServer);
@@ -180,7 +180,7 @@ protected override ValueTask PackageHandler(IAppSession session, IMessage messag
180180
{
181181
var reqRegisterServer = (ReqRegisterServer)messageObject.DeserializeMessageObject();
182182
// 注册服务
183-
var serviceInfo = new ServiceInfo(reqRegisterServer.ServerType, session, session.SessionID, reqRegisterServer.ServerName, reqRegisterServer.ServerId, reqRegisterServer.ServerInstanceId, reqRegisterServer.InnerIp, reqRegisterServer.InnerPort, reqRegisterServer.OuterIp, reqRegisterServer.OuterPort);
183+
var serviceInfo = new ServiceInfo(reqRegisterServer.ServerType, session, session.SessionID, reqRegisterServer.ServerName, reqRegisterServer.ServerId, reqRegisterServer.ServerInstanceId, reqRegisterServer.InnerHost, reqRegisterServer.InnerPort, reqRegisterServer.OuterHost, reqRegisterServer.OuterPort);
184184
_namingServiceManager.Add(serviceInfo);
185185
LogHelper.Info($"注册服务成功:{reqRegisterServer.ServerType} {reqRegisterServer.ServerName} {reqRegisterServer}");
186186
return ValueTask.CompletedTask;
@@ -204,7 +204,7 @@ protected override ValueTask PackageHandler(IAppSession session, IMessage messag
204204
respConnectServer.ServerType = serverInfo.Type;
205205
respConnectServer.ServerName = serverInfo.Name;
206206
respConnectServer.ServerId = serverInfo.ServerId;
207-
respConnectServer.TargetIp = serverInfo.ExternalHost;
207+
respConnectServer.TargetHost = serverInfo.ExternalHost;
208208
respConnectServer.TargetPort = serverInfo.ExternalPort;
209209
}
210210

GameFrameX.Proto/BuiltIn/DiscoveryCenter_-2.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ public partial class RespConnectServer : MessageObject, IResponseMessage
8080
public long ServerId { get; set; }
8181

8282
/// <summary>
83-
/// 服务器IP
83+
/// 服务器地址
8484
/// </summary>
8585
[ProtoMember(5)]
86-
public string TargetIp { get; set; }
86+
public string TargetHost { get; set; }
8787

8888
/// <summary>
8989
/// 服务器端口
@@ -179,10 +179,10 @@ public partial class ReqRegisterServer : MessageObject, IRequestMessage
179179
public string ServerName { get; set; }
180180

181181
/// <summary>
182-
/// 内部服务器IP
182+
/// 内部服务器地址
183183
/// </summary>
184184
[ProtoMember(3)]
185-
public string InnerIp { get; set; }
185+
public string InnerHost { get; set; }
186186

187187
/// <summary>
188188
/// 内部服务器端口
@@ -191,10 +191,10 @@ public partial class ReqRegisterServer : MessageObject, IRequestMessage
191191
public ushort InnerPort { get; set; }
192192

193193
/// <summary>
194-
/// 外部服务器IP
194+
/// 外部服务器地址
195195
/// </summary>
196196
[ProtoMember(5)]
197-
public string OuterIp { get; set; }
197+
public string OuterHost { get; set; }
198198

199199
/// <summary>
200200
/// 外部服务器端口

0 commit comments

Comments
 (0)