调整包结构

重新设计 RPC over MQTT

common/src/main/java/cn/reghao/autodop/common/dagent/app/AppIdArgs.java → common/src/main/java/cn/reghao/autodop/common/dagent/app/AppIdParam.java

@@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
-public class AppIdArgs {
+public class AppIdParam {
     private String packerType;
     private String appId;
 }

common/src/main/java/cn/reghao/autodop/common/dagent/app/deploy/AppDeployArgs.java → common/src/main/java/cn/reghao/autodop/common/dagent/app/DeployParam.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.dagent.app.deploy;
+package cn.reghao.autodop.common.dagent.app;
 
 import lombok.Data;
 
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date 2020-12-25 19:00:54
  */
 @Data
-public class AppDeployArgs {
+public class DeployParam {
     private String buildLogId;
     private String packType;
     private String appId;

common/src/main/java/cn/reghao/autodop/common/dagent/app/DeployResult.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.common.dagent.app;
 
-import cn.reghao.util.result.Result;
+import cn.reghao.jdkutil.result.Result;
 import lombok.Data;
 
 import java.time.LocalDateTime;

common/src/main/java/cn/reghao/autodop/common/dagent/app/deploy/PackType.java → common/src/main/java/cn/reghao/autodop/common/dagent/app/PackType.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.dagent.app.deploy;
+package cn.reghao.autodop.common.dagent.app;
 
 /**
  * 打包方式类型

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

@@ -7,7 +7,7 @@ import cn.reghao.autodop.common.dagent.machine.memory.Memory;
 import cn.reghao.autodop.common.dagent.machine.network.Network;
 import cn.reghao.autodop.common.dagent.machine.os.Os;
 import cn.reghao.autodop.common.message.CallResult;
-import cn.reghao.autodop.common.util.MachineIdentity;
+import cn.reghao.autodop.common.util.MachineId;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
@@ -26,14 +26,14 @@ public class Machine {
     private Os os;
     private String machineId;
 
-    public Machine(MachineIdentity machineIdentity, Cpu cpu, Memory memory, Disk disk, Network network, Os os)
+    public Machine(MachineId machineId, Cpu cpu, Memory memory, Disk disk, Network network, Os os)
             throws IOException {
         this.cpu = cpu;
         this.memory = memory;
         this.disk = disk;
         this.network = network;
         this.os = os;
-        this.machineId = machineIdentity.id();
+        this.machineId = machineId.id();
     }
 
     public MachineInfo registry() {

common/src/main/java/cn/reghao/autodop/common/dagent/machine/cpu/Cpu.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.common.dagent.machine.cpu;
 
 import cn.reghao.autodop.common.dagent.machine.LinuxProc;
 import cn.reghao.autodop.common.util.AbstractPercentageCalculator;
-import cn.reghao.util.text.TextFile;
+import cn.reghao.jdkutil.text.TextFile;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.*;

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

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.common.dagent.machine.memory;
 
 import cn.reghao.autodop.common.dagent.machine.LinuxProc;
-import cn.reghao.util.text.TextFile;
+import cn.reghao.jdkutil.text.TextFile;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

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

@@ -3,7 +3,7 @@ package cn.reghao.autodop.common.dagent.machine.network;
 import cn.reghao.autodop.common.dagent.machine.LinuxProc;
 import cn.reghao.autodop.common.dagent.machine.os.ProcessStat;
 import cn.reghao.autodop.common.util.IpAddressConverter;
-import cn.reghao.util.text.TextFile;
+import cn.reghao.jdkutil.text.TextFile;
 
 import java.net.*;
 import java.util.ArrayList;

common/src/main/java/cn/reghao/autodop/common/dagent/machine/os/Os.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.common.dagent.machine.os;
 
 import cn.reghao.autodop.common.dagent.machine.LinuxProc;
-import cn.reghao.util.text.DateTimeConverter;
-import cn.reghao.util.text.TextFile;
+import cn.reghao.jdkutil.converter.DateTimeConverter;
+import cn.reghao.jdkutil.text.TextFile;
 import lombok.extern.slf4j.Slf4j;
 
 import java.time.LocalDateTime;

common/src/main/java/cn/reghao/autodop/common/dagent/machine/os/Process.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.common.dagent.machine.os;
 
 import cn.reghao.autodop.common.dagent.machine.LinuxProc;
-import cn.reghao.util.text.TextFile;
+import cn.reghao.jdkutil.text.TextFile;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;

common/src/main/java/cn/reghao/autodop/common/docker/Docker.java

@@ -13,12 +13,12 @@ import cn.reghao.autodop.common.docker.unixdomain.DockerHeader;
 import cn.reghao.autodop.common.docker.unixdomain.UnixSocketClient;
 import cn.reghao.autodop.common.docker.unixdomain.HttpClient;
 import cn.reghao.autodop.common.util.ExceptionUtil;
-import cn.reghao.util.text.JsonArrayDeserializer;
-import cn.reghao.util.text.JsonConverter;
-import cn.reghao.util.security.Base64Util;
+import cn.reghao.jdkutil.serializer.JsonArrayDeserializer;
+import cn.reghao.jdkutil.serializer.JsonConverter;
+import cn.reghao.jdkutil.security.Base64Util;
 import cn.reghao.autodop.common.util.compression.TarFiles;
-import cn.reghao.util.security.Md5Util;
-import cn.reghao.util.text.TextFile;
+import cn.reghao.jdkutil.security.Md5Util;
+import cn.reghao.jdkutil.text.TextFile;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import io.netty.handler.codec.http.FullHttpResponse;

common/src/main/java/cn/reghao/autodop/common/log/MqttAppender.java

@@ -6,8 +6,8 @@ import cn.reghao.autodop.common.message.AsyncMsg;
 import cn.reghao.autodop.common.message.MessageType;
 import cn.reghao.autodop.common.message.ops.DagentOps;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.util.text.DateTimeConverter;
-import cn.reghao.util.text.JsonConverter;
+import cn.reghao.jdkutil.converter.DateTimeConverter;
+import cn.reghao.jdkutil.serializer.JsonConverter;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 

common/src/main/java/cn/reghao/autodop/common/message/CallResult.java

@@ -3,7 +3,7 @@ package cn.reghao.autodop.common.message;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
-import static cn.reghao.util.result.ResultStatus.*;
+import static cn.reghao.jdkutil.result.ResultStatus.*;
 
 /**
  * RPC 调用结果

common/src/main/java/cn/reghao/autodop/common/mqtt/DefaultMqttClient.java

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.common.mqtt;
 
 import cn.reghao.autodop.common.message.AsyncMsg;
-import cn.reghao.autodop.common.util.MachineIdentity;
-import cn.reghao.util.text.JsonConverter;
+import cn.reghao.autodop.common.util.MachineId;
+import cn.reghao.jdkutil.serializer.JsonConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.*;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
@@ -26,9 +26,9 @@ public class DefaultMqttClient implements AutoCloseable {
     private Map<String, IMqttMessageListener> subMap = new HashMap<>();
     private MqttCallback callback = new MqttClientCallback();
 
-    public DefaultMqttClient(MachineIdentity id, MosquittoProperties properties) throws MqttException, IOException {
+    public DefaultMqttClient(MosquittoProperties properties) throws MqttException, IOException {
         this.properties = properties;
-        String clientId = properties.getClientId() + id.id();
+        String clientId = properties.getClientId() + MachineId.id();
         this.client = new MqttClient(properties.getBroker(), clientId, new MemoryPersistence());
     }
 

common/src/main/java/cn/reghao/autodop/common/node/msg/NodeMsg.java

@@ -0,0 +1,26 @@
+package cn.reghao.autodop.common.node.msg;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author reghao
+ * @date 2021-08-25 17:19:41
+ */
+@Data
+public class NodeMsg implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String nodeOps;
+    private String jsonPayload;
+    private long sendTime;
+
+    public static NodeMsg nodeMsg(String nodeOps, String jsonPayload) {
+        NodeMsg nodeMsg = new NodeMsg();
+        nodeMsg.setNodeOps(nodeOps);
+        nodeMsg.setJsonPayload(jsonPayload);
+        nodeMsg.setSendTime(System.currentTimeMillis());
+        return nodeMsg;
+    }
+}

common/src/main/java/cn/reghao/autodop/common/node/msg/constant/AppId.java

@@ -0,0 +1,9 @@
+package cn.reghao.autodop.common.node.msg.constant;
+
+/**
+ * @author reghao
+ * @date 2021-08-27 17:32:08
+ */
+public enum AppId {
+    dmaster, dagent
+}

common/src/main/java/cn/reghao/autodop/common/node/msg/constant/AppStatus.java

@@ -0,0 +1,9 @@
+package cn.reghao.autodop.common.node.msg.constant;
+
+/**
+ * @author reghao
+ * @date 2021-08-27 17:33:20
+ */
+public enum AppStatus {
+    online, offline
+}

common/src/main/java/cn/reghao/autodop/common/node/msg/constant/NodeOps.java

@@ -0,0 +1,11 @@
+package cn.reghao.autodop.common.node.msg.constant;
+
+/**
+ * 节点应用操作(只发布消息)
+ *
+ * @author reghao
+ * @date 2021-08-25 17:19:41
+ */
+public enum NodeOps {
+    nodeStart, nodeShutdown, nodeHeartbeat, nodeLog,
+}

common/src/main/java/cn/reghao/autodop/common/node/msg/dto/NodeAppDTO.java

@@ -0,0 +1,30 @@
+package cn.reghao.autodop.common.node.msg.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author reghao
+ * @date 2021-08-25 22:22:35
+ */
+@Data
+public class NodeAppDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String nodeId;
+    private String appId;
+    private String publicIp;
+    private String privateIp;
+    private String appStatus;
+    private long heartbeatTime;
+
+    /*public NodeAppDTO(String nodeId, AppId appId, String publicIp, String privateIp, AppStatus appStatus) {
+        this.nodeId = nodeId;
+        this.appId = appId.name();
+        this.publicIp = publicIp;
+        this.privateIp = privateIp;
+        this.appStatus = appStatus.name();
+        this.heartbeatTime = System.currentTimeMillis();
+    }*/
+}

common/src/main/java/cn/reghao/autodop/common/node/msg/dto/NodeAppLogDTO.java

@@ -0,0 +1,22 @@
+package cn.reghao.autodop.common.node.msg.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author reghao
+ * @date 2021-06-11 09:48:14
+ */
+@Data
+public class NodeAppLogDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String nodeId;
+    private String appId;
+    private long timestamp;
+    private String level;
+    private String threadName;
+    private String loggerName;
+    private String message;
+}

