From e9d07db1ba82a6eb4309d2be3d6895938f6150ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E9=83=8E=E7=A7=83=E5=A4=B4=E5=91=80?=
 <1069410172@qq.com>
Date: Sat, 17 Feb 2024 21:38:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmonitor/Program.cs                           | 10 +++-----
 cmonitor/client/ClientTransfer.cs             |  4 +--
 .../client/reports/system/SystemWindows.cs    | 25 +++++++++++++------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/cmonitor/Program.cs b/cmonitor/Program.cs
index 62758dce..3c3cd598 100644
--- a/cmonitor/Program.cs
+++ b/cmonitor/Program.cs
@@ -40,6 +40,7 @@ using cmonitor.client.reports.wallpaper;
 using cmonitor.client.reports.snatch;
 using cmonitor.service.messengers.snatch;
 using cmonitor.libs;
+using common.libs.winapis;
 
 
 namespace cmonitor
@@ -58,12 +59,6 @@ namespace cmonitor
             //日志输出
             LoggerConsole();
 
-            /*
-            foreach (var arg in Dns.GetHostByName(Dns.GetHostName()).AddressList)
-            {
-                Console.WriteLine(arg.Address.ToString());
-            }*/
-
             //读取参数
             Dictionary<string, string> dic = ArgumentParser.Parse(args, out string error);
 #if RELEASE
@@ -223,6 +218,9 @@ namespace cmonitor
             else if (OperatingSystem.IsLinux()) serviceCollection.AddSingleton<ISnatch, SnatchLinux>();
             else if (OperatingSystem.IsMacOS()) serviceCollection.AddSingleton<ISnatch, SnatchMacOS>();
 
+            
+
+            serviceCollection.AddSingleton<WlanReport>();
             serviceCollection.AddSingleton<ShareReport>();
 
             serviceCollection.AddSingleton<CommandReport>();
diff --git a/cmonitor/client/ClientTransfer.cs b/cmonitor/client/ClientTransfer.cs
index 25da8fc7..3d80a190 100644
--- a/cmonitor/client/ClientTransfer.cs
+++ b/cmonitor/client/ClientTransfer.cs
@@ -39,7 +39,7 @@ namespace cmonitor.client
                 await Task.Delay(10000);
                 while (true)
                 {
-                    
+
                     if (clientSignInState.Connected == false)
                     {
                         try
@@ -69,7 +69,7 @@ namespace cmonitor.client
                 try
                 {
                     IPEndPoint remote = new IPEndPoint(ip, config.ServicePort);
-
+                    //Logger.Instance.Info($"connect server {remote}");
                     Socket socket = new Socket(ip.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
                     socket.KeepAlive();
                     IAsyncResult result = socket.BeginConnect(remote, null, null);
diff --git a/cmonitor/client/reports/system/SystemWindows.cs b/cmonitor/client/reports/system/SystemWindows.cs
index 0625440f..77db81e4 100644
--- a/cmonitor/client/reports/system/SystemWindows.cs
+++ b/cmonitor/client/reports/system/SystemWindows.cs
@@ -24,12 +24,23 @@ namespace cmonitor.client.reports.system
 
         public ReportDriveInfo[] GetAllDrives()
         {
-            return DriveInfo.GetDrives().Select(c => new ReportDriveInfo
+            List<ReportDriveInfo> result = new List<ReportDriveInfo>();
+            foreach (DriveInfo item in DriveInfo.GetDrives())
             {
-                Name = c.Name,
-                Free = c.TotalFreeSpace,
-                Total = c.TotalSize
-            }).ToArray();
+                try
+                {
+                    result.Add(new ReportDriveInfo
+                    {
+                        Name = item.Name,
+                        Free = item.TotalFreeSpace,
+                        Total = item.TotalSize
+                    });
+                }
+                catch (Exception)
+                {
+                }
+            }
+            return result.ToArray();
         }
 
         bool restored = false;
@@ -58,9 +69,9 @@ namespace cmonitor.client.reports.system
                     Task.Run(async () =>
                     {
                         Logger.Instance.Info($"regedit reuse");
-                        while ( reused == false)
+                        while (reused == false)
                         {
-                            if(restored )
+                            if (restored)
                             {
                                 reused |= registryOptionHelper.Reuse();
                                 OptionUpdate(new SystemOptionUpdateInfo { Keys = new string[] { "SoftwareSASGeneration" }, Value = false });