From 091094a24c73f53eaa19774bf9614fb6445efcb8 Mon Sep 17 00:00:00 2001
From: "2248356998 qq.com" <2248356998@qq.com>
Date: Mon, 22 May 2023 14:33:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E4=BF=A1=E6=81=AF=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=B7=BB=E5=8A=A0=E5=BC=82=E5=B8=B8=E6=8B=A6=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HardwareInfo/HardwareInfoService.cs       | 50 ++++++++++++-------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/ThingsGateway.Web.Foundation/Wokers/HardwareInfo/HardwareInfoService.cs b/src/ThingsGateway.Web.Foundation/Wokers/HardwareInfo/HardwareInfoService.cs
index 0c3232709..3635ce1f3 100644
--- a/src/ThingsGateway.Web.Foundation/Wokers/HardwareInfo/HardwareInfoService.cs
+++ b/src/ThingsGateway.Web.Foundation/Wokers/HardwareInfo/HardwareInfoService.cs
@@ -15,7 +15,7 @@ namespace ThingsGateway.Web.Foundation
     /// </summary>
     public class HardwareInfoService : ISingleton
     {
-        private readonly Hardware.Info.HardwareInfo hardwareInfo = new();
+        private readonly Hardware.Info.HardwareInfo hardwareInfo;
 
         private ILogger _logger;
 
@@ -27,28 +27,44 @@ namespace ThingsGateway.Web.Foundation
                 var loggerFactory = scope.ServiceProvider.GetRequiredService<ILoggerFactory>();
                 _logger = loggerFactory.CreateLogger(nameof(HardwareInfoService));
             });
+            try
+            {
+                hardwareInfo = new();
+            }
+            catch
+            {
 
+            }
             _ = Task.Run(async () =>
              {
 
                  while (true)
                  {
-                     hardwareInfo.RefreshMemoryStatus();
-                     hardwareInfo.RefreshMemoryList();
-                     hardwareInfo.RefreshDriveList();
-                     hardwareInfo.RefreshNetworkAdapterList();
-                     hardwareInfo.RefreshCPUList();
-                     aPPInfo = new()
+                     try
                      {
-                         HostName = Environment.MachineName, // 主机名称
-                         SystemOs = RuntimeInformation.OSDescription, // 操作系统
-                         OsArchitecture = Environment.OSVersion.Platform.ToString() + " " + RuntimeInformation.OSArchitecture.ToString(), // 系统架构
-                         RemoteIp = await GetIpFromOnlineAsync(), // 外网地址
-                         FrameworkDescription = RuntimeInformation.FrameworkDescription, // NET框架
-                         Environment = App.HostEnvironment.IsDevelopment() ? "Development" : "Production",
-                         Stage = App.HostEnvironment.IsStaging() ? "Stage" : "非Stage", // 是否Stage环境
-                     };
-                     await Task.Delay(5000);
+
+
+                         hardwareInfo?.RefreshMemoryStatus();
+                         hardwareInfo?.RefreshMemoryList();
+                         hardwareInfo?.RefreshDriveList();
+                         hardwareInfo?.RefreshNetworkAdapterList();
+                         hardwareInfo?.RefreshCPUList();
+                         aPPInfo = new()
+                         {
+                             HostName = Environment.MachineName, // 主机名称
+                             SystemOs = RuntimeInformation.OSDescription, // 操作系统
+                             OsArchitecture = Environment.OSVersion.Platform.ToString() + " " + RuntimeInformation.OSArchitecture.ToString(), // 系统架构
+                             RemoteIp = await GetIpFromOnlineAsync(), // 外网地址
+                             FrameworkDescription = RuntimeInformation.FrameworkDescription, // NET框架
+                             Environment = App.HostEnvironment.IsDevelopment() ? "Development" : "Production",
+                             Stage = App.HostEnvironment.IsStaging() ? "Stage" : "非Stage", // 是否Stage环境
+                         };
+                         await Task.Delay(5000);
+                     }
+                     catch
+                     {
+
+                     }
                  }
              });
 
@@ -63,7 +79,7 @@ namespace ThingsGateway.Web.Foundation
         /// <summary>
         /// 硬件信息获取
         /// </summary>
-        public TGHardwareInfo HardwareInfo => hardwareInfo.Adapt<TGHardwareInfo>();
+        public TGHardwareInfo HardwareInfo => hardwareInfo?.Adapt<TGHardwareInfo>();
 
         /// <summary>
         /// IP地址信息