From eb031fefb3ed97aeecc6cecc9a2e9e4e3fd81741 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Mon, 22 Apr 2024 15:13:45 +0800 Subject: [PATCH] Refactor(Statistics): Optimize memory and hard disk capacity display Unknown is displayed when detailed capacity cannot be obtained --- .../api/service/system/impl/StatisticsServiceImpl.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/StatisticsServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/StatisticsServiceImpl.kt index e6394f8..ae264a7 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/StatisticsServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/StatisticsServiceImpl.kt @@ -66,15 +66,17 @@ class StatisticsServiceImpl( cpuLogicalProcessorCount = systemInfo.hardware.processor.logicalProcessorCount, microarchitecture = systemInfo.hardware.processor.processorIdentifier.microarchitecture, memories = "${ByteUtil.formatByteSize(systemInfo.hardware.memory.total)} (${ - systemInfo.hardware.memory.physicalMemory.joinToString( + if (systemInfo.hardware.memory.physicalMemory.size > 0) systemInfo.hardware.memory.physicalMemory.joinToString( " + " ) { ByteUtil.formatByteSize(it.capacity) } + else "Unknown" })", - disks = "${ByteUtil.formatByteSize(systemInfo.hardware.diskStores.sumOf { it.size })} (${ + disks = if (systemInfo.hardware.diskStores.size > 0) "${ByteUtil.formatByteSize(systemInfo.hardware.diskStores.sumOf { it.size })} (${ systemInfo.hardware.diskStores.joinToString( " + " ) { ByteUtil.formatByteSize(it.size) } })" + else "Unknown" ) override fun cpu(): CpuInfoVo { @@ -190,7 +192,11 @@ class StatisticsServiceImpl( return OnlineInfoVo( current = redisUtil.keys("${SecurityProperties.jwtIssuer}_login_*") - .distinctBy { Regex("${SecurityProperties.jwtIssuer}_login_(.*):.*").matchEntire(it)?.groupValues?.getOrNull(1) }.size.toLong(), + .distinctBy { + Regex("${SecurityProperties.jwtIssuer}_login_(.*):.*").matchEntire(it)?.groupValues?.getOrNull( + 1 + ) + }.size.toLong(), history = history ) }