From 038da830145e405b45405b5bf0ac6ebce12731e7 Mon Sep 17 00:00:00 2001
From: "Gui.H" <springhgui@outlook.com>
Date: Mon, 2 Jan 2023 19:30:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=81=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FastTunnel.Core/Models/TunnelClient.cs            | 14 +++++++-------
 FastTunnel.Server/Controllers/SystemController.cs | 13 ++++++++++---
 2 files changed, 17 insertions(+), 10 deletions(-)

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<WebInfo> webInfos = new List<WebInfo>();
-    private readonly IList<ForwardInfo<ForwardHandlerArg>> forwardInfos = new List<ForwardInfo<ForwardHandlerArg>>();
+    public readonly IList<WebInfo> WebInfos = new List<WebInfo>();
+    public readonly IList<ForwardInfo<ForwardHandlerArg>> ForwardInfos = new List<ForwardInfo<ForwardHandlerArg>>();
 
     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<ForwardHandlerArg> forwardInfo)
     {
-        forwardInfos.Add(forwardInfo);
+        ForwardInfos.Add(forwardInfo);
     }
 
     /// <summary>
@@ -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;
     }