[修改]1. 修改接口的变动适配

AlianBlank · AlianBlank · commit 4103be5e93e9 · 2024-11-18T11:48:11.000+08:00
diff --git a/DataBaseServer/GameFrameX.DataBase.RDS.MySql/SqlSugarDbService.cs b/DataBaseServer/GameFrameX.DataBase.RDS.MySql/SqlSugarDbService.cs
@@ -50,7 +50,7 @@ public void Open(string url, string dbName)
                                       };
                                   });
 
-            var types = AssemblyHelper.GetRuntimeImplementTypeNames<BaseCacheState>();
+            var types = Assembly.GetRuntimeImplementTypeNames<BaseCacheState>();
             foreach (var type in types)
             {
                 Client.CodeFirst.InitTables(type);
diff --git a/GameFrameX.Apps/BsonClassMapHelper.cs b/GameFrameX.Apps/BsonClassMapHelper.cs
@@ -32,45 +32,45 @@ public void Apply(BsonMemberMap memberMap)
                 if (genType == typeof(List<>))
                 {
                     memberMap.SetShouldSerializeMethod(o =>
-                                                       {
-                                                           var value = memberMap.Getter(o);
-                                                           if (value is IList list)
-                                                           {
-                                                               return list != null && list.Count > 0;
-                                                           }
+                    {
+                        var value = memberMap.Getter(o);
+                        if (value is IList list)
+                        {
+                            return list != null && list.Count > 0;
+                        }
 
-                                                           return true;
-                                                       });
+                        return true;
+                    });
                 }
 
                 else if (genType == typeof(ConcurrentDictionary<,>) || genType == typeof(Dictionary<,>))
                 {
                     memberMap.SetShouldSerializeMethod(o =>
-                                                       {
-                                                           if (o != null)
-                                                           {
-                                                               var value = memberMap.Getter(o);
-                                                               if (value != null)
-                                                               {
-                                                                   PropertyInfo countProperty = value.GetType().GetProperty("Count");
-                                                                   if (countProperty != null)
-                                                                   {
-                                                                       int count = (int)countProperty.GetValue(value, null);
-                                                                       return count > 0;
-                                                                   }
-                                                               }
-                                                           }
+                    {
+                        if (o != null)
+                        {
+                            var value = memberMap.Getter(o);
+                            if (value != null)
+                            {
+                                PropertyInfo countProperty = value.GetType().GetProperty("Count");
+                                if (countProperty != null)
+                                {
+                                    int count = (int)countProperty.GetValue(value, null);
+                                    return count > 0;
+                                }
+                            }
+                        }
 
-                                                           return true;
-                                                       });
+                        return true;
+                    });
                 }
             }
         }
     }
 
     public static class BsonClassMapHelper
     {
-        static public void SetConvention()
+        public static void SetConvention()
         {
             ConventionRegistry.Register(nameof(DictionaryRepresentationConvention),
                                         new ConventionPack { new DictionaryRepresentationConvention(DictionaryRepresentation.ArrayOfDocuments) }, _ => true);
@@ -79,8 +79,11 @@ static public void SetConvention()
                                         new ConventionPack { new EmptyContainerSerializeMethodConvention() }, _ => true);
         }
 
