对应 dagent-cpp 的修改

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

@@ -7,8 +7,10 @@ package cn.reghao.autodop.common.mq;
  * @date 2019-10-18 14:31:29
  */
 public enum MsgType {
-    deploy("Deploy"), log("Log"), status("Status"),
-    dagentStart("Plain"), dagentStop("Plain"), dagentHeartbeat("DagentHeartbeat");
+    dagentStart("Plain"), dagentStop("Plain"), dagentHeartbeat("DagentHeartbeat"),
+    machineStatus(""),
+    appDeploy(""), appStart(""), appStop(""), appRestart(""), appLog(""),
+    deploy("Deploy"), log("Log"), status("Status");
 
     private String value;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/protocol/MQMessage.java

@@ -0,0 +1,15 @@
+package cn.reghao.autodop.dmaster.app.protocol;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 17:49:26
+ */
+@Data
+public class MQMessage {
+    private String machineId;
+    private String msgType;
+    private long sendTime;
+    private Object payload;
+}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/protocol/MachineHeartbeat.java

@@ -0,0 +1,12 @@
+package cn.reghao.autodop.dmaster.app.protocol;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 17:55:46
+ */
+@Data
+public class MachineHeartbeat {
+    private String machineId;
+}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/protocol/MachineState.java

@@ -0,0 +1,13 @@
+package cn.reghao.autodop.dmaster.app.protocol;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 17:53:15
+ */
+@Data
+public class MachineState {
+    private String machineId;
+    private String bootTime;
+}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/protocol/MessageType.java

@@ -0,0 +1,9 @@
+package cn.reghao.autodop.dmaster.app.protocol;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 17:49:44
+ */
+public enum MessageType {
+    app, machine
+}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/protocol/app/AppOps.java

@@ -0,0 +1,9 @@
+package cn.reghao.autodop.dmaster.app.protocol.app;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 19:15:00
+ */
+public enum AppOps {
+    deploy, status, log
+}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/protocol/app/DeployArgs.java

@@ -0,0 +1,15 @@
+package cn.reghao.autodop.dmaster.app.protocol.app;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 19:00:54
+ */
+@Data
+public class DeployArgs {
+    private String packerType;
+    private String appId;
+    private String appPath;
+    private String runningDir;
+}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/protocol/app/LogArgs.java

@@ -0,0 +1,16 @@
+package cn.reghao.autodop.dmaster.app.protocol.app;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 19:01:22
+ */
+@Data
+public class LogArgs {
+    private String logType;
+    private String logLevel;
+    private String appId;
+    private String logdirPath;
+    private String logfilePath;
+}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/protocol/app/StatusArgs.java

@@ -0,0 +1,13 @@
+package cn.reghao.autodop.dmaster.app.protocol.app;
+
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 19:01:15
+ */
+@Data
+public class StatusArgs {
+    private String statusType;
+    private String appId;
+}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/protocol/machine/MachineOps.java

@@ -0,0 +1,9 @@
+package cn.reghao.autodop.dmaster.app.protocol.machine;
+
+/**
+ * @author reghao
+ * @date 2020-12-25 19:15:00
+ */
+public enum MachineOps {
+    state, heartbeat, shell
+}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/protocol/machine/ShellArgs.java

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

dmaster/src/main/java/cn/reghao/autodop/dmaster/vm/controller/HostController.java

@@ -3,27 +3,36 @@ package cn.reghao.autodop.dmaster.vm.controller;
 import cn.reghao.autodop.common.result.WebResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author reghao
  * @date 2020-10-31 16:04:58
  */
+@Slf4j
 @Api(tags = "宿主机管理接口")
 @RestController
 @RequestMapping("/api/vm/host")
 public class HostController {
     @PostMapping
-    public String addPhysicalHost() {
+    public String addPhysicalHost(@RequestParam("name") String name) {
+    //public String addPhysicalHost(@RequestParam("name") String name, @RequestBody String json) {
+        log.info("post request...");
+        return WebResult.success("ok");
+    }
+
+    @DeleteMapping
+    public String deletePhysicalHost() {
+        //public String addPhysicalHost(@RequestParam("name") String name, @RequestBody String json) {
+        log.info("delete request...");
         return WebResult.success("ok");
     }
 
     @ApiOperation(value = "")
     @GetMapping("/list")
-    public String nodeList() {
+    public String nodeList(@RequestParam("name") String name) {
+        log.info("name -> {}", name);
         return WebResult.success("ok");
     }
 }