From e56a7e7e5778d6359343570884236f9c49669124 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 6 Dec 2018 11:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A3=81=E7=9B=98=EF=BC=88=E5=85=89=E9=A9=B1?=
 =?UTF-8?q?=EF=BC=89=E9=AA=8C=E8=AF=81=E9=99=A4=E6=95=B0=E4=B8=8D=E4=B8=BA?=
 =?UTF-8?q?=E9=9B=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java | 4 ++++
 .../src/main/java/com/ruoyi/framework/web/domain/Server.java | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
index 1132ec64..2d7673e7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
@@ -86,6 +86,10 @@ public class Arith
         }
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
         BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        if (b1.compareTo(BigDecimal.ZERO) == 0)
+        {
+            return BigDecimal.ZERO.doubleValue();
+        }
         return b1.divide(b2, scale, BigDecimal.ROUND_HALF_UP).doubleValue();
     }
 
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java
index f3b9850a..26aed47d 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java
@@ -28,6 +28,9 @@ import oshi.util.Util;
  */
 public class Server
 {
+    
+    private static final int OSHI_WAIT_SECOND = 1000;
+    
     /**
      * CPU相关信息
      */
@@ -126,7 +129,7 @@ public class Server
     {
         // CPU信息
         long[] prevTicks = processor.getSystemCpuLoadTicks();
-        Util.sleep(500);
+        Util.sleep(OSHI_WAIT_SECOND);
         long[] ticks = processor.getSystemCpuLoadTicks();
         long nice = ticks[TickType.NICE.getIndex()] - prevTicks[TickType.NICE.getIndex()];
         long irq = ticks[TickType.IRQ.getIndex()] - prevTicks[TickType.IRQ.getIndex()];