[升级] 升级新的框架版本

AlianBlank · AlianBlank · commit c76d5cde13ba · 2025-01-24T11:38:11.000+08:00
diff --git a/GameFrameX.Apps/CacheStateTypeManager.cs b/GameFrameX.Apps/CacheStateTypeManager.cs
@@ -1,4 +1,5 @@
-﻿using GameFrameX.Utility.Extensions;
+﻿using GameFrameX.Foundation.Hash;
+using GameFrameX.Utility.Extensions;
 
 namespace GameFrameX.Apps;
 
@@ -20,7 +21,7 @@ public static void Init()
             var isImplWithInterface = type.IsImplWithInterface(typeof(ICacheState));
             if (isImplWithInterface)
             {
-                HashMap.TryAdd(Hash.XXHash.Hash32(type.ToString()), type);
+                HashMap.TryAdd(XxHashHelper.Hash32(type.ToString()), type);
                 BsonClassMapHelper.RegisterClass(type);
             }
         }
diff --git a/GameFrameX.Apps/GameFrameX.Apps.csproj b/GameFrameX.Apps/GameFrameX.Apps.csproj
@@ -17,7 +17,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="GameFrameX.Core" Version="1.2.0-beta18" />
-      <PackageReference Include="GameFrameX.Monitor" Version="1.2.0-beta18" />
+      <PackageReference Include="GameFrameX.Core" Version="1.2.0-beta21" />
+      <PackageReference Include="GameFrameX.Monitor" Version="1.2.0-beta21" />
     </ItemGroup>
 </Project>
diff --git a/GameFrameX.CodeGenerator/GameFrameX.CodeGenerator.csproj b/GameFrameX.CodeGenerator/GameFrameX.CodeGenerator.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GameFrameX.Core" Version="1.2.0-beta18" />
+    <PackageReference Include="GameFrameX.Core" Version="1.2.0-beta21" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/GameFrameX.Config/GameFrameX.Config.csproj b/GameFrameX.Config/GameFrameX.Config.csproj
@@ -13,8 +13,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="GameFrameX.Core.Config" Version="1.2.0-beta18" />
-      <PackageReference Include="GameFrameX.Utility" Version="1.2.0-beta18" />
+      <PackageReference Include="GameFrameX.Core.Config" Version="1.2.0-beta21" />
+      <PackageReference Include="GameFrameX.Utility" Version="1.2.0-beta21" />
     </ItemGroup>
 
 </Project>
diff --git a/GameFrameX.Hotfix/GameFrameX.Hotfix.csproj b/GameFrameX.Hotfix/GameFrameX.Hotfix.csproj
@@ -21,13 +21,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\GameFrameX.CodeGenerator\GameFrameX.CodeGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="..\GameFrameX.Apps\GameFrameX.Apps.csproj" />
         <ProjectReference Include="..\GameFrameX.Launcher\GameFrameX.Launcher.csproj" />
+        <ProjectReference Include="..\GameFrameX.CodeGenerator\GameFrameX.CodeGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="GameFrameX.Core" Version="1.2.0-beta18" />
-      <PackageReference Include="GameFrameX.SuperSocket.ClientEngine" Version="1.0.1" />
+      <PackageReference Include="GameFrameX.Core" Version="1.2.0-beta21" />
+      <PackageReference Include="GameFrameX.SuperSocket.ClientEngine" Version="1.0.3" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/GameFrameX.Hotfix/Logic/Http/GetOnlinePlayerHttpHandler.cs b/GameFrameX.Hotfix/Logic/Http/GetOnlinePlayerHttpHandler.cs
@@ -1,4 +1,5 @@
 using GameFrameX.Apps.Common.Session;
+using GameFrameX.Foundation.Http.Normalization;
 using GameFrameX.NetWork.HTTP;
 
 namespace GameFrameX.Hotfix.Logic.Http;