common/src/main/java/cn/reghao/autodop/common/node/rpc/JsonRpc.java

@@ -0,0 +1,33 @@
+package cn.reghao.autodop.common.node.rpc;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author reghao
+ * @date 2021-08-25 17:19:41
+ */
+@Data
+public class JsonRpc implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String clazz;
+    private String method;
+    private Object param;
+
+    public static  JsonRpc jsonRpc(String clazz, String method) {
+        JsonRpc nodeMsg = new JsonRpc();
+        nodeMsg.setClazz(clazz);
+        nodeMsg.setMethod(method);
+        return nodeMsg;
+    }
+
+    public static  JsonRpc jsonRpc(String clazz, String method, Object param) {
+        JsonRpc nodeMsg = new JsonRpc();
+        nodeMsg.setClazz(clazz);
+        nodeMsg.setMethod(method);
+        nodeMsg.setParam(param);
+        return nodeMsg;
+    }
+}

common/src/main/java/cn/reghao/autodop/common/node/rpc/RpcMsg.java

@@ -0,0 +1,42 @@
+package cn.reghao.autodop.common.node.rpc;
+
+import lombok.Data;
+
+import java.util.UUID;
+
+/**
+ * @author reghao
+ * @date 2021-09-14 17:42:43
+ */
+@Data
+public class RpcMsg {
+    private String destination;
+    private String originator;
+    private JsonRpc jsonRpc;
+    private RpcResult<?> rpcResult;
+    private String msgId;
+    private long sendTime;
+
+    public RpcMsg() {
+        this.msgId = UUID.randomUUID().toString();
+        this.sendTime = System.currentTimeMillis();
+    }
+
+    public static RpcMsg callMsg(String destination, String originator, JsonRpc jsonRpc) {
+        RpcMsg rpcMsg = new RpcMsg();
+        rpcMsg.setDestination(destination);
+        rpcMsg.setOriginator(originator);
+        rpcMsg.setJsonRpc(jsonRpc);
+        return rpcMsg;
+    }
+
+    public static RpcMsg resultMsg(RpcMsg callMsg, RpcResult<?> rpcResult) {
+        RpcMsg rpcMsg = new RpcMsg();
+        rpcMsg.setDestination(callMsg.getOriginator());
+        rpcMsg.setOriginator(callMsg.getDestination());
+        rpcMsg.setJsonRpc(callMsg.getJsonRpc());
+        rpcMsg.setRpcResult(rpcResult);
+        rpcMsg.setMsgId(callMsg.getMsgId());
+        return rpcMsg;
+    }
+}

common/src/main/java/cn/reghao/autodop/common/node/rpc/RpcQueue.java

@@ -0,0 +1,15 @@
+package cn.reghao.autodop.common.node.rpc;
+
+/**
+ * @author reghao
+ * @date 2021-09-14 17:10:31
+ */
+public class RpcQueue {
+    public static String rpcQueue(String nodeId, String appId) {
+        return String.format("rpc.%s.%s", nodeId, appId);
+    }
+
+    public static String rpcTopic(String nodeId, String appId) {
+        return String.format("rpc.%s.%s", nodeId, appId);
+    }
+}

common/src/main/java/cn/reghao/autodop/common/node/rpc/RpcResult.java

@@ -0,0 +1,33 @@
+package cn.reghao.autodop.common.node.rpc;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import static cn.reghao.jdkutil.result.ResultStatus.*;
+
+/**
+ * RPC 调用结果
+ *
+ * @author reghao
+ * @date 2020-09-07 23:04:16
+ */
+@Data
+@AllArgsConstructor
+public class RpcResult<T> {
+    // 0 - 成功 1 - 失败
+    private int code;
+    private String msg;
+    private T data;
+
+    public static <T> RpcResult<T> success(T data) {
+        return new RpcResult<>(SUCCESS.getCode(), SUCCESS.getMsg(), data);
+    }
+
+    public static <T> RpcResult<T> fail(String msg) {
+        return new RpcResult<>(FAIL.getCode(), msg, null);
+    }
+
+    public static <T> RpcResult<T> error(String msg) {
+        return new RpcResult<>(ERROR.getCode(), msg, null);
+    }
+}

common/src/main/java/cn/reghao/autodop/common/node/rpc/clazz/AppClazz.java

@@ -0,0 +1,9 @@
+package cn.reghao.autodop.common.node.rpc.clazz;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 19:15:00
+ */
+public enum AppClazz {
+    deploy, status, restart, stop, start, log,
+}

common/src/main/java/cn/reghao/autodop/common/node/rpc/clazz/Clazz.java

@@ -0,0 +1,9 @@
+package cn.reghao.autodop.common.node.rpc.clazz;
+
+/**
+ * @author reghao
+ * @date 2021-09-14 18:15:05
+ */
+public enum Clazz {
+    AppClazz, MachineClazz, DockerClazz,
+}

common/src/main/java/cn/reghao/autodop/common/node/rpc/clazz/DockerClazz.java

@@ -0,0 +1,10 @@
+package cn.reghao.autodop.common.node.rpc.clazz;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 19:15:00
+ */
+public enum DockerClazz {
+    dockerImage,
+    dockerImageResult,
+}

common/src/main/java/cn/reghao/autodop/common/node/rpc/clazz/MachineClazz.java

@@ -0,0 +1,10 @@
+package cn.reghao.autodop.common.node.rpc.clazz;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 19:15:00
+ */
+public enum MachineClazz {
+    shellMethod, statMethod,
+    shellResult, statResult,
+}

common/src/main/java/cn/reghao/autodop/common/node/rpc/dto/machine/cpu/CpuInfo.java

@@ -0,0 +1,16 @@
+package cn.reghao.autodop.common.node.rpc.dto.machine.cpu;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-10-20 09:51:52
+ */
+@Data
+public class CpuInfo {
+    private int physicalCore;
+    private int logicalCore;
+    private String vendorId;
+    private String modelName;
+    private String bogoMips;
+}

common/src/main/java/cn/reghao/autodop/common/node/rpc/dto/machine/cpu/CpuStat.java

@@ -0,0 +1,22 @@
+package cn.reghao.autodop.common.node.rpc.dto.machine.cpu;
+
+import lombok.Data;
+
+/**
+ * CPU 使用率
+ * top 命令中的 CPU 数据
+ *
+ * @author reghao
+ * @date 2020-03-19 10:01:03
+ */
+@Data
+public class CpuStat {
+    private String us;
+    private String sy;
+    private String ni;
+    private String id;
+    private String wa;
+    private String hi;
+    private String si;
+    private String st;
+}

common/src/main/java/cn/reghao/autodop/common/node/rpc/dto/machine/cpu/CpuStats.java

@@ -0,0 +1,37 @@
+package cn.reghao.autodop.common.node.rpc.dto.machine.cpu;
+
+import lombok.Data;
+
+/**
+ * CPU 状态
+ * /proc/stat 中 cpu 行内容
+ *
+ * @author reghao
+ * @date 2019-10-25 14:40:53
+ */
+@Data
+public class CpuStats {
+    private long user;
+    private long nice;
+    private long system;
+    private long idle;
+    private long iowait;
+    private long irq;
+    private long softirq;
+    private long steal;
+    private long guest;
+    private long guestnice;
+
+    public long total() {
+        return user + nice + system + idle + iowait + irq + softirq + steal + guest + guestnice;
+    }
+
+    public long us() {
+        //return user + nice;
+        return user;
+    }
+
+    public long sy() {
+        return system + irq + softirq;
+    }
+}

common/src/main/java/cn/reghao/autodop/common/node/rpc/dto/machine/disk/DiskInfo.java

@@ -0,0 +1,22 @@
+package cn.reghao.autodop.common.node.rpc.dto.machine.disk;
+
+import lombok.Data;
+
+/**
+ * df -h 命令输出
+ *
+ * @author reghao
+ * @date 2020-10-20 10:51:59
+ */
+@Data
+public class DiskInfo {
+    private String diskPath;
+    private String mountedOn;
+    private String fsType;
+    // bytes
+    private long size;
+    private long used;
+    private long avail;
+    private int inodeTotal;
+    private int inodeFree;
+}

