增加供应商

opsli-base-support/opsli-core/src/main/java/org/opsli/core/monitor/SystemHardwareInfo.java

@@ -91,8 +91,6 @@ public class SystemHardwareInfo implements Serializable {
         setSysInfo(si.getOperatingSystem());
     }
     public void copyToJvmInfo() {
-        SystemInfo si = new SystemInfo();
-        HardwareAbstractionLayer hal = si.getHardware();
         setJvmInfo();
     }
     public void copyToSysFilesInfo() {
@@ -162,6 +160,8 @@ public class SystemHardwareInfo implements Serializable {
         jvm.setFree(Runtime.getRuntime().freeMemory());
         jvm.setVersion(props.getProperty("java.version"));
         jvm.setHome(props.getProperty("java.home"));
+        jvm.setVendor(props.getProperty("java.vendor"));
+        jvm.setVendorUrl(props.getProperty("java.vendor.url"));
     }
 
     /**

opsli-base-support/opsli-core/src/main/java/org/opsli/core/monitor/utils/CPU.java

@@ -8,6 +8,8 @@ import cn.hutool.core.util.NumberUtil;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+
 /**
  * 系统监控
  *
@@ -74,5 +76,4 @@ public class CPU implements Serializable {
         return NumberUtil.round(NumberUtil.mul(free / total, 100), 2).doubleValue();
     }
 
-
 }

opsli-base-support/opsli-core/src/main/java/org/opsli/core/monitor/utils/JVM.java

@@ -67,10 +67,16 @@ public class JVM implements Serializable {
      */
     private String runTime;
 
+
+    /** Java的运行环境供应商 */
+    private String vendor;
+
     /**
-     * JAVA名称
+     * Java的运行环境供应商 URL
      */
-    private String name;
+    private String vendorUrl;
+
+    // =============================
 
     public double getTotal() {
         return NumberUtil.div(total, (1024 * 1024), 2);
@@ -100,8 +106,24 @@ public class JVM implements Serializable {
         return NumberUtil.mul(NumberUtil.div(total - free, total, 4), 100);
     }
 
+    public String getVendor() {
+        return vendor;
+    }
+
+    public void setVendor(String vendor) {
+        this.vendor = vendor;
+    }
+
+    public String getVendorUrl() {
+        return vendorUrl;
+    }
+
+    public void setVendorUrl(String vendorUrl) {
+        this.vendorUrl = vendorUrl;
+    }
+
     /**
-     * 获取JDK名称
+     * 获取 JVM 虚拟机名称
      */
     public String getName() {
         return ManagementFactory.getRuntimeMXBean().getVmName();

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/monitor/web/MonitorController.java

@@ -34,7 +34,7 @@ public class MonitorController {
      * 查询服务器信息
      * @return ResultVo
      */
-    @RequiresPermissions("system_monitor_select")
+    @RequiresPermissions("devops_sysmonitor_select")
     @RequestMapping("/getSystemInfo")
     @ApiOperation(value = "当前服务器信息", notes = "当前服务器信息")
     public ResultVo<?> getSystemInfo() {
@@ -56,7 +56,7 @@ public class MonitorController {
      * 查询CPU信息
      * @return ResultVo
      */
-    @RequiresPermissions("system_monitor_select")
+    @RequiresPermissions("devops_sysmonitor_select")
     @RequestMapping("/getCpuInfo")
     @ApiOperation(value = "当前CPU信息", notes = "当前CPU信息")
     public ResultVo<?> getCpuInfo() {
@@ -68,7 +68,7 @@ public class MonitorController {
      * 查询内存信息
      * @return ResultVo
      */
-    @RequiresPermissions("system_monitor_select")
+    @RequiresPermissions("devops_sysmonitor_select")
     @RequestMapping("/getMemInfo")
     @ApiOperation(value = "当前内存信息", notes = "当前内存信息")
     public ResultVo<?> getMemInfo() {
@@ -80,7 +80,7 @@ public class MonitorController {
      * 查询JVM信息
      * @return ResultVo
      */
-    @RequiresPermissions("system_monitor_select")
+    @RequiresPermissions("devops_sysmonitor_select")
     @RequestMapping("/getJVMInfo")
     @ApiOperation(value = "当前JVM信息", notes = "当前JVM信息")
     public ResultVo<?> getJVMInfo() {