-        //提前注册,简化多态类型处理
-        public static void RegisterAllClass(Assembly assembly)
+        /// <summary>
+        /// 提前注册,简化多态类型处理
+        /// </summary>
+        /// <param name="assembly"></param>
+        public static void RegisterAllClass(System.Reflection.Assembly assembly)
         {
             var types = assembly.GetTypes();
             foreach (var t in types)
diff --git a/GameFrameX.Launcher/Program.cs b/GameFrameX.Launcher/Program.cs
@@ -1,5 +1,4 @@
-﻿using System.Reflection;
-using GameFrameX.GameAnalytics;
+﻿using GameFrameX.GameAnalytics;
 using GameFrameX.NetWork.Message;
 using GameFrameX.Proto.BuiltIn;
 
@@ -9,7 +8,7 @@ internal static class Program
     {
         static async Task Main(string[] args)
         {
-            GameAnalyticsHelper.Init("ec33486a135ae80984dbfc66eede1e41", "379e705038d46691c5c567db947af1828f702861", Assembly.GetCallingAssembly().ImageRuntimeVersion);
+            GameAnalyticsHelper.Init("ec33486a135ae80984dbfc66eede1e41", "379e705038d46691c5c567db947af1828f702861", System.Reflection.Assembly.GetCallingAssembly().ImageRuntimeVersion);
             await GameApp.Entry(args, () =>
             {
                 CacheStateTypeManager.Init();
diff --git a/GameFrameX.Launcher/StartUp/Discovery/AppStartUpDiscoveryCenter.cs b/GameFrameX.Launcher/StartUp/Discovery/AppStartUpDiscoveryCenter.cs
@@ -20,7 +20,7 @@ public override async Task StartAsync()
             _namingServiceManager.AddSelf(Setting);
 
             StartServer();
-            var aopHandlerTypes = AssemblyHelper.GetRuntimeImplementTypeNamesInstance<IHttpAopHandler>();
+            var aopHandlerTypes = Assembly.GetRuntimeImplementTypeNamesInstance<IHttpAopHandler>();
             aopHandlerTypes.Sort((handlerX, handlerY) => handlerX.Priority.CompareTo(handlerY.Priority));
             // 启动Http服务
             await HttpServer.Start(Setting.HttpPort, Setting.HttpsPort, HotfixManager.GetHttpHandler, aopHandlerTypes);
diff --git a/GameFrameX.NetWork.ChannelBase/ConnectChannelHelper.cs b/GameFrameX.NetWork.ChannelBase/ConnectChannelHelper.cs
@@ -333,7 +333,7 @@ public bool IsConnected
     /// <param name="serverPort">服务器端口</param>
     public void Start(string serverIp, int serverPort)
     {
-        if (IpHelper.IsValidIpAddress(serverIp, out var value))
+        if (Net.IsValidIpAddress(serverIp, out var value))
         {
             TargetEndPoint = new IPEndPoint(value, serverPort);
         }
diff --git a/GameFrameX.StartUp/AppExitHandler.cs b/GameFrameX.StartUp/AppExitHandler.cs
@@ -30,7 +30,7 @@ public static void Init(Action<string> existCallBack, AppSetting setting)
             _isKill = false;
             _setting = setting;
             _existCallBack = existCallBack;
-            var fetalExceptionExitHandlers = AssemblyHelper.GetRuntimeImplementTypeNames<IFetalExceptionExitHandler>();
+            var fetalExceptionExitHandlers = Assembly.GetRuntimeImplementTypeNames<IFetalExceptionExitHandler>();
             foreach (var exceptionExitHandler in fetalExceptionExitHandlers)
             {
                 var handler = (IFetalExceptionExitHandler)Activator.CreateInstance(exceptionExitHandler);
diff --git a/GameFrameX.StartUp/GameApp.cs b/GameFrameX.StartUp/GameApp.cs
@@ -71,7 +71,7 @@ public static async Task Entry(string[] args, Action initAction, Action<LogOptio
             GlobalSettings.Load($"Configs/app_config.json");
             initAction?.Invoke();
 
-            var types = AssemblyHelper.GetTypes();
+            var types = Utility.Assembly.GetTypes();
             if (types != null)
             {
                 foreach (var type in types)

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public void Open(string url, string dbName)`
`50`	`50`	`};`
`51`	`51`	`});`
`52`	`52`
`53`		`- var types = AssemblyHelper.GetRuntimeImplementTypeNames<BaseCacheState>();`
	`53`	`+ var types = Assembly.GetRuntimeImplementTypeNames<BaseCacheState>();`
`54`	`54`	`foreach (var type in types)`
`55`	`55`	`{`
`56`	`56`	`Client.CodeFirst.InitTables(type);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using System.Reflection;`
`2`		`-using GameFrameX.GameAnalytics;`
	`1`	`+using GameFrameX.GameAnalytics;`
`3`	`2`	`using GameFrameX.NetWork.Message;`
`4`	`3`	`using GameFrameX.Proto.BuiltIn;`
`5`	`4`
`@@ -9,7 +8,7 @@ internal static class Program`
`9`	`8`	`{`
`10`	`9`	`static async Task Main(string[] args)`
`11`	`10`	`{`
`12`		`- GameAnalyticsHelper.Init("ec33486a135ae80984dbfc66eede1e41", "379e705038d46691c5c567db947af1828f702861", Assembly.GetCallingAssembly().ImageRuntimeVersion);`
	`11`	`+ GameAnalyticsHelper.Init("ec33486a135ae80984dbfc66eede1e41", "379e705038d46691c5c567db947af1828f702861", System.Reflection.Assembly.GetCallingAssembly().ImageRuntimeVersion);`
`13`	`12`	`await GameApp.Entry(args, () =>`
`14`	`13`	`{`
`15`	`14`	`CacheStateTypeManager.Init();`
Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ public bool IsConnected`
`333`	`333`	`/// <param name="serverPort">服务器端口</param>`
`334`	`334`	`public void Start(string serverIp, int serverPort)`
`335`	`335`	`{`
`336`		`- if (IpHelper.IsValidIpAddress(serverIp, out var value))`
	`336`	`+ if (Net.IsValidIpAddress(serverIp, out var value))`
`337`	`337`	`{`
`338`	`338`	`TargetEndPoint = new IPEndPoint(value, serverPort);`
`339`	`339`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public static void Init(Action<string> existCallBack, AppSetting setting)`
`30`	`30`	`_isKill = false;`
`31`	`31`	`_setting = setting;`
`32`	`32`	`_existCallBack = existCallBack;`
`33`		`- var fetalExceptionExitHandlers = AssemblyHelper.GetRuntimeImplementTypeNames<IFetalExceptionExitHandler>();`
	`33`	`+ var fetalExceptionExitHandlers = Assembly.GetRuntimeImplementTypeNames<IFetalExceptionExitHandler>();`
`34`	`34`	`foreach (var exceptionExitHandler in fetalExceptionExitHandlers)`
`35`	`35`	`{`
`36`	`36`	`var handler = (IFetalExceptionExitHandler)Activator.CreateInstance(exceptionExitHandler);`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public static async Task Entry(string[] args, Action initAction, Action<LogOptio`
`71`	`71`	`GlobalSettings.Load($"Configs/app_config.json");`
`72`	`72`	`initAction?.Invoke();`
`73`	`73`
`74`		`- var types = AssemblyHelper.GetTypes();`
	`74`	`+ var types = Utility.Assembly.GetTypes();`
`75`	`75`	`if (types != null)`
`76`	`76`	`{`
`77`	`77`	`foreach (var type in types)`