Skip to content

Commit 87598a8

Browse files
committed
[修改]1. 修改设置参数的适配
1 parent c7b17fd commit 87598a8

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

GameFrameX.Launcher/StartUp/Gateway/AppStartUpGateway.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ private ValueTask OnDisconnected(IAppSession appSession, CloseEventArgs disconne
7878
private ValueTask OnConnected(IAppSession appSession)
7979
{
8080
LogHelper.Info("有客户端网络连接成功!。链接信息:SessionID:" + appSession.SessionID + " RemoteEndPoint:" + appSession.RemoteEndPoint);
81-
var netChannel = new DefaultNetWorkChannel(appSession, messageEncoderHandler, RpcSession);
81+
var netChannel = new DefaultNetWorkChannel(appSession, Setting, messageEncoderHandler, RpcSession);
8282
GameClientSessionManager.SetSession(appSession.SessionID, netChannel); //移除
8383
return ValueTask.CompletedTask;
8484
}

GameFrameX.Launcher/StartUp/Router/AppStartUpRouter.cs

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,18 @@ protected override void DiscoveryCenterDataReceived(INetworkMessage message)
6868
private async Task StartServer()
6969
{
7070
_webSocketServer = WebSocketHostBuilder.Create()
71-
.UseWebSocketMessageHandler(WebSocketMessageHandler)
72-
.UseSessionHandler(OnConnected, OnDisconnected)
73-
.ConfigureAppConfiguration((Action<HostBuilderContext, IConfigurationBuilder>)(ConfigureWebServer)).Build();
71+
.UseWebSocketMessageHandler(WebSocketMessageHandler)
72+
.UseSessionHandler(OnConnected, OnDisconnected)
73+
.ConfigureAppConfiguration((Action<HostBuilderContext, IConfigurationBuilder>)(ConfigureWebServer)).Build();
7474
await _webSocketServer.StartAsync();
7575
_tcpService = SuperSocketHostBuilder.Create<INetworkMessage, MessageObjectPipelineFilter>()
76-
.ConfigureSuperSocket(ConfigureSuperSocket)
77-
.UseClearIdleSession()
78-
.UsePackageDecoder<MessageRouterDecoderHandler>()
79-
.UseSessionHandler(OnConnected, OnDisconnected)
80-
.UsePackageHandler(MessagePackageHandler, ClientErrorHandler)
81-
.UseInProcSessionContainer()
82-
.BuildAsServer();
76+
.ConfigureSuperSocket(ConfigureSuperSocket)
77+
.UseClearIdleSession()
78+
.UsePackageDecoder<MessageRouterDecoderHandler>()
79+
.UseSessionHandler(OnConnected, OnDisconnected)
80+
.UsePackageHandler(MessagePackageHandler, ClientErrorHandler)
81+
.UseInProcSessionContainer()
82+
.BuildAsServer();
8383

8484
await _tcpService.StartAsync();
8585
}
@@ -100,7 +100,7 @@ private ValueTask OnDisconnected(IAppSession appSession, CloseEventArgs disconne
100100
private ValueTask OnConnected(IAppSession appSession)
101101
{
102102
LogHelper.Info("有外部客户端网络连接成功!。链接信息:SessionID:" + appSession.SessionID + " RemoteEndPoint:" + appSession.RemoteEndPoint);
103-
var netChannel = new DefaultNetWorkChannel(appSession, messageEncoderHandler, RpcSession, appSession is WebSocketSession);
103+
var netChannel = new DefaultNetWorkChannel(appSession, Setting, messageEncoderHandler, RpcSession, appSession is WebSocketSession);
104104
GameClientSessionManager.SetSession(appSession.SessionID, netChannel); //移除
105105

106106
return ValueTask.CompletedTask;
@@ -120,8 +120,8 @@ private async ValueTask WebSocketMessageHandler(WebSocketSession session, WebSoc
120120
return;
121121
}
122122

123-
var bytes = message.Data;
124-
var buffer = bytes.ToArray();
123+
var bytes = message.Data;
124+
var buffer = bytes.ToArray();
125125
var messageObject = messageDecoderHandler.Handler(buffer);
126126
await MessagePackageHandler(session, messageObject);
127127
}
@@ -144,10 +144,10 @@ private ValueTask MessagePackageHandler(IAppSession appSession, INetworkMessage
144144
{
145145
var reqHeartBeat = (ReqHeartBeat)outerMessage.DeserializeMessageObject();
146146
var response = new NotifyHeartBeat()
147-
{
148-
UniqueId = reqHeartBeat.UniqueId,
149-
Timestamp = TimeHelper.UnixTimeSeconds()
150-
};
147+
{
148+
UniqueId = reqHeartBeat.UniqueId,
149+
Timestamp = TimeHelper.UnixTimeSeconds()
150+
};
151151
SendToClient(appSession, response);
152152
return ValueTask.CompletedTask;
153153
}
@@ -191,7 +191,7 @@ private static async void SendToClient(IAppSession appSession, MessageObject mes
191191
private void ConfigureWebServer(HostBuilderContext context, IConfigurationBuilder builder)
192192
{
193193
builder.AddInMemoryCollection(new Dictionary<string, string>()
194-
{ { "serverOptions:name", "TestServer" }, { "serverOptions:listeners:0:ip", "Any" }, { "serverOptions:listeners:0:port", Setting.WsPort.ToString() } });
194+
{ { "serverOptions:name", "TestServer" }, { "serverOptions:listeners:0:ip", "Any" }, { "serverOptions:listeners:0:port", Setting.WsPort.ToString() } });
195195
}
196196

197197
public override async Task StopAsync(string message = "")
@@ -207,17 +207,17 @@ protected override void Init()
207207
if (Setting == null)
208208
{
209209
Setting = new AppSetting
210-
{
211-
ServerId = 3000,
212-
ServerType = ServerType.Router,
213-
InnerPort = 23001,
214-
WsPort = 23110,
215-
// 网关配置
216-
DiscoveryCenterIp = "127.0.0.1",
217-
DiscoveryCenterPort = 21001,
218-
// 最大连接数
219-
MaxClientCount = 3000,
220-
};
210+
{
211+
ServerId = 3000,
212+
ServerType = ServerType.Router,
213+
InnerPort = 23001,
214+
WsPort = 23110,
215+
// 网关配置
216+
DiscoveryCenterIp = "127.0.0.1",
217+
DiscoveryCenterPort = 21001,
218+
// 最大连接数
219+
MaxClientCount = 3000,
220+
};
221221
if (PlatformRuntimeHelper.IsLinux)
222222
{
223223
Setting.DiscoveryCenterIp = "gateway";

0 commit comments

Comments
 (0)