完成linux系统下内存信息、磁盘信息获取

ZR.Admin.WebApi/Controllers/System/SysLoginController.cs

@@ -16,6 +16,7 @@ using ZR.Service.System.IService;
 using Hei.Captcha;
 using ZR.Common;
 using ZR.Service.System;
+using Microsoft.Extensions.Options;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {
@@ -33,6 +34,8 @@ namespace ZR.Admin.WebApi.Controllers.System
         private readonly SecurityCodeHelper SecurityCodeHelper;
         private readonly ISysConfigService sysConfigService;
         private readonly ISysRoleService roleService;
+        private readonly OptionsSetting jwtSettings;
+
         public SysLoginController(
             IHttpContextAccessor contextAccessor,
             ISysMenuService sysMenuService,
@@ -41,7 +44,8 @@ namespace ZR.Admin.WebApi.Controllers.System
             ISysPermissionService permissionService,
             ISysConfigService configService,
             ISysRoleService sysRoleService,
-            SecurityCodeHelper captcha)
+            SecurityCodeHelper captcha,
+            IOptions<OptionsSetting> jwtSettings)
         {
             httpContextAccessor = contextAccessor;
             SecurityCodeHelper = captcha;
@@ -51,6 +55,7 @@ namespace ZR.Admin.WebApi.Controllers.System
             this.permissionService = permissionService;
             this.sysConfigService = configService;
             roleService = sysRoleService;
+            this.jwtSettings = jwtSettings.Value;
         }
 
 
@@ -82,7 +87,7 @@ namespace ZR.Admin.WebApi.Controllers.System
 
             LoginUser loginUser = new(user, roles, permissions);
             CacheHelper.SetCache(GlobalConstant.UserPermKEY + user.UserId, loginUser);
-            return SUCCESS(JwtUtil.GenerateJwtToken(HttpContext.AddClaims(loginUser)));
+            return SUCCESS(JwtUtil.GenerateJwtToken(HttpContext.AddClaims(loginUser), jwtSettings.JwtSettings));
         }
 
         /// <summary>

ZR.Admin.WebApi/Controllers/System/monitor/MonitorController.cs

@@ -1,4 +1,5 @@
 using Infrastructure;
+using Infrastructure.Extensions;
 using Infrastructure.Model;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
@@ -7,8 +8,6 @@ using Microsoft.Extensions.Options;
 using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using ZR.Admin.WebApi.Filters;
-using ZR.Common;
 
 namespace ZR.Admin.WebApi.Controllers.monitor
 {
@@ -17,7 +16,7 @@ namespace ZR.Admin.WebApi.Controllers.monitor
     {
         private OptionsSetting Options;
         private IWebHostEnvironment HostEnvironment;
-
+        private NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
         public MonitorController(IOptions<OptionsSetting> options, IWebHostEnvironment hostEnvironment)
         {
             this.HostEnvironment = hostEnvironment;
@@ -55,13 +54,16 @@ namespace ZR.Admin.WebApi.Controllers.monitor
             string version = RuntimeInformation.FrameworkDescription;
             string appRAM = ((double)Process.GetCurrentProcess().WorkingSet64 / 1048576).ToString("N2") + " MB";
             string startTime = Process.GetCurrentProcess().StartTime.ToString("yyyy-MM-dd HH:mm:ss");
-            string runTime = Process.GetCurrentProcess().StartTime.ToString("yyyy-MM-dd HH:mm:ss");
-            string serverIP = (Request.HttpContext.Connection.LocalIpAddress.MapToIPv4().ToString() + ":" + Request.HttpContext.Connection.LocalPort);//获取服务器IP
+            string sysRunTime = ComputerHelper.GetRunTime();
+            string serverIP = Request.HttpContext.Connection.LocalIpAddress.MapToIPv4().ToString() + ":" + Request.HttpContext.Connection.LocalPort;//获取服务器IP
 
+            var programStartTime = Process.GetCurrentProcess().StartTime;
+            string programRunTime = DateTimeHelper.FormatTime((DateTime.Now - programStartTime).TotalMilliseconds.ToString().Split('.')[0].ParseToLong());
             var data = new
             {
                 cpu = ComputerHelper.GetComputerInfo(),
-                sys = new { cpuNum, computerName, osName, osArch, serverIP },
+                disk = ComputerHelper.GetDiskInfos(),
+                sys = new { cpuNum, computerName, osName, osArch, serverIP, runTime = sysRunTime },
                 app = new
                 {
                     name = HostEnvironment.EnvironmentName,
@@ -70,9 +72,9 @@ namespace ZR.Admin.WebApi.Controllers.monitor
                     version,
                     appRAM,
                     startTime,
-                    runTime,
+                    runTime = programRunTime,
                     host = serverIP
-                }
+                },
             };
 
             return SUCCESS(data);

ZR.Admin.WebApi/Framework/JwtUtil.cs

@@ -39,11 +39,12 @@ namespace ZR.Admin.WebApi.Framework
         /// 生成token
         /// </summary>
         /// <param name="claims"></param>
+        /// <param name="jwtSettings"></param>
         /// <returns></returns>
-        public static string GenerateJwtToken(List<Claim> claims)
+        public static string GenerateJwtToken(List<Claim> claims, JwtSettings jwtSettings)
         {
-            JwtSettings jwtSettings = new();
-            ConfigUtils.Instance.Bind("JwtSettings", jwtSettings);
+            //JwtSettings jwtSettings = new();
+            //ConfigUtils.Instance.Bind("JwtSettings", jwtSettings);
 
             var authTime = DateTime.Now;
             var expiresAt = authTime.AddMinutes(jwtSettings.Expire);