调整 agent 的配置

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

@@ -6,20 +6,14 @@ import ch.qos.logback.classic.LoggerContext;
 import cn.reghao.devops.agent.config.ConfigFile;
 import cn.reghao.devops.agent.config.AgentConfig;
 import cn.reghao.devops.agent.ws.WebSocketClient;
-import cn.reghao.devops.common.docker.Docker;
-import cn.reghao.devops.common.docker.DockerImpl;
 import cn.reghao.devops.common.docker.DockerManager;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
-import cn.reghao.jutil.jdk.string.StringRegexp;
-import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.*;
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.ScheduledExecutorService;
 
 @Slf4j
 public class AgentApp {
@@ -29,25 +23,6 @@ public class AgentApp {
 		rootLogger.setLevel(Level.INFO);
 	}
 
-	private static void tryConnect(String host, int port) {
-		try {
-			boolean isAddress = StringRegexp.matchIPv4Address(host);
-			InetAddress inetAddress;
-			if (isAddress) {
-				inetAddress = InetAddress.getByAddress(host.getBytes(StandardCharsets.UTF_8));
-			} else {
-				inetAddress = InetAddress.getByName(host);
-			}
-
-			InetSocketAddress socketAddress = new InetSocketAddress(inetAddress, port);
-			Socket socket = new Socket();
-			socket.connect(socketAddress);
-		} catch (IOException e) {
-			String errorMsg = String.format("尝试建立到 %s:%s 的 Socket 连接失败", host, port);
-			throw  new RuntimeException(errorMsg);
-		}
-	}
-
 	private static void shutdownGracefully(WebSocketClient webSocketClient) {
 		Runtime.getRuntime().addShutdownHook(new Thread(() -> {
 			log.info("收到退出信号，正在执行清理...");
@@ -114,7 +89,6 @@ public class AgentApp {
 			AgentConfig agentConfig = JsonConverter.jsonFileToObject(new File(configFilePath), AgentConfig.class);
 			// 4. 启动核心服务 (心跳、监控、WebSocket)
 			WebSocketClient webSocketClient = new WebSocketClient(agentConfig);
-			tryConnect(agentConfig.getHost(), agentConfig.getPort());
 			webSocketClient.start();
 			shutdownGracefully(webSocketClient);
 			// 6. 阻塞主线程，防止应用退出

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

@@ -1,6 +1,5 @@
 package cn.reghao.devops.agent.config;
 
-import cn.reghao.devops.common.util.Machine;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -15,17 +14,11 @@ import java.util.UUID;
 @Setter
 @Getter
 public class AgentConfig {
-    private String agentId;
-    private String host;
-    private int port;
     private String serverUrl;
-    private String dockerHost;
     private String token;
 
     public AgentConfig() {
-        this.agentId = Machine.ID;
         this.serverUrl = "ws://localhost:4030";
-        this.dockerHost = "unix:///var/run/docker.sock";
         this.token = UUID.randomUUID().toString();
     }
 }

bin/agent/devopsagent.json

@@ -1,4 +1,3 @@
 {
-  "host": "192.168.0.77",
-  "port": 4030
+  "serverUrl": "ws://localhost:4030"
 }