处理机器信息相关数据

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

@@ -37,6 +37,7 @@ public class Machine {
 
     public MachineStat stat() {
         MachineStat machineStat = new MachineStat();
+        machineStat.setMachineId(MachineId.id());
         machineStat.setMemoryDetail(memory.detail());
         machineStat.setDiskDetails(Disk.details());
         return new MachineStat();

common/src/main/java/cn/reghao/autodop/common/msg/pub/dto/node/constant/AppStatus.java → common/src/main/java/cn/reghao/autodop/common/msg/pub/dto/node/constant/NodeStatus.java

@@ -4,6 +4,6 @@ package cn.reghao.autodop.common.msg.pub.dto.node.constant;
  * @author reghao
  * @date 2021-08-27 17:33:20
  */
-public enum AppStatus {
+public enum NodeStatus {
     Online, Offline
 }

dagent/src/main/java/cn/reghao/autodop/dagent/machine/NodeClazzPubImpl.java

@@ -41,8 +41,8 @@ public class NodeClazzPubImpl {
 
     public void nodeShutdown() {
         ThreadPoolWrapper.shutdownScheduler(scheduler);
-        Machine.MachineDetail machineDetail = machine.detail();
-        String jsonPayload = JsonConverter.objectToJson(machineDetail);
+        Machine.MachineStat machineStat = machine.stat();
+        String jsonPayload = JsonConverter.objectToJson(machineStat);
         PubMsg pubMsg = PubMsg.pubMsg(pubClazz, NodePubClazz.shutdown.name(), jsonPayload);
         pub(pubMsg);
     }
@@ -67,8 +67,8 @@ public class NodeClazzPubImpl {
     class Heartbeat implements Runnable {
         @Override
         public void run() {
-            Machine.MachineDetail machineDetail = machine.detail();
-            String jsonPayload = JsonConverter.objectToJson(machineDetail);
+            Machine.MachineStat machineStat = machine.stat();
+            String jsonPayload = JsonConverter.objectToJson(machineStat);
             PubMsg pubMsg = PubMsg.pubMsg(pubClazz, NodePubClazz.heartbeat.name(), jsonPayload);
             pub(pubMsg);
         }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/AppBuilding.java

@@ -7,9 +7,7 @@ import cn.reghao.autodop.dmaster.app.model.po.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.service.bd.tools.repo.CommitInfo;
 import cn.reghao.autodop.dmaster.util.db.BaseEntity;
 import cn.reghao.jdkutil.converter.DateTimeConverter;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import javax.persistence.Entity;
 import java.time.LocalDateTime;
@@ -19,8 +17,8 @@ import java.time.LocalDateTime;
  * @date 2021-05-21 09:57:35
  */
 @NoArgsConstructor
-@Data
-@EqualsAndHashCode(callSuper = false)
+@Getter
+@Setter
 @Entity
 public class AppBuilding extends BaseEntity<Integer> {
     private String appId;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/AppDeploying.java

@@ -4,9 +4,7 @@ import cn.reghao.autodop.common.msg.rpc.dto.app.DeployResult;
 import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.DeployConfig;
 import cn.reghao.autodop.dmaster.app.model.po.log.BuildLog;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import javax.persistence.Entity;
 import java.time.LocalDateTime;
@@ -16,8 +14,8 @@ import java.time.LocalDateTime;
  * @date 2021-05-21 09:57:35
  */
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@Data
+@Getter
+@Setter
 @Entity
 public class AppDeploying extends AppProperty {
     private String buildLogId;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/AppRunning.java

@@ -4,9 +4,7 @@ import cn.reghao.autodop.common.msg.rpc.dto.app.AppStatus;
 import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.model.po.config.DeployConfig;
 import cn.reghao.autodop.dmaster.app.model.po.log.BuildLog;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import javax.persistence.Entity;
 import java.time.LocalDateTime;
@@ -16,8 +14,8 @@ import java.time.LocalDateTime;
  * @date 2021-05-31 13:36:46
  */
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@Data
+@Getter
+@Setter
 @Entity
 public class AppRunning extends AppProperty {
     private Integer httpPort;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/AppConfig.java

@@ -10,6 +10,8 @@ import cn.reghao.autodop.dmaster.notification.model.po.NotifyGroup;
 import cn.reghao.autodop.dmaster.util.validator.ValidEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 import org.hibernate.validator.constraints.Length;
@@ -23,8 +25,8 @@ import java.util.List;
  * @author reghao
  * @date 2020-02-28 14:11:02
  */
-@Data
-@EqualsAndHashCode(callSuper = false)
+@Getter
+@Setter
 @Entity
 public class AppConfig extends BaseEntity<Integer> implements Cloneable {
     @Column(nullable = false, unique = true)

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/build/BuildDir.java

@@ -3,6 +3,8 @@ package cn.reghao.autodop.dmaster.app.model.po.config.build;
 import cn.reghao.autodop.dmaster.util.db.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -14,8 +16,8 @@ import javax.validation.constraints.NotBlank;
  * @author reghao
  * @date 2019-08-27 00:17:55
  */
-@Data
-@EqualsAndHashCode(callSuper = false)
+@Getter
+@Setter
 @Entity
 public class BuildDir extends BaseEntity<Integer> {
     @Column(nullable = false, unique = true)

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/build/CompilerConfig.java

@@ -3,9 +3,7 @@ package cn.reghao.autodop.dmaster.app.model.po.config.build;
 import cn.reghao.autodop.dmaster.app.model.constant.build.CompileType;
 import cn.reghao.autodop.dmaster.util.validator.ValidEnum;
 import cn.reghao.autodop.dmaster.util.db.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -18,8 +16,8 @@ import javax.validation.constraints.NotBlank;
  * @date 2021-02-05 17:37:28
  */
 @NoArgsConstructor
-@Data
-@EqualsAndHashCode(callSuper = false)
+@Getter
+@Setter
 @Entity
 public class CompilerConfig extends BaseEntity<Integer> {
     @NotBlank(message = "机器 ID 不能为空白字符串")

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/build/PackerConfig.java

@@ -3,9 +3,7 @@ package cn.reghao.autodop.dmaster.app.model.po.config.build;
 import cn.reghao.autodop.common.msg.rpc.dto.app.PackType;
 import cn.reghao.autodop.dmaster.util.validator.ValidEnum;
 import cn.reghao.autodop.dmaster.util.db.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -18,8 +16,8 @@ import javax.validation.constraints.NotBlank;
  * @date 2020-05-13 16:40:22
  */
 @NoArgsConstructor
-@Data
-@EqualsAndHashCode(callSuper = false)
+@Getter
+@Setter
 @Entity
 public class PackerConfig extends BaseEntity<Integer> {
     @NotBlank(message = "机器 ID 不能为空白字符串")

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/model/po/config/build/RepoAuthConfig.java

@@ -6,6 +6,8 @@ import cn.reghao.autodop.dmaster.util.validator.ValidEnum;
 import cn.reghao.autodop.dmaster.util.db.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -18,8 +20,8 @@ import javax.validation.constraints.NotBlank;
  * @author reghao
  * @date 2020-05-13 22:50:38
  */
-@Data
-@EqualsAndHashCode(callSuper = false)
+@Getter
+@Setter
 @Entity
 public class RepoAuthConfig extends BaseEntity<Integer> {
     @Column(nullable = false)

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/rpc/AppRpcClazzResultService.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/rpc/AppRpcClazzResultHandler.java

@@ -7,7 +7,7 @@ import cn.reghao.autodop.common.msg.rpc.dto.app.DeployResult;
  * @author reghao
  * @date 2021-07-01 20:15:57
  */
-public interface AppRpcClazzResultService {
+public interface AppRpcClazzResultHandler {
     void deployResult(DeployResult deployResult);
     void statusResult(AppStatus appStatus);
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/rpc/AppRpcClazzResultServiceImpl.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/rpc/AppRpcClazzResultHandlerImpl.java

@@ -32,7 +32,7 @@ import java.util.Optional;
  * @date 2021-07-01 20:15:57
  */
 @Service
-public class AppRpcClazzResultServiceImpl implements AppRpcClazzResultService {
+public class AppRpcClazzResultHandlerImpl implements AppRpcClazzResultHandler {
     private MonitorService monitorService;
     private AppRunningRepository runningRepository;
     private NotifyService notifyService;
@@ -42,7 +42,7 @@ public class AppRpcClazzResultServiceImpl implements AppRpcClazzResultService {
     private AppDeployingRepository deployingRepository;
     private AppConfigQuery appConfigQuery;
 
-    public AppRpcClazzResultServiceImpl(MonitorService monitorService,
+    public AppRpcClazzResultHandlerImpl(MonitorService monitorService,
                                         AppRunningRepository runningRepository,
                                         NotifyService notifyService,
                                         BuildLogRepository buildLogRepository,

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/db/crud/NodeLogCrud.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/db/crud/NodeLogCrud.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.sys.db.crud;
+package cn.reghao.autodop.dmaster.machine.db.crud;
 
-import cn.reghao.autodop.dmaster.sys.model.po.NodeLog;
+import cn.reghao.autodop.dmaster.machine.model.po.NodeLog;
 import cn.reghao.jdkutil.db.BaseCrud;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/db/crud/NodeLogCrudImpl.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/db/crud/NodeLogCrudImpl.java

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.dmaster.sys.db.crud;
+package cn.reghao.autodop.dmaster.machine.db.crud;
 
-import cn.reghao.autodop.dmaster.sys.db.repository.NodeLogRepository;
-import cn.reghao.autodop.dmaster.sys.model.po.NodeLog;
+import cn.reghao.autodop.dmaster.machine.db.repository.NodeLogRepository;
+import cn.reghao.autodop.dmaster.machine.model.po.NodeLog;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/db/query/MongoQuery.java

@@ -1,7 +1,6 @@
 package cn.reghao.autodop.dmaster.machine.db.query;
 
-import cn.reghao.autodop.dmaster.sys.model.vo.AppRuntimeLogVO;
-import cn.reghao.autodop.dmaster.sys.model.vo.RuntimeLogVO;
+import cn.reghao.autodop.dmaster.machine.model.po.NodeLog;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.AggregateIterable;
 import org.bson.Document;
@@ -20,13 +19,13 @@ import java.util.*;
  */
 @Component
 public class MongoQuery {
-    private MongoTemplate mongoTemplate;
+    private final MongoTemplate mongoTemplate;
 
     public MongoQuery(MongoTemplate mongoTemplate) {
         this.mongoTemplate = mongoTemplate;
     }
 
-    public List<RuntimeLogVO> aggregate(String col, Map<String, String> groupByIds) {
+    public List<NodeLog> aggregate(String col, Map<String, String> groupByIds) {
         Document groupBy = new Document();
         groupBy.putAll(groupByIds);
 
@@ -38,7 +37,7 @@ public class MongoQuery {
         List<Document> pipeline = new ArrayList<>();
         pipeline.add(queryObject);
 
-        List<RuntimeLogVO> list = new ArrayList<>();
+        List<NodeLog> list = new ArrayList<>();
         AggregateIterable<Document> result = mongoTemplate.getCollection(col).aggregate(pipeline).allowDiskUse(true);
         for (Document document : result) {
             Document doc = document.get("_id", Document.class);
@@ -46,12 +45,12 @@ public class MongoQuery {
             String appId = doc.get("appId", String.class);
             String machineIpv4 = document.get("machineIpv4", String.class);
             Integer total = document.get("total", Integer.class);
-            list.add(new RuntimeLogVO(machineId, machineIpv4, appId));
+            list.add(new NodeLog());
         }
         return list;
     }
 
-    public List<AppRuntimeLogVO> aggregate1(String col, String machineId, String appId) {
+    public List<NodeLog> aggregate1(String col, String machineId, String appId) {
         Map<String, String> matchMap = new HashMap<>();
         matchMap.put("machineId", machineId);
         matchMap.put("appId", appId);
@@ -70,13 +69,13 @@ public class MongoQuery {
         pipeline.add(matchObject);
         pipeline.add(groupObject);
 
-        List<AppRuntimeLogVO> list = new ArrayList<>();
+        List<NodeLog> list = new ArrayList<>();
         AggregateIterable<Document> result = mongoTemplate.getCollection(col).aggregate(pipeline).allowDiskUse(true);
         for (Document document : result) {
             Document doc = document.get("_id", Document.class);
             String yearMonthDay = doc.get("yearMonthDay", String.class);
             Integer total = document.get("total", Integer.class);
-            list.add(new AppRuntimeLogVO(machineId, appId, yearMonthDay, total));
+            list.add(new NodeLog());
         }
         return list;
     }

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/db/repository/NodeLogRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/db/repository/NodeLogRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.sys.db.repository;
+package cn.reghao.autodop.dmaster.machine.db.repository;
 
-import cn.reghao.autodop.dmaster.sys.model.po.NodeLog;
+import cn.reghao.autodop.dmaster.machine.model.po.NodeLog;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 import java.util.List;

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/model/po/DiskInfo.java

@@ -1,6 +1,8 @@
 package cn.reghao.autodop.dmaster.machine.model.po;
 
+import cn.reghao.jdkutil.machine.Disk;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.persistence.Embeddable;
 import java.io.Serializable;
@@ -9,6 +11,7 @@ import java.io.Serializable;
  * @author reghao
  * @date 2021-10-15 15:50:32
  */
+@NoArgsConstructor
 @Embeddable
 @Data
 public class DiskInfo implements Serializable {
@@ -22,4 +25,15 @@ public class DiskInfo implements Serializable {
     private long avail;
     private int inodeTotal;
     private int inodeFree;
+
+    public DiskInfo(Disk.DiskDetail diskDetail) {
+        this.diskPath = diskDetail.getDiskPath();
+        this.mountedOn = diskDetail.getMountedOn();
+        this.fsType = diskDetail.getFsType();
+        this.size = diskDetail.getSize();
+        this.used = diskDetail.getUsed();
+        this.avail = diskDetail.getAvail();
+        this.inodeTotal = diskDetail.getInodeTotal();
+        this.inodeFree = diskDetail.getInodeFree();
+    }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/model/po/MachineHost.java

@@ -1,12 +1,11 @@
 package cn.reghao.autodop.dmaster.machine.model.po;
 
-import cn.reghao.autodop.common.msg.pub.dto.node.constant.AppStatus;
+import cn.reghao.autodop.common.msg.pub.dto.node.constant.NodeStatus;
 import cn.reghao.autodop.dmaster.app.model.constant.EnvList;
 import cn.reghao.autodop.dmaster.util.db.BaseEntity;
 import cn.reghao.autodop.dmaster.notification.model.po.NotifyGroup;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import cn.reghao.jdkutil.converter.DateTimeConverter;
+import lombok.*;
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
@@ -19,8 +18,8 @@ import java.util.List;
  * @date 2021-06-29 09:36:13
  */
 @NoArgsConstructor
-@Data
-@EqualsAndHashCode(callSuper = false)
+@Getter
+@Setter
 @Entity
 public class MachineHost extends BaseEntity<Integer> {
     @Column(unique = true, nullable = false)
@@ -32,7 +31,7 @@ public class MachineHost extends BaseEntity<Integer> {
     private String osVersion;
     private String env;
     private String status;
-    private LocalDateTime lastCheck;
+    private String lastCheck;
     @Embedded
     private SshAuth sshAuth;
     @ManyToMany(cascade = CascadeType.REFRESH)
@@ -49,9 +48,13 @@ public class MachineHost extends BaseEntity<Integer> {
         } else {
             this.machineIpv4 = "127.0.0.1";
         }
+        this.bootTime = DateTimeConverter.format(machineInfo.getBootTime());
+        this.osArch = machineInfo.getArch();
+        this.osName = machineInfo.getName();
+        this.osVersion = machineInfo.getVersion();
 
         this.env = EnvList.test.name();
-        this.status = AppStatus.Online.name();
-        this.lastCheck = LocalDateTime.now();
+        this.status = NodeStatus.Online.name();
+        this.lastCheck = DateTimeConverter.format(LocalDateTime.now());
     }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/model/po/MachineInfo.java

@@ -1,8 +1,13 @@
 package cn.reghao.autodop.dmaster.machine.model.po;
 
+import cn.reghao.autodop.common.machine.Cpu;
+import cn.reghao.autodop.common.machine.Machine;
+import cn.reghao.autodop.common.machine.Memory;
 import cn.reghao.autodop.dmaster.util.db.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import cn.reghao.jdkutil.machine.OsDetail;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
@@ -10,13 +15,15 @@ import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author reghao
  * @date 2020-12-25 17:53:15
  */
-@Data
-@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@Getter
+@Setter
 @Entity
 public class MachineInfo  extends BaseEntity<Integer> {
     private String machineId;
@@ -43,4 +50,31 @@ public class MachineInfo  extends BaseEntity<Integer> {
     @ElementCollection(targetClass = DiskInfo.class)
     @LazyCollection(LazyCollectionOption.FALSE)
     private List<DiskInfo> diskInfos;
+
+    public MachineInfo(Machine.MachineDetail machineDetail) {
+        this.machineId = machineDetail.getMachineId();
+
+        OsDetail osDetail = machineDetail.getOsDetail();
+        this.arch = osDetail.getArch();
+        this.name = osDetail.getName();
+        this.version = osDetail.getVersion();
+        this.byteOrder = osDetail.getByteOrder();
+        this.bootTime = osDetail.getBootTime();
+
+        Cpu.CpuDetail cpuDetail = machineDetail.getCpuDetail();
+        this.physicalCore = cpuDetail.getPhysicalCore();
+        this.logicalCore = cpuDetail.getLogicalCore();
+        this.vendorId = cpuDetail.getVendorId();
+        this.modelName = cpuDetail.getModelName();
+        this.bogoMips = getBogoMips();
+
+        Memory.MemoryDetail memoryDetail = machineDetail.getMemoryDetail();
+        this.memTotal = memoryDetail.getTotal();
+        this.memUsed = memoryDetail.getUsed();
+        this.memAvail = memoryDetail.getFree();
+
+        this.networkInfos = machineDetail.getNetworkDetails().stream().map(NetworkInfo::new).collect(Collectors.toList());
+        this.diskInfos = machineDetail.getDiskDetails().stream().map(DiskInfo::new).collect(Collectors.toList());
+        this.machineIpv4 = networkInfos.isEmpty() ? "127.0.0.1" : networkInfos.get(0).getIpv4();
+    }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/model/po/NetworkInfo.java

@@ -1,6 +1,8 @@
 package cn.reghao.autodop.dmaster.machine.model.po;
 
+import cn.reghao.jdkutil.machine.Network;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.persistence.Embeddable;
 import java.io.Serializable;
@@ -9,6 +11,7 @@ import java.io.Serializable;
  * @author reghao
  * @date 2021-10-15 15:49:43
  */
+@NoArgsConstructor
 @Embeddable
 @Data
 public class NetworkInfo implements Serializable {
@@ -18,4 +21,11 @@ public class NetworkInfo implements Serializable {
     private String mac;
     private String ipv4;
     private String ipv6;
+
+    public NetworkInfo(Network.NetworkDetail networkDetail) {
+        this.iface = networkDetail.getIface();
+        this.mac = networkDetail.getMac();
+        this.ipv4 = networkDetail.getIpv4();
+        this.ipv6 = networkDetail.getIpv6();
+    }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/model/po/NodeLog.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/model/po/NodeLog.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.sys.model.po;
+package cn.reghao.autodop.dmaster.machine.model.po;
 
 import cn.reghao.autodop.common.msg.pub.dto.node.NodeLogDTO;
 import cn.reghao.autodop.dmaster.util.db.BaseDocument;

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/service/NodePubClazzImpl.java

@@ -0,0 +1,81 @@
+package cn.reghao.autodop.dmaster.machine.service;
+
+import cn.reghao.autodop.common.machine.Machine;
+import cn.reghao.autodop.common.msg.pub.dto.node.NodeLogDTO;
+import cn.reghao.autodop.common.msg.pub.dto.node.constant.NodeStatus;
+import cn.reghao.autodop.dmaster.machine.db.crud.MachineHostCrud;
+import cn.reghao.autodop.dmaster.machine.db.crud.MachineInfoCrud;
+import cn.reghao.autodop.dmaster.machine.db.query.MachineHostQuery;
+import cn.reghao.autodop.dmaster.machine.db.query.MachineInfoQuery;
+import cn.reghao.autodop.dmaster.machine.model.po.MachineHost;
+import cn.reghao.autodop.dmaster.machine.model.po.MachineInfo;
+import cn.reghao.autodop.dmaster.machine.db.crud.NodeLogCrud;
+import cn.reghao.autodop.dmaster.machine.model.po.NodeLog;
+import cn.reghao.jdkutil.converter.DateTimeConverter;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author reghao
+ * @date 2021-10-15 16:39:48
+ */
+@Service
+public class NodePubClazzImpl {
+    private final MachineInfoQuery infoQuery;
+    private final MachineInfoCrud infoCrud;
+    private final MachineHostQuery hostQuery;
+    private final MachineHostCrud hostCrud;
+    private final NodeLogCrud nodeLogCrud;
+
+    public NodePubClazzImpl(MachineInfoQuery infoQuery, MachineInfoCrud infoCrud,
+                            MachineHostQuery hostQuery, MachineHostCrud hostCrud,
+                            NodeLogCrud nodeLogCrud) {
+        this.infoQuery = infoQuery;
+        this.infoCrud = infoCrud;
+        this.hostQuery = hostQuery;
+        this.hostCrud = hostCrud;
+        this.nodeLogCrud = nodeLogCrud;
+    }
+
+    public void start(Machine.MachineDetail machineDetail) {
+        String machineId = machineDetail.getMachineId();
+        MachineInfo machineInfo = infoQuery.findByMachineId(machineId);
+        if (machineInfo == null) {
+            machineInfo = new MachineInfo(machineDetail);
+            infoCrud.save(machineInfo);
+            hostCrud.save(new MachineHost(machineInfo));
+        }
+
+        MachineHost machineHost = hostQuery.findByMachineId(machineId);
+        if (machineHost != null) {
+            machineHost.setLastCheck(DateTimeConverter.format(LocalDateTime.now()));
+            machineHost.setStatus(NodeStatus.Online.name());
+            hostCrud.update(machineHost);
+        }
+    }
+
+    public void shutdown(Machine.MachineStat machineStat) {
+        String machineId = machineStat.getMachineId();
+        MachineHost machineHost = hostQuery.findByMachineId(machineId);
+        if (machineHost != null) {
+            machineHost.setLastCheck(DateTimeConverter.format(LocalDateTime.now()));
+            machineHost.setStatus(NodeStatus.Offline.name());
+            hostCrud.update(machineHost);
+        }
+    }
+
+    // TODO 异步处理 MachineStat 中的信息，检查系统负载，CPU，内存，磁盘等使用情况
+    public void heartbeat(Machine.MachineStat machineStat) {
+        String machineId = machineStat.getMachineId();
+        MachineHost machineHost = hostQuery.findByMachineId(machineId);
+        if (machineHost != null) {
+            machineHost.setLastCheck(DateTimeConverter.format(LocalDateTime.now()));
+            hostCrud.update(machineHost);
+        }
+    }
+
+    public void log(NodeLogDTO nodeLogDTO) {
+        nodeLogCrud.save(new NodeLog(nodeLogDTO));
+    }
+}

dmaster/src/main/java/cn/reghao/autodop/dmaster/machine/service/NodeService.java

@@ -1,113 +0,0 @@
-package cn.reghao.autodop.dmaster.machine.service;
-
-import cn.reghao.autodop.dmaster.machine.db.crud.MachineHostCrud;
-import cn.reghao.autodop.dmaster.machine.db.crud.MachineInfoCrud;
-import cn.reghao.autodop.dmaster.machine.db.crud.MachineStatCrud;
-import cn.reghao.autodop.dmaster.machine.db.query.MachineHostQuery;
-import cn.reghao.autodop.dmaster.machine.db.query.MachineInfoQuery;
-import cn.reghao.autodop.dmaster.machine.db.query.MachineStatQuery;
-import cn.reghao.autodop.dmaster.machine.model.po.MachineHost;
-import cn.reghao.autodop.dmaster.machine.model.po.MachineStat;
-import cn.reghao.autodop.dmaster.machine.model.po.MachineInfo;
-import cn.reghao.autodop.dmaster.monitor.db.MonitorJobCrudService;
-import cn.reghao.autodop.dmaster.monitor.model.po.JobId;
-import cn.reghao.autodop.dmaster.monitor.model.po.JobType;
-import cn.reghao.autodop.dmaster.monitor.model.po.MonitorJob;
-import cn.reghao.autodop.dmaster.monitor.service.MonitorJobData;
-import cn.reghao.autodop.dmaster.monitor.service.MonitorService;
-import cn.reghao.autodop.dmaster.notification.model.po.NotifyGroup;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * DagentOps 实现
- *
- * @author reghao
- * @date 2021-07-01 19:11:54
- */
-@Deprecated
-@Slf4j
-@Service
-public class NodeService {
-    private MachineInfoCrud infoCrud;
-    private MachineInfoQuery infoQuery;
-    private MachineHostCrud hostCrud;
-    private MachineHostQuery hostQuery;
-    private MachineStatCrud statCrud;
-    private MachineStatQuery statQuery;
-
-    private MonitorService monitorService;
-    private MonitorJobData monitorJobData;
-    private MonitorJobCrudService jobCrudService;
-
-    public NodeService(MachineInfoCrud infoCrud, MachineInfoQuery infoQuery,
-                       MachineHostCrud hostCrud, MachineHostQuery hostQuery,
-                       MachineStatCrud statCrud, MachineStatQuery statQuery,
-                       MonitorService monitorService,
-                       MonitorJobData monitorJobData, MonitorJobCrudService jobCrudService) {
-        this.infoCrud = infoCrud;
-        this.infoQuery = infoQuery;
-        this.hostCrud = hostCrud;
-        this.hostQuery = hostQuery;
-        this.statCrud = statCrud;
-        this.statQuery = statQuery;
-        this.monitorService = monitorService;
-        this.monitorJobData = monitorJobData;
-        this.jobCrudService = jobCrudService;
-    }
-
-    public void start(MachineInfo machineInfo) {
-        String machineId = machineInfo.getMachineId();
-        MachineInfo infoEntity = infoQuery.findByMachineId(machineId);
-        if (infoEntity != null) {
-            machineInfo.setId(infoEntity.getId());
-            machineInfo.setCreateTime(infoEntity.getCreateTime());
-            machineInfo.setUpdateTime(LocalDateTime.now());
-            infoCrud.update(machineInfo);
-
-            MachineHost machineHost = hostQuery.findByMachineId(machineId);
-            List<NotifyGroup> notifyGroups = machineHost.getNotifyGroups();
-            if (!notifyGroups.isEmpty()) {
-                String jobId = monitorJobData.machineMonitorJobId(machineId).getJobId();
-                MonitorJob monitorJob = jobCrudService.selectByUk(jobId);
-                try {
-                    monitorService.startJob(monitorJob);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    log.error("任务启动失败 {}", e.getMessage());
-                }
-            }
-        } else {
-            // 先存储数据，然后再添加监控任务，若任务添加失败则回滚
-            infoCrud.save(machineInfo);
-            //addMonitorJob(machineId);
-        }
-    }
-
-    private void addMonitorJob(String machineId) {
-        JobId jobId = monitorJobData.machineMonitorJobId(machineId);
-        MonitorJob monitorJob = new MonitorJob(jobId.getJobId(), jobId.getJobClassName(), JobType.machine.name());
-        jobCrudService.insertOrUpdate(monitorJob);
-    }
-
-    public void heartbeat(MachineStat machineStat) {
-        String machineId = machineStat.getMachineId();
-        MachineHost machineHost = hostQuery.findByMachineId(machineId);
-        if (machineHost != null) {
-            hostCrud.update(machineHost);
-            statCrud.update(machineStat);
-        } else {
-            statCrud.save(machineStat);
-        }
-    }
-
-    public void shutdown(MachineStat machineStat) {
-        String machineId = machineStat.getMachineId();
-        /*JobId jobId = monitorJobData.machineMonitorJobId(machineId);
-        monitorService.pauseJob(jobId.getJobId());*/
-        statCrud.save(machineStat);
-    }
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/monitor/model/po/MonitorJob.java

@@ -1,9 +1,7 @@
 package cn.reghao.autodop.dmaster.monitor.model.po;
 
 import cn.reghao.autodop.dmaster.util.db.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
@@ -15,8 +13,8 @@ import javax.validation.constraints.NotBlank;
  * @date 2021-06-23 20:50:41
  */
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@Data
+@Getter
+@Setter
 @Entity
 public class MonitorJob extends BaseEntity<Integer> {
     @NotBlank(message = "任务 ID 不能为空白字符串")

dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/MessageListener.java

@@ -9,7 +9,7 @@ import cn.reghao.autodop.common.msg.rpc.RpcMsg;
 import cn.reghao.autodop.common.msg.rpc.RpcResult;
 import cn.reghao.autodop.common.msg.rpc.clazz.RpcClazz;
 import cn.reghao.autodop.dmaster.mqttsub.rpcresult.AppRpcClazzResult;
-import cn.reghao.autodop.dmaster.mqttsub.impl.NodeClazzPubResult;
+import cn.reghao.autodop.dmaster.mqttsub.impl.NodePubClazzHandler;
 import cn.reghao.autodop.dmaster.mqttsub.rpcresult.DockerRpcClazzResult;
 import cn.reghao.autodop.dmaster.mqttsub.rpcresult.MachineRpcClazzResult;
 import cn.reghao.jdkutil.serializer.JsonConverter;
@@ -28,12 +28,12 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class MessageListener implements MqttCallback {
-    private final NodeClazzPubResult nodeClazzPubResult;
+    private final NodePubClazzHandler nodeClazzPubResult;
     private final MachineRpcClazzResult machineRpcClazzResult;
     private final AppRpcClazzResult appRpcClazzResult;
     private final DockerRpcClazzResult dockerRpcClazzResult;
 
-    public MessageListener(NodeClazzPubResult nodeClazzPubResult, MachineRpcClazzResult machineRpcClazzResult,
+    public MessageListener(NodePubClazzHandler nodeClazzPubResult, MachineRpcClazzResult machineRpcClazzResult,
                            AppRpcClazzResult appRpcClazzResult, DockerRpcClazzResult dockerRpcClazzResult) {
         this.nodeClazzPubResult = nodeClazzPubResult;
         this.machineRpcClazzResult = machineRpcClazzResult;

dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/impl/NodeClazzPubResult.java

@@ -1,73 +0,0 @@
-package cn.reghao.autodop.dmaster.mqttsub.impl;
-
-import cn.reghao.autodop.common.machine.Machine;
-import cn.reghao.autodop.common.msg.pub.clazz.NodePubClazz;
-import cn.reghao.autodop.common.msg.pub.dto.node.NodeLogDTO;
-import cn.reghao.autodop.dmaster.machine.db.crud.*;
-import cn.reghao.autodop.dmaster.machine.db.query.MachineHostQuery;
-import cn.reghao.autodop.dmaster.machine.db.query.MachineInfoQuery;
-import cn.reghao.autodop.dmaster.sys.db.crud.NodeLogCrud;
-import cn.reghao.autodop.dmaster.sys.model.po.NodeLog;
-import cn.reghao.jdkutil.serializer.JsonConverter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * @author reghao
- * @date 2020-12-30 10:26:47
- */
-@Slf4j
-@Component
-public class NodeClazzPubResult {
-    private final MachineHostQuery hostQuery;
-    private final MachineHostCrud hostCrud;
-    private final MachineInfoQuery infoQuery;
-    private final MachineInfoCrud infoCrud;
-    private final NodeLogCrud nodeLogCrud;
-
-    public NodeClazzPubResult(MachineHostQuery hostQuery, MachineHostCrud hostCrud,
-                              MachineInfoQuery infoQuery, MachineInfoCrud infoCrud,
-                              NodeLogCrud nodeLogCrud) {
-        this.hostQuery = hostQuery;
-        this.infoCrud = infoCrud;
-        this.infoQuery = infoQuery;
-        this.hostCrud = hostCrud;
-        this.nodeLogCrud = nodeLogCrud;
-    }
-
-    public void process(String method, String jsonPayload) {
-        switch (NodePubClazz.valueOf(method)) {
-            case start:
-                start(jsonPayload);
-                break;
-            case shutdown:
-                shutdown(jsonPayload);
-                break;
-            case heartbeat:
-                heartbeat(jsonPayload);
-                break;
-            case log:
-                log(jsonPayload);
-                break;
-            default:
-                ;
-        }
-    }
-
-    private void start(String payload) {
-        Machine.MachineDetail machineDetail = JsonConverter.jsonToObject(payload, Machine.MachineDetail.class);
-        System.out.println();
-    }
-
-    private void shutdown(String payload) {
-    }
-
-    // TODO 异步处理 MachineStat 中的信息，检查系统负载，CPU，内存，磁盘等使用情况
-    private void heartbeat(String payload) {
-    }
-
-    private void log(String payload) {
-        NodeLogDTO nodeLogDTO = JsonConverter.jsonToObject(payload, NodeLogDTO.class);
-        nodeLogCrud.save(new NodeLog(nodeLogDTO));
-    }
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/impl/NodePubClazzHandler.java

@@ -0,0 +1,46 @@
+package cn.reghao.autodop.dmaster.mqttsub.impl;
+
+import cn.reghao.autodop.common.machine.Machine;
+import cn.reghao.autodop.common.msg.pub.clazz.NodePubClazz;
+import cn.reghao.autodop.common.msg.pub.dto.node.NodeLogDTO;
+import cn.reghao.autodop.dmaster.machine.service.NodePubClazzImpl;
+import cn.reghao.jdkutil.serializer.JsonConverter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author reghao
+ * @date 2020-12-30 10:26:47
+ */
+@Slf4j
+@Component
+public class NodePubClazzHandler {
+    private final NodePubClazzImpl nodePubClazz;
+
+    public NodePubClazzHandler(NodePubClazzImpl nodePubClazz) {
+        this.nodePubClazz = nodePubClazz;
+    }
+
+    public void process(String method, String jsonPayload) {
+        switch (NodePubClazz.valueOf(method)) {
+            case start:
+                Machine.MachineDetail machineDetail = JsonConverter.jsonToObject(jsonPayload, Machine.MachineDetail.class);
+                nodePubClazz.start(machineDetail);
+                break;
+            case shutdown:
+                Machine.MachineStat machineStat = JsonConverter.jsonToObject(jsonPayload, Machine.MachineStat.class);
+                nodePubClazz.shutdown(machineStat);
+                break;
+            case heartbeat:
+                Machine.MachineStat machineStat1 = JsonConverter.jsonToObject(jsonPayload, Machine.MachineStat.class);
+                nodePubClazz.heartbeat(machineStat1);
+                break;
+            case log:
+                NodeLogDTO nodeLogDTO = JsonConverter.jsonToObject(jsonPayload, NodeLogDTO.class);
+                nodePubClazz.log(nodeLogDTO);
+                break;
+            default:
+                ;
+        }
+    }
+}

dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/rpcresult/AppRpcClazzResult.java

@@ -7,7 +7,7 @@ import cn.reghao.autodop.common.msg.rpc.dto.app.DeployResult;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
 import cn.reghao.jdkutil.result.ResultStatus;
 import cn.reghao.jdkutil.serializer.JsonConverter;
-import cn.reghao.autodop.dmaster.app.service.rpc.AppRpcClazzResultService;
+import cn.reghao.autodop.dmaster.app.service.rpc.AppRpcClazzResultHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -20,10 +20,10 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class AppRpcClazzResult {
-    private final AppRpcClazzResultService appRpcClazzResultService;
+    private final AppRpcClazzResultHandler appRpcClazzResultService;
     private final DefaultMqttClient mqttClient;
 
-    public AppRpcClazzResult(AppRpcClazzResultService appRpcClazzResultService, DefaultMqttClient mqttClient) {
+    public AppRpcClazzResult(AppRpcClazzResultHandler appRpcClazzResultService, DefaultMqttClient mqttClient) {
         this.appRpcClazzResultService = appRpcClazzResultService;
         this.mqttClient = mqttClient;
     }

dmaster/src/main/java/cn/reghao/autodop/dmaster/notification/model/po/DingAccount.java

@@ -1,8 +1,6 @@
 package cn.reghao.autodop.dmaster.notification.model.po;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import javax.persistence.Entity;
 
@@ -13,8 +11,8 @@ import javax.persistence.Entity;
  * @date 2021-06-23 10:29:18
  */
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@Data
+@Getter
+@Setter
 @Entity
 public class DingAccount extends NotifyAccount {
     // 若没有启用签名，password 字段默认为 none

dmaster/src/main/java/cn/reghao/autodop/dmaster/notification/model/po/EmailAccount.java

@@ -1,8 +1,6 @@
 package cn.reghao.autodop.dmaster.notification.model.po;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import javax.persistence.Entity;
 import javax.validation.constraints.NotBlank;
@@ -12,8 +10,8 @@ import javax.validation.constraints.NotBlank;
  * @date 2021-06-23 10:29:18
  */
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@Data
+@Getter
+@Setter
 @Entity
 public class EmailAccount extends NotifyAccount {
     //private String account;

dmaster/src/main/java/cn/reghao/autodop/dmaster/notification/model/po/NotifyGroup.java

@@ -2,9 +2,7 @@ package cn.reghao.autodop.dmaster.notification.model.po;
 
 import cn.reghao.autodop.dmaster.util.validator.ValidEnum;
 import cn.reghao.autodop.dmaster.util.db.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 
@@ -18,8 +16,8 @@ import java.util.List;
  * @author reghao
  * @date 2020-03-06 21:20:06
  */
-@NoArgsConstructor
-@Data
+@Getter
+@Setter
 @Entity
 public class NotifyGroup extends BaseEntity<Integer> {
     @Column(nullable = false)

dmaster/src/main/java/cn/reghao/autodop/dmaster/notification/model/po/SmsAccount.java

@@ -1,8 +1,6 @@
 package cn.reghao.autodop.dmaster.notification.model.po;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import javax.persistence.Entity;
 import javax.validation.constraints.NotBlank;
@@ -14,8 +12,8 @@ import javax.validation.constraints.NotBlank;
  * @date 2021-02-25 17:54:08
  */
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@Data
+@Getter
+@Setter
 @Entity
 public class SmsAccount extends NotifyAccount {
     //private String name;

dmaster/src/main/java/cn/reghao/autodop/dmaster/rbac/model/po/User.java

@@ -2,9 +2,7 @@ package cn.reghao.autodop.dmaster.rbac.model.po;
 
 import cn.reghao.autodop.dmaster.util.db.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
@@ -20,8 +18,8 @@ import java.util.Set;
  * @date 2019/03/14 19:12:48
  */
 @NoArgsConstructor
-@Data
-@EqualsAndHashCode(callSuper = false)
+@Getter
+@Setter
 @Entity
 public class User extends BaseEntity<Integer> implements UserDetails {
     // 用户名和密码

dmaster/src/main/java/cn/reghao/autodop/dmaster/spring/DmasterLifecycle.java

@@ -8,7 +8,7 @@ import cn.reghao.autodop.common.msg.MsgQueue;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDir;
 import cn.reghao.autodop.dmaster.app.service.config.BuildDirService;
 import cn.reghao.autodop.dmaster.mqttsub.MessageListener;
-import cn.reghao.autodop.dmaster.sys.db.crud.NodeLogCrud;
+import cn.reghao.autodop.dmaster.machine.db.crud.NodeLogCrud;
 import cn.reghao.autodop.dmaster.util.log.Appenders;
 import cn.reghao.jdkutil.machine.MachineId;
 import lombok.extern.slf4j.Slf4j;

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/model/vo/AppRuntimeLogVO.java

@@ -1,18 +0,0 @@
-package cn.reghao.autodop.dmaster.sys.model.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2021-06-22 11:00:07
- */
-@Deprecated
-@AllArgsConstructor
-@Data
-public class AppRuntimeLogVO {
-    private String machineId;
-    private String appId;
-    private String yearMonthDay;
-    private int total;
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/sys/model/vo/RuntimeLogVO.java

@@ -1,17 +0,0 @@
-package cn.reghao.autodop.dmaster.sys.model.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2021-06-22 11:00:07
- */
-@Deprecated
-@AllArgsConstructor
-@Data
-public class RuntimeLogVO {
-    private String machineId;
-    private String machineIpv4;
-    private String appId;
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/util/log/Appenders.java

@@ -4,7 +4,7 @@ import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.Appender;
-import cn.reghao.autodop.dmaster.sys.db.crud.NodeLogCrud;
+import cn.reghao.autodop.dmaster.machine.db.crud.NodeLogCrud;
 import org.slf4j.LoggerFactory;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/util/log/MongoAppender.java

@@ -3,8 +3,8 @@ package cn.reghao.autodop.dmaster.util.log;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.UnsynchronizedAppenderBase;
 import cn.reghao.autodop.common.msg.pub.dto.node.constant.AppId;
-import cn.reghao.autodop.dmaster.sys.db.crud.NodeLogCrud;
-import cn.reghao.autodop.dmaster.sys.model.po.NodeLog;
+import cn.reghao.autodop.dmaster.machine.db.crud.NodeLogCrud;
+import cn.reghao.autodop.dmaster.machine.model.po.NodeLog;
 import cn.reghao.jdkutil.machine.MachineId;
 
 /**