Ver Fonte

😁代码优化,适配MacOS获取系统信息

zuohuaijun há 2 anos atrás
pai
commit
7bbb82cb4b

+ 1 - 1
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -39,7 +39,7 @@
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.37.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.21.0" />
     <PackageReference Include="SqlSugarCore" Version="5.1.4.136" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.7" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.8" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.25" />

+ 2 - 1
Admin.NET/Admin.NET.Core/Util/ComputerUtil.cs

@@ -87,7 +87,7 @@ public static class ComputerUtil
                 var diskInfo = new DiskInfo()
                 {
                     DiskName = disk[0],
-                    TypeName = ShellHelper.Bash("diskutil info " + disk[0] + " | awk '/File System Personality/ {print $4}'").Replace("\n",string.Empty),
+                    TypeName = ShellHelper.Bash("diskutil info " + disk[0] + " | awk '/File System Personality/ {print $4}'").Replace("\n", string.Empty),
                     TotalSize = long.Parse(disk[1]) / 1024,
                     Used = long.Parse(disk[2]) / 1024,
                     AvailableFreeSpace = long.Parse(disk[3]) / 1024,
@@ -351,6 +351,7 @@ public class MemoryMetricsClient
         }
         return metrics;
     }
+
     /// <summary>
     /// macOS系统获取
     /// </summary>