将sigar替换为oshi (#278)

* sigar 使用需要修改系统文件, 现改为使用oshi监控系统信息

* 去除README.md和pom.xml中关于sigar的相关内容

eladmin-monitor/src/test/java/me/zhengjie/SystemInfoTest.java

+/**
+ * MIT License
+ * <p>
+ * Copyright (c) 2010 - 2020 The OSHI Project Contributors: https://github.com/oshi/oshi/graphs/contributors
+ * <p>
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * <p>
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * <p>
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package me.zhengjie;
+
+import static org.junit.Assert.assertFalse;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import oshi.PlatformEnum;
+import oshi.SystemInfo;
+import oshi.hardware.CentralProcessor;
+import oshi.hardware.CentralProcessor.TickType;
+import oshi.hardware.ComputerSystem;
+import oshi.hardware.Display;
+import oshi.hardware.GlobalMemory;
+import oshi.hardware.HWDiskStore;
+import oshi.hardware.HWPartition;
+import oshi.hardware.HardwareAbstractionLayer;
+import oshi.hardware.NetworkIF;
+import oshi.hardware.PhysicalMemory;
+import oshi.hardware.PowerSource;
+import oshi.hardware.Sensors;
+import oshi.hardware.SoundCard;
+import oshi.hardware.UsbDevice;
+import oshi.hardware.VirtualMemory;
+import oshi.software.os.FileSystem;
+import oshi.software.os.NetworkParams;
+import oshi.software.os.OSFileStore;
+import oshi.software.os.OSProcess;
+import oshi.software.os.OSService;
+import oshi.software.os.OperatingSystem;
+import oshi.software.os.OperatingSystem.ProcessSort;
+import oshi.util.FormatUtil;
+import oshi.util.Util;
+
+/**
+ * A demonstration of access to many of OSHI's capabilities
+ */
+public class SystemInfoTest {
+
+    private static final Logger logger = LoggerFactory.getLogger(SystemInfoTest.class);
+
+    static List<String> oshi = new ArrayList<>();
+
+    /**
+     * Test that this platform is implemented..
+     */
+    @Test
+    public void testPlatformEnum() {
+        assertFalse(PlatformEnum.UNKNOWN.equals(SystemInfo.getCurrentPlatformEnum()));
+        // Exercise the main method
+        main(null);
+    }
+
+    /**
+     * The main method, demonstrating use of classes.
+     *
+     * @param args the arguments (unused)
+     */
+    public static void main(String[] args) {
+        logger.info("Initializing System...");
+        SystemInfo si = new SystemInfo();
+
+        HardwareAbstractionLayer hal = si.getHardware();
+        OperatingSystem os = si.getOperatingSystem();
+
+        printOperatingSystem(os);
+
+        logger.info("Checking computer system...");
+        printComputerSystem(hal.getComputerSystem());
+
+        logger.info("Checking Processor...");
+        printProcessor(hal.getProcessor());
+
+        logger.info("Checking Memory...");
+        printMemory(hal.getMemory());
+
+        logger.info("Checking CPU...");
+        printCpu(hal.getProcessor());
+
+        logger.info("Checking Processes...");
+        printProcesses(os, hal.getMemory());
+
+        logger.info("Checking Services...");
+        printServices(os);
+
+        logger.info("Checking Sensors...");
+        printSensors(hal.getSensors());
+
+        logger.info("Checking Power sources...");
+        printPowerSources(hal.getPowerSources());
+
+        logger.info("Checking Disks...");
+        printDisks(hal.getDiskStores());
+
+        logger.info("Checking File System...");
+        printFileSystem(os.getFileSystem());
+
+        logger.info("Checking Network interfaces...");
+        printNetworkInterfaces(hal.getNetworkIFs());
+
+        logger.info("Checking Network parameters...");
+        printNetworkParameters(os.getNetworkParams());
+
+        // hardware: displays
+        logger.info("Checking Displays...");
+        printDisplays(hal.getDisplays());
+
+        // hardware: USB devices
+        logger.info("Checking USB Devices...");
+        printUsbDevices(hal.getUsbDevices(true));
+
+        logger.info("Checking Sound Cards...");
+        printSoundCards(hal.getSoundCards());
+
+        StringBuilder output = new StringBuilder();
+        for (int i = 0; i < oshi.size(); i++) {
+            output.append(oshi.get(i));
+            if (oshi.get(i) != null && !oshi.get(i).endsWith("\n")) {
+                output.append('\n');
+            }
+        }
+        logger.info("Printing Operating System and Hardware Info:{}{}", '\n', output);
+    }
+
+    private static void printOperatingSystem(final OperatingSystem os) {
+        oshi.add(String.valueOf(os));
+        oshi.add("Booted: " + Instant.ofEpochSecond(os.getSystemBootTime()));
+        oshi.add("Uptime: " + FormatUtil.formatElapsedSecs(os.getSystemUptime()));
+        oshi.add("Running with" + (os.isElevated() ? "" : "out") + " elevated permissions.");
+    }
+
+    private static void printComputerSystem(final ComputerSystem computerSystem) {
+        oshi.add("system: " + computerSystem.toString());
+        oshi.add(" firmware: " + computerSystem.getFirmware().toString());
+        oshi.add(" baseboard: " + computerSystem.getBaseboard().toString());
+    }
+
+    private static void printProcessor(CentralProcessor processor) {
+        oshi.add(processor.toString());
+    }
+
+    private static void printMemory(GlobalMemory memory) {
+        oshi.add("Memory: \n " + memory.toString());
+        VirtualMemory vm = memory.getVirtualMemory();
+        oshi.add("Swap: \n " + vm.toString());
+        PhysicalMemory[] pmArray = memory.getPhysicalMemory();
+        if (pmArray.length > 0) {
+            oshi.add("Physical Memory: ");
+            for (PhysicalMemory pm : pmArray) {
+                oshi.add(" " + pm.toString());
+            }
+        }
+    }
+
+    private static void printCpu(CentralProcessor processor) {
+        oshi.add("Context Switches/Interrupts: " + processor.getContextSwitches() + " / " + processor.getInterrupts());
+
+        long[] prevTicks = processor.getSystemCpuLoadTicks();
+        long[][] prevProcTicks = processor.getProcessorCpuLoadTicks();
+        oshi.add("CPU, IOWait, and IRQ ticks @ 0 sec:" + Arrays.toString(prevTicks));
+        // Wait a second...
+        Util.sleep(1000);
+        long[] ticks = processor.getSystemCpuLoadTicks();
+        oshi.add("CPU, IOWait, and IRQ ticks @ 1 sec:" + Arrays.toString(ticks));
+        long user = ticks[TickType.USER.getIndex()] - prevTicks[TickType.USER.getIndex()];
+        long nice = ticks[TickType.NICE.getIndex()] - prevTicks[TickType.NICE.getIndex()];
+        long sys = ticks[TickType.SYSTEM.getIndex()] - prevTicks[TickType.SYSTEM.getIndex()];
+        long idle = ticks[TickType.IDLE.getIndex()] - prevTicks[TickType.IDLE.getIndex()];
+        long iowait = ticks[TickType.IOWAIT.getIndex()] - prevTicks[TickType.IOWAIT.getIndex()];
+        long irq = ticks[TickType.IRQ.getIndex()] - prevTicks[TickType.IRQ.getIndex()];
+        long softirq = ticks[TickType.SOFTIRQ.getIndex()] - prevTicks[TickType.SOFTIRQ.getIndex()];
+        long steal = ticks[TickType.STEAL.getIndex()] - prevTicks[TickType.STEAL.getIndex()];
+        long totalCpu = user + nice + sys + idle + iowait + irq + softirq + steal;
+
+        oshi.add(String.format(
+                "User: %.1f%% Nice: %.1f%% System: %.1f%% Idle: %.1f%% IOwait: %.1f%% IRQ: %.1f%% SoftIRQ: %.1f%% Steal: %.1f%%",
+                100d * user / totalCpu, 100d * nice / totalCpu, 100d * sys / totalCpu, 100d * idle / totalCpu,
+                100d * iowait / totalCpu, 100d * irq / totalCpu, 100d * softirq / totalCpu, 100d * steal / totalCpu));
+        oshi.add(String.format("CPU load: %.1f%%", processor.getSystemCpuLoadBetweenTicks(prevTicks) * 100));
+        double[] loadAverage = processor.getSystemLoadAverage(3);
+        oshi.add("CPU load averages:" + (loadAverage[0] < 0 ? " N/A" : String.format(" %.2f", loadAverage[0]))
+                + (loadAverage[1] < 0 ? " N/A" : String.format(" %.2f", loadAverage[1]))
+                + (loadAverage[2] < 0 ? " N/A" : String.format(" %.2f", loadAverage[2])));
+        // per core CPU
+        StringBuilder procCpu = new StringBuilder("CPU load per processor:");
+        double[] load = processor.getProcessorCpuLoadBetweenTicks(prevProcTicks);
+        for (double avg : load) {
+            procCpu.append(String.format(" %.1f%%", avg * 100));
+        }
+        oshi.add(procCpu.toString());
+        long freq = processor.getProcessorIdentifier().getVendorFreq();
+        if (freq > 0) {
+            oshi.add("Vendor Frequency: " + FormatUtil.formatHertz(freq));
+        }
+        freq = processor.getMaxFreq();
+        if (freq > 0) {
+            oshi.add("Max Frequency: " + FormatUtil.formatHertz(freq));
+        }
+        long[] freqs = processor.getCurrentFreq();
+        if (freqs[0] > 0) {
+            StringBuilder sb = new StringBuilder("Current Frequencies: ");
+            for (int i = 0; i < freqs.length; i++) {
+                if (i > 0) {
+                    sb.append(", ");
+                }
+                sb.append(FormatUtil.formatHertz(freqs[i]));
+            }
+            oshi.add(sb.toString());
+        }
+    }
+
+    private static void printProcesses(OperatingSystem os, GlobalMemory memory) {
+        oshi.add("My PID: " + os.getProcessId() + " with affinity "
+                + Long.toBinaryString(os.getProcessAffinityMask(os.getProcessId())));
+        oshi.add("Processes: " + os.getProcessCount() + ", Threads: " + os.getThreadCount());
+        // Sort by highest CPU
+        List<OSProcess> procs = Arrays.asList(os.getProcesses(5, ProcessSort.CPU));
+
+        oshi.add("   PID  %CPU %MEM       VSZ       RSS Name");
+        for (int i = 0; i < procs.size() && i < 5; i++) {
+            OSProcess p = procs.get(i);
+            oshi.add(String.format(" %5d %5.1f %4.1f %9s %9s %s", p.getProcessID(),
+                    100d * (p.getKernelTime() + p.getUserTime()) / p.getUpTime(),
+                    100d * p.getResidentSetSize() / memory.getTotal(), FormatUtil.formatBytes(p.getVirtualSize()),
+                    FormatUtil.formatBytes(p.getResidentSetSize()), p.getName()));
+        }
+    }
+
+    private static void printServices(OperatingSystem os) {
+        oshi.add("Services: ");
+        oshi.add("   PID   State   Name");
+        // DO 5 each of running and stopped
+        int i = 0;
+        for (OSService s : os.getServices()) {
+            if (s.getState().equals(OSService.State.RUNNING) && i++ < 5) {
+                oshi.add(String.format(" %5d  %7s  %s", s.getProcessID(), s.getState(), s.getName()));
+            }
+        }
+        i = 0;
+        for (OSService s : os.getServices()) {
+            if (s.getState().equals(OSService.State.STOPPED) && i++ < 5) {
+                oshi.add(String.format(" %5d  %7s  %s", s.getProcessID(), s.getState(), s.getName()));
+            }
+        }
+    }
+
+    private static void printSensors(Sensors sensors) {
+        oshi.add("Sensors: " + sensors.toString());
+    }
+
+    private static void printPowerSources(PowerSource[] powerSources) {
+        StringBuilder sb = new StringBuilder("Power Sources: ");
+        if (powerSources.length == 0) {
+            sb.append("Unknown");
+        }
+        for (PowerSource powerSource : powerSources) {
+            sb.append("\n ").append(powerSource.toString());
+        }
+        oshi.add(sb.toString());
+    }
+
+    private static void printDisks(HWDiskStore[] diskStores) {
+        oshi.add("Disks:");
+        for (HWDiskStore disk : diskStores) {
+            oshi.add(" " + disk.toString());
+
+            HWPartition[] partitions = disk.getPartitions();
+            for (HWPartition part : partitions) {
+                oshi.add(" |-- " + part.toString());
+            }
+        }
+
+    }
+
+    private static void printFileSystem(FileSystem fileSystem) {
+        oshi.add("File System:");
+
+        oshi.add(String.format(" File Descriptors: %d/%d", fileSystem.getOpenFileDescriptors(),
+                fileSystem.getMaxFileDescriptors()));
+
+        OSFileStore[] fsArray = fileSystem.getFileStores();
+        for (OSFileStore fs : fsArray) {
+            long usable = fs.getUsableSpace();
+            long total = fs.getTotalSpace();
+            oshi.add(String.format(
+                    " %s (%s) [%s] %s of %s free (%.1f%%), %s of %s files free (%.1f%%) is %s "
+                            + (fs.getLogicalVolume() != null && fs.getLogicalVolume().length() > 0 ? "[%s]" : "%s")
+                            + " and is mounted at %s",
+                    fs.getName(), fs.getDescription().isEmpty() ? "file system" : fs.getDescription(), fs.getType(),
+                    FormatUtil.formatBytes(usable), FormatUtil.formatBytes(fs.getTotalSpace()), 100d * usable / total,
+                    FormatUtil.formatValue(fs.getFreeInodes(), ""), FormatUtil.formatValue(fs.getTotalInodes(), ""),
+                    100d * fs.getFreeInodes() / fs.getTotalInodes(), fs.getVolume(), fs.getLogicalVolume(),
+                    fs.getMount()));
+        }
+    }
+
+    private static void printNetworkInterfaces(NetworkIF[] networkIFs) {
+        StringBuilder sb = new StringBuilder("Network Interfaces:");
+        if (networkIFs.length == 0) {
+            sb.append(" Unknown");
+        }
+        for (NetworkIF net : networkIFs) {
+            sb.append("\n ").append(net.toString());
+        }
+        oshi.add(sb.toString());
+    }
+
+    private static void printNetworkParameters(NetworkParams networkParams) {
+        oshi.add("Network parameters:\n " + networkParams.toString());
+    }
+
+    private static void printDisplays(Display[] displays) {
+        oshi.add("Displays:");
+        int i = 0;
+        for (Display display : displays) {
+            oshi.add(" Display " + i + ":");
+            oshi.add(String.valueOf(display));
+            i++;
+        }
+    }
+
+    private static void printUsbDevices(UsbDevice[] usbDevices) {
+        oshi.add("USB Devices:");
+        for (UsbDevice usbDevice : usbDevices) {
+            oshi.add(String.valueOf(usbDevice));
+        }
+    }
+
+    private static void printSoundCards(SoundCard[] cards) {
+        oshi.add("Sound Cards:");
+        for (SoundCard card : cards) {
+            oshi.add(" " + String.valueOf(card));
+        }
+    }
+}
\ No newline at end of file

eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/ServerServiceImpl.java

@@ -44,7 +44,7 @@ public class ServerServiceImpl implements ServerService {
 			try {
 				server.setState("1");
 				String url = String.format("http://%s:%d/api/serverMonitor",server.getAddress(),server.getPort());
-				String res = HttpUtil.get(url,1000);
+				String res = HttpUtil.get(url,3000);
 				JSONObject obj = JSONObject.parseObject(res);
 				server.setCpuRate(obj.getDouble("cpuRate"));
 				server.setCpuCore(obj.getInteger("cpuCore"));