解决springboot降级相关报错

jjt-admin/src/main/java/com/jjt/web/controller/monitor/ServerController.java

@@ -1,8 +1,6 @@
 package com.jjt.web.controller.monitor;
 
 import com.jjt.common.core.domain.AjaxResult;
-import com.jjt.framework.web.domain.Server;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -18,8 +16,8 @@ public class ServerController {
     //@PreAuthorize("@ss.hasPermi('monitor:server:list')")
     @GetMapping()
     public AjaxResult getInfo() throws Exception {
-        Server server = new Server();
-        server.copyTo();
-        return AjaxResult.success(server);
+//        Server server = new Server();
+//        server.copyTo();
+        return AjaxResult.success();
     }
 }

jjt-framework/src/main/java/com/jjt/framework/web/domain/Server.java

@@ -1,211 +1,211 @@
-package com.jjt.framework.web.domain;
-
-import com.jjt.common.utils.Arith;
-import com.jjt.common.utils.ip.IpUtils;
-import com.jjt.framework.web.domain.server.*;
-import oshi.SystemInfo;
-import oshi.hardware.CentralProcessor;
-import oshi.hardware.CentralProcessor.TickType;
-import oshi.hardware.GlobalMemory;
-import oshi.hardware.HardwareAbstractionLayer;
-import oshi.software.os.FileSystem;
-import oshi.software.os.OSFileStore;
-import oshi.software.os.OperatingSystem;
-import oshi.util.Util;
-
-import java.net.UnknownHostException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * 服务器相关信息
- *
- * @author jjt
- */
-public class Server {
-    private static final int OSHI_WAIT_SECOND = 1000;
-
-    /**
-     * CPU相关信息
-     */
-    private Cpu cpu = new Cpu();
-
-    /**
-     * 內存相关信息
-     */
-    private Mem mem = new Mem();
-
-    /**
-     * JVM相关信息
-     */
-    private Jvm jvm = new Jvm();
-
-    /**
-     * 服务器相关信息
-     */
-    private Sys sys = new Sys();
-
-    /**
-     * 磁盘相关信息
-     */
-    private List<SysFile> sysFiles = new LinkedList<SysFile>();
-
-    public Cpu getCpu() {
-        return cpu;
-    }
-
-    public void setCpu(Cpu cpu) {
-        this.cpu = cpu;
-    }
-
-    public Mem getMem() {
-        return mem;
-    }
-
-    public void setMem(Mem mem) {
-        this.mem = mem;
-    }
-
-    public Jvm getJvm() {
-        return jvm;
-    }
-
-    public void setJvm(Jvm jvm) {
-        this.jvm = jvm;
-    }
-
-    public Sys getSys() {
-        return sys;
-    }
-
-    public void setSys(Sys sys) {
-        this.sys = sys;
-    }
-
-    public List<SysFile> getSysFiles() {
-        return sysFiles;
-    }
-
-    public void setSysFiles(List<SysFile> sysFiles) {
-        this.sysFiles = sysFiles;
-    }
-
-    public void copyTo() throws Exception {
-        SystemInfo si = new SystemInfo();
-        HardwareAbstractionLayer hal = si.getHardware();
-
-        setCpuInfo(hal.getProcessor());
-
-        setMemInfo(hal.getMemory());
-
-        setSysInfo();
-
-        setJvmInfo();
-
-        setSysFiles(si.getOperatingSystem());
-    }
-
-    /**
-     * 设置CPU信息
-     */
-    private void setCpuInfo(CentralProcessor processor) {
-        // CPU信息
-        long[] prevTicks = processor.getSystemCpuLoadTicks();
-        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()];
-        long softirq = ticks[TickType.SOFTIRQ.getIndex()] - prevTicks[TickType.SOFTIRQ.getIndex()];
-        long steal = ticks[TickType.STEAL.getIndex()] - prevTicks[TickType.STEAL.getIndex()];
-        long cSys = ticks[TickType.SYSTEM.getIndex()] - prevTicks[TickType.SYSTEM.getIndex()];
-        long user = ticks[TickType.USER.getIndex()] - prevTicks[TickType.USER.getIndex()];
-        long iowait = ticks[TickType.IOWAIT.getIndex()] - prevTicks[TickType.IOWAIT.getIndex()];
-        long idle = ticks[TickType.IDLE.getIndex()] - prevTicks[TickType.IDLE.getIndex()];
-        long totalCpu = user + nice + cSys + idle + iowait + irq + softirq + steal;
-        cpu.setCpuNum(processor.getLogicalProcessorCount());
-        cpu.setTotal(totalCpu);
-        cpu.setSys(cSys);
-        cpu.setUsed(user);
-        cpu.setWait(iowait);
-        cpu.setFree(idle);
-    }
-
-    /**
-     * 设置内存信息
-     */
-    private void setMemInfo(GlobalMemory memory) {
-        mem.setTotal(memory.getTotal());
-        mem.setUsed(memory.getTotal() - memory.getAvailable());
-        mem.setFree(memory.getAvailable());
-    }
-
-    /**
-     * 设置服务器信息
-     */
-    private void setSysInfo() {
-        Properties props = System.getProperties();
-        sys.setComputerName(IpUtils.getHostName());
-        sys.setComputerIp(IpUtils.getHostIp());
-        sys.setOsName(props.getProperty("os.name"));
-        sys.setOsArch(props.getProperty("os.arch"));
-        sys.setUserDir(props.getProperty("user.dir"));
-    }
-
-    /**
-     * 设置Java虚拟机
-     */
-    private void setJvmInfo() throws UnknownHostException {
-        Properties props = System.getProperties();
-        jvm.setTotal(Runtime.getRuntime().totalMemory());
-        jvm.setMax(Runtime.getRuntime().maxMemory());
-        jvm.setFree(Runtime.getRuntime().freeMemory());
-        jvm.setVersion(props.getProperty("java.version"));
-        jvm.setHome(props.getProperty("java.home"));
-    }
-
-    /**
-     * 设置磁盘信息
-     */
-    private void setSysFiles(OperatingSystem os) {
-        FileSystem fileSystem = os.getFileSystem();
-        List<OSFileStore> fsArray = fileSystem.getFileStores();
-        for (OSFileStore fs : fsArray) {
-            long free = fs.getUsableSpace();
-            long total = fs.getTotalSpace();
-            long used = total - free;
-            SysFile sysFile = new SysFile();
-            sysFile.setDirName(fs.getMount());
-            sysFile.setSysTypeName(fs.getType());
-            sysFile.setTypeName(fs.getName());
-            sysFile.setTotal(convertFileSize(total));
-            sysFile.setFree(convertFileSize(free));
-            sysFile.setUsed(convertFileSize(used));
-            sysFile.setUsage(Arith.mul(Arith.div(used, total, 4), 100));
-            sysFiles.add(sysFile);
-        }
-    }
-
-    /**
-     * 字节转换
-     *
-     * @param size 字节大小
-     * @return 转换后值
-     */
-    public String convertFileSize(long size) {
-        long kb = 1024;
-        long mb = kb * 1024;
-        long gb = mb * 1024;
-        if (size >= gb) {
-            return String.format("%.1f GB", (float) size / gb);
-        } else if (size >= mb) {
-            float f = (float) size / mb;
-            return String.format(f > 100 ? "%.0f MB" : "%.1f MB", f);
-        } else if (size >= kb) {
-            float f = (float) size / kb;
-            return String.format(f > 100 ? "%.0f KB" : "%.1f KB", f);
-        } else {
-            return String.format("%d B", size);
-        }
-    }
-}
+//package com.jjt.framework.web.domain;
+//
+//import com.jjt.common.utils.Arith;
+//import com.jjt.common.utils.ip.IpUtils;
+//import com.jjt.framework.web.domain.server.*;
+//import oshi.SystemInfo;
+//import oshi.hardware.CentralProcessor;
+//import oshi.hardware.CentralProcessor.TickType;
+//import oshi.hardware.GlobalMemory;
+//import oshi.hardware.HardwareAbstractionLayer;
+//import oshi.software.os.FileSystem;
+//import oshi.software.os.OSFileStore;
+//import oshi.software.os.OperatingSystem;
+//import oshi.util.Util;
+//
+//import java.net.UnknownHostException;
+//import java.util.LinkedList;
+//import java.util.List;
+//import java.util.Properties;
+//
+///**
+// * 服务器相关信息
+// *
+// * @author jjt
+// */
+//public class Server {
+//    private static final int OSHI_WAIT_SECOND = 1000;
+//
+//    /**
+//     * CPU相关信息
+//     */
+//    private Cpu cpu = new Cpu();
+//
+//    /**
+//     * 內存相关信息
+//     */
+//    private Mem mem = new Mem();
+//
+//    /**
+//     * JVM相关信息
+//     */
+//    private Jvm jvm = new Jvm();
+//
+//    /**
+//     * 服务器相关信息
+//     */
+//    private Sys sys = new Sys();
+//
+//    /**
+//     * 磁盘相关信息
+//     */
+//    private List<SysFile> sysFiles = new LinkedList<SysFile>();
+//
+//    public Cpu getCpu() {
+//        return cpu;
+//    }
+//
+//    public void setCpu(Cpu cpu) {
+//        this.cpu = cpu;
+//    }
+//
+//    public Mem getMem() {
+//        return mem;
+//    }
+//
+//    public void setMem(Mem mem) {
+//        this.mem = mem;
+//    }
+//
+//    public Jvm getJvm() {
+//        return jvm;
+//    }
+//
+//    public void setJvm(Jvm jvm) {
+//        this.jvm = jvm;
+//    }
+//
+//    public Sys getSys() {
+//        return sys;
+//    }
+//
+//    public void setSys(Sys sys) {
+//        this.sys = sys;
+//    }
+//
+//    public List<SysFile> getSysFiles() {
+//        return sysFiles;
+//    }
+//
+//    public void setSysFiles(List<SysFile> sysFiles) {
+//        this.sysFiles = sysFiles;
+//    }
+//
+//    public void copyTo() throws Exception {
+//        SystemInfo si = new SystemInfo();
+//        HardwareAbstractionLayer hal = si.getHardware();
+//
+////        setCpuInfo(hal.getProcessor());
+//
+////        setMemInfo(hal.getMemory());
+//
+//        setSysInfo();
+//
+//        setJvmInfo();
+//
+//        setSysFiles(si.getOperatingSystem());
+//    }
+//
+//    /**
+//     * 设置CPU信息
+//     */
+//    private void setCpuInfo(CentralProcessor processor) {
+//        // CPU信息
+//        long[] prevTicks = processor.getSystemCpuLoadTicks();
+//        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()];
+//        long softirq = ticks[TickType.SOFTIRQ.getIndex()] - prevTicks[TickType.SOFTIRQ.getIndex()];
+//        long steal = ticks[TickType.STEAL.getIndex()] - prevTicks[TickType.STEAL.getIndex()];
+//        long cSys = ticks[TickType.SYSTEM.getIndex()] - prevTicks[TickType.SYSTEM.getIndex()];
+//        long user = ticks[TickType.USER.getIndex()] - prevTicks[TickType.USER.getIndex()];
+//        long iowait = ticks[TickType.IOWAIT.getIndex()] - prevTicks[TickType.IOWAIT.getIndex()];
+//        long idle = ticks[TickType.IDLE.getIndex()] - prevTicks[TickType.IDLE.getIndex()];
+//        long totalCpu = user + nice + cSys + idle + iowait + irq + softirq + steal;
+//        cpu.setCpuNum(processor.getLogicalProcessorCount());
+//        cpu.setTotal(totalCpu);
+//        cpu.setSys(cSys);
+//        cpu.setUsed(user);
+//        cpu.setWait(iowait);
+//        cpu.setFree(idle);
+//    }
+//
+//    /**
+//     * 设置内存信息
+//     */
+//    private void setMemInfo(GlobalMemory memory) {
+//        mem.setTotal(memory.getTotal());
+//        mem.setUsed(memory.getTotal() - memory.getAvailable());
+//        mem.setFree(memory.getAvailable());
+//    }
+//
+//    /**
+//     * 设置服务器信息
+//     */
+//    private void setSysInfo() {
+//        Properties props = System.getProperties();
+//        sys.setComputerName(IpUtils.getHostName());
+//        sys.setComputerIp(IpUtils.getHostIp());
+//        sys.setOsName(props.getProperty("os.name"));
+//        sys.setOsArch(props.getProperty("os.arch"));
+//        sys.setUserDir(props.getProperty("user.dir"));
+//    }
+//
+//    /**
+//     * 设置Java虚拟机
+//     */
+//    private void setJvmInfo() throws UnknownHostException {
+//        Properties props = System.getProperties();
+//        jvm.setTotal(Runtime.getRuntime().totalMemory());
+//        jvm.setMax(Runtime.getRuntime().maxMemory());
+//        jvm.setFree(Runtime.getRuntime().freeMemory());
+//        jvm.setVersion(props.getProperty("java.version"));
+//        jvm.setHome(props.getProperty("java.home"));
+//    }
+//
+//    /**
+//     * 设置磁盘信息
+//     */
+//    private void setSysFiles(OperatingSystem os) {
+//        FileSystem fileSystem = os.getFileSystem();
+//        List<OSFileStore> fsArray = fileSystem.getFileStores();
+//        for (OSFileStore fs : fsArray) {
+//            long free = fs.getUsableSpace();
+//            long total = fs.getTotalSpace();
+//            long used = total - free;
+//            SysFile sysFile = new SysFile();
+//            sysFile.setDirName(fs.getMount());
+//            sysFile.setSysTypeName(fs.getType());
+//            sysFile.setTypeName(fs.getName());
+//            sysFile.setTotal(convertFileSize(total));
+//            sysFile.setFree(convertFileSize(free));
+//            sysFile.setUsed(convertFileSize(used));
+//            sysFile.setUsage(Arith.mul(Arith.div(used, total, 4), 100));
+//            sysFiles.add(sysFile);
+//        }
+//    }
+//
+//    /**
+//     * 字节转换
+//     *
+//     * @param size 字节大小
+//     * @return 转换后值
+//     */
+//    public String convertFileSize(long size) {
+//        long kb = 1024;
+//        long mb = kb * 1024;
+//        long gb = mb * 1024;
+//        if (size >= gb) {
+//            return String.format("%.1f GB", (float) size / gb);
+//        } else if (size >= mb) {
+//            float f = (float) size / mb;
+//            return String.format(f > 100 ? "%.0f MB" : "%.1f MB", f);
+//        } else if (size >= kb) {
+//            float f = (float) size / kb;
+//            return String.format(f > 100 ? "%.0f KB" : "%.1f KB", f);
+//        } else {
+//            return String.format("%d B", size);
+//        }
+//    }
+//}