将 cn.reghao.autodop.common.msg 包中的消息划分为 PubMsg 和 SubMsg 两种。其中 PubMsg 只接收不返回，而接收到 SubMsg 后还需要返回一条消息到发送 SubMsg 的一方

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

@@ -2,7 +2,7 @@ package cn.reghao.autodop.common.mqtt;
 
 import cn.reghao.autodop.common.machine.Machine;
 import cn.reghao.autodop.common.msg.Message;
-import cn.reghao.autodop.common.msg.rpc.RpcMsg;
+import cn.reghao.autodop.common.msg.sub.SubMsg;
 import cn.reghao.jdkutil.serializer.JsonConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.*;
@@ -23,7 +23,7 @@ public class DefaultMqttClient implements AutoCloseable {
     private final MosquittoProperties properties;
     private final MqttClient client;
     // 记录 RPC 调用, size 为 0 时表示所有 pub 消息的结果都已 sub
-    private final Map<String, RpcMsg> rpcRecorder = new HashMap<>();
+    private final Map<String, SubMsg> rpcRecorder = new HashMap<>();
     private final Map<String, IMqttMessageListener> subMap = new HashMap<>();
     private final MqttCallback callback = new MqttClientCallback();
 
@@ -52,7 +52,7 @@ public class DefaultMqttClient implements AutoCloseable {
         client.close();
     }
 
-    public void putRecord(String msgId, RpcMsg rpcMsg) {
+    public void putRecord(String msgId, SubMsg rpcMsg) {
         rpcRecorder.put(msgId, rpcMsg);
     }
 

common/src/main/java/cn/reghao/autodop/common/msg/Message.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.common.msg;
 
 import cn.reghao.autodop.common.msg.pub.PubMsg;
-import cn.reghao.autodop.common.msg.rpc.RpcMsg;
+import cn.reghao.autodop.common.msg.sub.SubMsg;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,7 +16,7 @@ public class Message implements Serializable {
 
     private String msgType;
     private PubMsg pubMsg;
-    private RpcMsg rpcMsg;
+    private SubMsg rpcMsg;
     private long sendTime;
 
     public static Message pubMessage(PubMsg pubMsg) {
@@ -27,9 +27,9 @@ public class Message implements Serializable {
         return message;
     }
 
-    public static Message rpcMessage(RpcMsg rpcMsg) {
+    public static Message rpcMessage(SubMsg rpcMsg) {
         Message message = new Message();
-        message.setMsgType(MsgType.rpc.name());
+        message.setMsgType(MsgType.sub.name());
         message.setRpcMsg(rpcMsg);
         message.setSendTime(System.currentTimeMillis());
         return message;

common/src/main/java/cn/reghao/autodop/common/msg/MsgType.java

@@ -5,5 +5,5 @@ package cn.reghao.autodop.common.msg;
  * @date 2021-09-15 09:01:17
  */
 public enum MsgType {
-    pub, rpc
+    pub, sub
 }

common/src/main/java/cn/reghao/autodop/common/msg/rpc/clazz/DockerRpcClazz.java

@@ -1,9 +0,0 @@
-package cn.reghao.autodop.common.msg.rpc.clazz;
-
-/**
- * @author reghao
- * @date 2020-12-25 19:15:00
- */
-public enum DockerRpcClazz {
-    dockerImage, dockerPs
-}

common/src/main/java/cn/reghao/autodop/common/msg/rpc/clazz/MachineRpcClazz.java

@@ -1,9 +0,0 @@
-package cn.reghao.autodop.common.msg.rpc.clazz;
-
-/**
- * @author reghao
- * @date 2020-12-25 19:15:00
- */
-public enum MachineRpcClazz {
-    shell, stat,
-}

common/src/main/java/cn/reghao/autodop/common/msg/rpc/clazz/RpcClazz.java

@@ -1,9 +0,0 @@
-package cn.reghao.autodop.common.msg.rpc.clazz;
-
-/**
- * @author reghao
- * @date 2021-09-14 18:15:05
- */
-public enum RpcClazz {
-    AppRpcClazz, MachineRpcClazz, DockerRpcClazz,
-}

common/src/main/java/cn/reghao/autodop/common/msg/rpc/RpcPayload.java → common/src/main/java/cn/reghao/autodop/common/msg/sub/RpcPayload.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.msg.rpc;
+package cn.reghao.autodop.common.msg.sub;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/msg/rpc/RpcResult.java → common/src/main/java/cn/reghao/autodop/common/msg/sub/RpcResult.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.msg.rpc;
+package cn.reghao.autodop.common.msg.sub;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

common/src/main/java/cn/reghao/autodop/common/msg/rpc/RpcMsg.java → common/src/main/java/cn/reghao/autodop/common/msg/sub/SubMsg.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.msg.rpc;
+package cn.reghao.autodop.common.msg.sub;
 
 import lombok.Data;
 
@@ -9,27 +9,27 @@ import java.util.UUID;
  * @date 2021-09-14 17:42:43
  */
 @Data
-public class RpcMsg {
+public class SubMsg {
     private String msgId;
     private RpcPayload rpcPayload;
     private RpcResult rpcResult;
 
-    public RpcMsg(RpcPayload rpcPayload) {
+    public SubMsg(RpcPayload rpcPayload) {
         this.msgId = UUID.randomUUID().toString();
         this.rpcPayload = rpcPayload;
     }
 
-    public RpcMsg(String msgId, RpcPayload rpcPayload, RpcResult rpcResult) {
+    public SubMsg(String msgId, RpcPayload rpcPayload, RpcResult rpcResult) {
         this.msgId = msgId;
         this.rpcPayload = rpcPayload;
         this.rpcResult = rpcResult;
     }
 
-    public static RpcMsg callMsg(RpcPayload rpcPayload) {
-        return new RpcMsg(rpcPayload);
+    public static SubMsg callMsg(RpcPayload rpcPayload) {
+        return new SubMsg(rpcPayload);
     }
 
-    public static RpcMsg resultMsg(RpcMsg callMsg, RpcResult rpcResult) {
-        return new RpcMsg(callMsg.getMsgId(), callMsg.getRpcPayload(), rpcResult);
+    public static SubMsg resultMsg(SubMsg callMsg, RpcResult rpcResult) {
+        return new SubMsg(callMsg.getMsgId(), callMsg.getRpcPayload(), rpcResult);
     }
 }

common/src/main/java/cn/reghao/autodop/common/msg/rpc/clazz/AppRpcClazz.java → common/src/main/java/cn/reghao/autodop/common/msg/sub/clazz/AppSubClazz.java

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

common/src/main/java/cn/reghao/autodop/common/msg/sub/clazz/SubClazz.java

@@ -0,0 +1,9 @@
+package cn.reghao.autodop.common.msg.sub.clazz;
+
+/**
+ * @author reghao
+ * @date 2021-09-14 18:15:05
+ */
+public enum SubClazz {
+    AppSubClazz,
+}

common/src/main/java/cn/reghao/autodop/common/msg/rpc/dto/app/AppIdParam.java → common/src/main/java/cn/reghao/autodop/common/msg/sub/dto/app/AppIdParam.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.msg.rpc.dto.app;
+package cn.reghao.autodop.common.msg.sub.dto.app;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

common/src/main/java/cn/reghao/autodop/common/msg/rpc/dto/app/AppStatus.java → common/src/main/java/cn/reghao/autodop/common/msg/sub/dto/app/AppStatus.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.msg.rpc.dto.app;
+package cn.reghao.autodop.common.msg.sub.dto.app;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/msg/rpc/dto/app/DeployParam.java → common/src/main/java/cn/reghao/autodop/common/msg/sub/dto/app/DeployParam.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.msg.rpc.dto.app;
+package cn.reghao.autodop.common.msg.sub.dto.app;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/msg/rpc/dto/app/DeployResult.java → common/src/main/java/cn/reghao/autodop/common/msg/sub/dto/app/DeployResult.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.msg.rpc.dto.app;
+package cn.reghao.autodop.common.msg.sub.dto.app;
 
 import cn.reghao.jdkutil.result.Result;
 import lombok.Data;

common/src/main/java/cn/reghao/autodop/common/msg/rpc/dto/app/PackType.java → common/src/main/java/cn/reghao/autodop/common/msg/sub/dto/app/PackType.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.msg.rpc.dto.app;
+package cn.reghao.autodop.common.msg.sub.dto.app;
 
 /**
  * 打包方式类型

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.msg.rpc.dto.app.AppStatus;
-import cn.reghao.autodop.common.msg.rpc.dto.app.DeployParam;
+import cn.reghao.autodop.common.msg.sub.dto.app.AppStatus;
+import cn.reghao.autodop.common.msg.sub.dto.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.DockerException;

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

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dagent.app;
 
 import cn.reghao.autodop.common.machine.Machine;
-import cn.reghao.autodop.common.msg.rpc.dto.app.AppStatus;
-import cn.reghao.autodop.common.msg.rpc.dto.app.DeployParam;
+import cn.reghao.autodop.common.msg.sub.dto.app.AppStatus;
+import cn.reghao.autodop.common.msg.sub.dto.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;

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.msg.rpc.dto.app.AppStatus;
-import cn.reghao.autodop.common.msg.rpc.dto.app.DeployParam;
+import cn.reghao.autodop.common.msg.sub.dto.app.AppStatus;
+import cn.reghao.autodop.common.msg.sub.dto.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;

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

@@ -3,13 +3,11 @@ package cn.reghao.autodop.dagent.mqttsub;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
 import cn.reghao.autodop.common.msg.Message;
 import cn.reghao.autodop.common.msg.MsgQueue;
-import cn.reghao.autodop.common.msg.rpc.RpcPayload;
-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.common.msg.sub.RpcPayload;
+import cn.reghao.autodop.common.msg.sub.SubMsg;
+import cn.reghao.autodop.common.msg.sub.RpcResult;
+import cn.reghao.autodop.common.msg.sub.clazz.SubClazz;
 import cn.reghao.autodop.dagent.mqttsub.impl.AppClazzRpcImpl;
-import cn.reghao.autodop.dagent.mqttsub.impl.DockerClazzRpcImpl;
-import cn.reghao.autodop.dagent.mqttsub.impl.MachineClazzRpcImpl;
 import cn.reghao.jdkutil.serializer.JsonConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
@@ -32,16 +30,11 @@ public class RpcListener implements MqttCallback {
     private final long startTime;
     private final DefaultMqttClient mqttClient;
     private final AppClazzRpcImpl appClazz;
-    private final MachineClazzRpcImpl machineClazz;
-    private final DockerClazzRpcImpl dockerClazz;
 
-    public RpcListener(DefaultMqttClient mqttClient, AppClazzRpcImpl appClazz, MachineClazzRpcImpl machineClazz,
-                       DockerClazzRpcImpl dockerClazz) {
+    public RpcListener(DefaultMqttClient mqttClient, AppClazzRpcImpl appClazz) {
         this.startTime = ManagementFactory.getRuntimeMXBean().getStartTime();
         this.mqttClient = mqttClient;
         this.appClazz = appClazz;
-        this.machineClazz = machineClazz;
-        this.dockerClazz = dockerClazz;
     }
 
     @Override
@@ -49,27 +42,21 @@ public class RpcListener implements MqttCallback {
         try {
             String msg = message.toString();
             Message callMessage = JsonConverter.jsonToObject(msg, Message.class);
-            RpcMsg callMsg = callMessage.getRpcMsg();
+            SubMsg callMsg = callMessage.getRpcMsg();
 
             RpcPayload rpcPayload = callMsg.getRpcPayload();
             String clazz = rpcPayload.getClazz();
             RpcResult rpcResult;
-            switch (RpcClazz.valueOf(clazz)) {
-                case AppRpcClazz:
+            switch (SubClazz.valueOf(clazz)) {
+                case AppSubClazz:
                     rpcResult = appClazz.process(rpcPayload);
                     break;
-                case MachineRpcClazz:
-                    rpcResult = machineClazz.process(rpcPayload);
-                    break;
-                case DockerRpcClazz:
-                    rpcResult = dockerClazz.process(rpcPayload);
-                    break;
                 default:
                     String err = String.format("找不到 %s 类型", clazz);
                     rpcResult = RpcResult.error(err);
             }
 
-            RpcMsg resultMsg = RpcMsg.resultMsg(callMsg, rpcResult);
+            SubMsg resultMsg = SubMsg.resultMsg(callMsg, rpcResult);
             Message message1 = Message.rpcMessage(resultMsg);
             rpcReply(message1);
         } catch (Exception e) {

dagent/src/main/java/cn/reghao/autodop/dagent/mqttsub/impl/AppClazzRpcImpl.java

@@ -4,10 +4,10 @@ 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.machine.Machine;
-import cn.reghao.autodop.common.msg.rpc.dto.app.*;
-import cn.reghao.autodop.common.msg.rpc.RpcPayload;
-import cn.reghao.autodop.common.msg.rpc.RpcResult;
-import cn.reghao.autodop.common.msg.rpc.clazz.AppRpcClazz;
+import cn.reghao.autodop.common.msg.sub.clazz.AppSubClazz;
+import cn.reghao.autodop.common.msg.sub.dto.app.*;
+import cn.reghao.autodop.common.msg.sub.RpcPayload;
+import cn.reghao.autodop.common.msg.sub.RpcResult;
 import cn.reghao.autodop.common.util.ExceptionUtil;
 import cn.reghao.autodop.dagent.app.AppService;
 import cn.reghao.autodop.dagent.app.DockerAppServiceImpl;
@@ -39,7 +39,7 @@ public class AppClazzRpcImpl {
         String method = rpcPayload.getMethod();
         String jsonParam = rpcPayload.getJsonParam();
         Object param;
-        switch (AppRpcClazz.valueOf(method)) {
+        switch (AppSubClazz.valueOf(method)) {
             case deploy:
                 param = JsonConverter.jsonToObject(jsonParam, DeployParam.class);
                 return deploy(param);

dagent/src/main/java/cn/reghao/autodop/dagent/mqttsub/impl/DockerClazzRpcImpl.java

@@ -1,33 +0,0 @@
-package cn.reghao.autodop.dagent.mqttsub.impl;
-
-import cn.reghao.autodop.common.docker.Docker;
-import cn.reghao.autodop.common.msg.rpc.RpcPayload;
-import cn.reghao.autodop.common.msg.rpc.RpcResult;
-import cn.reghao.autodop.common.msg.rpc.clazz.DockerRpcClazz;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * @author reghao
- * @date 2020-12-30 10:26:47
- */
-@Slf4j
-@Component
-public class DockerClazzRpcImpl {
-    private Docker docker;
-
-    public DockerClazzRpcImpl() {
-        //this.docker = new Docker();
-    }
-    
-    public RpcResult process(RpcPayload rpcPayload) {
-        String method = rpcPayload.getMethod();
-        String jsonParam = rpcPayload.getJsonParam();
-        switch (DockerRpcClazz.valueOf(method)) {
-            case dockerImage:
-            default:
-        }
-
-        return null;
-    }
-}

dagent/src/main/java/cn/reghao/autodop/dagent/mqttsub/impl/MachineClazzRpcImpl.java

@@ -1,45 +0,0 @@
-package cn.reghao.autodop.dagent.mqttsub.impl;
-
-import cn.reghao.autodop.common.machine.Machine;
-import cn.reghao.autodop.common.msg.rpc.RpcPayload;
-import cn.reghao.autodop.common.msg.rpc.RpcResult;
-import cn.reghao.autodop.common.msg.rpc.clazz.MachineRpcClazz;
-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 MachineClazzRpcImpl {
-    private final Machine machine;
-
-    public MachineClazzRpcImpl(Machine machine) {
-        this.machine = machine;
-    }
-    
-    public RpcResult process(RpcPayload rpcPayload) {
-        String method = rpcPayload.getMethod();
-        String jsonParam = rpcPayload.getJsonParam();
-        switch (MachineRpcClazz.valueOf(method)) {
-            case stat:
-                break;
-            case shell:
-                break;
-            default:
-        }
-        return null;
-    }
-
-
-    public RpcResult stat() {
-        return RpcResult.success(JsonConverter.objectToJson(machine.stat()));
-    }
-
-    public RpcResult shell(String script) {
-        return RpcResult.success("");
-    }
-}

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

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.controller.page;
 
-import cn.reghao.autodop.common.msg.rpc.dto.app.PackType;
+import cn.reghao.autodop.common.msg.sub.dto.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.app.model.po.config.DeployConfig;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/page/PackerPageController.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.controller.page;
 
 import cn.reghao.autodop.common.machine.Machine;
-import cn.reghao.autodop.common.msg.rpc.dto.app.PackType;
+import cn.reghao.autodop.common.msg.sub.dto.app.PackType;
 import cn.reghao.autodop.dmaster.app.db.query.config.PackerConfigQuery;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;
 import cn.reghao.autodop.dmaster.app.model.vo.KeyValue;

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

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.model.po;
 
-import cn.reghao.autodop.common.msg.rpc.dto.app.DeployResult;
+import cn.reghao.autodop.common.msg.sub.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;

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

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.model.po;
 
-import cn.reghao.autodop.common.msg.rpc.dto.app.AppStatus;
+import cn.reghao.autodop.common.msg.sub.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;

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

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.model.po.config.build;
 
-import cn.reghao.autodop.common.msg.rpc.dto.app.PackType;
+import cn.reghao.autodop.common.msg.sub.dto.app.PackType;
 import cn.reghao.autodop.dmaster.util.validator.ValidEnum;
 import cn.reghao.autodop.dmaster.util.db.BaseEntity;
 import lombok.*;

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

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.model.po.log;
 
-import cn.reghao.autodop.common.msg.rpc.dto.app.AppStatus;
-import cn.reghao.autodop.common.msg.rpc.dto.app.DeployResult;
+import cn.reghao.autodop.common.msg.sub.dto.app.AppStatus;
+import cn.reghao.autodop.common.msg.sub.dto.app.DeployResult;
 import cn.reghao.jdkutil.result.Result;
 import cn.reghao.autodop.dmaster.util.db.BaseDocument;
 import lombok.Data;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/bd/AppDeployer.java

@@ -3,10 +3,10 @@ package cn.reghao.autodop.dmaster.app.service.bd;
 import cn.reghao.autodop.common.machine.Machine;
 import cn.reghao.autodop.common.msg.Message;
 import cn.reghao.autodop.common.msg.MsgQueue;
-import cn.reghao.autodop.common.msg.rpc.RpcMsg;
-import cn.reghao.autodop.common.msg.rpc.RpcPayload;
-import cn.reghao.autodop.common.msg.rpc.clazz.AppRpcClazz;
-import cn.reghao.autodop.common.msg.rpc.dto.app.DeployParam;
+import cn.reghao.autodop.common.msg.sub.SubMsg;
+import cn.reghao.autodop.common.msg.sub.RpcPayload;
+import cn.reghao.autodop.common.msg.sub.clazz.AppSubClazz;
+import cn.reghao.autodop.common.msg.sub.dto.app.DeployParam;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
 import cn.reghao.jdkutil.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
@@ -48,9 +48,9 @@ public class AppDeployer {
             String startScript = deployConfig.getStartScript();
             deployParam.setStartScript(startScript);
 
-            RpcPayload rpcPayload = RpcPayload.rpcPayload(AppRpcClazz.class.getSimpleName(), AppRpcClazz.deploy.name(),
+            RpcPayload rpcPayload = RpcPayload.rpcPayload(AppSubClazz.class.getSimpleName(), AppSubClazz.deploy.name(),
                     JsonConverter.objectToJson(deployParam));
-            RpcMsg rpcMsg = RpcMsg.callMsg(rpcPayload);
+            SubMsg rpcMsg = SubMsg.callMsg(rpcPayload);
             Message message = Message.rpcMessage(rpcMsg);
 
             // TODO 对于需要返回值的 pub，需要做一个记录，pub 和 sub 一一对应

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/bd/AppIntegrate.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.service.bd;
 
-import cn.reghao.autodop.common.msg.rpc.dto.app.PackType;
+import cn.reghao.autodop.common.msg.sub.dto.app.PackType;
 import cn.reghao.autodop.dmaster.app.model.constant.build.CompileType;
 import cn.reghao.autodop.dmaster.app.model.constant.build.RepoType;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.CompilerConfig;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/bd/DeployNotifyMsg.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.service.bd;
 
-import cn.reghao.autodop.common.msg.rpc.dto.app.AppStatus;
-import cn.reghao.autodop.common.msg.rpc.dto.app.DeployResult;
+import cn.reghao.autodop.common.msg.sub.dto.app.AppStatus;
+import cn.reghao.autodop.common.msg.sub.dto.app.DeployResult;
 import cn.reghao.autodop.dmaster.app.model.po.log.BuildLog;
 import cn.reghao.autodop.dmaster.notification.service.notifier.ding.DingMsg;
 import cn.reghao.jdkutil.converter.DateTimeConverter;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/bd/tools/packer/ZipPack.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.service.bd.tools.packer;
 
-import cn.reghao.autodop.common.msg.rpc.dto.app.PackType;
+import cn.reghao.autodop.common.msg.sub.dto.app.PackType;
 import cn.reghao.autodop.common.util.compression.ZipFiles;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.LocalBuildDir;
 import cn.reghao.autodop.dmaster.app.model.po.config.build.PackerConfig;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/impl/AppStatusServiceImpl.java

@@ -2,14 +2,12 @@ package cn.reghao.autodop.dmaster.app.service.impl;
 
 import cn.reghao.autodop.common.dagent.app.log.LogFile;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.autodop.common.msg.rpc.dto.app.AppIdParam;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
 import cn.reghao.autodop.dmaster.app.db.repository.AppRunningRepository;
 import cn.reghao.autodop.dmaster.app.model.constant.StatusOps;
 import cn.reghao.autodop.dmaster.app.model.po.AppRunning;
 import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 import cn.reghao.autodop.dmaster.app.service.AppStatusService;
-import cn.reghao.jdkutil.serializer.JsonConverter;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

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

@@ -4,14 +4,12 @@ import cn.reghao.autodop.common.msg.Message;
 import cn.reghao.autodop.common.msg.MsgType;
 import cn.reghao.autodop.common.msg.pub.PubMsg;
 import cn.reghao.autodop.common.msg.pub.clazz.PubClazz;
-import cn.reghao.autodop.common.msg.rpc.RpcPayload;
-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.common.msg.sub.RpcPayload;
+import cn.reghao.autodop.common.msg.sub.SubMsg;
+import cn.reghao.autodop.common.msg.sub.RpcResult;
+import cn.reghao.autodop.common.msg.sub.clazz.SubClazz;
 import cn.reghao.autodop.dmaster.mqttsub.impl.rpcresult.AppRpcClazzResultHandler;
 import cn.reghao.autodop.dmaster.mqttsub.impl.pub.NodePubClazzHandler;
-import cn.reghao.autodop.dmaster.mqttsub.impl.rpcresult.DockerRpcClazzResultHandler;
-import cn.reghao.autodop.dmaster.mqttsub.impl.rpcresult.MachineRpcClazzResultHandler;
 import cn.reghao.jdkutil.serializer.JsonConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
@@ -29,16 +27,11 @@ import org.springframework.stereotype.Component;
 @Component
 public class MessageListener implements MqttCallback {
     private final NodePubClazzHandler nodePubClazzHandler;
-    private final MachineRpcClazzResultHandler machineRpcClazzResult;
     private final AppRpcClazzResultHandler appRpcClazzResult;
-    private final DockerRpcClazzResultHandler dockerRpcClazzResult;
 
-    public MessageListener(NodePubClazzHandler nodePubClazzHandler, MachineRpcClazzResultHandler machineRpcClazzResult,
-                           AppRpcClazzResultHandler appRpcClazzResult, DockerRpcClazzResultHandler dockerRpcClazzResult) {
+    public MessageListener(NodePubClazzHandler nodePubClazzHandler, AppRpcClazzResultHandler appRpcClazzResult) {
         this.nodePubClazzHandler = nodePubClazzHandler;
-        this.machineRpcClazzResult = machineRpcClazzResult;
         this.appRpcClazzResult = appRpcClazzResult;
-        this.dockerRpcClazzResult = dockerRpcClazzResult;
     }
 
     @Override
@@ -55,7 +48,7 @@ public class MessageListener implements MqttCallback {
                 case pub:
                     processPubMsg(message1.getPubMsg());
                     break;
-                case rpc:
+                case sub:
                     processRpcResult(message1.getRpcMsg());
                     break;
                 default:
@@ -78,22 +71,16 @@ public class MessageListener implements MqttCallback {
         }
     }
 
-    private void processRpcResult(RpcMsg rpcMsg) {
+    private void processRpcResult(SubMsg rpcMsg) {
         String msgId = rpcMsg.getMsgId();
         RpcPayload rpcPayload = rpcMsg.getRpcPayload();
         String clazz = rpcPayload.getClazz();
         String method = rpcPayload.getMethod();
         RpcResult rpcResult = rpcMsg.getRpcResult();
-        switch (RpcClazz.valueOf(clazz)) {
-            case AppRpcClazz:
+        switch (SubClazz.valueOf(clazz)) {
+            case AppSubClazz:
                 appRpcClazzResult.process(msgId, method, rpcResult);
                 break;
-            case MachineRpcClazz:
-                machineRpcClazzResult.process(msgId, method, rpcResult);
-                break;
-            case DockerRpcClazz:
-                dockerRpcClazzResult.process(msgId, method, rpcResult);
-                break;
             default:
                 ;
         }

dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/impl/rpcresult/AppRpcClazzResultHandler.java

@@ -1,9 +1,9 @@
 package cn.reghao.autodop.dmaster.mqttsub.impl.rpcresult;
 
-import cn.reghao.autodop.common.msg.rpc.RpcResult;
-import cn.reghao.autodop.common.msg.rpc.clazz.AppRpcClazz;
-import cn.reghao.autodop.common.msg.rpc.dto.app.AppStatus;
-import cn.reghao.autodop.common.msg.rpc.dto.app.DeployResult;
+import cn.reghao.autodop.common.msg.sub.RpcResult;
+import cn.reghao.autodop.common.msg.sub.clazz.AppSubClazz;
+import cn.reghao.autodop.common.msg.sub.dto.app.AppStatus;
+import cn.reghao.autodop.common.msg.sub.dto.app.DeployResult;
 import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
 import cn.reghao.jdkutil.result.ResultStatus;
 import cn.reghao.jdkutil.serializer.JsonConverter;
@@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 /**
- * 分发 AppRpcClazz 相关的消息
+ * 分发 AppSubClazz 相关的消息
  *
  * @author reghao
  * @date 2020-12-30 10:26:47
@@ -36,7 +36,7 @@ public class AppRpcClazzResultHandler {
             return;
         }
 
-        switch (AppRpcClazz.valueOf(method)) {
+        switch (AppSubClazz.valueOf(method)) {
             case deploy:
                 processDeployResult(rpcResult.getJsonData());
                 break;

dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/impl/rpcresult/AppRpcClazzResultImpl.java

@@ -2,8 +2,8 @@ package cn.reghao.autodop.dmaster.mqttsub.impl.rpcresult;
 
 import cn.reghao.autodop.common.http.DefaultWebRequest;
 import cn.reghao.autodop.common.http.WebRequest;
-import cn.reghao.autodop.common.msg.rpc.dto.app.AppStatus;
-import cn.reghao.autodop.common.msg.rpc.dto.app.DeployResult;
+import cn.reghao.autodop.common.msg.sub.dto.app.AppStatus;
+import cn.reghao.autodop.common.msg.sub.dto.app.DeployResult;
 import cn.reghao.autodop.dmaster.app.db.query.config.AppConfigQuery;
 import cn.reghao.autodop.dmaster.app.db.repository.AppDeployingRepository;
 import cn.reghao.autodop.dmaster.app.db.repository.AppRunningRepository;

dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/impl/rpcresult/DockerRpcClazzResultHandler.java

@@ -1,29 +0,0 @@
-package cn.reghao.autodop.dmaster.mqttsub.impl.rpcresult;
-
-import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.autodop.common.msg.rpc.RpcResult;
-import cn.reghao.autodop.common.msg.rpc.clazz.DockerRpcClazz;
-import org.springframework.stereotype.Component;
-
-/**
- * @author reghao
- * @date 2021-09-15 14:45:43
- */
-@Component
-public class DockerRpcClazzResultHandler {
-    private final DefaultMqttClient mqttClient;
-
-    public DockerRpcClazzResultHandler(DefaultMqttClient mqttClient) {
-        this.mqttClient = mqttClient;
-    }
-
-    public void process(String msgId, String method, RpcResult rpcResult) {
-        mqttClient.removeRecord(msgId);
-        switch (DockerRpcClazz.valueOf(method)) {
-            case dockerImage:
-                break;
-            default:
-                ;
-        }
-    }
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/mqttsub/impl/rpcresult/MachineRpcClazzResultHandler.java

@@ -1,33 +0,0 @@
-package cn.reghao.autodop.dmaster.mqttsub.impl.rpcresult;
-
-import cn.reghao.autodop.common.mqtt.DefaultMqttClient;
-import cn.reghao.autodop.common.msg.rpc.RpcResult;
-import cn.reghao.autodop.common.msg.rpc.clazz.MachineRpcClazz;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * @author reghao
- * @date 2020-12-30 10:26:47
- */
-@Slf4j
-@Component
-public class MachineRpcClazzResultHandler {
-    private final DefaultMqttClient mqttClient;
-
-    public MachineRpcClazzResultHandler(DefaultMqttClient mqttClient) {
-        this.mqttClient = mqttClient;
-    }
-
-    public void process(String msgId, String method, RpcResult rpcResult) {
-        mqttClient.removeRecord(msgId);
-        switch (MachineRpcClazz.valueOf(method)) {
-            case stat:
-                break;
-            case shell:
-                break;
-            default:
-                ;
-        }
-    }
-}