|
1 | 1 | using GameFrameX.NetWork.Abstractions;
|
2 | 2 | using GameFrameX.NetWork.HTTP;
|
| 3 | +using GameFrameX.NetWork.Message; |
3 | 4 | using GameFrameX.Proto.BuiltIn;
|
4 | 5 | using GameFrameX.ServerManager;
|
| 6 | +using GameFrameX.Utility.Extensions; |
5 | 7 |
|
6 | 8 | namespace GameFrameX.Launcher.StartUp.Discovery;
|
7 | 9 |
|
8 | 10 | /// <summary>
|
9 | 11 | /// 服务发现中心服务器
|
10 | 12 | /// </summary>
|
11 |
| -[StartUpTag(ServerType.DiscoveryCenter, 0)] |
12 |
| -internal partial class AppStartUpDiscoveryCenter : AppStartUpService |
| 13 | +// [StartUpTag(ServerType.DiscoveryCenter, 0)] |
| 14 | +internal partial class AppStartUpDiscoveryCenter : AppStartUpBase |
13 | 15 | {
|
14 | 16 | public override async Task StartAsync()
|
15 | 17 | {
|
16 | 18 | try
|
17 | 19 | {
|
18 | 20 | _namingServiceManager.AddSelf(Setting);
|
19 | 21 |
|
20 |
| - StartServer(); |
| 22 | + await StartServerAsync<DefaultMessageDecoderHandler, DefaultMessageEncoderHandler>(new DefaultMessageCompressHandler(), new DefaultMessageDecompressHandler()); |
| 23 | + |
21 | 24 | var aopHandlerTypes = AssemblyHelper.GetRuntimeImplementTypeNamesInstance<IHttpAopHandler>();
|
22 | 25 | aopHandlerTypes.Sort((handlerX, handlerY) => handlerX.Priority.CompareTo(handlerY.Priority));
|
23 | 26 | // 启动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); |
25 | 28 | await AppExitToken;
|
26 | 29 | }
|
27 | 30 | catch (Exception e)
|
@@ -72,7 +75,7 @@ protected override ValueTask PackageHandler(IAppSession session, IMessage messag
|
72 | 75 | var serverInfo = _namingServiceManager.GetNodeBySessionId(session.SessionID);
|
73 | 76 | if (serverInfo != null)
|
74 | 77 | {
|
75 |
| - LogHelper.Debug($"---收到[{serverInfo.Type} To {ServerType}] {message.ToFormatMessageString()}"); |
| 78 | + LogHelper.Debug($"---收到[{serverInfo} To {ServerType}] {message.ToFormatMessageString()}"); |
76 | 79 | }
|
77 | 80 | else
|
78 | 81 | {
|
|
0 commit comments