diff --git a/Infrastructure/Helper/ComputerHelper.cs b/Infrastructure/Helper/ComputerHelper.cs index 2695d4b..52fa318 100644 --- a/Infrastructure/Helper/ComputerHelper.cs +++ b/Infrastructure/Helper/ComputerHelper.cs @@ -77,16 +77,24 @@ namespace Infrastructure var driv = DriveInfo.GetDrives(); foreach (var item in driv) { - var obj = new DiskInfo() + try { - DiskName = item.Name, - TypeName = item.DriveType.ToString(), - TotalSize = item.TotalSize / 1024 / 1024 / 1024, - AvailableFreeSpace = item.AvailableFreeSpace / 1024 / 1024 / 1024, - }; - obj.Used = obj.TotalSize - obj.AvailableFreeSpace; - obj.AvailablePercent = decimal.Ceiling(obj.Used / (decimal)obj.TotalSize * 100); - diskInfos.Add(obj); + var obj = new DiskInfo() + { + DiskName = item.Name, + TypeName = item.DriveType.ToString(), + TotalSize = item.TotalSize / 1024 / 1024 / 1024, + AvailableFreeSpace = item.AvailableFreeSpace / 1024 / 1024 / 1024, + }; + obj.Used = obj.TotalSize - obj.AvailableFreeSpace; + obj.AvailablePercent = decimal.Ceiling(obj.Used / (decimal)obj.TotalSize * 100); + diskInfos.Add(obj); + } + catch (Exception ex) + { + Console.WriteLine("获取磁盘信息出错了" + ex.Message); + continue; + } } } diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json index d9f765b..d4c987b 100644 --- a/ZR.Admin.WebApi/appsettings.json +++ b/ZR.Admin.WebApi/appsettings.json @@ -34,8 +34,9 @@ "conn": "server=LAPTOP-STKF2M8H\\SQLEXPRESS;user=zr;pwd=abc;database=ZrAdmin;Trusted_Connection=SSPI", "dbType": 1, //MySql = 0, SqlServer = 1 "autoPre": true, //Զȥǰ׺ - "author": "zr", - "tablePrefix": "sys_" //"ǰ׺ǰ׺öŷָ", + "author": "admin", + "tablePrefix": "sys_", //"ǰ׺ǰ׺öŷָ", + "vuePath": "" //ǰ˴洢·egD:\Work\ZRAdmin-Vue3 }, //Ϣ "MailOptions": { diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt index 4c4f917..8221726 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt @@ -7,7 +7,7 @@ * @LastEditTime: (${replaceDto.AddTime}) -->