@@ -20,7 +21,7 @@ public override Task<string> Action(string ip, string url, Dictionary<string, ob
     {
         var response = new GetOnlinePlayerResponse();
         response.Count = SessionManager.Count();
-        var res = HttpResult.CreateOk($"当前在线人数:{response.Count}", JsonHelper.Serialize(response));
+        var res = HttpJsonResult.SuccessString($"当前在线人数:{response.Count}", JsonHelper.Serialize(response));
         return Task.FromResult(res);
     }
 
diff --git a/GameFrameX.Hotfix/Logic/Http/GetOnlinePlayerListHttpHandler.cs b/GameFrameX.Hotfix/Logic/Http/GetOnlinePlayerListHttpHandler.cs
@@ -1,4 +1,5 @@
 using GameFrameX.Apps.Common.Session;
+using GameFrameX.Foundation.Http.Normalization;
 using GameFrameX.NetWork.HTTP;
 
 namespace GameFrameX.Hotfix.Logic.Http;
@@ -24,7 +25,7 @@ public override Task<string> Action(string ip, string url, Dictionary<string, ob
         var pageIndex = string.IsNullOrEmpty(pageIndexStr?.ToString()) ? 0 : Convert.ToInt32(pageIndexStr);
 
         var response = SessionManager.GetPageList(pageSize, pageIndex);
-        var res = HttpResult.CreateOk("当前在线玩家", JsonHelper.Serialize(response));
+        var res = HttpJsonResult.SuccessString("当前在线玩家", JsonHelper.Serialize(response));
         return Task.FromResult(res);
     }
 }
diff --git a/GameFrameX.Hotfix/Logic/Http/KickOffLineByUserIdPlayerHttpHandler.cs b/GameFrameX.Hotfix/Logic/Http/KickOffLineByUserIdPlayerHttpHandler.cs
@@ -1,4 +1,5 @@
 using GameFrameX.Apps.Common.Session;
+using GameFrameX.Foundation.Http.Normalization;
 using GameFrameX.NetWork.HTTP;
 
 namespace GameFrameX.Hotfix.Logic.Http;
@@ -22,10 +23,10 @@ public override Task<string> Action(string ip, string url, Dictionary<string, ob
         {
             SessionManager.KickOffLineByUserId(Convert.ToInt64(roleId));
 
-            return Task.FromResult(HttpResult.CreateOk());
+            return Task.FromResult(HttpJsonResult.SuccessString());
         }
 
-        var res = HttpResult.CreateErrorParam("角色ID异常");
+        var res = HttpJsonResult.ParamErrorString();
         return Task.FromResult(res);
     }
 }
diff --git a/GameFrameX.Hotfix/Logic/Http/ReloadHttpHandler.cs b/GameFrameX.Hotfix/Logic/Http/ReloadHttpHandler.cs
@@ -1,3 +1,4 @@
+using GameFrameX.Foundation.Http.Normalization;
 using GameFrameX.NetWork.HTTP;
 
 namespace GameFrameX.Hotfix.Logic.Http;
@@ -20,11 +21,9 @@ public override async Task<string> Action(string ip, string url, Dictionary<stri
         if (parameters.TryGetValue("version", out var version))
         {
             await HotfixManager.LoadHotfixModule(null, version.ToString());
-            return Task.FromResult(HttpResult.CreateOk()).Result;
+            return HttpJsonResult.SuccessString();
         }
 
-        var result = HttpResult.CreateErrorParam($"参数错误 {nameof(version)}");
-
-        return Task.FromResult(result).Result;
+        return HttpJsonResult.ParamErrorString();
     }
 }
diff --git a/GameFrameX.Hotfix/Logic/Http/TestHttpHandler.cs b/GameFrameX.Hotfix/Logic/Http/TestHttpHandler.cs
@@ -1,3 +1,4 @@
+using GameFrameX.Foundation.Http.Normalization;
 using GameFrameX.NetWork.HTTP;
 
 namespace GameFrameX.Hotfix.Logic.Http;
@@ -25,7 +26,7 @@ public override Task<string> Action(string ip, string url, Dictionary<string, ob
         };
         response.TestInfo.Age = 18;
         response.TestInfo.Name = "leeveel";
-        return Task.FromResult(HttpResult.Create(JsonHelper.Serialize(response)));
+        return Task.FromResult(HttpJsonResult.SuccessString(response));
     }
 
     public class HttpTestRes
