完成和 dagent 的通信，对应 dagent 的 14a9c4f1 版本

common/src/main/java/cn/reghao/autodop/common/jvm/JVM.java

@@ -1,7 +1,6 @@
 package cn.reghao.autodop.common.jvm;
 
 import cn.reghao.autodop.common.jvm.pojo.*;
-import cn.reghao.autodop.common.stat.jvm.pojo.*;
 import cn.reghao.autodop.common.utils.DatetimeConverter;
 
 import java.lang.management.*;

common/src/main/java/cn/reghao/autodop/common/machine/LinuxSys.java

@@ -1,45 +0,0 @@
-package cn.reghao.autodop.common.machine;
-
-import cn.reghao.autodop.common.machine.pojo.LinuxSysInfo;
-import cn.reghao.autodop.common.machine.pojo.LinuxSysStat;
-
-/**
- * @author reghao
- * @date 2020-10-22 15:47:58
- */
-public class LinuxSys {
-    private OS os;
-    private CPU cpu;
-    private Memory memory;
-    private Disk disk;
-    private Network network;
-
-    public LinuxSys() {
-        this.os = new OS();
-        this.cpu = new CPU();
-        this.memory = new Memory();
-        this.disk = new Disk();
-        this.network = new Network();
-    }
-
-    public LinuxSysInfo info() {
-        LinuxSysInfo linuxSysInfo = new LinuxSysInfo();
-        linuxSysInfo.setOs(os.info());
-        linuxSysInfo.setCpu(cpu.info());
-        linuxSysInfo.setMemory(memory.info());
-        linuxSysInfo.setDisk(disk.info());
-        linuxSysInfo.setNetwork(network.info());
-        return linuxSysInfo;
-    }
-
-    public LinuxSysStat stat() {
-        LinuxSysStat linuxSysStat = new LinuxSysStat();
-        try {
-            linuxSysStat.setOs(os.stat());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        linuxSysStat.setMemory(memory.info());
-        return linuxSysStat;
-    }
-}

common/src/main/java/cn/reghao/autodop/common/machine/Machine.java

@@ -0,0 +1,37 @@
+package cn.reghao.autodop.common.machine;
+
+import cn.reghao.autodop.common.machine.cpu.CPU;
+import cn.reghao.autodop.common.machine.disk.Disk;
+import cn.reghao.autodop.common.machine.memory.Memory;
+import cn.reghao.autodop.common.machine.network.Network;
+import cn.reghao.autodop.common.machine.os.OS;
+
+/**
+ * @author reghao
+ * @date 2020-10-22 15:47:58
+ */
+public class Machine {
+    private OS os;
+    private CPU cpu;
+    private Memory memory;
+    private Disk disk;
+    private Network network;
+
+    public Machine() {
+        this.os = new OS();
+        this.cpu = new CPU();
+        this.memory = new Memory();
+        this.disk = new Disk();
+        this.network = new Network();
+    }
+
+    public MachineInfo info() {
+        MachineInfo machineInfo = new MachineInfo();
+        return machineInfo;
+    }
+
+    public MachineStat stat() {
+        MachineStat machineStat = new MachineStat();
+        return machineStat;
+    }
+}

common/src/main/java/cn/reghao/autodop/common/machine/MachineInfo.java

@@ -0,0 +1,23 @@
+package cn.reghao.autodop.common.machine;
+
+import cn.reghao.autodop.common.machine.cpu.CPUInfo;
+import cn.reghao.autodop.common.machine.disk.DiskInfo;
+import cn.reghao.autodop.common.machine.memory.MemoryInfo;
+import cn.reghao.autodop.common.machine.network.NetworkInfo;
+import cn.reghao.autodop.common.machine.os.OSInfo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author reghao
+ * @date 2020-10-22 15:45:29
+ */
+@Data
+public class MachineInfo {
+    private CPUInfo cpuInfo;
+    private MemoryInfo memoryInfo;
+    private List<DiskInfo> diskInfo;
+    private List<NetworkInfo> networkInfo;
+    private OSInfo osInfo;
+}

common/src/main/java/cn/reghao/autodop/common/machine/MachineStat.java

@@ -0,0 +1,11 @@
+package cn.reghao.autodop.common.machine;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-10-22 15:45:43
+ */
+@Data
+public class MachineStat {
+}

common/src/main/java/cn/reghao/autodop/common/machine/CPU.java → common/src/main/java/cn/reghao/autodop/common/machine/cpu/CPU.java

@@ -1,9 +1,6 @@
-package cn.reghao.autodop.common.machine;
+package cn.reghao.autodop.common.machine.cpu;
 
 import cn.reghao.autodop.common.machine.contant.ProcFile;
-import cn.reghao.autodop.common.machine.pojo.CPUInfo;
-import cn.reghao.autodop.common.machine.pojo.cpu.CpuStats;
-import cn.reghao.autodop.common.machine.pojo.cpu.CpuStat;
 import cn.reghao.autodop.common.machine.utils.AbstractPercentageCalculator;
 import cn.reghao.autodop.common.machine.utils.CpuPercentageCalculator;
 import cn.reghao.autodop.common.utils.text.TextFile;
@@ -29,29 +26,12 @@ public class CPU {
         }
         Map<String, String> map = list.get(0);
         CPUInfo cpuInfo = new CPUInfo();
-        cpuInfo.setModelName(map.get("model name"));
-        cpuInfo.setCpus(list.size());
-        cpuInfo.setCpuCores(Integer.parseInt(map.get("cpu cores")));
-        cpuInfo.setBogomips(Double.parseDouble(map.get("bogomips")));
         return cpuInfo;
     }
 
     private List<Map<String, String>> parseCpuInfo() {
         String info = textFile.readFile(ProcFile.CPU_INFO);
         List<Map<String, String>> list = new ArrayList<>();
-        Map<String, String> map = new LinkedHashMap<>();
-        for (String line : info.split(System.lineSeparator())) {
-            if (!line.isEmpty()) {
-                String[] strs = line.replace("\t", "").split(":");
-                if (!strs[0].startsWith("power management")) {
-                    map.put(strs[0], strs[1].replace(" ", ""));
-                }
-            } else {
-                list.add(map);
-                map = new LinkedHashMap<>();
-            }
-        }
-        list.add(map);
         return list;
     }
 

