diff --git a/FastTunnel.Core/Models/TunnelClient.cs b/FastTunnel.Core/Models/TunnelClient.cs index 31be5ce..ecfc1d8 100644 --- a/FastTunnel.Core/Models/TunnelClient.cs +++ b/FastTunnel.Core/Models/TunnelClient.cs @@ -36,8 +36,8 @@ public class TunnelClient public IPAddress RemoteIpAddress { get; private set; } - private readonly IList webInfos = new List(); - private readonly IList> forwardInfos = new List>(); + public readonly IList WebInfos = new List(); + public readonly IList> ForwardInfos = new List>(); public TunnelClient( WebSocket webSocket, FastTunnelServer fastTunnelServer, @@ -48,19 +48,19 @@ public class TunnelClient this.fastTunnelServer = fastTunnelServer; this.loginHandler = loginHandler; this.RemoteIpAddress = remoteIpAddress; - StartTime = DateTime.Now; + this.StartTime = DateTime.Now; } public DateTime StartTime { get; } internal void AddWeb(WebInfo info) { - webInfos.Add(info); + WebInfos.Add(info); } internal void AddForward(ForwardInfo forwardInfo) { - forwardInfos.Add(forwardInfo); + ForwardInfos.Add(forwardInfo); } /// @@ -96,9 +96,9 @@ public class TunnelClient internal void Logout() { // forward监听终止 - if (forwardInfos != null) + if (ForwardInfos != null) { - foreach (var item in forwardInfos) + foreach (var item in ForwardInfos) { try { diff --git a/FastTunnel.Server/Controllers/SystemController.cs b/FastTunnel.Server/Controllers/SystemController.cs index 2681293..dc95cde 100644 --- a/FastTunnel.Server/Controllers/SystemController.cs +++ b/FastTunnel.Server/Controllers/SystemController.cs @@ -80,8 +80,13 @@ public class SystemController : BaseController ApiResponse.data = new { Count = fastTunnelServer.ForwardList.Count, - Rows = fastTunnelServer.ForwardList.Select(x => new { x.Key, x.Value.SSHConfig.LocalIp, x.Value.SSHConfig.LocalPort, x.Value.SSHConfig.RemotePort }) - + Rows = fastTunnelServer.ForwardList.Select(x => new + { + x.Key, + x.Value.SSHConfig.LocalIp, + x.Value.SSHConfig.LocalPort, + x.Value.SSHConfig.RemotePort + }) }; return ApiResponse; @@ -103,8 +108,10 @@ public class SystemController : BaseController { ApiResponse.data = fastTunnelServer.Clients.Select(x => new { + x.WebInfos, + x.ForwardInfos, RemoteIpAddress = x.RemoteIpAddress.ToString(), - StartTime = x.StartTime.ToString("yyyyy-MM-dd HH:mm:ss") + StartTime = x.StartTime.ToString("yyyy-MM-dd HH:mm:ss") }); return ApiResponse; }