[增加]1. 增加服务器的实例ID的字段和处理

Author: AlianBlank

GameFrameX.ServerManager/NamingServiceManager.cs

@@ -159,7 +159,7 @@ public void AddSelf(AppSetting setting)
             return;
         }
 
-        SelfServiceInfo = new ServiceInfo(setting.ServerType, null, string.Empty, setting.ServerName, setting.ServerId, setting.InnerIp, setting.InnerPort, setting.OuterIp, setting.OuterPort);
+        SelfServiceInfo = new ServiceInfo(setting.ServerType, null, string.Empty, setting.ServerName, setting.ServerId, setting.ServerInstanceId, setting.InnerIp, setting.InnerPort, setting.OuterIp, setting.OuterPort);
         _serverMap[SelfServiceInfo.ServerId] = SelfServiceInfo;
     }
 

GameFrameX.ServerManager/ServiceInfo.cs

@@ -17,11 +17,12 @@ public sealed class ServiceInfo : IServiceInfo
     /// <param name="sessionId"></param>
     /// <param name="serverName"></param>
     /// <param name="serverId"></param>
+    /// <param name="serverInstanceId"></param>
     /// <param name="innerIp"></param>
     /// <param name="innerPort"></param>
     /// <param name="outerIp"></param>
     /// <param name="outerPort"></param>
-    public ServiceInfo(ServerType type, object session, string sessionId, string serverName, long serverId, string innerIp, ushort innerPort, string outerIp, ushort outerPort)
+    public ServiceInfo(ServerType type, object session, string sessionId, string serverName, long serverId, long serverInstanceId, string innerIp, ushort innerPort, string outerIp, ushort outerPort)
     {
         Type = type;
         Session = session;
@@ -32,6 +33,7 @@ public ServiceInfo(ServerType type, object session, string sessionId, string ser
         OuterIp = outerIp;
         OuterPort = outerPort;
         SessionId = sessionId;
+        ServerInstanceId = serverInstanceId;
         StatusInfo = new ServiceStatusInfo();
     }
 
@@ -86,6 +88,11 @@ public ServiceInfo(ServerType type, object session, string sessionId, string ser
     /// </summary>
     public long ServerId { get; }
 
+    /// <summary>
+    /// 服务器实例ID
+    /// </summary>
+    public long ServerInstanceId { get; set; }
+
     /// <summary>
     /// 转换为字符串
     /// </summary>

GameFrameX.StartUp/AppStartUpByServer.cs

@@ -319,7 +319,7 @@ private async Task StartServer<TMessageDecoderHandler>(List<BaseHttpHandler> bas
                                       {
                                           config.ServiceName = Setting.ServerName + "-" + Setting.TagName;
                                           config.ServiceVersion = Assembly.GetCallingAssembly().ImageRuntimeVersion;
-                                          config.ServiceInstanceId = Setting.ServerId.ToString();
+                                          config.ServiceInstanceId = Setting.ServerId + "-" + Setting.ServerInstanceId;
                                           config.DeploymentEnvironment = EnvironmentHelper.GetEnvironmentName().IsNullOrEmpty() ? Setting.IsDebug ? "Debug" : "Release" : EnvironmentHelper.GetEnvironmentName();
                                       })
                                       .Build();

GameFrameX.StartUp/Options/LauncherOptions.cs

@@ -93,6 +93,12 @@ public sealed class LauncherOptions
     [Option(nameof(ServerId), HelpText = "服务器ID")]
     public int ServerId { get; set; }
 
+    /// <summary>
+    /// 服务器实例ID
+    /// </summary>
+    [Option(nameof(ServerInstanceId), HelpText = "服务器实例ID")]
+    public long ServerInstanceId { get; set; }
+
     /// <summary>
     /// 保存数据间隔, 单位毫秒，默认300秒/5分钟
     /// </summary>

GameFrameX.Utility/Setting/AppSetting.cs

@@ -183,6 +183,11 @@ public string ToFormatString()
     /// </summary>
     public int ServerId { get; set; }
 
+    /// <summary>
+    /// 服务器实例ID
+    /// </summary>
+    public long ServerInstanceId { get; set; }
+
     /// <summary>
     /// 服务器名称
     /// </summary>