common/src/main/java/cn/reghao/autodop/common/machine/pojo/CPUInfo.java → common/src/main/java/cn/reghao/autodop/common/machine/cpu/CPUInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.machine.pojo;
+package cn.reghao.autodop.common.machine.cpu;
 
 import lombok.Data;
 
@@ -8,8 +8,11 @@ import lombok.Data;
  */
 @Data
 public class CPUInfo {
-    private String modelName;
-    private int cpus;
+    private String arch;
+    private String byteOrder;
     private int cpuCores;
-    private double bogomips;
+    private int cpus;
+    private String vendorId;
+    private String modelName;
+    private String bogoMips;
 }

common/src/main/java/cn/reghao/autodop/common/machine/pojo/cpu/CpuStat.java → common/src/main/java/cn/reghao/autodop/common/machine/cpu/CpuStat.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.machine.pojo.cpu;
+package cn.reghao.autodop.common.machine.cpu;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/machine/pojo/cpu/CpuStats.java → common/src/main/java/cn/reghao/autodop/common/machine/cpu/CpuStats.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.machine.pojo.cpu;
+package cn.reghao.autodop.common.machine.cpu;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/machine/Disk.java → common/src/main/java/cn/reghao/autodop/common/machine/disk/Disk.java

@@ -1,6 +1,5 @@
-package cn.reghao.autodop.common.machine;
+package cn.reghao.autodop.common.machine.disk;
 
-import cn.reghao.autodop.common.machine.pojo.DiskInfo;
 import cn.reghao.autodop.common.machine.utils.ByteConverter;
 import cn.reghao.autodop.common.machine.utils.ByteType;
 import lombok.extern.slf4j.Slf4j;
