diff --git a/snowy-admin-web/src/views/dev/monitor/index.vue b/snowy-admin-web/src/views/dev/monitor/index.vue index f4791abc..967296aa 100644 --- a/snowy-admin-web/src/views/dev/monitor/index.vue +++ b/snowy-admin-web/src/views/dev/monitor/index.vue @@ -91,8 +91,8 @@ - {{ devMonitorCpuInfo.cupName }} - {{ devMonitorCpuInfo.cupNum }} + {{ devMonitorCpuInfo.cpuName }} + {{ devMonitorCpuInfo.cpuNum }} {{ devMonitorCpuInfo.cpuPhysicalCoreNum }} {{ devMonitorCpuInfo.cpuLogicalCoreNum }} diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/result/DevMonitorServerResult.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/result/DevMonitorServerResult.java index e6ca8ceb..2fdd107d 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/result/DevMonitorServerResult.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/result/DevMonitorServerResult.java @@ -65,11 +65,11 @@ public class DevMonitorServerResult { /** CPU名称 */ @ApiModelProperty(value = "CPU名称", position = 1) - private String cupName; + private String cpuName; /** CPU数量 */ @ApiModelProperty(value = "CPU数量", position = 2) - private String cupNum; + private String cpuNum; /** CPU物理核心数 */ @ApiModelProperty(value = "CPU物理核心数", position = 3) diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/service/impl/DevMonitorServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/service/impl/DevMonitorServiceImpl.java index 942298cf..b60c1648 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/service/impl/DevMonitorServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/service/impl/DevMonitorServiceImpl.java @@ -58,8 +58,8 @@ public class DevMonitorServiceImpl implements DevMonitorService { // CPU信息 DevMonitorServerResult.DevMonitorCpuInfo devMonitorCpuInfo = new DevMonitorServerResult.DevMonitorCpuInfo(); - devMonitorCpuInfo.setCupName(StrUtil.trim(cpu.getProcessorIdentifier().getName())); - devMonitorCpuInfo.setCupNum(cpu.getPhysicalPackageCount() + "颗物理CPU"); + devMonitorCpuInfo.setCpuName(StrUtil.trim(cpu.getProcessorIdentifier().getName())); + devMonitorCpuInfo.setCpuNum(cpu.getPhysicalPackageCount() + "颗物理CPU"); devMonitorCpuInfo.setCpuPhysicalCoreNum(cpu.getPhysicalProcessorCount() + "个物理核心"); devMonitorCpuInfo.setCpuLogicalCoreNum(cpu.getLogicalProcessorCount() + "个逻辑核心"); long[] prevTicks = cpu.getSystemCpuLoadTicks();