FatttSnake/oxygen-api
1
0
Fork 0
Code Pull Requests Activity

Refactor(Statistics): Optimize memory and hard disk capacity display

Browse Source 
Unknown is displayed when detailed capacity cannot be obtained
This commit is contained in:
Fat Snake
2024-04-22 15:13:45 +08:00
parent 27ed533530
commit eb031fefb3
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/StatisticsServiceImpl.kt
View File

@@ -66,15 +66,17 @@ class StatisticsServiceImpl(
cpuLogicalProcessorCount = systemInfo.hardware.processor.logicalProcessorCount, cpuLogicalProcessorCount = systemInfo.hardware.processor.logicalProcessorCount,
microarchitecture = systemInfo.hardware.processor.processorIdentifier.microarchitecture, microarchitecture = systemInfo.hardware.processor.processorIdentifier.microarchitecture,
memories = "${ByteUtil.formatByteSize(systemInfo.hardware.memory.total)} (${ 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) } ) { 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( systemInfo.hardware.diskStores.joinToString(
" + " " + "
) { ByteUtil.formatByteSize(it.size) } ) { ByteUtil.formatByteSize(it.size) }
})" })"
else "Unknown"
) )
override fun cpu(): CpuInfoVo { override fun cpu(): CpuInfoVo {
@@ -190,7 +192,11 @@ class StatisticsServiceImpl(
return OnlineInfoVo( return OnlineInfoVo(
current = redisUtil.keys("${SecurityProperties.jwtIssuer}_login_*") 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 history = history
) )
} }