@@ -37,7 +36,6 @@ public class Disk {
                     String fsType = fileStore.type();
 
                     DiskInfo diskInfo = new DiskInfo();
-                    diskInfo.setFileSystem(fileSystem);
                     diskInfo.setSize(size);
                     diskInfo.setUsed(used);
                     diskInfo.setAvail(avail);

common/src/main/java/cn/reghao/autodop/common/machine/pojo/DiskInfo.java → common/src/main/java/cn/reghao/autodop/common/machine/disk/DiskInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.machine.pojo;
+package cn.reghao.autodop.common.machine.disk;
 
 import lombok.Data;
 
@@ -10,10 +10,12 @@ import lombok.Data;
  */
 @Data
 public class DiskInfo {
-    private String fileSystem;
+    private String diskPath;
+    private String fsType;
     private String size;
     private String used;
     private String avail;
     private String mountedOn;
-    private String fsType;
+    private int inodeTotal;
+    private int inodeFree;
 }

common/src/main/java/cn/reghao/autodop/common/machine/pojo/disk/DiskStat.java → common/src/main/java/cn/reghao/autodop/common/machine/disk/DiskStat.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.machine.pojo.disk;
+package cn.reghao.autodop.common.machine.disk;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/machine/pojo/disk/DiskUsage.java → common/src/main/java/cn/reghao/autodop/common/machine/disk/DiskUsage.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.machine.pojo.disk;
+package cn.reghao.autodop.common.machine.disk;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/machine/pojo/memory/MemStat.java → common/src/main/java/cn/reghao/autodop/common/machine/memory/MemStat.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.machine.pojo.memory;
+package cn.reghao.autodop.common.machine.memory;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/machine/pojo/memory/MemUsage.java → common/src/main/java/cn/reghao/autodop/common/machine/memory/MemUsage.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.machine.pojo.memory;
+package cn.reghao.autodop.common.machine.memory;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/machine/Memory.java → common/src/main/java/cn/reghao/autodop/common/machine/memory/Memory.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.common.machine;
+package cn.reghao.autodop.common.machine.memory;
 
 import cn.reghao.autodop.common.machine.contant.ProcFile;
-import cn.reghao.autodop.common.machine.pojo.MemoryInfo;
+import cn.reghao.autodop.common.machine.memory.MemoryInfo;
 import cn.reghao.autodop.common.machine.utils.ByteConverter;
 import cn.reghao.autodop.common.machine.utils.ByteType;
 import cn.reghao.autodop.common.utils.text.TextFile;

common/src/main/java/cn/reghao/autodop/common/machine/pojo/MemoryInfo.java → common/src/main/java/cn/reghao/autodop/common/machine/memory/MemoryInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.machine.pojo;
+package cn.reghao.autodop.common.machine.memory;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/machine/Network.java → common/src/main/java/cn/reghao/autodop/common/machine/network/Network.java

@@ -1,10 +1,8 @@
-package cn.reghao.autodop.common.machine;
+package cn.reghao.autodop.common.machine.network;
 
 import cn.reghao.autodop.common.machine.contant.ProcFile;
 import cn.reghao.autodop.common.machine.contant.TcpState;
-import cn.reghao.autodop.common.machine.pojo.network.TCPConnStat;
-import cn.reghao.autodop.common.machine.pojo.os.ProcessStat;
-import cn.reghao.autodop.common.machine.pojo.NetworkInfo;
+import cn.reghao.autodop.common.machine.os.ProcessStat;
 import cn.reghao.autodop.common.machine.utils.IpAddressConversion;
 import cn.reghao.autodop.common.utils.text.TextFile;
 

common/src/main/java/cn/reghao/autodop/common/machine/pojo/NetworkInfo.java → common/src/main/java/cn/reghao/autodop/common/machine/network/NetworkInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.machine.pojo;
+package cn.reghao.autodop.common.machine.network;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/machine/pojo/network/TCPConnStat.java → common/src/main/java/cn/reghao/autodop/common/machine/network/TCPConnStat.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.machine.pojo.network;
+package cn.reghao.autodop.common.machine.network;
 
 import cn.reghao.autodop.common.machine.contant.TcpState;
 import lombok.Data;

common/src/main/java/cn/reghao/autodop/common/machine/OS.java → common/src/main/java/cn/reghao/autodop/common/machine/os/OS.java

@@ -1,8 +1,6 @@
-package cn.reghao.autodop.common.machine;
+package cn.reghao.autodop.common.machine.os;
 
 import cn.reghao.autodop.common.machine.contant.ProcFile;
-import cn.reghao.autodop.common.machine.pojo.OSInfo;
-import cn.reghao.autodop.common.machine.pojo.OSStat;
 import cn.reghao.autodop.common.utils.DatetimeConverter;
 import cn.reghao.autodop.common.utils.text.TextFile;
 
@@ -15,9 +13,6 @@ public class OS {
 
     public OSInfo info() {
         OSInfo osInfo = new OSInfo();
-        osInfo.setOsName(System.getProperty("os.name"));
-        osInfo.setOsArch(System.getProperty("os.arch"));
-        osInfo.setOsVersion(System.getProperty("os.version"));
         osInfo.setBootTime(bootTime());
         return osInfo;
     }

common/src/main/java/cn/reghao/autodop/common/machine/os/OSInfo.java

@@ -0,0 +1,16 @@
+package cn.reghao.autodop.common.machine.os;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-10-20 23:16:42
+ */
+@Data
+public class OSInfo {
+    private String type;
+    private String name;
+    private String arch;
+    private String version;
+    private String bootTime;
+}

common/src/main/java/cn/reghao/autodop/common/machine/pojo/OSStat.java → common/src/main/java/cn/reghao/autodop/common/machine/os/OSStat.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.machine.pojo;
+package cn.reghao.autodop.common.machine.os;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/machine/pojo/os/ProcessStat.java → common/src/main/java/cn/reghao/autodop/common/machine/os/ProcessStat.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.machine.pojo.os;
+package cn.reghao.autodop.common.machine.os;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/machine/pojo/os/SysStat.java → common/src/main/java/cn/reghao/autodop/common/machine/os/SysStat.java

@@ -1,8 +1,8 @@
-package cn.reghao.autodop.common.machine.pojo.os;
+package cn.reghao.autodop.common.machine.os;
 
-import cn.reghao.autodop.common.machine.pojo.cpu.CpuStat;
-import cn.reghao.autodop.common.machine.pojo.memory.MemUsage;
-import cn.reghao.autodop.common.machine.pojo.network.TCPConnStat;
+import cn.reghao.autodop.common.machine.cpu.CpuStat;
+import cn.reghao.autodop.common.machine.memory.MemUsage;
+import cn.reghao.autodop.common.machine.network.TCPConnStat;
 import lombok.Data;
 
 import java.util.List;

common/src/main/java/cn/reghao/autodop/common/machine/pojo/LinuxSysInfo.java

@@ -1,18 +0,0 @@
-package cn.reghao.autodop.common.machine.pojo;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2020-10-22 15:45:29
- */
-@Data
-public class LinuxSysInfo {
-    private OSInfo os;
-    private CPUInfo cpu;
-    private MemoryInfo memory;
-    private List<DiskInfo> disk;
-    private List<NetworkInfo> network;
-}

common/src/main/java/cn/reghao/autodop/common/machine/pojo/LinuxSysStat.java

@@ -1,19 +0,0 @@
-package cn.reghao.autodop.common.machine.pojo;
-
-import cn.reghao.autodop.common.machine.pojo.cpu.CpuStat;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2020-10-22 15:45:43
- */
-@Data
-public class LinuxSysStat {
-    private OSStat os;
-    private CpuStat cpu;
-    private MemoryInfo memory;
-    private List<DiskInfo> disk;
-    private List<NetworkInfo> network;
-}

common/src/main/java/cn/reghao/autodop/common/machine/pojo/OSInfo.java

@@ -1,15 +0,0 @@
-package cn.reghao.autodop.common.machine.pojo;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2020-10-20 23:16:42
- */
-@Data
-public class OSInfo {
-    private String osName;
-    private String osArch;
-    private String osVersion;
-    private String bootTime;
-}

common/src/main/java/cn/reghao/autodop/common/machine/Process.java → common/src/main/java/cn/reghao/autodop/common/machine/process/Process.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.common.machine;
+package cn.reghao.autodop.common.machine.process;
 
 import cn.reghao.autodop.common.machine.contant.ProcFile;
-import cn.reghao.autodop.common.machine.pojo.os.ProcessStat;
+import cn.reghao.autodop.common.machine.os.ProcessStat;
 import cn.reghao.autodop.common.utils.text.TextFile;
 import lombok.extern.slf4j.Slf4j;
 

common/src/main/java/cn/reghao/autodop/common/machine/utils/CpuPercentageCalculator.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.common.machine.utils;
 
-import cn.reghao.autodop.common.machine.pojo.cpu.CpuStats;
-import cn.reghao.autodop.common.machine.pojo.cpu.CpuStat;
+import cn.reghao.autodop.common.machine.cpu.CpuStats;
+import cn.reghao.autodop.common.machine.cpu.CpuStat;
 
 /**
  * @author reghao

common/src/main/java/cn/reghao/autodop/common/machine/utils/MemCalculator.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.common.machine.utils;
 
-import cn.reghao.autodop.common.machine.pojo.memory.MemStat;
-import cn.reghao.autodop.common.machine.pojo.memory.MemUsage;
+import cn.reghao.autodop.common.machine.memory.MemStat;
+import cn.reghao.autodop.common.machine.memory.MemUsage;
 
 /**
  * @author reghao

dagent/src/main/java/cn/reghao/autodop/dagent/node/SysStatBeanConfig.java

@@ -1,6 +1,10 @@
 package cn.reghao.autodop.dagent.node;
 
-import cn.reghao.autodop.common.machine.*;
+import cn.reghao.autodop.common.machine.cpu.CPU;
+import cn.reghao.autodop.common.machine.disk.Disk;
+import cn.reghao.autodop.common.machine.memory.Memory;
+import cn.reghao.autodop.common.machine.network.Network;
+import cn.reghao.autodop.common.machine.os.OS;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

dagent/src/main/java/cn/reghao/autodop/dagent/node/agent/AgentInfo.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dagent.node.agent;
 
 import cn.reghao.autodop.common.jvm.pojo.JVMInfo;
-import cn.reghao.autodop.common.machine.pojo.LinuxSysInfo;
+import cn.reghao.autodop.common.machine.MachineInfo;
 import lombok.Data;
 
 /**
@@ -13,7 +13,7 @@ public class AgentInfo {
     private String agentId;
     private String agentAddress;
     private JVMInfo jvmInfo;
-    private LinuxSysInfo linuxSysInfo;
+    private MachineInfo machineInfo;
 
     public AgentInfo() {
     }

dagent/src/main/java/cn/reghao/autodop/dagent/service/MachineStatusScheduler.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dagent.service;
 
-import cn.reghao.autodop.common.machine.pojo.os.SysStat;
+import cn.reghao.autodop.common.machine.os.SysStat;
 import cn.reghao.autodop.common.mq.MqMessage;
 import cn.reghao.autodop.common.mq.MsgType;
 import cn.reghao.autodop.common.mq.MessageSender;

dmaster/src/main/java/cn/reghao/autodop/dmaster/cluster/MachineMessageDispatcher.java

@@ -1,5 +1,6 @@
 package cn.reghao.autodop.dmaster.cluster;
 
+import cn.reghao.autodop.common.machine.MachineInfo;
 import cn.reghao.autodop.common.mq.protocol.machine.MachineHeartbeat;
 import cn.reghao.autodop.common.mq.protocol.machine.MachineOps;
 import cn.reghao.autodop.common.mq.protocol.machine.MachineRegistry;
@@ -17,7 +18,8 @@ public class MachineMessageDispatcher implements MessageDispatcher {
         switch (MachineOps.valueOf(msgType)) {
             case machineRegistry:
                 log.info("机器注册消息...");
-                MachineRegistry machineRegistry = (MachineRegistry) JsonConverter.jsonToObject(msg, MachineRegistry.class);
+                MachineInfo machineInfo = (MachineInfo) JsonConverter.jsonToObject(msg, MachineInfo.class);
+                //MachineRegistry machineRegistry = (MachineRegistry) JsonConverter.jsonToObject(msg, MachineRegistry.class);
                 break;
             case machineHeartbeat:
                 log.info("机器心跳消息...");

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/MonitorService.java

@@ -3,9 +3,9 @@ package cn.reghao.autodop.dmaster.sys;
 import cn.reghao.autodop.common.jvm.JVM;
 import cn.reghao.autodop.common.jvm.pojo.JVMInfo;
 import cn.reghao.autodop.common.jvm.pojo.JVMStat;
-import cn.reghao.autodop.common.machine.LinuxSys;
-import cn.reghao.autodop.common.machine.pojo.LinuxSysInfo;
-import cn.reghao.autodop.common.machine.pojo.LinuxSysStat;
+import cn.reghao.autodop.common.machine.Machine;
+import cn.reghao.autodop.common.machine.MachineInfo;
+import cn.reghao.autodop.common.machine.MachineStat;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,11 +15,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class MonitorService {
     private JVM jvm;
-    private LinuxSys linuxSys;
+    private Machine machine;
 
     public MonitorService() {
         this.jvm = new JVM();
-        this.linuxSys = new LinuxSys();
+        this.machine = new Machine();
     }
 
     public JVMInfo jvmInfo() {
@@ -30,11 +30,11 @@ public class MonitorService {
         return jvm.stat();
     }
 
-    public LinuxSysInfo linuxSysInfo() {
-        return linuxSys.info();
+    public MachineInfo linuxSysInfo() {
+        return machine.info();
     }
 
-    public LinuxSysStat linuxSysStat() {
+    public MachineStat linuxSysStat() {
         return null;
     }
 }