对应 dagent 的修改

common/src/main/java/cn/reghao/autodop/common/mq/protocol/MQMessage.java → common/src/main/java/cn/reghao/autodop/common/amqp/MQMessage.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.mq.protocol;
+package cn.reghao.autodop.common.amqp;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/mq/MessageSender.java → common/src/main/java/cn/reghao/autodop/common/amqp/MessageSender.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.mq;
+package cn.reghao.autodop.common.amqp;
 
 import cn.reghao.autodop.common.result.RpcResult;
 import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;

common/src/main/java/cn/reghao/autodop/common/mq/protocol/MessageType.java → common/src/main/java/cn/reghao/autodop/common/amqp/MessageType.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.mq.protocol;
+package cn.reghao.autodop.common.amqp;
 
 /**
  * @author reghao

common/src/main/java/cn/reghao/autodop/common/mq/MqMessage.java → common/src/main/java/cn/reghao/autodop/common/amqp/MqMessage.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.mq;
+package cn.reghao.autodop.common.amqp;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/mq/MsgType.java → common/src/main/java/cn/reghao/autodop/common/amqp/MsgType.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.mq;
+package cn.reghao.autodop.common.amqp;
 
 /**
  * MQ 消息类型

common/src/main/java/cn/reghao/autodop/common/dagent/protocol/RPCResult.java → common/src/main/java/cn/reghao/autodop/common/amqp/RPCResult.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.dagent.protocol;
+package cn.reghao.autodop.common.amqp;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

common/src/main/java/cn/reghao/autodop/common/mq/RabbitProducer.java → common/src/main/java/cn/reghao/autodop/common/amqp/RabbitProducer.java

@@ -1,7 +1,5 @@
-package cn.reghao.autodop.common.mq;
+package cn.reghao.autodop.common.amqp;
 
-import cn.reghao.autodop.common.dagent.protocol.RPCResult;
-import cn.reghao.autodop.common.mq.protocol.MQMessage;
 import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -28,12 +26,11 @@ public class RabbitProducer {
     public RPCResult callRemote(String routeKey, MQMessage mqMessage) {
         String msg = JsonConverter.objectToJson(mqMessage);
         // TODO RPC 调用等待超时，若 RPC 服务端业务处理的时间超过设定的超时，则会引发不可知的错误
-        rabbitTemplate.setReplyTimeout(10_000);
+        rabbitTemplate.setReplyTimeout(30_000);
         // TODO 处理未成功发送到 mq 时的情况
-        // TODO 处理 RPC 服务端未启动时的情况
         String result = (String) rabbitTemplate.convertSendAndReceive(routeKey, msg);
         if (result == null) {
-            return RPCResult.fail("RPC 调用超时...");
+            return RPCResult.fail("RPC timeout...");
         } else {
             return (RPCResult) JsonConverter.jsonToObject(result, RPCResult.class);
         }

common/src/main/java/cn/reghao/autodop/common/dagent/app/AppOps.java → common/src/main/java/cn/reghao/autodop/common/dagent/app/api/AppOps.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.dagent.app;
+package cn.reghao.autodop.common.dagent.app.api;
 
 /**
  * @author reghao

common/src/main/java/cn/reghao/autodop/common/dagent/app/StatusArgs.java → common/src/main/java/cn/reghao/autodop/common/dagent/app/api/data/AppRestartArgs.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.dagent.app;
+package cn.reghao.autodop.common.dagent.app.api.data;
 
 import lombok.Data;
 
@@ -7,7 +7,6 @@ import lombok.Data;
  * @date 2020-12-25 19:01:15
  */
 @Data
