From 1d3a361a66474f7ddb5b2ebfae6083d28f24d1b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Thu, 8 Apr 2021 16:40:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=AD=97=E8=8A=82=E8=BD=AC=E6=8D=A2=20bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/framework/web/domain/Server.java    | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

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 5195efada..341d0b36e 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
@@ -1,26 +1,20 @@
 package com.ruoyi.framework.web.domain;
 
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-
-import cn.hutool.core.net.NetUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.system.*;
 import cn.hutool.system.oshi.CpuInfo;
 import cn.hutool.system.oshi.OshiUtil;
-import com.ruoyi.framework.web.domain.server.Cpu;
-import com.ruoyi.framework.web.domain.server.Jvm;
-import com.ruoyi.framework.web.domain.server.Mem;
-import com.ruoyi.framework.web.domain.server.Sys;
-import com.ruoyi.framework.web.domain.server.SysFile;
+import com.ruoyi.framework.web.domain.server.*;
 import lombok.Data;
 import oshi.hardware.GlobalMemory;
 import oshi.software.os.FileSystem;
 import oshi.software.os.OSFileStore;
 import oshi.software.os.OperatingSystem;
 
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * 服务器相关信息
  *
@@ -149,15 +143,15 @@ public class Server {
         long mb = kb * 1024;
         long gb = mb * 1024;
         if (size >= gb) {
-            return StrUtil.format("%.1f GB", (float) size / gb);
+            return String.format("%.1f GB", (float) size / gb);
         } else if (size >= mb) {
             float f = (float) size / mb;
-            return StrUtil.format(f > 100 ? "%.0f MB" : "%.1f MB", f);
+            return String.format(f > 100 ? "%.0f MB" : "%.1f MB", f);
         } else if (size >= kb) {
             float f = (float) size / kb;
-            return StrUtil.format(f > 100 ? "%.0f KB" : "%.1f KB", f);
+            return String.format(f > 100 ? "%.0f KB" : "%.1f KB", f);
         } else {
-            return StrUtil.format("%d B", size);
+            return String.format("%d B", size);
         }
     }
 }