From c9e01879caaf914c33adbaaab68219d7b88d2b07 Mon Sep 17 00:00:00 2001
From: linjiaru <15988824557@163.com>
Date: 星期二, 23 三月 2021 16:22:02 +0800
Subject: [PATCH] beanUtil.copy参数顺序反了
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java | 60 +++++++++++++++++++++++++-----------------------------------
1 files changed, 25 insertions(+), 35 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
index 485d201..4b70cbb 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
@@ -1,16 +1,19 @@
package com.ruoyi.framework.web.domain.server;
import java.lang.management.ManagementFactory;
-import com.ruoyi.common.utils.Arith;
+import java.util.Date;
+
+import cn.hutool.core.date.BetweenFormatter;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.NumberUtil;
import com.ruoyi.common.utils.DateUtils;
/**
* JVM鐩稿叧淇℃伅
- *
+ *
* @author ruoyi
*/
-public class Jvm
-{
+public class Jvm {
/**
* 褰撳墠JVM鍗犵敤鐨勫唴瀛樻�绘暟(M)
*/
@@ -36,71 +39,58 @@
*/
private String home;
- public double getTotal()
- {
- return Arith.div(total, (1024 * 1024), 2);
+ public double getTotal() {
+ return NumberUtil.div(total, (1024 * 1024), 2);
}
- public void setTotal(double total)
- {
+ public void setTotal(double total) {
this.total = total;
}
- public double getMax()
- {
- return Arith.div(max, (1024 * 1024), 2);
+ public double getMax() {
+ return NumberUtil.div(max, (1024 * 1024), 2);
}
- public void setMax(double max)
- {
+ public void setMax(double max) {
this.max = max;
}
- public double getFree()
- {
- return Arith.div(free, (1024 * 1024), 2);
+ public double getFree() {
+ return NumberUtil.div(free, (1024 * 1024), 2);
}
- public void setFree(double free)
- {
+ public void setFree(double free) {
this.free = free;
}
- public double getUsed()
- {
- return Arith.div(total - free, (1024 * 1024), 2);
+ public double getUsed() {
+ return NumberUtil.div(total - free, (1024 * 1024), 2);
}
- public double getUsage()
- {
- return Arith.mul(Arith.div(total - free, total, 4), 100);
+ public double getUsage() {
+ return NumberUtil.mul(NumberUtil.div(total - free, total, 4), 100);
}
/**
* 鑾峰彇JDK鍚嶇О
*/
- public String getName()
- {
+ public String getName() {
return ManagementFactory.getRuntimeMXBean().getVmName();
}
- public String getVersion()
- {
+ public String getVersion() {
return version;
}
- public void setVersion(String version)
- {
+ public void setVersion(String version) {
this.version = version;
}
- public String getHome()
- {
+ public String getHome() {
return home;
}
- public void setHome(String home)
- {
+ public void setHome(String home) {
this.home = home;
}
--
Gitblit v1.9.3