-public class StatusArgs {
-    private String statusType;
+public class AppRestartArgs {
     private String appId;
 }

common/src/main/java/cn/reghao/autodop/common/dagent/app/api/data/AppStartArgs.java

@@ -0,0 +1,12 @@
+package cn.reghao.autodop.common.dagent.app.api.data;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 19:01:15
+ */
+@Data
+public class AppStartArgs {
+    private String appId;
+}

common/src/main/java/cn/reghao/autodop/common/dagent/app/api/data/AppStatus.java

@@ -0,0 +1,17 @@
+package cn.reghao.autodop.common.dagent.app.api.data;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2021-01-29 16:02:15
+ */
+@Data
+public class AppStatus {
+    private String appId;
+    private String commitId;
+    private String host;
+    private String status;
+    private String startedTime;
+    private int pid;
+}

common/src/main/java/cn/reghao/autodop/common/dagent/app/api/data/AppStatusArgs.java

@@ -0,0 +1,12 @@
+package cn.reghao.autodop.common.dagent.app.api.data;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 19:01:15
+ */
+@Data
+public class AppStatusArgs {
+    private String appId;
+}

common/src/main/java/cn/reghao/autodop/common/dagent/app/api/data/AppStopArgs.java

@@ -0,0 +1,12 @@
+package cn.reghao.autodop.common.dagent.app.api.data;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 19:01:15
+ */
+@Data
+public class AppStopArgs {
+    private String appId;
+}

common/src/main/java/cn/reghao/autodop/common/dagent/app/DeployArgs.java → common/src/main/java/cn/reghao/autodop/common/dagent/app/api/data/deploy/AppDeployArgs.java

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

common/src/main/java/cn/reghao/autodop/common/deploy/PackerType.java → common/src/main/java/cn/reghao/autodop/common/dagent/app/api/data/deploy/PackerType.java

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

common/src/main/java/cn/reghao/autodop/common/dagent/app/api/data/log/AppLog.java

@@ -0,0 +1,14 @@
+package cn.reghao.autodop.common.dagent.app.api.data.log;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 19:01:22
+ */
+@Data
+public class AppLog {
+    private List<String> logs;
+}

common/src/main/java/cn/reghao/autodop/common/dagent/app/LogArgs.java → common/src/main/java/cn/reghao/autodop/common/dagent/app/api/data/log/AppLogArgs.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.dagent.app;
+package cn.reghao.autodop.common.dagent.app.api.data.log;
 
 import lombok.Data;
 
@@ -7,7 +7,7 @@ import lombok.Data;
  * @date 2020-12-25 19:01:22
  */
 @Data
-public class LogArgs {
+public class AppLogArgs {
     private String logType;
     private String logLevel;
     private String appId;

common/src/main/java/cn/reghao/autodop/common/deploy/LogLevel.java → common/src/main/java/cn/reghao/autodop/common/dagent/app/api/data/log/LogLevel.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.deploy;
+package cn.reghao.autodop.common.dagent.app.api.data.log;
 
 /**
  * 应用日志等级

common/src/main/java/cn/reghao/autodop/common/deploy/LogType.java → common/src/main/java/cn/reghao/autodop/common/dagent/app/api/data/log/LogType.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.deploy;
+package cn.reghao.autodop.common.dagent.app.api.data.log;
 
 /**
  * 应用日志类型

common/src/main/java/cn/reghao/autodop/common/mq/protocol/machine/MachineOps.java → common/src/main/java/cn/reghao/autodop/common/dagent/machine/api/MachineOps.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.mq.protocol.machine;
+package cn.reghao.autodop.common.dagent.machine.api;
 
 /**
  * @author reghao

common/src/main/java/cn/reghao/autodop/common/mq/protocol/machine/MachineHeartbeat.java → common/src/main/java/cn/reghao/autodop/common/dagent/machine/api/data/MachineHeartbeat.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.mq.protocol.machine;
+package cn.reghao.autodop.common.dagent.machine.api.data;
 
 import lombok.Data;
 
@@ -8,5 +8,4 @@ import lombok.Data;
  */
 @Data
 public class MachineHeartbeat {
-    private String machineId;
 }

common/src/main/java/cn/reghao/autodop/common/dagent/machine/MachineLog.java → common/src/main/java/cn/reghao/autodop/common/dagent/machine/api/data/MachineLog.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.dagent.machine;
+package cn.reghao.autodop.common.dagent.machine.api.data;
 
 import lombok.Data;
 

common/src/main/java/cn/reghao/autodop/common/dagent/machine/api/data/MachineRegistry.java

@@ -0,0 +1,11 @@
+package cn.reghao.autodop.common.dagent.machine.api.data;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 17:53:15
+ */
+@Data
+public class MachineRegistry {
+}

common/src/main/java/cn/reghao/autodop/common/mq/protocol/machine/MachineShell.java → common/src/main/java/cn/reghao/autodop/common/dagent/machine/api/data/MachineShell.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.common.mq.protocol.machine;
+package cn.reghao.autodop.common.dagent.machine.api.data;
 
 import lombok.Data;
 
@@ -8,5 +8,6 @@ import lombok.Data;
  */
 @Data
 public class MachineShell {
-    private String script;
+    private int exitStatus;
+    private String result;
 }

common/src/main/java/cn/reghao/autodop/common/dagent/machine/api/data/MachineShellArgs.java

@@ -0,0 +1,14 @@
+package cn.reghao.autodop.common.dagent.machine.api.data;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 17:55:46
+ */
+@Data
+public class MachineShellArgs {
+    // command or script
+    private String type;
+    private String content;
+}

common/src/main/java/cn/reghao/autodop/common/dagent/machine/api/data/MachineState.java

@@ -0,0 +1,11 @@
+package cn.reghao.autodop.common.dagent.machine.api.data;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 17:53:15
+ */
+@Data
+public class MachineState {
+}

common/src/main/java/cn/reghao/autodop/common/dockerc/DockerClient.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.common.dockerc;
 
-import cn.reghao.autodop.common.deploy.LogLevel;
+import cn.reghao.autodop.common.dagent.app.api.data.log.LogLevel;
 import cn.reghao.autodop.common.dockerc.api.ContainerOps;
 import cn.reghao.autodop.common.dockerc.api.DockerApi;
 import cn.reghao.autodop.common.dockerc.api.ImageOps;

common/src/main/java/cn/reghao/autodop/common/mq/protocol/machine/MachineMessage.java

@@ -1,13 +0,0 @@
-package cn.reghao.autodop.common.mq.protocol.machine;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2020-12-30 16:15:56
- */
-@Data
-public class MachineMessage {
-    private String machineOps;
-    private String message;
-}

common/src/main/java/cn/reghao/autodop/common/mq/protocol/machine/MachineRegistry.java

@@ -1,17 +0,0 @@
-package cn.reghao.autodop.common.mq.protocol.machine;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2020-12-25 17:53:15
- */
-@Data
-public class MachineRegistry {
-    private String bootTime;
-    private String osType;
-    private String osArch;
-    private List<String> ipAddr;
-}

common/src/main/java/cn/reghao/autodop/common/mq/protocol/machine/MachineState.java

@@ -1,16 +0,0 @@
-package cn.reghao.autodop.common.mq.protocol.machine;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2020-12-25 17:53:15
- */
-@Data
-public class MachineState {
-    private String machineId;
-    private String machineOps;
-    private String bootTime;
-    private String osType;
-    private String osArch;
-}

common/src/main/java/cn/reghao/autodop/common/mq/protocol/machine/ShellArgs.java

@@ -1,13 +0,0 @@
-package cn.reghao.autodop.common.mq.protocol.machine;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2020-12-25 19:28:42
- */
-@Data
-public class ShellArgs {
-    private String machineId;
-    private String script;
-}

dagent/src/main/java/cn/reghao/autodop/dagent/DagentApplication.java

@@ -6,7 +6,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableScheduling
-@ComponentScan({"cn.reghao.autodop.dagent", "cn.reghao.autodop.common.mq"})
+@ComponentScan({"cn.reghao.autodop.dagent", "cn.reghao.autodop.common.amqp"})
 @SpringBootApplication
 public class DagentApplication {
 	public static void main(String[] args) {

dagent/src/main/java/cn/reghao/autodop/dagent/app/deploy/AppDeployService.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dagent.app.deploy;
 
 import cn.reghao.autodop.common.deploy.DeployConfig;
-import cn.reghao.autodop.common.deploy.PackerType;
+import cn.reghao.autodop.common.dagent.app.api.data.deploy.PackerType;
 import lombok.extern.slf4j.Slf4j;
 
 /**

dagent/src/main/java/cn/reghao/autodop/dagent/app/log/DockerAppLogServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dagent.app.log;
 
-import cn.reghao.autodop.common.deploy.LogLevel;
-import cn.reghao.autodop.common.deploy.LogType;
+import cn.reghao.autodop.common.dagent.app.api.data.log.LogLevel;
+import cn.reghao.autodop.common.dagent.app.api.data.log.LogType;
 import cn.reghao.autodop.common.dockerc.DockerClient;
 import cn.reghao.autodop.common.utils.text.TextFile;
 

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

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dagent.node.agent;
 
-import cn.reghao.autodop.common.mq.MessageSender;
-import cn.reghao.autodop.common.mq.MqMessage;
-import cn.reghao.autodop.common.mq.MsgType;
+import cn.reghao.autodop.common.amqp.MessageSender;
+import cn.reghao.autodop.common.amqp.MqMessage;
+import cn.reghao.autodop.common.amqp.MsgType;
 import cn.reghao.autodop.common.utils.HostAddress;
 import cn.reghao.autodop.common.utils.NetworkUtil;
 import cn.reghao.autodop.common.utils.text.TextFile;

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

@@ -1,9 +1,9 @@
 package cn.reghao.autodop.dagent.service;
 
 import cn.reghao.autodop.common.dagent.machine.os.SysStat;
-import cn.reghao.autodop.common.mq.MqMessage;
-import cn.reghao.autodop.common.mq.MsgType;
-import cn.reghao.autodop.common.mq.MessageSender;
+import cn.reghao.autodop.common.amqp.MqMessage;
+import cn.reghao.autodop.common.amqp.MsgType;
+import cn.reghao.autodop.common.amqp.MessageSender;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

dagent/src/main/java/cn/reghao/autodop/dagent/utils/mq/RemoteCallDispatcher.java

@@ -1,12 +1,6 @@
 package cn.reghao.autodop.dagent.utils.mq;
 
-import cn.reghao.autodop.common.deploy.DeployConfig;
-import cn.reghao.autodop.common.mq.MsgType;
 import cn.reghao.autodop.common.result.RpcResult;
-import cn.reghao.autodop.dagent.app.deploy.AppDeployService;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
@@ -14,8 +8,6 @@ import org.springframework.amqp.core.MessageProperties;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
 
-import java.lang.management.ManagementFactory;
-
 /**
  * RPC 调用分发
  *

dmaster/src/main/java/cn/reghao/autodop/dmaster/DmasterApplication.java

@@ -14,7 +14,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 @SpringBootApplication
 @EnableJpaRepositories
 @EntityScan
-@ComponentScan({"cn.reghao.autodop.dmaster", "cn.reghao.autodop.common.mq"})
+@ComponentScan({"cn.reghao.autodop.dmaster", "cn.reghao.autodop.common.amqp"})
 public class DmasterApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(DmasterApplication.class, args);

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

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.controller;
 
-import cn.reghao.autodop.common.deploy.PackerType;
+import cn.reghao.autodop.common.dagent.app.api.data.deploy.PackerType;
 import cn.reghao.autodop.dmaster.app.constant.*;
 import cn.reghao.autodop.dmaster.app.service.ConfigService;
 import cn.reghao.autodop.dmaster.app.constant.RepoAuthType;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/ConfigService.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.service;
 
-import cn.reghao.autodop.common.deploy.PackerType;
+import cn.reghao.autodop.common.dagent.app.api.data.deploy.PackerType;
 import cn.reghao.autodop.common.shell.ShellExecutor;
 import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.app.constant.ConfigType;

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

@@ -6,7 +6,7 @@ import cn.reghao.autodop.dmaster.app.entity.build.AppCompile;
 import cn.reghao.autodop.dmaster.app.entity.build.AppPack;
 import cn.reghao.autodop.dmaster.app.entity.build.AppUpdate;
 import cn.reghao.autodop.dmaster.app.constant.CompilerType;
-import cn.reghao.autodop.common.deploy.PackerType;
+import cn.reghao.autodop.common.dagent.app.api.data.deploy.PackerType;
 import cn.reghao.autodop.dmaster.app.constant.RepoType;
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.entity.log.DeployLog;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/crud/build/AppPackCrudService.java

@@ -1,6 +1,6 @@
 package cn.reghao.autodop.dmaster.app.service.crud.build;
 
-import cn.reghao.autodop.common.deploy.PackerType;
+import cn.reghao.autodop.common.dagent.app.api.data.deploy.PackerType;
 import cn.reghao.autodop.common.utils.data.db.CrudOps;
 import cn.reghao.autodop.common.utils.data.db.PageList;
 import cn.reghao.autodop.dmaster.app.entity.build.AppPack;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/deploy/AppDeployTask.java

@@ -1,7 +1,7 @@
 package cn.reghao.autodop.dmaster.app.service.deploy;
 
 import cn.reghao.autodop.common.deploy.DeployConfig;
-import cn.reghao.autodop.common.mq.*;
+import cn.reghao.autodop.common.amqp.*;
 import cn.reghao.autodop.common.result.RpcResult;
 import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
 

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

@@ -1,8 +1,8 @@
 package cn.reghao.autodop.dmaster.app.service.deploy;
 
 import cn.reghao.autodop.common.deploy.DeployConfig;
-import cn.reghao.autodop.common.deploy.PackerType;
-import cn.reghao.autodop.common.mq.MessageSender;
+import cn.reghao.autodop.common.dagent.app.api.data.deploy.PackerType;
+import cn.reghao.autodop.common.amqp.MessageSender;
 import cn.reghao.autodop.common.result.RpcResult;
 import cn.reghao.autodop.dmaster.app.entity.build.AppPack;
 import cn.reghao.autodop.dmaster.app.entity.deploy.AppDeploy;

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

@@ -1,8 +1,9 @@
 package cn.reghao.autodop.dmaster.cluster;
 
 import cn.reghao.autodop.common.dagent.machine.MachineInfo;
-import cn.reghao.autodop.common.dagent.machine.MachineLog;
-import cn.reghao.autodop.common.mq.protocol.machine.MachineOps;
+import cn.reghao.autodop.common.dagent.machine.api.data.MachineLog;
+import cn.reghao.autodop.common.dagent.machine.api.data.MachineHeartbeat;
+import cn.reghao.autodop.common.dagent.machine.api.MachineOps;
 import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
 import lombok.extern.slf4j.Slf4j;
 
@@ -13,19 +14,19 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class MachineMessageDispatcher implements MessageDispatcher {
     @Override
-    public void dispatch(String msgType, String msg) {
-        switch (MachineOps.valueOf(msgType)) {
+    public void dispatch(String ops, String payload) {
+        switch (MachineOps.valueOf(ops)) {
             case machineRegistryOps:
                 log.info("机器注册消息...");
-                MachineInfo machineInfo = (MachineInfo) JsonConverter.jsonToObject(msg, MachineInfo.class);
+                MachineInfo machineInfo = (MachineInfo) JsonConverter.jsonToObject(payload, MachineInfo.class);
                 break;
             case machineHeartbeatOps:
                 log.info("机器心跳消息...");
-                //MachineHeartbeat machineHeartbeat = (MachineHeartbeat) JsonConverter.jsonToObject(msg, MachineHeartbeat.class);
+                MachineHeartbeat machineHeartbeat = (MachineHeartbeat) JsonConverter.jsonToObject(payload, MachineHeartbeat.class);
                 break;
             case machineLogOps:
                 log.info("dagent 日志消息...");
-                MachineLog machineLog = (MachineLog) JsonConverter.jsonToObject(msg, MachineLog.class);
+                MachineLog machineLog = (MachineLog) JsonConverter.jsonToObject(payload, MachineLog.class);
                 break;
             default:
                 log.info("来自机器的消息...");

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

@@ -5,5 +5,5 @@ package cn.reghao.autodop.dmaster.cluster;
  * @date 2020-12-30 10:26:47
  */
 public interface MessageDispatcher {
-    void dispatch(String msgType, String msg);
+    void dispatch(String ops, String payload);
 }

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

@@ -1,8 +1,7 @@
 package cn.reghao.autodop.dmaster.cluster;
 
-import cn.reghao.autodop.common.mq.protocol.MQMessage;
-import cn.reghao.autodop.common.mq.protocol.machine.MachineMessage;
-import cn.reghao.autodop.common.mq.protocol.MessageType;
+import cn.reghao.autodop.common.amqp.MQMessage;
+import cn.reghao.autodop.common.amqp.MessageType;
 import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
@@ -28,16 +27,16 @@ public class RabbitConsumer implements MessageListener {
         try {
             MQMessage mqMessage = (MQMessage) JsonConverter.jsonToObject(body, MQMessage.class);
             String machineId = mqMessage.getMachineId();
+            long sendTime = mqMessage.getSendTime();
+            boolean isRpc = mqMessage.isRpc();
             String type = mqMessage.getType();
+            String ops = mqMessage.getOps();
+            String payload = mqMessage.getPayload();
 
             log.info("MQMessage from {}...", machineId);
             switch (MessageType.valueOf(type)) {
                 case machineType:
-                    MachineMessage machineMessage =
-                            (MachineMessage) JsonConverter.jsonToObject(mqMessage.getPayload(), MachineMessage.class);
-                    String machineOps = machineMessage.getMachineOps();
-                    String message = machineMessage.getMessage();
-                    machineMessageDispatcher.dispatch(machineOps, message);
+                    machineMessageDispatcher.dispatch(ops, payload);
                     break;
                 case appType:
                     log.info("msg from app...");

dmaster/src/test/java/cn/reghao/autodop/common/mq/RabbitProducerTest.java → dmaster/src/test/java/cn/reghao/autodop/common/amqp/RabbitProducerTest.java

@@ -1,14 +1,9 @@
-package cn.reghao.autodop.common.mq;
+package cn.reghao.autodop.common.amqp;
 
-import cn.reghao.autodop.common.dagent.app.AppOps;
-import cn.reghao.autodop.common.dagent.app.DeployArgs;
+import cn.reghao.autodop.common.dagent.app.api.AppOps;
+import cn.reghao.autodop.common.dagent.app.api.data.deploy.AppDeployArgs;
 import cn.reghao.autodop.common.dagent.machine.MachineShell;
-import cn.reghao.autodop.common.dagent.protocol.RPCResult;
-import cn.reghao.autodop.common.deploy.PackerType;
-import cn.reghao.autodop.common.mq.protocol.MQMessage;
-import cn.reghao.autodop.common.mq.protocol.MessageType;
-import cn.reghao.autodop.common.mq.protocol.machine.MachineMessage;
-import cn.reghao.autodop.common.mq.protocol.machine.MachineOps;
+import cn.reghao.autodop.common.dagent.app.api.data.deploy.PackerType;
 import cn.reghao.autodop.common.utils.data.serializer.JsonConverter;
 import cn.reghao.autodop.dmaster.DmasterApplication;
 import lombok.extern.slf4j.Slf4j;
@@ -47,11 +42,11 @@ class RabbitProducerTest {
 
     @Test
     void callRemote() {
-        DeployArgs deployArgs = new DeployArgs();
-        deployArgs.setPackerType(PackerType.docker.name());
-        deployArgs.setAppId("admin-sys");
-        deployArgs.setAppPath("docker.iquizoo.com/iq3x/admin-sys:2b3dd783ec7e");
-        deployArgs.setRunningDir("");
+        AppDeployArgs appDeployArgs = new AppDeployArgs();
+        appDeployArgs.setPackerType(PackerType.docker.name());
+        appDeployArgs.setAppId("admin-sys");
+        appDeployArgs.setAppPath("docker.iquizoo.com/iq3x/admin-sys:2b3dd783ec7e");
+        appDeployArgs.setRunningDir("");
 
         MachineShell machineShell = new MachineShell();
         machineShell.setType("command");
@@ -65,7 +60,7 @@ class RabbitProducerTest {
         mqMessage.setRpc(true);
         mqMessage.setType(MessageType.appType.name());
         mqMessage.setOps(AppOps.appDeployOps.name());
-        mqMessage.setPayload(JsonConverter.objectToJson(deployArgs));
+        mqMessage.setPayload(JsonConverter.objectToJson(appDeployArgs));
 
         RPCResult rpcResult = rabbitProducer.callRemote(queueName, mqMessage);
         System.out.println(rpcResult.getResult());