diff --git a/src/global.d.ts b/src/global.d.ts index 4a7620e..36a6253 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -348,4 +348,6 @@ interface HardwareInfoVo { cpuPhysicalProcessorCount: number cpuLogicalProcessorCount: number microarchitecture: string + memories: string + disks: string } diff --git a/src/pages/system/index.tsx b/src/pages/system/index.tsx index 5f483ab..6e23f0d 100644 --- a/src/pages/system/index.tsx +++ b/src/pages/system/index.tsx @@ -69,13 +69,21 @@ const SoftwareInfo: React.FC = () => {
后端服务器启动时间
-
{softwareInfoData?.os}
-
{softwareInfoData?.bitness}
-
{`${softwareInfoData?.javaVersion} (${softwareInfoData?.javaVersionDate})`}
-
{softwareInfoData?.javaVendor}
-
{`${softwareInfoData?.javaRuntime} (build ${softwareInfoData?.javaRuntimeVersion})`}
-
{`${softwareInfoData?.jvm} (build ${softwareInfoData?.jvmVersion}, ${softwareInfoData?.jvmInfo})`}
-
{softwareInfoData?.jvmVendor}
+
{softwareInfoData?.os}
+
+ {softwareInfoData?.bitness} +
+
{`${softwareInfoData?.javaVersion} (${softwareInfoData?.javaVersionDate})`}
+
{softwareInfoData?.javaVendor}
+
{`${softwareInfoData?.javaRuntime} (build ${softwareInfoData?.javaRuntimeVersion})`}
+
{`${softwareInfoData?.jvm} (build ${softwareInfoData?.jvmVersion}, ${softwareInfoData?.jvmInfo})`}
+
{softwareInfoData?.jvmVendor}
{softwareInfoData?.osBootTime && utcToLocalTime(softwareInfoData?.osBootTime)} @@ -113,21 +121,35 @@ const HardwareInfo: React.FC = () => {
CPU
-
架构
+
CPU 架构
微架构
64位
CPU 插槽
CPU 内核
CPU 逻辑处理器
+
内存
+
磁盘
-
{hardwareInfoData?.cpu}
-
{hardwareInfoData?.arch}
-
{hardwareInfoData?.microarchitecture}
-
{hardwareInfoData?.is64Bit ? '是' : '否'}
-
{hardwareInfoData?.cpuPhysicalPackageCount}
-
{hardwareInfoData?.cpuPhysicalProcessorCount}
-
{hardwareInfoData?.cpuLogicalProcessorCount}
+
{hardwareInfoData?.cpu}
+
{hardwareInfoData?.arch}
+
+ {hardwareInfoData?.microarchitecture} +
+
+ {hardwareInfoData?.is64Bit ? '是' : '否'} +
+
+ {hardwareInfoData?.cpuPhysicalPackageCount} +
+
+ {hardwareInfoData?.cpuPhysicalProcessorCount} +
+
+ {hardwareInfoData?.cpuLogicalProcessorCount} +
+
{hardwareInfoData?.memories}
+
{hardwareInfoData?.disks}