Skip to content

Commit 218e360

Browse files
committed
[修改]1. 修改发现中心的启动逻辑
1 parent 369b2c9 commit 218e360

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

GameFrameX.Launcher/GameFrameX.Launcher.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<ProjectReference Include="..\GameFrameX.NetWork.Message\GameFrameX.NetWork.Message.csproj" />
4545
<ProjectReference Include="..\GameFrameX.Proto.BuiltIn\GameFrameX.Proto.BuiltIn.csproj" />
4646
<ProjectReference Include="..\GameFrameX.Proto\GameFrameX.Proto.csproj" />
47+
<ProjectReference Include="..\GameFrameX.ServerManager\GameFrameX.ServerManager.csproj" />
4748
<ProjectReference Include="..\GameFrameX.StartUp\GameFrameX.StartUp.csproj" />
4849
<ProjectReference Include="..\GameFrameX.Utility\GameFrameX.Utility.csproj" />
4950
</ItemGroup>

GameFrameX.Launcher/StartUp/Discovery/AppStartUpDiscoveryCenter.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
using GameFrameX.NetWork.Abstractions;
22
using GameFrameX.NetWork.HTTP;
3+
using GameFrameX.NetWork.Message;
34
using GameFrameX.Proto.BuiltIn;
45
using GameFrameX.ServerManager;
6+
using GameFrameX.Utility.Extensions;
57

68
namespace GameFrameX.Launcher.StartUp.Discovery;
79

810
/// <summary>
911
/// 服务发现中心服务器
1012
/// </summary>
11-
[StartUpTag(ServerType.DiscoveryCenter, 0)]
12-
internal partial class AppStartUpDiscoveryCenter : AppStartUpService
13+
// [StartUpTag(ServerType.DiscoveryCenter, 0)]
14+
internal partial class AppStartUpDiscoveryCenter : AppStartUpBase
1315
{
1416
public override async Task StartAsync()
1517
{
1618
try
1719
{
1820
_namingServiceManager.AddSelf(Setting);
1921

20-
StartServer();
22+
await StartServerAsync<DefaultMessageDecoderHandler, DefaultMessageEncoderHandler>(new DefaultMessageCompressHandler(), new DefaultMessageDecompressHandler());
23+
2124
var aopHandlerTypes = AssemblyHelper.GetRuntimeImplementTypeNamesInstance<IHttpAopHandler>();
2225
aopHandlerTypes.Sort((handlerX, handlerY) => handlerX.Priority.CompareTo(handlerY.Priority));
2326
// 启动Http服务
24-
await HttpServer.Start(Setting.HttpPort, Setting.HttpsPort, HotfixManager.GetHttpHandler, aopHandlerTypes);
27+
await HttpServer.Start(Setting.HttpPort, Setting.HttpsPort, HotfixManager.GetListHttpHandler(), HotfixManager.GetHttpHandler, null, Setting.HttpUrl);
2528
await AppExitToken;
2629
}
2730
catch (Exception e)
@@ -72,7 +75,7 @@ protected override ValueTask PackageHandler(IAppSession session, IMessage messag
7275
var serverInfo = _namingServiceManager.GetNodeBySessionId(session.SessionID);
7376
if (serverInfo != null)
7477
{
75-
LogHelper.Debug($"---收到[{serverInfo.Type} To {ServerType}] {message.ToFormatMessageString()}");
78+
LogHelper.Debug($"---收到[{serverInfo} To {ServerType}] {message.ToFormatMessageString()}");
7679
}
7780
else
7881
{

0 commit comments

Comments
 (0)