diff --git a/GameFrameX.Hotfix/StartUp/AppStartUpHotfixGameByEntry.cs b/GameFrameX.Hotfix/StartUp/AppStartUpHotfixGameByEntry.cs
@@ -1,8 +1,8 @@
-﻿using GameFrameX.Launcher.StartUp;
+﻿using GameFrameX.StartUp;
 
 namespace GameFrameX.Hotfix.StartUp
 {
-    internal partial class AppStartUpHotfixGame : AppStartUpService, IHotfixBridge
+    internal partial class AppStartUpHotfixGame : AppStartUpBase, IHotfixBridge
     {
         public async Task<bool> OnLoadSuccess(AppSetting setting, bool reload)
         {
diff --git a/GameFrameX.Launcher/GameFrameX.Launcher.csproj b/GameFrameX.Launcher/GameFrameX.Launcher.csproj
@@ -36,9 +36,9 @@
 
     <ItemGroup>
       <PackageReference Include="CommandLineParser" Version="2.9.1" />
-      <PackageReference Include="GameFrameX.Core" Version="1.2.0-beta18" />
-      <PackageReference Include="GameFrameX.NetWork.Message" Version="1.2.0-beta18" />
-      <PackageReference Include="GameFrameX.StartUp" Version="1.2.0-beta18" />
-      <PackageReference Include="GameFrameX.SuperSocket.ClientEngine" Version="1.0.1" />
+      <PackageReference Include="GameFrameX.Core" Version="1.2.0-beta21" />
+      <PackageReference Include="GameFrameX.NetWork.Message" Version="1.2.0-beta21" />
+      <PackageReference Include="GameFrameX.StartUp" Version="1.2.0-beta21" />
+      <PackageReference Include="GameFrameX.SuperSocket.ClientEngine" Version="1.0.3" />
     </ItemGroup>
 </Project>
diff --git a/GameFrameX.Launcher/GlobalUsings.cs b/GameFrameX.Launcher/GlobalUsings.cs
@@ -26,4 +26,7 @@
 global using GameFrameX.SuperSocket.WebSocket;
 global using GameFrameX.SuperSocket.WebSocket.Server;
 global using CloseReason = GameFrameX.SuperSocket.WebSocket.CloseReason;
-global using ErrorEventArgs = GameFrameX.SuperSocket.ClientEngine.ErrorEventArgs;
+global using ErrorEventArgs = GameFrameX.SuperSocket.ClientEngine.ErrorEventArgs;
+global using GameFrameX.Core.Components;
+global using GameFrameX.DataBase.Mongo;
+global using GameFrameX.Utility.Setting;
diff --git a/GameFrameX.Launcher/StartUp/AppStartUpGame.cs b/GameFrameX.Launcher/StartUp/AppStartUpGame.cs
@@ -0,0 +1,77 @@
+﻿namespace GameFrameX.Launcher.StartUp;
+
+/// <summary>
+/// 游戏服务器
+/// </summary>
+[StartUpTag(ServerType.Game)]
+internal sealed class AppStartUpGame : AppStartUpBase
+{
+    public override async Task StartAsync()
+    {
+        try
+        {
+            LogHelper.InfoConsole($"开始启动服务器{Setting.ServerType}");
+            var hotfixPath = Directory.GetCurrentDirectory() + "/hotfix";
+            if (!Directory.Exists(hotfixPath))
+            {
+                Directory.CreateDirectory(hotfixPath);
+            }
+
+            LogHelper.InfoConsole("开始配置Actor限制逻辑...");
+            ActorLimit.Init(ActorLimit.RuleType.None);
+            LogHelper.InfoConsole("配置Actor限制逻辑结束...");
+
+            LogHelper.InfoConsole("开始启动数据库服务...");
+            GameDb.Init<MongoDbService>(Setting.DataBaseUrl, Setting.DataBaseName);
+            LogHelper.InfoConsole("启动数据库服务 结束...");
+
+            LogHelper.InfoConsole("注册组件开始...");
+            await ComponentRegister.Init(typeof(AppsHandler).Assembly);
+            LogHelper.InfoConsole("注册组件结束...");
+
+            LogHelper.InfoConsole("开始加载热更新模块...");
+            await HotfixManager.LoadHotfixModule(Setting);
+            LogHelper.InfoConsole("加载热更新模块结束...");
+
+            LogHelper.InfoConsole("进入游戏主循环...");
+            GlobalSettings.LaunchTime = DateTime.Now;
+            GlobalSettings.IsAppRunning = true;
+            await AppExitToken;
+        }
+        catch (Exception e)
+        {
+            LogHelper.InfoConsole($"服务器执行异常，e:{e}");
+            LogHelper.Fatal(e);
+        }
+
+        LogHelper.InfoConsole("退出服务器开始");
+        await HotfixManager.Stop();
+        LogHelper.InfoConsole("退出服务器成功");
+    }
+
+    protected override void Init()
+    {
+        if (Setting == null)
+        {
+            Setting = new AppSetting
+            {
+                ServerId = 9000,
+                ServerType = ServerType.Game,
+                InnerPort = 29100,
+                APMPort = 29090,
+                HttpPort = 29200,
+                WsPort = 29110,
+                MinModuleId = 10,
+                MaxModuleId = 9999,
+                DiscoveryCenterIp = "127.0.0.1",
+                DiscoveryCenterPort = 21001,
+                //
+                HttpCode = "inner_httpcode",
+                DataBaseUrl = "mongodb+srv://gameframex:f9v42aU9DVeFNfAF@gameframex.8taphic.mongodb.net/?retryWrites=true&w=majority",
+                DataBaseName = "gameframex",
+            };
+        }
+
+        base.Init();
+    }
+}
diff --git a/GameFrameX.Launcher/StartUp/AppStartUpService.cs b/GameFrameX.Launcher/StartUp/AppStartUpService.cs
diff --git a/GameFrameX.Launcher/StartUp/Game/AppStartUpGame.cs b/GameFrameX.Launcher/StartUp/Game/AppStartUpGame.cs
diff --git a/GameFrameX.Proto/GameFrameX.Proto.csproj b/GameFrameX.Proto/GameFrameX.Proto.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="GameFrameX.NetWork" Version="1.2.0-beta18" />
+      <PackageReference Include="GameFrameX.NetWork" Version="1.2.0-beta21" />
     </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using GameFrameX.Utility.Extensions;`
	`1`	`+using GameFrameX.Foundation.Hash;`
	`2`	`+using GameFrameX.Utility.Extensions;`
`2`	`3`
`3`	`4`	`namespace GameFrameX.Apps;`
`4`	`5`
`@@ -20,7 +21,7 @@ public static void Init()`
`20`	`21`	`var isImplWithInterface = type.IsImplWithInterface(typeof(ICacheState));`
`21`	`22`	`if (isImplWithInterface)`
`22`	`23`	`{`
`23`		`- HashMap.TryAdd(Hash.XXHash.Hash32(type.ToString()), type);`
	`24`	`+ HashMap.TryAdd(XxHashHelper.Hash32(type.ToString()), type);`
`24`	`25`	`BsonClassMapHelper.RegisterClass(type);`
`25`	`26`	`}`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using GameFrameX.Apps.Common.Session;`
	`2`	`+using GameFrameX.Foundation.Http.Normalization;`
`2`	`3`	`using GameFrameX.NetWork.HTTP;`
`3`	`4`
`4`	`5`	`namespace GameFrameX.Hotfix.Logic.Http;`
`@@ -20,7 +21,7 @@ public override Task<string> Action(string ip, string url, Dictionary<string, ob`
`20`	`21`	`{`
`21`	`22`	`var response = new GetOnlinePlayerResponse();`
`22`	`23`	`response.Count = SessionManager.Count();`
`23`		`- var res = HttpResult.CreateOk($"当前在线人数:{response.Count}", JsonHelper.Serialize(response));`
	`24`	`+ var res = HttpJsonResult.SuccessString($"当前在线人数:{response.Count}", JsonHelper.Serialize(response));`
`24`	`25`	`return Task.FromResult(res);`
`25`	`26`	`}`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using GameFrameX.Foundation.Http.Normalization;`
`1`	`2`	`using GameFrameX.NetWork.HTTP;`
`2`	`3`
`3`	`4`	`namespace GameFrameX.Hotfix.Logic.Http;`
`@@ -20,11 +21,9 @@ public override async Task<string> Action(string ip, string url, Dictionary<stri`
`20`	`21`	`if (parameters.TryGetValue("version", out var version))`
`21`	`22`	`{`
`22`	`23`	`await HotfixManager.LoadHotfixModule(null, version.ToString());`
`23`		`- return Task.FromResult(HttpResult.CreateOk()).Result;`
	`24`	`+ return HttpJsonResult.SuccessString();`
`24`	`25`	`}`
`25`	`26`
`26`		`- var result = HttpResult.CreateErrorParam($"参数错误 {nameof(version)}");`
`27`		`-`
`28`		`- return Task.FromResult(result).Result;`
	`27`	`+ return HttpJsonResult.ParamErrorString();`
`29`	`28`	`}`
`30`	`29`	`}`