common/src/main/java/cn/reghao/autodop/common/node/rpc/dto/machine/disk/DiskStat.java

@@ -0,0 +1,31 @@
+package cn.reghao.autodop.common.node.rpc.dto.machine.disk;
+
+import lombok.Data;
+
+/**
+ * 磁盘状态
+ * /proc/diskstats 文件内容
+ *
+ * @author reghao
+ * @date 2019-10-30 10:09:24
+ */
+@Data
+public class DiskStat {
+    private int major;
+    private int minor;
+    private String device;
+    private long readsCompletedSuccessfully;
+    private long readsMerged;
+    private long sectorsRead;
+    private long timeSpentReading;
+    private long writesCompleted;
+    private long writesMerged;
+    private long sectorsWritten;
+    private long timeSpentWriting;
+    private long iosCurrentlyInProgress;
+    private long timeSpentDoingIos;
+    private long discardsCompletedSuccessfully;
+    private long discardsMerged;
+    private long sectorsDiscard;
+    private long timeSpentDiscarding;
+}

common/src/main/java/cn/reghao/autodop/common/node/rpc/dto/machine/mem/MemoryInfo.java

@@ -0,0 +1,23 @@
+package cn.reghao.autodop.common.node.rpc.dto.machine.mem;
+
+import lombok.Data;
+
+/**
+ * free -h 命令输出
+ *
+ * @author reghao
+ * @date 2020-10-20 10:51:50
+ */
+@Data
+public class MemoryInfo {
+    // KiB
+    private long total;
+    private long used;
+    private long free;
+    private long shared;
+    private long buffCache;
+    private long available;
+    private long swapTotal;
+    private long swapUsed;
+    private long swapFree;
+}

common/src/main/java/cn/reghao/autodop/common/util/ByteConverter.java

