Finish memory statistics information api
This commit is contained in:
@@ -30,8 +30,4 @@ class StatisticsController(
|
|||||||
@Operation(summary = "获取内存信息")
|
@Operation(summary = "获取内存信息")
|
||||||
@GetMapping("/memory")
|
@GetMapping("/memory")
|
||||||
fun memory(): ResponseResult<MemoryInfoVo> = ResponseResult.success(data = statisticsService.memory())
|
fun memory(): ResponseResult<MemoryInfoVo> = ResponseResult.success(data = statisticsService.memory())
|
||||||
|
|
||||||
@Operation(summary = "获取 jvm 信息")
|
|
||||||
@GetMapping("/jvm")
|
|
||||||
fun jvm(): ResponseResult<JvmInfoVo> = ResponseResult.success(data = statisticsService.jvm())
|
|
||||||
}
|
}
|
||||||
@@ -10,6 +10,4 @@ interface IStatisticsService {
|
|||||||
fun cpu(): CpuInfoVo
|
fun cpu(): CpuInfoVo
|
||||||
|
|
||||||
fun memory(): MemoryInfoVo
|
fun memory(): MemoryInfoVo
|
||||||
|
|
||||||
fun jvm(): JvmInfoVo
|
|
||||||
}
|
}
|
||||||
@@ -118,11 +118,8 @@ class StatisticsServiceImpl : IStatisticsService {
|
|||||||
virtualMax = systemInfo.hardware.memory.virtualMemory.virtualMax,
|
virtualMax = systemInfo.hardware.memory.virtualMemory.virtualMax,
|
||||||
virtualInUse = systemInfo.hardware.memory.virtualMemory.virtualInUse,
|
virtualInUse = systemInfo.hardware.memory.virtualMemory.virtualInUse,
|
||||||
swapTotal = systemInfo.hardware.memory.virtualMemory.swapTotal,
|
swapTotal = systemInfo.hardware.memory.virtualMemory.swapTotal,
|
||||||
swapUsed = systemInfo.hardware.memory.virtualMemory.swapUsed
|
swapUsed = systemInfo.hardware.memory.virtualMemory.swapUsed,
|
||||||
)
|
jvmTotal = runtime.totalMemory(),
|
||||||
|
jvmFree = runtime.freeMemory()
|
||||||
override fun jvm() = JvmInfoVo(
|
|
||||||
totalMemory = runtime.totalMemory(),
|
|
||||||
freeMemory = runtime.freeMemory()
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
package top.fatweb.api.vo.system
|
|
||||||
|
|
||||||
data class JvmInfoVo(
|
|
||||||
val totalMemory: Long,
|
|
||||||
val freeMemory: Long,
|
|
||||||
)
|
|
||||||
@@ -3,8 +3,10 @@ package top.fatweb.api.vo.system
|
|||||||
data class MemoryInfoVo(
|
data class MemoryInfoVo(
|
||||||
val total: Long,
|
val total: Long,
|
||||||
val free: Long,
|
val free: Long,
|
||||||
val virtualInUse: Long,
|
|
||||||
val virtualMax: Long,
|
val virtualMax: Long,
|
||||||
|
val virtualInUse: Long,
|
||||||
val swapTotal: Long,
|
val swapTotal: Long,
|
||||||
val swapUsed: Long
|
val swapUsed: Long,
|
||||||
|
val jvmTotal: Long,
|
||||||
|
val jvmFree: Long,
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user