diff --git a/src/main/kotlin/top/fatweb/api/controller/system/StatisticsController.kt b/src/main/kotlin/top/fatweb/api/controller/system/StatisticsController.kt index 765d231..7ad3ccf 100644 --- a/src/main/kotlin/top/fatweb/api/controller/system/StatisticsController.kt +++ b/src/main/kotlin/top/fatweb/api/controller/system/StatisticsController.kt @@ -30,8 +30,4 @@ class StatisticsController( @Operation(summary = "获取内存信息") @GetMapping("/memory") fun memory(): ResponseResult = ResponseResult.success(data = statisticsService.memory()) - - @Operation(summary = "获取 jvm 信息") - @GetMapping("/jvm") - fun jvm(): ResponseResult = ResponseResult.success(data = statisticsService.jvm()) } \ No newline at end of file diff --git a/src/main/kotlin/top/fatweb/api/service/system/IStatisticsService.kt b/src/main/kotlin/top/fatweb/api/service/system/IStatisticsService.kt index 1e267fb..1307c9a 100644 --- a/src/main/kotlin/top/fatweb/api/service/system/IStatisticsService.kt +++ b/src/main/kotlin/top/fatweb/api/service/system/IStatisticsService.kt @@ -10,6 +10,4 @@ interface IStatisticsService { fun cpu(): CpuInfoVo fun memory(): MemoryInfoVo - - fun jvm(): JvmInfoVo } \ No newline at end of file diff --git a/src/main/kotlin/top/fatweb/api/service/system/impl/StatisticsServiceImpl.kt b/src/main/kotlin/top/fatweb/api/service/system/impl/StatisticsServiceImpl.kt index 4cd152b..8f1e601 100644 --- a/src/main/kotlin/top/fatweb/api/service/system/impl/StatisticsServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/api/service/system/impl/StatisticsServiceImpl.kt @@ -118,11 +118,8 @@ class StatisticsServiceImpl : IStatisticsService { virtualMax = systemInfo.hardware.memory.virtualMemory.virtualMax, virtualInUse = systemInfo.hardware.memory.virtualMemory.virtualInUse, swapTotal = systemInfo.hardware.memory.virtualMemory.swapTotal, - swapUsed = systemInfo.hardware.memory.virtualMemory.swapUsed - ) - - override fun jvm() = JvmInfoVo( - totalMemory = runtime.totalMemory(), - freeMemory = runtime.freeMemory() + swapUsed = systemInfo.hardware.memory.virtualMemory.swapUsed, + jvmTotal = runtime.totalMemory(), + jvmFree = runtime.freeMemory() ) } \ No newline at end of file diff --git a/src/main/kotlin/top/fatweb/api/vo/system/JvmInfoVo.kt b/src/main/kotlin/top/fatweb/api/vo/system/JvmInfoVo.kt deleted file mode 100644 index 41f70c4..0000000 --- a/src/main/kotlin/top/fatweb/api/vo/system/JvmInfoVo.kt +++ /dev/null @@ -1,6 +0,0 @@ -package top.fatweb.api.vo.system - -data class JvmInfoVo( - val totalMemory: Long, - val freeMemory: Long, -) diff --git a/src/main/kotlin/top/fatweb/api/vo/system/MemoryInfoVo.kt b/src/main/kotlin/top/fatweb/api/vo/system/MemoryInfoVo.kt index 12cbd03..056cdc8 100644 --- a/src/main/kotlin/top/fatweb/api/vo/system/MemoryInfoVo.kt +++ b/src/main/kotlin/top/fatweb/api/vo/system/MemoryInfoVo.kt @@ -3,8 +3,10 @@ package top.fatweb.api.vo.system data class MemoryInfoVo( val total: Long, val free: Long, - val virtualInUse: Long, val virtualMax: Long, + val virtualInUse: Long, val swapTotal: Long, - val swapUsed: Long + val swapUsed: Long, + val jvmTotal: Long, + val jvmFree: Long, )