更新 agent 的配置文件, 只需指定 manager 的地址和端口即可

agent/bin/agent.json

@@ -1,7 +1,4 @@
 {
-  "manager": {
-    "host": "localhost",
-    "port": 4020
-  },
-  "heartbeatInterval": 5
+  "managerAddress": "localhost",
+  "managerPort": 4020
 }

agent/src/main/java/cn/reghao/devops/agent/AgentApp.java

@@ -5,7 +5,6 @@ import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
 import cn.reghao.devops.agent.config.ConfigFile;
 import cn.reghao.devops.agent.config.DagentConfig;
-import cn.reghao.devops.agent.config.ManagerConfig;
 import cn.reghao.devops.agent.event.ws.WsClient;
 import cn.reghao.devops.common.agent.app.iface.AppDeploy;
 import cn.reghao.devops.common.agent.app.iface.AppStat;
@@ -62,13 +61,7 @@ public class AgentApp {
 		AppDeploy appDeploy = new AppDeployService(dockerApp);
 		AppStat appStat = new AppStatService(dockerApp);
 
-		ManagerConfig managerConfig = dagentConfig.getManager();
-		if (managerConfig == null) {
-			log.error("配置文件中必须包含 manager 配置");
-			return null;
-		}
-
-		if (tryConnect(managerConfig.getHost(), managerConfig.getPort())) {
+		if (tryConnect(dagentConfig.getManagerAddress(), dagentConfig.getManagerPort())) {
 			messageSender = new WsClient(dagentConfig, appDeploy, appStat);
 			return messageSender;
 		}

agent/src/main/java/cn/reghao/devops/agent/config/DagentConfig.java

@@ -10,6 +10,6 @@ import lombok.Getter;
 @AllArgsConstructor
 @Getter
 public class DagentConfig {
-    private ManagerConfig manager;
-    private Integer heartbeatInterval;
+    private String managerAddress;
+    private int managerPort;
 }

agent/src/main/java/cn/reghao/devops/agent/config/ManagerConfig.java

@@ -1,15 +0,0 @@
-package cn.reghao.devops.agent.config;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2023-02-23 11:42:58
- */
-@AllArgsConstructor
-@Getter
-public class ManagerConfig {
-    private String host;
-    private int port;
-}

agent/src/main/java/cn/reghao/devops/agent/event/ws/WsClient.java

@@ -26,12 +26,13 @@ public class WsClient implements MessageSender {
     private int retryCount;
 
     public WsClient(DagentConfig dagentConfig, AppDeploy appDeploy, AppStat appStat) {
-        String host = dagentConfig.getManager().getHost();
-        int port = dagentConfig.getManager().getPort();
+        String host = dagentConfig.getManagerAddress();
+        int port = dagentConfig.getManagerPort();
         this.url = String.format("ws://%s:%s/ws/agent?token=%s", host, port, Machine.ID);
 
         EventCenter eventCenter = new EventCenter(this, appDeploy, appStat);
-        int heartbeatInterval = dagentConfig.getHeartbeatInterval();
+        // 每 10s 发送一次心跳
+        int heartbeatInterval = 10;
         MachineEvent machineEvent = new MachineEvent(this, new Machine(), heartbeatInterval);
         this.webSocketListener = new WebSocketListenerImpl(this, eventCenter, machineEvent);
         this.retry = true;