diff --git a/monitor/src/main/java/com/zfoo/monitor/model/SystemInfoVO.java b/monitor/src/main/java/com/zfoo/monitor/model/SystemInfoVO.java new file mode 100644 index 00000000..d63f0120 --- /dev/null +++ b/monitor/src/main/java/com/zfoo/monitor/model/SystemInfoVO.java @@ -0,0 +1,79 @@ +package com.zfoo.monitor.model; + +public class SystemInfoVO { + + /** + * host名称 + */ + private String hostname; + + /** + * 系统版本信息 + */ + private String version; + + /** + * 系统版本详细信息 + */ + private String versionDetail; + + /** + * core的逻辑核心个数 + */ + private int cpuLogicCore; + + /** + * CPU型号信息 + */ + private String cpuName; + + public static SystemInfoVO valueOf(String hostname, String version, String versionDetail, int cpuLogicCore, String cpuName) { + var vo = new SystemInfoVO(); + vo.hostname = hostname; + vo.version = version; + vo.versionDetail = versionDetail; + vo.cpuLogicCore = cpuLogicCore; + vo.cpuName = cpuName; + return vo; + } + + public String getHostname() { + return hostname; + } + + public void setHostname(String hostname) { + this.hostname = hostname; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getVersionDetail() { + return versionDetail; + } + + public void setVersionDetail(String versionDetail) { + this.versionDetail = versionDetail; + } + + public int getCpuLogicCore() { + return cpuLogicCore; + } + + public void setCpuLogicCore(int cpuLogicCore) { + this.cpuLogicCore = cpuLogicCore; + } + + public String getCpuName() { + return cpuName; + } + + public void setCpuName(String cpuName) { + this.cpuName = cpuName; + } +} diff --git a/monitor/src/main/java/com/zfoo/monitor/model/SystemInfoVo.java b/monitor/src/main/java/com/zfoo/monitor/model/SystemInfoVo.java deleted file mode 100644 index 4730de84..00000000 --- a/monitor/src/main/java/com/zfoo/monitor/model/SystemInfoVo.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.zfoo.monitor.model; - -import com.baidu.bjf.remoting.protobuf.annotation.Protobuf; - -import java.util.Date; - -public class SystemInfoVo { - - - - - - - /** - * host名称 - */ - private String hostname; - - /** - * 系统版本信息 - */ - private String version; - - /** - * 系统版本详细信息 - */ - private String versionDetail; - - - - /** - * core的个数(即核数) - */ - private String cpuCoreNum; - - - - /** - * CPU型号信息 - */ - private String cpuXh; - - - - - - - - public String getHostname() { - return hostname; - } - - public void setHostname(String hostname) { - this.hostname = hostname; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public String getVersionDetail() { - return versionDetail; - } - - public void setVersionDetail(String versionDetail) { - this.versionDetail = versionDetail; - } - - - - public String getCpuCoreNum() { - return cpuCoreNum; - } - - public void setCpuCoreNum(String cpuCoreNum) { - this.cpuCoreNum = cpuCoreNum; - } - - - - public String getCpuXh() { - return cpuXh; - } - - public void setCpuXh(String cpuXh) { - this.cpuXh = cpuXh; - } - - - - -} diff --git a/monitor/src/main/java/com/zfoo/monitor/util/OSUtils.java b/monitor/src/main/java/com/zfoo/monitor/util/OSUtils.java index 0fb2f632..92d6dea0 100644 --- a/monitor/src/main/java/com/zfoo/monitor/util/OSUtils.java +++ b/monitor/src/main/java/com/zfoo/monitor/util/OSUtils.java @@ -22,7 +22,6 @@ import com.zfoo.util.security.IdUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import oshi.SystemInfo; -import oshi.hardware.CentralProcessor; import oshi.hardware.HardwareAbstractionLayer; import oshi.hardware.NetworkIF; import oshi.software.os.OperatingSystem; @@ -304,19 +303,10 @@ public abstract class OSUtils { return StringUtils.EMPTY; } - public static SystemInfoVo os() { - CentralProcessor processor = hardware.getProcessor(); - SystemInfoVo systemInfo = new SystemInfoVo(); - systemInfo.setHostname(NetUtils.getLocalhostStr()); - systemInfo.setCpuCoreNum(processor.getLogicalProcessorCount() + ""); - String cpuInfo = processor.toString(); - if (cpuInfo.indexOf("\n") > 0) { - cpuInfo = cpuInfo.substring(0, cpuInfo.indexOf("\n")); - } - systemInfo.setCpuXh(cpuInfo); - systemInfo.setVersion(os.toString()); - systemInfo.setVersionDetail(os.toString()); - - return systemInfo; + public static SystemInfoVO os() { + var processor = hardware.getProcessor(); + var cpuLogicCore = processor.getLogicalProcessorCount(); + var cpuName = processor.getProcessorIdentifier().getName(); + return SystemInfoVO.valueOf(NetUtils.getLocalhostStr(), os.toString(), os.toString(), cpuLogicCore, cpuName); } } diff --git a/monitor/src/test/java/com/zfoo/monitor/ApplicationTest.java b/monitor/src/test/java/com/zfoo/monitor/ApplicationTest.java index 22e762c8..47156782 100644 --- a/monitor/src/test/java/com/zfoo/monitor/ApplicationTest.java +++ b/monitor/src/test/java/com/zfoo/monitor/ApplicationTest.java @@ -120,12 +120,17 @@ public class ApplicationTest { } - @Test - public void JvmTest(){ - JvmUtils.getJvmInfo().forEach(a->{ + public void JvmTest() { + JvmUtils.getJvmInfo().forEach(a -> { System.out.println(a.toString()); }); } + @Test + public void osTest() { + var os = OSUtils.os(); + System.out.println(JsonUtils.object2StringPrettyPrinter(os)); + } + }