@@ -10,8 +10,7 @@ import java.util.Map;
  * @date 2019-10-26 22:39:23
  */
 public class ByteConverter {
-    private final int base = 1024;
-    private Map<Integer, String> map = new HashMap<>();
+    private final Map<Integer, String> map = new HashMap<>();
 
     public ByteConverter() {
         for (ByteType byteType : ByteType.values()) {
@@ -23,6 +22,7 @@ public class ByteConverter {
      * @date 2020-10-20 上午11:26
      */
     public String convert(ByteType byteType, long value) {
+        int base = 1024;
         for (int i = byteType.ordinal(); i < ByteType.TiB.ordinal(); i++) {
             if (value < base) {
                 return value + map.get(i);

common/src/main/java/cn/reghao/autodop/common/util/MachineIdentity.java → common/src/main/java/cn/reghao/autodop/common/util/MachineId.java

@@ -1,8 +1,6 @@
 package cn.reghao.autodop.common.util;
 
-import cn.reghao.autodop.common.dagent.machine.network.NetworkInfo;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
 
 import java.io.*;
 import java.net.*;
@@ -16,22 +14,20 @@ import java.util.List;
  * @author reghao
  * @date 2021-05-20 15:45:28
  */
-@Slf4j
-@Component
-public class MachineIdentity {
-    public String id() throws IOException {
+public class MachineId {
+    public static String id() throws IOException {
         File file = new File("/etc/machine-id");
         BufferedReader in =  new BufferedReader(new InputStreamReader(new FileInputStream(file)));
         String line = in.readLine();
         in.close();
 
-        if (!line.isEmpty() && !line.isBlank()) {
-            return line;
+        if (line.isBlank()) {
+            throw new IOException("/etc/machine-id 文件中没有 machine-id");
         }
-        throw new IOException();
+        return line;
     }
 
-    public String ipv4() {
+    public static String ipv4() {
         List<String> ipv4List = new ArrayList<>();
         try {
             Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
@@ -44,9 +40,6 @@ public class MachineIdentity {
                     continue;
                 }
 
-                NetworkInfo networkInfo = new NetworkInfo();
-                networkInfo.setIface(name);
-
                 Enumeration<InetAddress> inetAddrs = iface.getInetAddresses();
                 while (inetAddrs.hasMoreElements()) {
                     InetAddress address = inetAddrs.nextElement();
@@ -58,8 +51,8 @@ public class MachineIdentity {
                 }
             }
         } catch (SocketException e) {
-            log.error("{}", e.getMessage());
+            e.printStackTrace();
         }
-        return ipv4List.isEmpty() ? "" : ipv4List.get(0);
+        return ipv4List.isEmpty() ? "127.0.0.1" : ipv4List.get(0);
     }
 }

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

@@ -1,7 +1,7 @@
-package cn.reghao.autodop.common.jvm;
+package cn.reghao.autodop.common.util.jvm;
 
-import cn.reghao.autodop.common.jvm.pojo.*;
-import cn.reghao.util.text.DateTimeConverter;
+import cn.reghao.autodop.common.util.jvm.po.*;
+import cn.reghao.jdkutil.converter.DateTimeConverter;
 
 import java.lang.management.*;
 import java.util.*;

common/src/main/java/cn/reghao/autodop/common/jvm/pojo/BufferPoolStat.java → common/src/main/java/cn/reghao/autodop/common/util/jvm/po/BufferPoolStat.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.jvm.pojo;
+package cn.reghao.autodop.common.util.jvm.po;
 
 import cn.reghao.autodop.common.util.ByteConverter;
 import cn.reghao.autodop.common.util.ByteType;

common/src/main/java/cn/reghao/autodop/common/jvm/pojo/GarbageCollectorStat.java → common/src/main/java/cn/reghao/autodop/common/util/jvm/po/GarbageCollectorStat.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.jvm.pojo;
+package cn.reghao.autodop.common.util.jvm.po;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/jvm/pojo/JvmInfo.java → common/src/main/java/cn/reghao/autodop/common/util/jvm/po/JvmInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.jvm.pojo;
+package cn.reghao.autodop.common.util.jvm.po;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/jvm/pojo/JvmStat.java → common/src/main/java/cn/reghao/autodop/common/util/jvm/po/JvmStat.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.jvm.pojo;
+package cn.reghao.autodop.common.util.jvm.po;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/jvm/pojo/MemoryPoolStat.java → common/src/main/java/cn/reghao/autodop/common/util/jvm/po/MemoryPoolStat.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.jvm.pojo;
+package cn.reghao.autodop.common.util.jvm.po;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/jvm/pojo/MemoryStat.java → common/src/main/java/cn/reghao/autodop/common/util/jvm/po/MemoryStat.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.jvm.pojo;
+package cn.reghao.autodop.common.util.jvm.po;
 
 import cn.reghao.autodop.common.util.ByteConverter;
 import cn.reghao.autodop.common.util.ByteType;

common/src/main/java/cn/reghao/autodop/common/jvm/pojo/ThreadStat.java → common/src/main/java/cn/reghao/autodop/common/util/jvm/po/ThreadStat.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.jvm.pojo;
+package cn.reghao.autodop.common.util.jvm.po;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/shell/ShellExecutor.java → common/src/main/java/cn/reghao/autodop/common/util/shell/ShellExecutor.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.shell;
+package cn.reghao.autodop.common.util.shell;
 
 import java.io.*;
 import java.util.UUID;

common/src/main/java/cn/reghao/autodop/common/shell/ShellResult.java → common/src/main/java/cn/reghao/autodop/common/util/shell/ShellResult.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.shell;
+package cn.reghao.autodop.common.util.shell;
 
 /**
  * @author reghao

common/src/main/java/cn/reghao/autodop/common/util/text/FileStream.java

@@ -1,34 +0,0 @@
-package cn.reghao.autodop.common.util.text;
-
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-/**
- * @author reghao
- * @date 2019-08-29 13:01:37
- */
-@Slf4j
-public class FileStream {
-    public String readFromJar(String filePath) {
-        //String resources = this.getClass().getClassLoader().getResource("").getPath();
-        InputStream in = this.getClass().getResourceAsStream(filePath);
-
-        BufferedReader br=new BufferedReader(new InputStreamReader(in));
-        StringBuilder sb = new StringBuilder();
-        String line;
-        try {
-            while ((line = br.readLine()) != null) {
-                sb.append(line);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        log.info("{}", sb.toString());
-
-        return null;
-    }
-}

common/src/main/java/cn/reghao/autodop/common/util/text/ReplaceCharacter.java

@@ -3,7 +3,7 @@ package cn.reghao.autodop.common.util.text;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import cn.reghao.util.text.TextFile;
+import cn.reghao.jdkutil.text.TextFile;
 
 /**
  * 将 Windows 中的 \ 字符替换为 Linux 中的 / 字符

dagent/src/main/java/cn/reghao/autodop/dagent/app/App.java

@@ -1,19 +1,19 @@
 package cn.reghao.autodop.dagent.app;
 
-import cn.reghao.autodop.common.dagent.app.AppIdArgs;
+import cn.reghao.autodop.common.dagent.app.AppIdParam;
 import cn.reghao.autodop.common.dagent.app.AppStatus;
 import cn.reghao.autodop.common.dagent.app.DeployResult;
-import cn.reghao.autodop.common.dagent.app.deploy.AppDeployArgs;
-import cn.reghao.autodop.common.dagent.app.deploy.PackType;
+import cn.reghao.autodop.common.dagent.app.DeployParam;
+import cn.reghao.autodop.common.dagent.app.PackType;
 import cn.reghao.autodop.common.dagent.app.log.AppLogArgs;
 import cn.reghao.autodop.common.dagent.app.log.LogConfig;
 import cn.reghao.autodop.common.dagent.app.log.LogFile;
 import cn.reghao.autodop.common.docker.exception.DockerException;
 import cn.reghao.autodop.common.message.CallResult;
-import cn.reghao.util.result.Result;
-import cn.reghao.util.result.ResultStatus;
+import cn.reghao.jdkutil.result.Result;
+import cn.reghao.jdkutil.result.ResultStatus;
 import cn.reghao.autodop.common.util.ExceptionUtil;
-import cn.reghao.util.text.JsonConverter;
+import cn.reghao.jdkutil.serializer.JsonConverter;
 import cn.reghao.autodop.dagent.spring.DagentLifecycle;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -37,9 +37,9 @@ public class App {
     }
 
     public DeployResult deploy(String payload) {
-        AppDeployArgs appDeployArgs = JsonConverter.jsonToObject(payload, AppDeployArgs.class);
-        String buildLogId = appDeployArgs.getBuildLogId();
-        String packType = appDeployArgs.getPackType();
+        DeployParam deployParam = JsonConverter.jsonToObject(payload, DeployParam.class);
+        String buildLogId = deployParam.getBuildLogId();
+        String packType = deployParam.getPackType();
 
         AppStatus appStatus;
         DeployResult deployResult = new DeployResult(buildLogId,
@@ -47,7 +47,7 @@ public class App {
         switch (PackType.valueOf(packType)) {
             case docker:
                 try {
-                    appStatus = dockerAppServiceImpl.deploy(appDeployArgs);
+                    appStatus = dockerAppServiceImpl.deploy(deployParam);
                     deployResult.setResult(Result.result(ResultStatus.SUCCESS));
                     deployResult.setAppStatus(appStatus);
                 } catch (DockerException e) {
@@ -55,12 +55,12 @@ public class App {
                 }
                 break;
             case zip:
-                appStatus = zipAppServiceImpl.deploy(appDeployArgs);
+                appStatus = zipAppServiceImpl.deploy(deployParam);
                 deployResult.setResult(Result.result(ResultStatus.SUCCESS));
                 deployResult.setAppStatus(appStatus);
                 break;
             default:
-                String msg = "打包类型 " + appDeployArgs.getPackType() + " 不存在";
+                String msg = "打包类型 " + deployParam.getPackType() + " 不存在";
                 deployResult.setResult(Result.result(ResultStatus.ERROR, msg));
         }
         return deployResult;
@@ -98,9 +98,9 @@ public class App {
     }
 
     public CallResult<AppStatus> status(String payload) {
-        AppIdArgs appIdArgs = JsonConverter.jsonToObject(payload, AppIdArgs.class);
-        String appId = appIdArgs.getAppId();
-        String packerType = appIdArgs.getPackerType();
+        AppIdParam appIdParam = JsonConverter.jsonToObject(payload, AppIdParam.class);
+        String appId = appIdParam.getAppId();
+        String packerType = appIdParam.getPackerType();
 
         AppStatus appStatus;
         switch (PackType.valueOf(packerType)) {
@@ -115,15 +115,15 @@ public class App {
                 appStatus = zipAppServiceImpl.status(appId);
                 break;
             default:
-                return CallResult.error("打包类型 " + appIdArgs.getPackerType() + " 不存在");
+                return CallResult.error("打包类型 " + appIdParam.getPackerType() + " 不存在");
         }
         return CallResult.success(appStatus);
     }
 
     public CallResult<AppStatus> restart(String payload) {
-        AppIdArgs appIdArgs = JsonConverter.jsonToObject(payload, AppIdArgs.class);
-        String appId = appIdArgs.getAppId();
-        String packerType = appIdArgs.getPackerType();
+        AppIdParam appIdParam = JsonConverter.jsonToObject(payload, AppIdParam.class);
+        String appId = appIdParam.getAppId();
+        String packerType = appIdParam.getPackerType();
 
         AppStatus appStatus;
         switch (PackType.valueOf(packerType)) {
@@ -138,15 +138,15 @@ public class App {
                 appStatus = zipAppServiceImpl.restart(appId);
                 break;
             default:
-                return CallResult.error("打包类型 " + appIdArgs.getPackerType() + " 不存在");
+                return CallResult.error("打包类型 " + appIdParam.getPackerType() + " 不存在");
         }
         return CallResult.success(appStatus);
     }
 
     public CallResult<AppStatus> stop(String payload) {
-        AppIdArgs appIdArgs = JsonConverter.jsonToObject(payload, AppIdArgs.class);
-        String appId = appIdArgs.getAppId();
-        String packerType = appIdArgs.getPackerType();
+        AppIdParam appIdParam = JsonConverter.jsonToObject(payload, AppIdParam.class);
+        String appId = appIdParam.getAppId();
+        String packerType = appIdParam.getPackerType();
 
         AppStatus appStatus;
         switch (PackType.valueOf(packerType)) {
@@ -161,15 +161,15 @@ public class App {
                 appStatus = zipAppServiceImpl.stop(appId);
                 break;
             default:
-                return CallResult.error("打包类型 " + appIdArgs.getPackerType() + " 不存在");
+                return CallResult.error("打包类型 " + appIdParam.getPackerType() + " 不存在");
         }
         return CallResult.success(appStatus);
     }
 
     public CallResult<AppStatus> start(String payload) {
-        AppIdArgs appIdArgs = JsonConverter.jsonToObject(payload, AppIdArgs.class);
-        String appId = appIdArgs.getAppId();
-        String packerType = appIdArgs.getPackerType();
+        AppIdParam appIdParam = JsonConverter.jsonToObject(payload, AppIdParam.class);
+        String appId = appIdParam.getAppId();
+        String packerType = appIdParam.getPackerType();
 
         AppStatus appStatus;
         switch (PackType.valueOf(packerType)) {
@@ -184,7 +184,7 @@ public class App {
                 appStatus = zipAppServiceImpl.start(appId);
                 break;
             default:
-                return CallResult.error("打包类型 " + appIdArgs.getPackerType() + " 不存在");
+                return CallResult.error("打包类型 " + appIdParam.getPackerType() + " 不存在");
         }
         return CallResult.success(appStatus);
     }

dagent/src/main/java/cn/reghao/autodop/dagent/app/AppService.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dagent.app;
 
 import cn.reghao.autodop.common.dagent.app.AppStatus;
-import cn.reghao.autodop.common.dagent.app.deploy.AppDeployArgs;
+import cn.reghao.autodop.common.dagent.app.DeployParam;
 import cn.reghao.autodop.common.dagent.app.log.AppLogArgs;
 import cn.reghao.autodop.common.dagent.app.log.LogFile;
 import cn.reghao.autodop.common.docker.exception.DockerException;
@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-02-22 16:21:28
  */
 public interface AppService {
-    AppStatus deploy(AppDeployArgs appDeployArgs) throws DockerException;
+    AppStatus deploy(DeployParam deployParam) throws DockerException;
     AppStatus status(String appId) throws DockerException;
     AppStatus restart(String appId) throws DockerException;
     AppStatus stop(String appId) throws DockerException;

dagent/src/main/java/cn/reghao/autodop/dagent/app/DockerAppServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dagent.app;
 
 import cn.reghao.autodop.common.dagent.app.AppStatus;
-import cn.reghao.autodop.common.dagent.app.deploy.AppDeployArgs;
+import cn.reghao.autodop.common.dagent.app.DeployParam;
 import cn.reghao.autodop.common.dagent.app.log.AppLogArgs;
 import cn.reghao.autodop.common.dagent.app.log.LogConfig;
 import cn.reghao.autodop.common.dagent.app.log.LogFile;
@@ -13,8 +13,8 @@ import cn.reghao.autodop.common.docker.pojo.HostConfig;
 import cn.reghao.autodop.common.docker.pojo.State;
 import cn.reghao.autodop.common.docker.pojo.result.ContainerInfo;
 import cn.reghao.autodop.common.util.ExceptionUtil;
-import cn.reghao.util.text.DateTimeConverter;
-import cn.reghao.util.text.JsonConverter;
+import cn.reghao.jdkutil.converter.DateTimeConverter;
+import cn.reghao.jdkutil.serializer.JsonConverter;
 import cn.reghao.autodop.dagent.spring.DagentLifecycle;
 
 import java.util.ArrayList;
@@ -28,10 +28,10 @@ public class DockerAppServiceImpl implements AppService {
     private final long sleep = 10_000;
 
     @Override
-    public AppStatus deploy(AppDeployArgs appDeployArgs) throws DockerException {
-        String appId = appDeployArgs.getAppId();
-        String packagePath = appDeployArgs.getPackagePath();
-        Config dockerConfig = JsonConverter.jsonToObject(appDeployArgs.getStartScript(), Config.class);
+    public AppStatus deploy(DeployParam deployParam) throws DockerException {
+        String appId = deployParam.getAppId();
+        String packagePath = deployParam.getPackagePath();
+        Config dockerConfig = JsonConverter.jsonToObject(deployParam.getStartScript(), Config.class);
         if (dockerConfig == null) {
             dockerConfig = new Config(packagePath);
         } else {

dagent/src/main/java/cn/reghao/autodop/dagent/app/ZipAppServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dagent.app;
 
 import cn.reghao.autodop.common.dagent.app.AppStatus;
-import cn.reghao.autodop.common.dagent.app.deploy.AppDeployArgs;
+import cn.reghao.autodop.common.dagent.app.DeployParam;
 import cn.reghao.autodop.common.dagent.app.log.AppLogArgs;
 import cn.reghao.autodop.common.dagent.app.log.LogFile;
 import lombok.extern.slf4j.Slf4j;
@@ -16,7 +16,7 @@ import java.util.List;
 @Slf4j
 public class ZipAppServiceImpl implements AppService {
     @Override
-    public AppStatus deploy(AppDeployArgs appDeployArgs) {
+    public AppStatus deploy(DeployParam deployParam) {
         log.info("zip 部署...");
         return null;
     }

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

@@ -5,7 +5,7 @@ import cn.reghao.autodop.common.message.MessageType;
 import cn.reghao.autodop.common.dagent.machine.Machine;
 import cn.reghao.autodop.common.message.ops.DagentOps;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.util.text.JsonConverter;
+import cn.reghao.jdkutil.serializer.JsonConverter;
 import cn.reghao.autodop.dagent.spring.DagentLifecycle;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttException;

dagent/src/main/java/cn/reghao/autodop/dagent/mqttsub/DmasterMsgDispatcher.java

@@ -2,7 +2,7 @@ package cn.reghao.autodop.dagent.mqttsub;
 
 import cn.reghao.autodop.common.message.AsyncMsg;
 import cn.reghao.autodop.common.message.MessageType;
-import cn.reghao.util.text.JsonConverter;
+import cn.reghao.jdkutil.serializer.JsonConverter;
 import cn.reghao.autodop.dagent.mqttsub.processor.app.AppOpsProcessor;
 import cn.reghao.autodop.dagent.mqttsub.processor.machine.MachineOpsProcessor;
 import cn.reghao.autodop.dagent.spring.DagentLifecycle;

dagent/src/main/java/cn/reghao/autodop/dagent/mqttsub/processor/app/AppOpsProcessor.java

@@ -6,7 +6,7 @@ import cn.reghao.autodop.common.message.MessageType;
 import cn.reghao.autodop.common.message.ops.AppOps;
 import cn.reghao.autodop.common.message.ops.OpsProcessor;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.util.text.JsonConverter;
+import cn.reghao.jdkutil.serializer.JsonConverter;
 import cn.reghao.autodop.dagent.app.App;
 import cn.reghao.autodop.dagent.spring.DagentLifecycle;
 import lombok.extern.slf4j.Slf4j;
@@ -20,8 +20,8 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 public class AppOpsProcessor implements OpsProcessor {
-    private DefaultMqttClient mqttClient;
-    private App app;
+    private final DefaultMqttClient mqttClient;
+    private final App app;
     
     public AppOpsProcessor(DefaultMqttClient mqttClient, App app) {
         this.mqttClient = mqttClient;

dagent/src/main/java/cn/reghao/autodop/dagent/mqttsub/processor/machine/MachineOpsProcessor.java

@@ -5,7 +5,7 @@ import cn.reghao.autodop.common.message.*;
 import cn.reghao.autodop.common.message.ops.MachineOps;
 import cn.reghao.autodop.common.message.ops.OpsProcessor;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.util.text.JsonConverter;
+import cn.reghao.jdkutil.serializer.JsonConverter;
 import cn.reghao.autodop.dagent.spring.DagentLifecycle;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttException;

dagent/src/main/java/cn/reghao/autodop/dagent/rpc/RpcListener.java

@@ -0,0 +1,83 @@
+package cn.reghao.autodop.dagent.rpc;
+
+import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
+import cn.reghao.autodop.common.node.rpc.JsonRpc;
+import cn.reghao.autodop.common.node.rpc.RpcMsg;
+import cn.reghao.autodop.common.node.rpc.RpcResult;
+import cn.reghao.autodop.common.node.rpc.clazz.Clazz;
+import cn.reghao.autodop.dagent.rpc.impl.AppClazzImpl;
+import cn.reghao.jdkutil.serializer.JsonConverter;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
+import org.eclipse.paho.client.mqttv3.MqttCallback;
+import org.eclipse.paho.client.mqttv3.MqttException;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.stereotype.Component;
+
+import java.lang.management.ManagementFactory;
+
+/**
+ * 分发 dmaster 发送的消息
+ *
+ * @author reghao
+ * @date 2021-05-24 09:24:03
+ */
+@Slf4j
+@Component
+public class RpcListener implements MqttCallback {
+    private final long startTime;
+    private final DefaultMqttClient mqttClient;
+    private AppClazzImpl appClazz;
+
+    public RpcListener(DefaultMqttClient mqttClient, AppClazzImpl appClazz) {
+        this.startTime = ManagementFactory.getRuntimeMXBean().getStartTime();
+        this.mqttClient = mqttClient;
+        this.appClazz = appClazz;
+    }
+
+    @Override
+    public void messageArrived(String topic, MqttMessage message) {
+        try {
+            String msg = message.toString();
+            RpcMsg callMsg = JsonConverter.jsonToObject(msg, RpcMsg.class);
+
+            JsonRpc jsonRpc = callMsg.getJsonRpc();
+            String clazz = jsonRpc.getClazz();
+            RpcResult<?> rpcResult = null;
+            switch (Clazz.valueOf(clazz)) {
+                case AppClazz:
+                    rpcResult = appClazz.process(jsonRpc);
+                    break;
+                case MachineClazz:
+                    break;
+                case DockerClazz:
+                    break;
+                default:
+            }
+
+            RpcMsg resultMsg = RpcMsg.resultMsg(callMsg, rpcResult);
+            rpcReply(resultMsg);
+        } catch (Exception e) {
+            log.error("MQTT message exception -> {}", e.getMessage());
+        }
+    }
+
+    @Override
+    public void deliveryComplete(IMqttDeliveryToken token) {
+        if (!token.isComplete()) {
+            log.error("token -> {}", token);
+        } else {
+            // 由于使用 MQTT 记录日志，而每条消息发送成功后都会调用此方法，因此会形成循环引用，导致超高 CPU 使用率
+            // log.info("token -> {}", token);
+        }
+    }
+
+    @Override
+    public void connectionLost(Throwable cause) {
+        log.error("MQTT connection lost -> {}", cause.getMessage());
+    }
+
+    private void rpcReply(RpcMsg rpcMsg) throws MqttException {
+        mqttClient.pub(rpcMsg.getDestination(), 1, JsonConverter.objectToJson(rpcMsg));
+    }
+}

dagent/src/main/java/cn/reghao/autodop/dagent/rpc/impl/AppClazzImpl.java

@@ -0,0 +1,90 @@
+package cn.reghao.autodop.dagent.rpc.impl;
+
+import cn.reghao.autodop.common.dagent.app.AppStatus;
+import cn.reghao.autodop.common.dagent.app.DeployResult;
+import cn.reghao.autodop.common.dagent.app.DeployParam;
+import cn.reghao.autodop.common.dagent.app.PackType;
+import cn.reghao.autodop.common.docker.exception.DockerException;
+import cn.reghao.autodop.common.node.rpc.JsonRpc;
+import cn.reghao.autodop.common.node.rpc.RpcResult;
+import cn.reghao.autodop.common.node.rpc.clazz.AppClazz;
+import cn.reghao.autodop.common.util.ExceptionUtil;
+import cn.reghao.autodop.dagent.app.AppService;
+import cn.reghao.autodop.dagent.app.DockerAppServiceImpl;
+import cn.reghao.autodop.dagent.app.ZipAppServiceImpl;
+import cn.reghao.autodop.dagent.spring.DagentLifecycle;
+import cn.reghao.jdkutil.result.Result;
+import cn.reghao.jdkutil.result.ResultStatus;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author reghao
+ * @date 2020-12-30 10:26:47
+ */
+@Slf4j
+@Component
+public class AppClazzImpl {
+    private final AppService dockerAppServiceImpl;
+    private final AppService zipAppServiceImpl;
+    
+    public AppClazzImpl() {
+        this.dockerAppServiceImpl = new DockerAppServiceImpl();
+        this.zipAppServiceImpl = new ZipAppServiceImpl();
+    }
+    
+    public RpcResult<?> process(JsonRpc jsonRpc) throws DockerException {
+        String method = jsonRpc.getMethod();
+        Object param = jsonRpc.getParam();
+        switch (AppClazz.valueOf(method)) {
+            case deploy:
+                if (!(param instanceof DeployParam)) {
+                    return RpcResult.error("不是 AppDeployArgs 对象");
+                }
+                return deploy(param);
+            case status:
+                break;
+            case start:
+                break;
+            case stop:
+                break;
+            case restart:
+                break;
+            default:
+                ;
+        }
+
+        return null;
+    }
+    
+    private RpcResult<?> deploy(Object param) throws DockerException {
+        DeployParam deployArgs = (DeployParam) param;
+        String buildLogId = deployArgs.getBuildLogId();
+        String packType = deployArgs.getPackType();
+
+        AppStatus appStatus;
+        DeployResult deployResult = new DeployResult(buildLogId,
+                DagentLifecycle.MACHINE_ID, DagentLifecycle.MACHINE_IPV4);
+        switch (PackType.valueOf(packType)) {
+            case docker:
+                try {
+                    appStatus = dockerAppServiceImpl.deploy(deployArgs);
+                    deployResult.setResult(Result.result(ResultStatus.SUCCESS));
+                    deployResult.setAppStatus(appStatus);
+                } catch (DockerException e) {
+                    deployResult.setResult(Result.result(ResultStatus.FAIL, ExceptionUtil.errorMsg(e)));
+                }
+                break;
+            case zip:
+                appStatus = zipAppServiceImpl.deploy(deployArgs);
+                deployResult.setResult(Result.result(ResultStatus.SUCCESS));
+                deployResult.setAppStatus(appStatus);
+                break;
+            default:
+                String msg = "打包类型 " + deployArgs.getPackType() + " 不存在";
+                deployResult.setResult(Result.result(ResultStatus.ERROR, msg));
+        }
+
+        return RpcResult.success(deployResult);
+    }
+}

dagent/src/main/java/cn/reghao/autodop/dagent/rpc/impl/MachineClazzImpl.java

@@ -0,0 +1,36 @@
+package cn.reghao.autodop.dagent.rpc.impl;
+
+import cn.reghao.autodop.common.dagent.machine.Machine;
+import cn.reghao.autodop.common.docker.exception.DockerException;
+import cn.reghao.autodop.common.node.rpc.JsonRpc;
+import cn.reghao.autodop.common.node.rpc.RpcResult;
+import cn.reghao.autodop.common.node.rpc.clazz.MachineClazz;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author reghao
+ * @date 2020-12-30 10:26:47
+ */
+@Slf4j
+@Component
+public class MachineClazzImpl {
+    private Machine machine;
+
+    public MachineClazzImpl(Machine machine) {
+        this.machine = machine;
+    }
+    
+    public RpcResult<?> process(JsonRpc jsonRpc) {
+        String method = jsonRpc.getMethod();
+        Object param = jsonRpc.getParam();
+        switch (MachineClazz.valueOf(method)) {
+            case statMethod:
+                break;
+            default:
+                ;
+        }
+
+        return null;
+    }
+}

dagent/src/main/java/cn/reghao/autodop/dagent/spring/DagentLifecycle.java

@@ -8,8 +8,8 @@ import cn.reghao.autodop.common.message.MessageType;
 import cn.reghao.autodop.common.dagent.machine.Machine;
 import cn.reghao.autodop.common.message.ops.DagentOps;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.autodop.common.util.MachineIdentity;
-import cn.reghao.util.text.JsonConverter;
+import cn.reghao.autodop.common.util.MachineId;
+import cn.reghao.jdkutil.serializer.JsonConverter;
 import cn.reghao.autodop.dagent.mqttsub.DmasterMsgDispatcher;
 import cn.reghao.autodop.dagent.machine.DagentHeartbeatJob;
 import cn.reghao.autodop.dagent.machine.MachineScheduler;
@@ -43,13 +43,12 @@ public class DagentLifecycle implements ApplicationRunner, DisposableBean {
     private final MachineScheduler machineScheduler;
     private final Machine machine;
 
-    public DagentLifecycle(MachineIdentity machineIdentity,
-                           DmasterMsgDispatcher dmasterMsgDispatcher,
+    public DagentLifecycle(DmasterMsgDispatcher dmasterMsgDispatcher,
                            DefaultMqttClient mqttClient,
                            MachineScheduler machineScheduler,
                            Machine machine) throws IOException {
-        MACHINE_ID = machineIdentity.id();
-        MACHINE_IPV4 = machineIdentity.ipv4();
+        MACHINE_ID = MachineId.id();
+        MACHINE_IPV4 = MachineId.ipv4();
         this.dmasterMsgDispatcher = dmasterMsgDispatcher;
         this.mqttClient = mqttClient;
         this.machineScheduler = machineScheduler;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/AppBakController.java

@@ -1,9 +1,9 @@
 package cn.reghao.autodop.dmaster.app.controller;
 
-import cn.reghao.util.result.WebBody;
-import cn.reghao.util.text.JsonConverter;
-import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.utils.UploadDownload;
+import cn.reghao.jdkutil.result.WebBody;
+import cn.reghao.jdkutil.serializer.JsonConverter;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.util.UploadDownload;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/config/AppConfigController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/AppConfigController.java

@@ -1,14 +1,14 @@
-package cn.reghao.autodop.dmaster.app.controller.config;
+package cn.reghao.autodop.dmaster.app.controller;
 
-import cn.reghao.util.result.Result;
-import cn.reghao.util.result.ResultStatus;
-import cn.reghao.autodop.dmaster.app.vo.NewApp;
-import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.notification.entity.NotifyGroup;
+import cn.reghao.jdkutil.result.Result;
+import cn.reghao.jdkutil.result.ResultStatus;
+import cn.reghao.autodop.dmaster.app.model.vo.NewApp;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+import cn.reghao.autodop.dmaster.notification.model.po.NotifyGroup;
 import cn.reghao.autodop.dmaster.app.db.crud.config.AppCrudService;
 import cn.reghao.autodop.dmaster.app.db.crud.config.ProjCrudService;
-import cn.reghao.util.result.WebBody;
+import cn.reghao.jdkutil.result.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/AppStatusController.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.controller;
 
-import cn.reghao.util.result.WebBody;
-import cn.reghao.autodop.dmaster.app.constant.StatusOps;
+import cn.reghao.jdkutil.result.WebBody;
+import cn.reghao.autodop.dmaster.app.model.constant.StatusOps;
 import cn.reghao.autodop.dmaster.app.service.AppStatusService;
 import cn.reghao.autodop.common.dagent.app.log.LogFile;
 import io.swagger.annotations.Api;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/config/BuildConfigController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/BuildConfigController.java

@@ -1,15 +1,15 @@
-package cn.reghao.autodop.dmaster.app.controller.config;
+package cn.reghao.autodop.dmaster.app.controller;
 
-import cn.reghao.util.result.Result;
-import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
-import cn.reghao.autodop.dmaster.app.entity.config.build.BuildDir;
+import cn.reghao.jdkutil.result.Result;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDir;
 import cn.reghao.autodop.dmaster.app.db.crud.config.build.BuildDirCrudService;
-import cn.reghao.autodop.dmaster.app.entity.config.build.CompilerConfig;
-import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
 import cn.reghao.autodop.dmaster.app.db.crud.config.build.CompilerConfigCrudService;
 import cn.reghao.autodop.dmaster.app.db.crud.config.build.PackerConfigCrudService;
 import cn.reghao.autodop.dmaster.app.db.crud.config.build.RepoAuthConfigCrudService;
-import cn.reghao.util.result.WebBody;
+import cn.reghao.jdkutil.result.WebBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/BuildDeployController.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.controller;
 
-import cn.reghao.util.result.WebBody;
+import cn.reghao.jdkutil.result.WebBody;
 import cn.reghao.autodop.dmaster.app.service.AppBuildDeployService;
 import cn.reghao.autodop.dmaster.app.service.BuildDeployDispatcher;
 import io.swagger.annotations.Api;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/BuildDeployLogController.java

@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import cn.reghao.util.result.WebBody;
+import cn.reghao.jdkutil.result.WebBody;
 
 /**
  * @author reghao

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/WebhookController.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.controller;
 
-import cn.reghao.util.result.WebBody;
-import cn.reghao.util.text.JsonConverter;
+import cn.reghao.jdkutil.result.WebBody;
+import cn.reghao.jdkutil.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.service.BuildDeployDispatcher;
 import com.google.gson.JsonObject;
 import io.swagger.annotations.ApiOperation;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/view/AppConfigPageController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/page/AppConfigPageController.java

@@ -1,24 +1,24 @@
-package cn.reghao.autodop.dmaster.app.controller.view;
+package cn.reghao.autodop.dmaster.app.controller.page;
 
-import cn.reghao.autodop.common.dagent.app.deploy.PackType;
-import cn.reghao.autodop.dmaster.app.constant.AppType;
-import cn.reghao.autodop.dmaster.app.constant.EnvList;
-import cn.reghao.autodop.dmaster.machine.db.query.MachineQuery;
+import cn.reghao.autodop.common.dagent.app.PackType;
+import cn.reghao.autodop.dmaster.app.model.constant.AppType;
+import cn.reghao.autodop.dmaster.app.model.constant.EnvList;
+import cn.reghao.autodop.dmaster.machine.db.crud.MachineQuery;
 import cn.reghao.autodop.dmaster.machine.entity.po.info.MachineInfo;
 import cn.reghao.autodop.dmaster.machine.entity.po.info.NetworkInfo;
-import cn.reghao.autodop.dmaster.notification.entity.NotifyGroup;
-import cn.reghao.autodop.dmaster.notification.entity.NotifyType;
+import cn.reghao.autodop.dmaster.notification.model.po.NotifyGroup;
+import cn.reghao.autodop.dmaster.notification.model.po.NotifyType;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.build.CompilerQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.build.PackerQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.build.RepoAuthQuery;
-import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.app.vo.KeyValue;
-import cn.reghao.autodop.dmaster.notification.repository.NotifyGroupRepository;
-import cn.reghao.autodop.dmaster.utils.db.PageList;
-import cn.reghao.autodop.dmaster.utils.db.PageSort;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+import cn.reghao.autodop.dmaster.app.model.vo.KeyValue;
+import cn.reghao.autodop.dmaster.notification.db.repository.NotifyGroupRepository;
+import cn.reghao.autodop.dmaster.util.db.PageList;
+import cn.reghao.autodop.dmaster.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/view/AppPageController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/page/AppPageController.java

@@ -1,24 +1,24 @@
-package cn.reghao.autodop.dmaster.app.controller.view;
+package cn.reghao.autodop.dmaster.app.controller.page;
 
-import cn.reghao.autodop.dmaster.app.constant.AppType;
-import cn.reghao.autodop.dmaster.app.constant.EnvList;
+import cn.reghao.autodop.dmaster.app.model.constant.AppType;
+import cn.reghao.autodop.dmaster.app.model.constant.EnvList;
 import cn.reghao.autodop.dmaster.app.db.query.AppBuildingQuery;
 import cn.reghao.autodop.dmaster.app.db.query.AppDeployingQuery;
 import cn.reghao.autodop.dmaster.app.db.query.AppRunningQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
-import cn.reghao.autodop.dmaster.app.entity.AppDeploying;
-import cn.reghao.autodop.dmaster.app.entity.AppRunning;
-import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.deploy.DeployConfig;
-import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
-import cn.reghao.autodop.dmaster.app.entity.AppBuilding;
-import cn.reghao.autodop.dmaster.app.entity.log.BuildTime;
-import cn.reghao.autodop.dmaster.app.repository.log.BuildLogRepository;
-import cn.reghao.autodop.dmaster.app.vo.BuildConfig;
+import cn.reghao.autodop.dmaster.app.model.po.AppDeploying;
+import cn.reghao.autodop.dmaster.app.model.po.AppRunning;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.deploy.DeployConfig;
+import cn.reghao.autodop.dmaster.app.model.po.log.BuildLog;
+import cn.reghao.autodop.dmaster.app.model.po.AppBuilding;
+import cn.reghao.autodop.dmaster.app.model.po.log.BuildTime;
+import cn.reghao.autodop.dmaster.app.db.repository.log.BuildLogRepository;
+import cn.reghao.autodop.dmaster.app.model.vo.BuildConfig;
 import cn.reghao.autodop.dmaster.rbac.UserContext;
 import cn.reghao.autodop.dmaster.rbac.model.constant.RoleType;
-import cn.reghao.autodop.dmaster.utils.db.PageList;
-import cn.reghao.autodop.dmaster.utils.db.PageSort;
+import cn.reghao.autodop.dmaster.util.db.PageList;
+import cn.reghao.autodop.dmaster.util.db.PageSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/view/BuildConfigPageController.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/page/BuildConfigPageController.java

@@ -1,22 +1,22 @@
-package cn.reghao.autodop.dmaster.app.controller.view;
+package cn.reghao.autodop.dmaster.app.controller.page;
 
-import cn.reghao.autodop.common.dagent.app.deploy.PackType;
+import cn.reghao.autodop.common.dagent.app.PackType;
 import cn.reghao.autodop.common.dagent.machine.disk.Disk;
-import cn.reghao.autodop.dmaster.app.constant.build.CompileType;
-import cn.reghao.autodop.dmaster.app.constant.build.RepoAuthType;
-import cn.reghao.autodop.dmaster.app.constant.build.RepoType;
+import cn.reghao.autodop.dmaster.app.model.constant.build.CompileType;
+import cn.reghao.autodop.dmaster.app.model.constant.build.RepoAuthType;
+import cn.reghao.autodop.dmaster.app.model.constant.build.RepoType;
 import cn.reghao.autodop.dmaster.app.db.query.config.build.BuildDirQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.build.CompilerQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.build.PackerQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.build.RepoAuthQuery;
-import cn.reghao.autodop.dmaster.app.entity.config.build.BuildDir;
-import cn.reghao.autodop.dmaster.app.entity.config.build.CompilerConfig;
-import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
-import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
-import cn.reghao.autodop.dmaster.app.vo.KeyValue;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDir;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.autodop.dmaster.app.model.vo.KeyValue;
 import cn.reghao.autodop.dmaster.machine.entity.vo.DiskUsage;
-import cn.reghao.autodop.dmaster.utils.db.PageList;
-import cn.reghao.autodop.dmaster.utils.db.PageSort;
+import cn.reghao.autodop.dmaster.util.db.PageList;
+import cn.reghao.autodop.dmaster.util.db.PageSort;
 import cn.reghao.autodop.dmaster.spring.DmasterLifecycle;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/AppBuildingCrudService.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.db.crud;
 
-import cn.reghao.autodop.dmaster.app.entity.AppBuilding;
-import cn.reghao.autodop.dmaster.app.repository.AppBuildingRepository;
+import cn.reghao.autodop.dmaster.app.model.po.AppBuilding;
+import cn.reghao.autodop.dmaster.app.db.repository.AppBuildingRepository;
 import org.springframework.stereotype.Service;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/AppDeployingCrudService.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.db.crud;
 
-import cn.reghao.autodop.dmaster.app.entity.AppDeploying;
-import cn.reghao.autodop.dmaster.app.repository.AppDeployingRepository;
+import cn.reghao.autodop.dmaster.app.model.po.AppDeploying;
+import cn.reghao.autodop.dmaster.app.db.repository.AppDeployingRepository;
 import org.springframework.stereotype.Service;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/AppRunningCrudService.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.db.crud;
 
-import cn.reghao.autodop.dmaster.app.entity.AppRunning;
-import cn.reghao.autodop.dmaster.app.repository.AppRunningRepository;
+import cn.reghao.autodop.dmaster.app.model.po.AppRunning;
+import cn.reghao.autodop.dmaster.app.db.repository.AppRunningRepository;
 import org.springframework.stereotype.Service;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/AppCrudService.java

@@ -1,20 +1,20 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config;
 
-import cn.reghao.util.result.Result;
-import cn.reghao.util.result.ResultStatus;
-import cn.reghao.autodop.dmaster.app.constant.AppType;
-import cn.reghao.autodop.dmaster.app.constant.EnvList;
-import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
+import cn.reghao.jdkutil.result.Result;
+import cn.reghao.jdkutil.result.ResultStatus;
+import cn.reghao.autodop.dmaster.app.model.constant.AppType;
+import cn.reghao.autodop.dmaster.app.model.constant.EnvList;
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
 import cn.reghao.autodop.dmaster.machine.db.crud.MachineInfoCrudService;
 import cn.reghao.autodop.dmaster.machine.entity.po.info.MachineInfo;
-import cn.reghao.autodop.dmaster.notification.entity.NotifyType;
-import cn.reghao.autodop.dmaster.app.entity.AppRunning;
-import cn.reghao.autodop.dmaster.app.entity.config.deploy.DeployConfig;
-import cn.reghao.autodop.dmaster.app.repository.AppRunningRepository;
+import cn.reghao.autodop.dmaster.notification.model.po.NotifyType;
+import cn.reghao.autodop.dmaster.app.model.po.AppRunning;
+import cn.reghao.autodop.dmaster.app.model.po.config.deploy.DeployConfig;
+import cn.reghao.autodop.dmaster.app.db.repository.AppRunningRepository;
 import cn.reghao.autodop.dmaster.app.service.AppBuildDeployService;
-import cn.reghao.autodop.dmaster.app.vo.NewApp;
-import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.repository.config.AppOrchestrationRepository;
+import cn.reghao.autodop.dmaster.app.model.vo.NewApp;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.db.repository.config.AppOrchestrationRepository;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/ProjCrudService.java

@@ -1,12 +1,12 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config;
 
-import cn.reghao.util.result.Result;
-import cn.reghao.util.result.ResultStatus;
-import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.app.repository.config.AppOrchestrationRepository;
-import cn.reghao.autodop.dmaster.app.repository.config.ProjOrchestrationRepository;
-import cn.reghao.autodop.dmaster.app.vo.NewApp;
+import cn.reghao.jdkutil.result.Result;
+import cn.reghao.jdkutil.result.ResultStatus;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+import cn.reghao.autodop.dmaster.app.db.repository.config.AppOrchestrationRepository;
+import cn.reghao.autodop.dmaster.app.db.repository.config.ProjOrchestrationRepository;
+import cn.reghao.autodop.dmaster.app.model.vo.NewApp;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/SharedEntityChecker.java

@@ -4,12 +4,12 @@ import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.build.CompilerQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.build.PackerQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.build.RepoAuthQuery;
-import cn.reghao.autodop.dmaster.app.entity.config.build.CompilerConfig;
-import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
-import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
-import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.app.vo.BuildConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+import cn.reghao.autodop.dmaster.app.model.vo.BuildConfig;
 import org.springframework.stereotype.Service;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/build/BuildDirCrudService.java

@@ -1,12 +1,12 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config.build;
 
 import cn.reghao.autodop.common.dagent.machine.disk.Disk;
-import cn.reghao.util.result.Result;
-import cn.reghao.util.result.ResultStatus;
+import cn.reghao.jdkutil.result.Result;
+import cn.reghao.jdkutil.result.ResultStatus;
 import cn.reghao.autodop.common.util.FileOps;
-import cn.reghao.autodop.dmaster.app.entity.config.build.BuildDir;
-import cn.reghao.autodop.dmaster.app.entity.config.build.BuildDirLocal;
-import cn.reghao.autodop.dmaster.app.repository.config.build.BuildDirRepository;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDir;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDirLocal;
+import cn.reghao.autodop.dmaster.app.db.repository.config.build.BuildDirRepository;
 import org.springframework.stereotype.Service;
 
 import java.io.File;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/build/CompilerConfigCrudService.java

@@ -1,14 +1,14 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config.build;
 
-import cn.reghao.util.result.Result;
-import cn.reghao.util.result.ResultStatus;
-import cn.reghao.autodop.dmaster.app.constant.build.CompileType;
+import cn.reghao.jdkutil.result.Result;
+import cn.reghao.jdkutil.result.ResultStatus;
+import cn.reghao.autodop.dmaster.app.model.constant.build.CompileType;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;
-import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.build.CompilerConfig;
-import cn.reghao.autodop.dmaster.app.repository.config.build.CompilerConfigRepository;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
+import cn.reghao.autodop.dmaster.app.db.repository.config.build.CompilerConfigRepository;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/build/PackerConfigCrudService.java

@@ -1,13 +1,13 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config.build;
 
-import cn.reghao.util.result.Result;
-import cn.reghao.util.result.ResultStatus;
+import cn.reghao.jdkutil.result.Result;
+import cn.reghao.jdkutil.result.ResultStatus;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;
-import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
-import cn.reghao.autodop.dmaster.app.repository.config.build.PackerConfigRepository;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
+import cn.reghao.autodop.dmaster.app.db.repository.config.build.PackerConfigRepository;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/crud/config/build/RepoAuthConfigCrudService.java

@@ -1,15 +1,15 @@
 package cn.reghao.autodop.dmaster.app.db.crud.config.build;
 
-import cn.reghao.util.result.Result;
-import cn.reghao.util.result.ResultStatus;
-import cn.reghao.autodop.dmaster.app.constant.build.RepoAuthType;
-import cn.reghao.autodop.dmaster.app.constant.build.RepoType;
+import cn.reghao.jdkutil.result.Result;
+import cn.reghao.jdkutil.result.ResultStatus;
+import cn.reghao.autodop.dmaster.app.model.constant.build.RepoAuthType;
+import cn.reghao.autodop.dmaster.app.model.constant.build.RepoType;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppQuery;
 import cn.reghao.autodop.dmaster.app.db.query.config.ProjQuery;
-import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
-import cn.reghao.autodop.dmaster.app.repository.config.build.RepoAuthConfigRepository;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.autodop.dmaster.app.db.repository.config.build.RepoAuthConfigRepository;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/AppBuildingQuery.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.db.query;
 
-import cn.reghao.autodop.dmaster.app.entity.AppBuilding;
-import cn.reghao.autodop.dmaster.app.repository.AppBuildingRepository;
+import cn.reghao.autodop.dmaster.app.model.po.AppBuilding;
+import cn.reghao.autodop.dmaster.app.db.repository.AppBuildingRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/AppDeployingQuery.java

@@ -1,9 +1,7 @@
 package cn.reghao.autodop.dmaster.app.db.query;
 
-import cn.reghao.autodop.dmaster.app.entity.AppBuilding;
-import cn.reghao.autodop.dmaster.app.entity.AppDeploying;
-import cn.reghao.autodop.dmaster.app.repository.AppBuildingRepository;
-import cn.reghao.autodop.dmaster.app.repository.AppDeployingRepository;
+import cn.reghao.autodop.dmaster.app.model.po.AppDeploying;
+import cn.reghao.autodop.dmaster.app.db.repository.AppDeployingRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/AppRunningQuery.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.db.query;
 
-import cn.reghao.autodop.dmaster.app.entity.AppRunning;
-import cn.reghao.autodop.dmaster.app.repository.AppRunningRepository;
+import cn.reghao.autodop.dmaster.app.model.po.AppRunning;
+import cn.reghao.autodop.dmaster.app.db.repository.AppRunningRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/AppQuery.java

@@ -1,12 +1,11 @@
 package cn.reghao.autodop.dmaster.app.db.query.config;
 
-import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.build.CompilerConfig;
-import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
-import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
-import cn.reghao.autodop.dmaster.app.repository.config.AppOrchestrationRepository;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.autodop.dmaster.app.db.repository.config.AppOrchestrationRepository;
 import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/ProjQuery.java

@@ -1,12 +1,11 @@
 package cn.reghao.autodop.dmaster.app.db.query.config;
 
-import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.build.CompilerConfig;
-import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
-import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
-import cn.reghao.autodop.dmaster.app.repository.config.ProjOrchestrationRepository;
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.autodop.dmaster.app.db.repository.config.ProjOrchestrationRepository;
 import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/build/BuildDirQuery.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.db.query.config.build;
 
-import cn.reghao.autodop.dmaster.app.entity.config.build.BuildDir;
-import cn.reghao.autodop.dmaster.app.repository.config.build.BuildDirRepository;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDir;
+import cn.reghao.autodop.dmaster.app.db.repository.config.build.BuildDirRepository;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/build/CompilerQuery.java

@@ -1,9 +1,8 @@
 package cn.reghao.autodop.dmaster.app.db.query.config.build;
 
-import cn.reghao.autodop.dmaster.app.entity.config.build.CompilerConfig;
-import cn.reghao.autodop.dmaster.app.repository.config.build.CompilerConfigRepository;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
+import cn.reghao.autodop.dmaster.app.db.repository.config.build.CompilerConfigRepository;
 import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/build/PackerQuery.java

@@ -1,9 +1,8 @@
 package cn.reghao.autodop.dmaster.app.db.query.config.build;
 
-import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
-import cn.reghao.autodop.dmaster.app.repository.config.build.PackerConfigRepository;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
+import cn.reghao.autodop.dmaster.app.db.repository.config.build.PackerConfigRepository;
 import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/config/build/RepoAuthQuery.java

@@ -1,9 +1,8 @@
 package cn.reghao.autodop.dmaster.app.db.query.config.build;
 
-import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
-import cn.reghao.autodop.dmaster.app.repository.config.build.RepoAuthConfigRepository;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
+import cn.reghao.autodop.dmaster.app.db.repository.config.build.RepoAuthConfigRepository;
 import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/log/BuildLogQuery.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.db.query.log;
 
-import cn.reghao.autodop.dmaster.app.repository.log.BuildLogRepository;
+import cn.reghao.autodop.dmaster.app.db.repository.log.BuildLogRepository;
 import org.springframework.stereotype.Service;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/query/log/DeployLogQuery.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.db.query.log;
 
-import cn.reghao.autodop.dmaster.app.repository.log.DeployLogRepository;
+import cn.reghao.autodop.dmaster.app.db.repository.log.DeployLogRepository;
 import org.springframework.stereotype.Service;
 
 /**

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/AppBuildingRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/repository/AppBuildingRepository.java

@@ -1,8 +1,6 @@
-package cn.reghao.autodop.dmaster.app.repository;
+package cn.reghao.autodop.dmaster.app.db.repository;
 
-import cn.reghao.autodop.dmaster.app.entity.AppBuilding;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
+import cn.reghao.autodop.dmaster.app.model.po.AppBuilding;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/AppDeployingRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/repository/AppDeployingRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.app.repository;
+package cn.reghao.autodop.dmaster.app.db.repository;
 
-import cn.reghao.autodop.dmaster.app.entity.AppDeploying;
+import cn.reghao.autodop.dmaster.app.model.po.AppDeploying;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/AppRunningRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/repository/AppRunningRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.app.repository;
+package cn.reghao.autodop.dmaster.app.db.repository;
 
-import cn.reghao.autodop.dmaster.app.entity.AppRunning;
+import cn.reghao.autodop.dmaster.app.model.po.AppRunning;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/config/AppOrchestrationRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/repository/config/AppOrchestrationRepository.java

@@ -1,10 +1,10 @@
-package cn.reghao.autodop.dmaster.app.repository.config;
+package cn.reghao.autodop.dmaster.app.db.repository.config;
 
-import cn.reghao.autodop.dmaster.app.entity.config.AppOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.build.CompilerConfig;
-import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
-import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.AppOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/config/ProjOrchestrationRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/repository/config/ProjOrchestrationRepository.java

@@ -1,9 +1,9 @@
-package cn.reghao.autodop.dmaster.app.repository.config;
+package cn.reghao.autodop.dmaster.app.db.repository.config;
 
-import cn.reghao.autodop.dmaster.app.entity.config.ProjOrchestration;
-import cn.reghao.autodop.dmaster.app.entity.config.build.CompilerConfig;
-import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
-import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.ProjOrchestration;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/config/build/BuildDirRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/repository/config/build/BuildDirRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.app.repository.config.build;
+package cn.reghao.autodop.dmaster.app.db.repository.config.build;
 
-import cn.reghao.autodop.dmaster.app.entity.config.build.BuildDir;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.BuildDir;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/config/build/CompilerConfigRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/repository/config/build/CompilerConfigRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.app.repository.config.build;
+package cn.reghao.autodop.dmaster.app.db.repository.config.build;
 
-import cn.reghao.autodop.dmaster.app.entity.config.build.CompilerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/config/build/PackerConfigRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/repository/config/build/PackerConfigRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.app.repository.config.build;
+package cn.reghao.autodop.dmaster.app.db.repository.config.build;
 
-import cn.reghao.autodop.dmaster.app.entity.config.build.PackerConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/config/build/RepoAuthConfigRepository.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/app/db/repository/config/build/RepoAuthConfigRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.autodop.dmaster.app.repository.config.build;
+package cn.reghao.autodop.dmaster.app.db.repository.config.build;
 
-import cn.reghao.autodop.dmaster.app.entity.config.build.RepoAuthConfig;
+import cn.reghao.autodop.dmaster.app.model.po.config.build.RepoAuthConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;