修复系统监控模块 cpu核心数的bug,调整接口响应模型结构

This commit is contained in:
Bi8bo
2024-09-14 14:12:35 +08:00
parent 099581dddc
commit 887ebe6f2f
3 changed files with 92 additions and 20 deletions

View File

@@ -21,7 +21,7 @@ namespace Yi.Framework.Rbac.Application.Services.Monitor
[HttpGet("monitor-server/info")]
public object GetInfo()
{
int cpuNum = Environment.ProcessorCount;
string computerName = Environment.MachineName;
string osName = RuntimeInformation.OSDescription;
string osArch = RuntimeInformation.OSArchitecture.ToString();
@@ -35,9 +35,10 @@ namespace Yi.Framework.Rbac.Application.Services.Monitor
string programRunTime = DateTimeHelper.FormatTime(long.Parse((DateTime.Now - programStartTime).TotalMilliseconds.ToString().Split('.')[0]));
var data = new
{
cpu = ComputerHelper.GetComputerInfo(),
memory = ComputerHelper.GetMemoryMetrics(),
cpu = ComputerHelper.GetCPUMetrics(),
disk = ComputerHelper.GetDiskInfos(),
sys = new { cpuNum, computerName, osName, osArch, serverIP, runTime = sysRunTime },
sys = new {computerName, osName, osArch, serverIP, runTime = sysRunTime },
app = new
{
name = _hostEnvironment.EnvironmentName,