1.全局使用 devops 关键字替换 bnt

2.将 web 模块名修改为 mgr

README.md

@@ -1,4 +1,4 @@
-# bnt
+# devops
 freemarker 模板来自[这个项目](https://github.com/langhsu/mblog) master 分支的 da0aec93 版本
 
 ## 依赖
@@ -8,7 +8,7 @@ freemarker 模板来自[这个项目](https://github.com/langhsu/mblog) master
 - mysql:5.7
 
 ## 模块
-bnt 项目模块:
+devops 项目模块:
 - web
 > 监听 4030 HTTP 端口和 14030 RPC 端口
 >
@@ -23,40 +23,40 @@ bnt 项目模块:
 ### pull 项目源码
 ```
 cd ~/Downloads
-git clone https://git.reghao.cn/reghao/bnt.git
+git clone https://git.reghao.cn/reghao/devops.git
 ```
 
 ### 初始化 MySQL
 ```
-cd ~/Downloads/bnt/zzz
+cd ~/Downloads/devops/zzz
 bash db_init.sh
 ```
-> 执行 db_init.sh 会自动创建 bnt 项目需要的数据库并初始化数据库表
+> 执行 db_init.sh 会自动创建 devops 项目需要的数据库并初始化数据库表
 > > 需要自行指定 db_init.sh 脚本中的 host, username, password 等变量值
 
 ### 构建并运行
 ```
-cd ~/Downloads/bnt/zzz
+cd ~/Downloads/devops/zzz
 bash build_jar.sh
 ```
-> 执行 db_init.sh 会自动构建并运行 bntweb 应用 jar 包
-> > build_jar.sh 脚本中的 proj_dir 变量默认是 ~/Downloads/bnt
+> 执行 db_init.sh 会自动构建并运行 devopsweb 应用 jar 包
+> > build_jar.sh 脚本中的 proj_dir 变量默认是 ~/Downloads/devops
 >
 > mvn 构建默认使用 dev 环境, 所以需要修改 web 模块 resources/application-dev.yml 配置文件中的第三方服务配置
 >
-> 运行 bntweb 应用前需要根据环境修改 bnt/web/bin/bntweb.yml 文件中的配置
+> 运行 devopsweb 应用前需要根据环境修改 devops/web/bin/devopsweb.yml 文件中的配置
 > > mysql 配置
 >
 > 运行应用
-> > 执行 bnt/web/bin/start.sh 脚本
-> > > 使用 bntweb.yml 外部配置文件
+> > 执行 devops/web/bin/start.sh 脚本
+> > > 使用 devopsweb.yml 外部配置文件
 > >
-> > 执行 bnt/web/bin/start1.sh 脚本
+> > 执行 devops/web/bin/start1.sh 脚本
 > > > 根据 mvn 打包选择的 profile, 使用 resources/application-dev.yml 或 resources/application-test.yml 内部配置文件
 
 ### 停止应用
 ```
-cd ~/Downloads/bnt/web/bin
+cd ~/Downloads/devops/web/bin
 bash shutdown.sh
 ```
-> 执行 shutdown.sh 会结束 bntweb 应用
+> 执行 shutdown.sh 会结束 devopsweb 应用

agent/pom.xml

@@ -3,8 +3,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>bnt</artifactId>
-        <groupId>cn.reghao.bnt</groupId>
+        <artifactId>devops</artifactId>
+        <groupId>cn.reghao.devops</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -18,7 +18,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>cn.reghao.bnt</groupId>
+            <groupId>cn.reghao.devops</groupId>
             <artifactId>common</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
@@ -45,7 +45,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>cn.reghao.bnt.agent.AgentApp</mainClass>
+                            <mainClass>cn.reghao.devops.agent.AgentApp</mainClass>
                         </manifest>
                     </archive>
                     <descriptorRefs>

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

@@ -1,112 +0,0 @@
-package cn.reghao.bnt.agent;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
-import cn.reghao.bnt.agent.config.ConfigFile;
-import cn.reghao.bnt.agent.config.AgentConfig;
-import cn.reghao.bnt.agent.service.FileReader;
-import cn.reghao.bnt.agent.ws.WsClient;
-import cn.reghao.bnt.common.agent.app.iface.AppDeploy;
-import cn.reghao.bnt.common.agent.app.iface.AppStat;
-import cn.reghao.bnt.common.agent.app.iface.impl.AppDeployImpl;
-import cn.reghao.bnt.common.agent.app.iface.impl.AppStatImpl;
-import cn.reghao.bnt.common.agent.app.iface.impl.DockerApp;
-import cn.reghao.bnt.common.docker.Docker;
-import cn.reghao.bnt.common.docker.DockerImpl;
-import cn.reghao.bnt.common.msg.MessageSender;
-import cn.reghao.jutil.jdk.serializer.JsonConverter;
-import cn.reghao.jutil.jdk.string.StringRegexp;
-import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
-import cn.reghao.jutil.jdk.util.SingleInstance;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.ScheduledExecutorService;
-
-@Slf4j
-public class AgentApp {
-	public static MessageSender messageSender;
-	public static ScheduledExecutorService scheduler = ThreadPoolWrapper.scheduledThreadPool("heartbeat", 5);
-	public static Docker docker = new DockerImpl();
-
-	static void setLogLevel() {
-		LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
-		Logger rootLogger = loggerContext.getLogger("ROOT");
-		rootLogger.setLevel(Level.INFO);
-		//LoggerConfig.initLogger(Appenders.fileAppender());
-	}
-	
-	static boolean 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);
-			return true;
-		} catch (IOException e) {
-			log.error("尝试建立到 {}:{} 的 Socket 连接失败", host, port);
-		}
-		return false;
-	}
-
-	static MessageSender getMessageSender(AgentConfig agentConfig) {
-		DockerApp dockerApp = new DockerApp(docker);
-		AppDeploy appDeploy = new AppDeployImpl(dockerApp);
-		AppStat appStat = new AppStatImpl(dockerApp);
-		FileReader fileReader = new FileReader(agentConfig.getLogFiles());
-
-		if (tryConnect(agentConfig.getHost(), agentConfig.getPort())) {
-			messageSender = new WsClient(agentConfig, fileReader, appDeploy, appStat);
-			return messageSender;
-		}
-
-		return null;
-	}
-
-	static void shutdownGracefully() {
-		Runtime.getRuntime().addShutdownHook(new Thread(new ShutdownHook(), "main-shutdown-hook"));
-	}
-
-	static class ShutdownHook implements Runnable {
-		@Override
-		public void run() {
-			messageSender.close();
-			log.info("资源清理完成，结束 devops-agent...");
-		}
-	}
-
-	public static void main(String[] args) {
-		setLogLevel();
-		if (args.length != 1) {
-			log.error("必须指定配置文件...");
-			return;
-		}
-
-		String configFilePath = ConfigFile.configFilePath(args[0], AgentApp.class);
-		AgentConfig agentConfig = JsonConverter.jsonFileToObject(new File(configFilePath), AgentConfig.class);
-		messageSender = getMessageSender(agentConfig);
-		if (messageSender == null) {
-			log.error("没有可用的 MessageSender, Agent 结束运行, 具体信息请查看日志");
-			System.exit(-1);
-		} else {
-			messageSender.connect();
-		}
-
-		shutdownGracefully();
-		SingleInstance.onlyOne(60001);
-	}
-}

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

@@ -1,22 +0,0 @@
-package cn.reghao.bnt.agent.config;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2023-02-23 11:37:32
- */
-@AllArgsConstructor
-@Setter
-@Getter
-public class AgentConfig {
-    private String protocol;
-    private String host;
-    private int port;
-    private boolean logstash;
-    private List<LogFile> logFiles;
-}

agent/src/main/java/cn/reghao/bnt/agent/config/ConfigFile.java

@@ -1,53 +0,0 @@
-package cn.reghao.bnt.agent.config;
-
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.File;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
-
-/**
- * @author reghao
- * @date 2021-03-03 18:47:01
- */
-@Slf4j
-public class ConfigFile {
-    public static String configFilePath(String arg, Class<?> clazz) {
-        String configFilePath = null;
-        File configFile = new File(arg);
-        if (!configFile.exists()) {
-            if (arg.startsWith("./")) {
-                String filename = arg.replace(".", "")
-                        .replace("/", "");
-                configFilePath = runningHome(clazz) + "/" + filename;
-            } else if (!arg.contains("/")) {
-                configFilePath = runningHome(clazz) + "/" + arg;
-            } else {
-                log.error("相对路径的配置文件必须以 ./configFile 或 configFile 形式指定...");
-            }
-        } else {
-            // 绝对路径
-            configFilePath = arg;
-        }
-        return configFilePath;
-    }
-    
-    /**
-     * jar 文件运行目录
-     *
-     * @param
-     * @return
-     * @date 2021-03-03 下午6:33
-     */
-    public static String runningHome(Class<?> clazz) {
-        URL url = clazz.getProtectionDomain().getCodeSource().getLocation();
-        String jarFilePath = URLDecoder.decode(url.getPath(), StandardCharsets.UTF_8);
-        if (jarFilePath.endsWith(".jar")) {
-            jarFilePath = jarFilePath.substring(0, jarFilePath.lastIndexOf("/") + 1);
-        }
-
-        File file = new File(jarFilePath);
-        return file.getAbsolutePath();
-    }
-}

agent/src/main/java/cn/reghao/bnt/agent/config/LogFile.java

@@ -1,29 +0,0 @@
-package cn.reghao.bnt.agent.config;
-
-import lombok.AllArgsConstructor;
-
-/**
- * @author reghao
- * @date 2022-05-20 18:28:21
- */
-@AllArgsConstructor
-public class LogFile {
-    private String domain;
-    private String filePath;
-
-    public void setDomain(String domain) {
-        this.domain = domain;
-    }
-
-    public String getDomain() {
-        return domain;
-    }
-
-    public void setFilePath(String filePath) {
-        this.filePath = filePath;
-    }
-
-    public String getFilePath() {
-        return filePath;
-    }
-}

agent/src/main/java/cn/reghao/bnt/agent/machine/MachineEvent.java

@@ -1,112 +0,0 @@
-package cn.reghao.bnt.agent.machine;
-
-import cn.reghao.bnt.agent.AgentApp;
-import cn.reghao.bnt.agent.task.ImageCleanTask;
-import cn.reghao.bnt.agent.task.ProcScanTask;
-import cn.reghao.bnt.common.agent.app.iface.AppStat;
-import cn.reghao.bnt.common.docker.Docker;
-import cn.reghao.bnt.common.machine.Machine;
-import cn.reghao.bnt.common.msg.MessageSender;
-import cn.reghao.bnt.common.msg.event.EvtAgentHeartbeat;
-import cn.reghao.bnt.common.msg.event.EvtAgentStart;
-import cn.reghao.bnt.common.msg.event.EvtAppStatResult;
-import cn.reghao.jutil.jdk.event.message.EventMessage;
-import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author reghao
- * @date 2021-09-03 09:22:42
- */
-@Slf4j
-public class MachineEvent {
-    private final ScheduledExecutorService scheduler;
-    private ScheduledFuture<?> heartbeatFuture;
-    private final Machine machine;
-    private final AppStat appStat;
-    private final MessageSender messageSender;
-    private final Docker docker;
-    
-    public MachineEvent(MessageSender messageSender, Machine machine, AppStat appStat) {
-        this.messageSender = messageSender;
-        this.machine = machine;
-        this.appStat = appStat;
-        this.scheduler = AgentApp.scheduler;
-        this.docker = AgentApp.docker;
-    }
-
-    public void agentStart() {
-        EvtAgentStart evtAgentStart = machine.detail();
-        EventMessage eventMessage = EventMessage.evt(evtAgentStart);
-        pub(eventMessage);
-
-        try {
-            List<EvtAppStatResult> list = appStat.stat();
-            list.forEach(evtAppStatResult -> {
-                EventMessage eventMessage1 = EventMessage.evt(evtAppStatResult);
-                pub(eventMessage1);
-            });
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        startTask();
-        agentHeartbeat();
-    }
-
-    public void agentShutdown() {
-        ThreadPoolWrapper.shutdownScheduler(scheduler);
-        EvtAgentHeartbeat machineStat = machine.stat();
-        EventMessage eventMessage = EventMessage.evt(machineStat);
-        pub(eventMessage);
-    }
-
-    public void agentHeartbeat() {
-        // 每 60s 发送一次心跳
-        int heartbeatInterval = 60;
-        heartbeatFuture = scheduler.scheduleAtFixedRate(new Heartbeat(), 5, heartbeatInterval, TimeUnit.SECONDS);
-    }
-
-    public void pauseHeartbeat() {
-        if (!heartbeatFuture.isCancelled()) {
-            heartbeatFuture.cancel(true);
-        }
-    }
-
-    private void pub(EventMessage eventMessage) {
-        if (messageSender.isConnected()) {
-            try {
-                messageSender.send("", eventMessage);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        } else {
-            log.error("连接断开");
-        }
-    }
-
-    class Heartbeat implements Runnable {
-        @Override
-        public void run() {
-            EvtAgentHeartbeat machineStat = machine.stat();
-            EventMessage eventMessage = EventMessage.evt(machineStat);
-            pub(eventMessage);
-        }
-    }
-
-    public void startTask() {
-        ProcScanTask procScanTask = new ProcScanTask(messageSender, docker);
-        scheduler.schedule(procScanTask, 0, TimeUnit.MINUTES);
-        scheduler.scheduleAtFixedRate(procScanTask, 1, 8, TimeUnit.HOURS);
-
-        ImageCleanTask cleanTask = new ImageCleanTask(messageSender, docker);
-        scheduler.schedule(cleanTask, 1, TimeUnit.MINUTES);
-        scheduler.scheduleAtFixedRate(cleanTask, 2, 8, TimeUnit.HOURS);
-    }
-}

agent/src/main/java/cn/reghao/bnt/agent/service/FileReader.java

@@ -1,33 +0,0 @@
-package cn.reghao.bnt.agent.service;
-
-import cn.reghao.bnt.agent.config.LogFile;
-import cn.reghao.bnt.agent.ws.WsClient;
-import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
-
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-
-/**
- * @author reghao
- * @date 2022-05-20 16:23:34
- */
-public class FileReader {
-    private final ExecutorService threadPool = ThreadPoolWrapper.threadPool("logstash");
-    private final List<LogFile> logFiles;
-
-    public FileReader(List<LogFile> logFiles) {
-        this.logFiles = logFiles;
-    }
-
-    public void start(WsClient wsClient) {
-        for (LogFile logFile: logFiles) {
-            String filePath = logFile.getFilePath();
-            try {
-                TailReader tailReader = new TailReader(filePath, wsClient);
-                threadPool.submit(tailReader);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}

agent/src/main/java/cn/reghao/bnt/agent/service/TailReader.java

@@ -1,103 +0,0 @@
-package cn.reghao.bnt.agent.service;
-
-import cn.reghao.bnt.agent.ws.WsClient;
-import cn.reghao.jutil.jdk.io.TextFile;
-import cn.reghao.jutil.jdk.serializer.JsonConverter;
-import cn.reghao.jutil.jdk.web.log.NginxLog;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.LinkedBlockingQueue;
-
-/**
- * @author reghao
- * @date 2022-05-20 11:41:08
- */
-@Slf4j
-public class TailReader implements Runnable {
-    private final String filePath;
-    private final RandomAccessFile raf;
-    private long pointer;
-    private final WsClient wsClient;
-    private final TextFile textFile;
-    private final String errorLogPath;
-
-    public TailReader(String filePath, WsClient wsClient) throws FileNotFoundException {
-        this.filePath = filePath;
-        this.raf  = new RandomAccessFile(filePath, "r");
-        this.pointer = 0;
-        this.wsClient = wsClient;
-        this.textFile = new TextFile();
-        this.errorLogPath = System.getProperty("user.dir") + "/error.log";
-    }
-
-    @Override
-    public void run() {
-        try {
-            File errLogFile = new File(errorLogPath);
-            if (!errLogFile.exists()) {
-                errLogFile.createNewFile();
-            }
-
-            while (!Thread.interrupted()) {
-                try {
-                    long length = raf.length();
-                    if (length > pointer) {
-                        raf.seek(pointer);
-                        String line = raf.readLine();
-                        while (line != null) {
-                            parseAndPersist(line, errLogFile);
-                            line = raf.readLine();
-                        }
-                        pointer = length;
-                    } else {
-                        log.info("已读取到 {} 文件末尾, 休眠 10s 后再尝试读取...", filePath);
-                        Thread.sleep(10_000);
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        } catch (Exception e ) {
-            e.printStackTrace();
-        }
-    }
-
-    Queue<NginxLog> queue = new LinkedBlockingQueue<>();
-    private void parseAndPersist(String line, File errLogFile) throws InterruptedException {
-        NginxLog nginxLog = null;
-        try {
-            nginxLog = JsonConverter.jsonToObject(line, NginxLog.class);
-        } catch (Exception e) {
-            e.printStackTrace();
-            try {
-                textFile.append(errLogFile.getAbsolutePath(), List.of(line));
-            } catch (IOException ex) {
-                ex.printStackTrace();
-            }
-        }
-
-        if (nginxLog != null) {
-            if (!wsClient.isConnected()) {
-                log.info("websocket disconnected, wait 10s...");
-                Thread.sleep(10_000);
-            }
-
-            try {
-                NginxLog nginxLog1 = queue.poll();
-                while (nginxLog1 != null) {
-                    wsClient.send("", nginxLog);
-                    nginxLog1 = queue.poll();
-                }
-                wsClient.send("", nginxLog);
-            } catch (Exception e) {
-                queue.add(nginxLog);
-            }
-        }
-    }
-}

agent/src/main/java/cn/reghao/bnt/agent/task/ImageCleanTask.java

@@ -1,91 +0,0 @@
-package cn.reghao.bnt.agent.task;
-
-import cn.reghao.bnt.common.docker.Docker;
-import cn.reghao.bnt.common.machine.Machine;
-import cn.reghao.bnt.common.msg.MessageSender;
-import cn.reghao.bnt.common.msg.event.EvtTaskResult;
-import cn.reghao.jutil.jdk.event.message.EventMessage;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.Image;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * 删除和运行容器依赖镜像不同 tag 的镜像
- *
- * @author reghao
- * @date 2024-07-29 16:17:47
- */
-@Slf4j
-public class ImageCleanTask implements Runnable {
-    private final String taskName;
-    private final MessageSender messageSender;
-    private final Docker docker;
-
-    public ImageCleanTask(MessageSender messageSender, Docker docker) {
-        this.taskName = this.getClass().getSimpleName();
-        this.messageSender = messageSender;
-        this.docker = docker;
-    }
-
-    @Override
-    public void run() {
-        String result = "exec ImageCleanTask";
-        log.info("{}", result);
-        EvtTaskResult evtTaskResult = new EvtTaskResult(Machine.ID, taskName, result);
-        try {
-            EventMessage evtMsg = EventMessage.evt(evtTaskResult);
-            messageSender.send("", evtMsg);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        Map<String, Image> map = docker.images().stream()
-                .collect(Collectors.toMap(Image::getId, image -> image));
-        List<InspectContainerResponse> list = docker.psAll();
-        // repo -> imageId
-        Map<String, String> repoMap = new HashMap<>();
-        for (InspectContainerResponse response : list) {
-            String imageId = response.getImageId();
-            Image image = map.get(imageId);
-            if (image != null) {
-                String[] repoTags = image.getRepoTags();
-                if (repoTags != null && repoTags.length > 1) {
-                    String repo = repoTags[0].split(":")[0];
-                    repoMap.put(repo, imageId);
-                }
-            }
-        }
-
-        map.values().forEach(image -> {
-            String imageId = image.getId();
-            String[] repoTags = image.getRepoTags();
-            if (repoTags != null && repoTags.length > 1) {
-                String repo = repoTags[0].split(":")[0];
-                String imageId0 = repoMap.get(repo);
-                if (imageId0 != null && !imageId.equals(imageId0)) {
-                    rmImage(image);
-                }
-            }
-        });
-    }
-
-    private void rmImage(Image image) {
-        try {
-            String imageId = image.getId();
-            docker.imageRm(imageId);
-            String[] tags = image.getRepoTags();
-            String result = String.format("delete image %s", tags);
-            EvtTaskResult evtTaskResult = new EvtTaskResult(Machine.ID, taskName, result);
-            EventMessage evtMsg = EventMessage.evt(evtTaskResult);
-            messageSender.send("", evtMsg);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}

agent/src/main/java/cn/reghao/bnt/agent/task/ProcScanTask.java

@@ -1,133 +0,0 @@
-package cn.reghao.bnt.agent.task;
-
-import cn.reghao.bnt.common.docker.Docker;
-import cn.reghao.bnt.common.machine.Machine;
-import cn.reghao.bnt.common.machine.model.SysProcess;
-import cn.reghao.bnt.common.msg.MessageSender;
-import cn.reghao.bnt.common.msg.event.EvtTaskResult;
-import cn.reghao.jutil.jdk.event.message.EventMessage;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import lombok.extern.slf4j.Slf4j;
-import oshi.SystemInfo;
-import oshi.software.os.InternetProtocolStats;
-import oshi.software.os.OSThread;
-import oshi.software.os.OperatingSystem;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @author reghao
- * @date 2025-12-17 14:30:36
- */
-@Slf4j
-public class ProcScanTask implements Runnable {
-    private final String taskName;
-    private final MessageSender messageSender;
-    private final Docker docker;
-    private final OperatingSystem os;
-
-    public ProcScanTask(MessageSender messageSender, Docker docker) {
-        this.taskName = this.getClass().getSimpleName();
-        this.messageSender = messageSender;
-        this.docker = docker;
-        SystemInfo si = new SystemInfo();
-        this.os = si.getOperatingSystem();
-    }
-
-    @Override
-    public void run() {
-        String result = "exec ProcScanTask";
-        log.info("{}", result);
-        EvtTaskResult evtTaskResult = new EvtTaskResult(Machine.ID, taskName, result);
-        try {
-            EventMessage evtMsg = EventMessage.evt(evtTaskResult);
-            messageSender.send("", evtMsg);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        Map<Integer, SysProcess> procMap = os.getProcesses().stream()
-                .map(osProcess -> {
-                    int pid = osProcess.getProcessID();
-                    String name = osProcess.getName();
-                    int ppid = osProcess.getParentProcessID();
-                    String state = osProcess.getState().name();
-                    List<OSThread> osThreadList = osProcess.getThreadDetails();
-                    String cmdLine = osProcess.getCommandLine();
-                    long startTime = osProcess.getStartTime();
-                    String user = osProcess.getUser();
-                    return new SysProcess(pid, name, ppid, cmdLine, startTime, user);
-                })
-                .collect(Collectors.toMap(SysProcess::getPid, sp -> sp));
-
-        String state = InternetProtocolStats.TcpState.LISTEN.name();
-        os.getInternetProtocolStats().getConnections().forEach(ipConnection -> {
-            if (!ipConnection.getState().name().equals(state)) {
-                return;
-            }
-
-            String connType = ipConnection.getType();
-            int pid = ipConnection.getowningProcessId();
-            byte[] localAddress = ipConnection.getLocalAddress();
-            String localAddressStr = byte2Str(localAddress);
-            int localPort = ipConnection.getLocalPort();
-            byte[] remoteAddress = ipConnection.getForeignAddress();
-            int remotePort = ipConnection.getForeignPort();
-            String hostPort = String.format("%s:%s", localAddressStr, localPort);
-
-            SysProcess sysProcess = procMap.get(pid);
-            if (sysProcess != null) {
-                sysProcess.getHostPorts().add(hostPort);
-            }
-        });
-
-        List<InspectContainerResponse> inspectContainerResponseList = docker.psAll();
-        for (InspectContainerResponse response : inspectContainerResponseList) {
-            Boolean running = response.getState().getRunning();
-            if (running != null && running) {
-                Integer pid = response.getState().getPid();
-                if (pid == null) {
-                    continue;
-                }
-
-                String containerId = response.getId();
-                String appId = response.getName().replace("/", "");
-                SysProcess sysProcess = procMap.get(pid);
-                if (sysProcess != null) {
-                    sysProcess.setContainerId(containerId);
-                    sysProcess.setAppId(appId);
-                } else {
-                    log.error("docker process {} not exist", pid);
-                }
-            }
-        }
-
-        List<SysProcess> listenProcessList = procMap.values().stream()
-                .filter(sysProcess -> !sysProcess.getHostPorts().isEmpty())
-                .collect(Collectors.toList());
-        evtTaskResult = new EvtTaskResult(Machine.ID, taskName, listenProcessList);
-        try {
-            EventMessage evtMsg = EventMessage.evt(evtTaskResult);
-            messageSender.send("", evtMsg);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private String byte2Str(byte[] buffer) {
-        String address = "-1.-1.-1.-1";
-        try {
-            InetAddress inetAddress = InetAddress.getByAddress(buffer);
-            address = inetAddress.getHostAddress();
-        } catch (UnknownHostException e) {
-            e.printStackTrace();
-        }
-
-        return address;
-    }
-}

agent/src/main/java/cn/reghao/bnt/agent/ws/WebSocketListenerImpl.java

@@ -1,102 +0,0 @@
-package cn.reghao.bnt.agent.ws;
-
-import cn.reghao.bnt.agent.ws.event.EventCenter;
-import cn.reghao.bnt.agent.machine.MachineEvent;
-import cn.reghao.jutil.jdk.event.message.EventMessage;
-import cn.reghao.jutil.jdk.serializer.JdkSerializer;
-import lombok.extern.slf4j.Slf4j;
-import okhttp3.Response;
-import okhttp3.WebSocket;
-import okhttp3.WebSocketListener;
-import okio.ByteString;
-
-/**
- * @author reghao
- * @date 2023-02-23 09:26:50
- */
-@Slf4j
-public class WebSocketListenerImpl extends WebSocketListener {
-    private final WsClient wsClient;
-    private final EventCenter eventCenter;
-    private final MachineEvent machineEvent;
-    private final boolean logstash;
-
-    public WebSocketListenerImpl(WsClient wsClient, boolean logstash, EventCenter eventCenter, MachineEvent machineEvent) {
-        this.wsClient = wsClient;
-        this.logstash = logstash;
-        this.eventCenter = eventCenter;
-        this.machineEvent = machineEvent;
-    }
-
-    @Override
-    public void onOpen(WebSocket webSocket, Response response) {
-        log.info("WebSocket 连接成功");
-        wsClient.setConnected(true);
-        wsClient.resetRetryCount();
-
-        if (!logstash) {
-            machineEvent.agentStart();
-        }
-    }
-
-    @Override
-    public void onClosing(WebSocket webSocket, int code, String reason) {
-        log.error("WebSocket 连接正在关闭 -> {} - {}", code, reason);
-        wsClient.setConnected(false);
-
-        if (!logstash) {
-            machineEvent.pauseHeartbeat();
-        }
-
-        if (wsClient.isRetry()) {
-            reconnect();
-        }
-    }
-
-    @Override
-    public void onClosed(WebSocket webSocket, int code, String reason) {
-        log.error("WebSocket 连接关闭成功 -> {} - {}", code, reason);
-        wsClient.setConnected(false);
-    }
-
-    @Override
-    public void onFailure(WebSocket webSocket, Throwable throwable, Response response) {
-        log.info("WebSocket 异常事件: {}", throwable.getMessage());
-        wsClient.setConnected(false);
-        if (wsClient.isRetry()) {
-            reconnect();
-        }
-    }
-
-    private void reconnect() {
-        log.info("WebSocket 重连");
-        try {
-            if (wsClient.getRetryCount() > 10) {
-                log.info("WebSocket 重连超过 10 次, 休眠 1 分钟后再尝试");
-                Thread.sleep(60_000);
-                wsClient.resetRetryCount();
-            } else {
-                log.info("休眠 10s 后再尝试重连");
-                Thread.sleep(10_000);
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        wsClient.close0();
-        wsClient.retryCountIncr();
-        wsClient.connect();
-    }
-
-    @Override
-    public void onMessage(WebSocket webSocket, String text) {
-    }
-
-    @Override
-    public void onMessage(WebSocket webSocket, ByteString bytes) {
-        Object object = JdkSerializer.deserialize(bytes.toByteArray());
-        if (object instanceof EventMessage) {
-            EventMessage eventMessage = (EventMessage) object;
-            eventCenter.dispatch(eventMessage);
-        }
-    }
-}

agent/src/main/java/cn/reghao/bnt/agent/ws/WsClient.java

@@ -1,123 +0,0 @@
-package cn.reghao.bnt.agent.ws;
-
-import cn.reghao.bnt.agent.config.AgentConfig;
-import cn.reghao.bnt.agent.service.FileReader;
-import cn.reghao.bnt.agent.ws.event.EventCenter;
-import cn.reghao.bnt.common.agent.app.iface.AppDeploy;
-import cn.reghao.bnt.common.agent.app.iface.AppStat;
-import cn.reghao.bnt.agent.machine.MachineEvent;
-import cn.reghao.bnt.common.machine.Machine;
-import cn.reghao.bnt.common.msg.MessageSender;
-import cn.reghao.jutil.jdk.serializer.JdkSerializer;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.WebSocket;
-import okhttp3.WebSocketListener;
-import okio.ByteString;
-
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * @author reghao
- * @date 2023-02-23 09:26:50
- */
-public class WsClient implements MessageSender {
-    private final String url;
-    private WebSocket webSocket;
-    private boolean connected;
-    private final WebSocketListener webSocketListener;
-    private boolean retry;
-    private int retryCount;
-
-    public WsClient(AgentConfig agentConfig, FileReader fileReader, AppDeploy appDeploy, AppStat appStat) {
-        String protocol = agentConfig.getProtocol();
-        String host = agentConfig.getHost();
-        int port = agentConfig.getPort();
-        String app = "agent";
-        String host1 = "127.0.0.1";
-        this.url = String.format("%s://%s:%s/bgws/agent?token=%s&app=%s&host=%s", protocol, host, port, Machine.ID, app, host1);
-        boolean logstash = agentConfig.isLogstash();
-
-        EventCenter eventCenter = new EventCenter(this, appDeploy, appStat);
-        MachineEvent machineEvent = new MachineEvent(this, new Machine(), appStat);
-        this.webSocketListener = new WebSocketListenerImpl(this, logstash, eventCenter, machineEvent);
-        this.retry = true;
-        this.retryCount = 0;
-
-        if (logstash) {
-            fileReader.start(this);
-        }
-        Logger.getLogger(OkHttpClient.class.getName()).setLevel(Level.FINE);
-    }
-
-    public void setRetry(boolean retry) {
-        this.retry = retry;
-    }
-
-    public boolean isRetry() {
-        return retry;
-    }
-
-    public void retryCountIncr() {
-        this.retryCount += 1;
-    }
-
-    public void resetRetryCount() {
-        this.retryCount = 0;
-    }
-
-    public int getRetryCount() {
-        return retryCount;
-    }
-
-    @Override
-    public void connect() {
-        Request request = new Request.Builder()
-                .url(url)
-                .header("Authorization", "Bearer " + Machine.ID)
-                .build();
-
-        OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                .pingInterval(10, TimeUnit.SECONDS)
-                .connectTimeout(60, TimeUnit.SECONDS)
-                .readTimeout(60, TimeUnit.SECONDS)
-                .writeTimeout(60, TimeUnit.SECONDS)
-                .build();
-
-        if (this.webSocket != null) {
-            this.webSocket.cancel();
-        }
-
-
-        this.webSocket = okHttpClient.newWebSocket(request, webSocketListener);
-    }
-
-    @Override
-    public void setConnected(boolean status) {
-        this.connected = status;
-    }
-
-    @Override
-    public boolean isConnected() {
-        return connected;
-    }
-
-    @Override
-    public void send(String dest, Object message) {
-        if (isConnected()) {
-            byte[] bytes = JdkSerializer.serialize(message);
-            webSocket.send(ByteString.of(bytes));
-        }
-    }
-
-    public void close() {
-        setRetry(false);
-        webSocket.close(1000, "Client Close Connection");
-    }
-
-    public void close0() {
-        webSocket.close(1000, "Client Close Connection");
-    }
-}

agent/src/main/java/cn/reghao/bnt/agent/ws/event/EventCenter.java

@@ -1,61 +0,0 @@
-package cn.reghao.bnt.agent.ws.event;
-
-import cn.reghao.bnt.agent.ws.event.handler.EvtAppDeployHandler;
-import cn.reghao.bnt.agent.ws.event.handler.EvtAppStatHandler;
-import cn.reghao.bnt.agent.ws.event.handler.EvtDockerHandler;
-import cn.reghao.bnt.common.agent.app.iface.AppDeploy;
-import cn.reghao.bnt.common.agent.app.iface.AppStat;
-import cn.reghao.bnt.common.docker.Docker;
-import cn.reghao.bnt.common.msg.MessageSender;
-import cn.reghao.bnt.common.msg.event.EvtAppDeploy;
-import cn.reghao.bnt.common.msg.event.EvtAppStat;
-import cn.reghao.bnt.common.msg.event.EvtDockerOps;
-import cn.reghao.jutil.jdk.event.message.Event;
-import cn.reghao.jutil.jdk.event.message.EventMessage;
-import cn.reghao.jutil.jdk.event.router.EventDispatcher;
-import cn.reghao.jutil.jdk.exception.ExceptionUtil;
-import lombok.extern.slf4j.Slf4j;
-
-import java.lang.management.ManagementFactory;
-
-/**
- * @author reghao
- * @date 2023-02-23 09:18:11
- */
-@Slf4j
-public class EventCenter {
-    private final long startTime;
-    private final EventDispatcher dispatcher;
-
-    public EventCenter(MessageSender messageSender, AppDeploy appDeploy, AppStat appStat) {
-        this.startTime = ManagementFactory.getRuntimeMXBean().getStartTime();
-        this.dispatcher = new EventDispatcher();
-        initDispatcher(messageSender, appDeploy, appStat);
-    }
-
-    private void initDispatcher(MessageSender messageSender, AppDeploy appDeploy, AppStat appStat) {
-        dispatcher.register(EvtAppDeploy.class, new EvtAppDeployHandler(messageSender, appDeploy));
-        dispatcher.register(EvtAppStat.class, new EvtAppStatHandler(messageSender, appStat));
-        dispatcher.register(EvtDockerOps.class, new EvtDockerHandler(messageSender));
-    }
-
-    public void dispatch(EventMessage eventMessage) {
-        try {
-            long sendTime = eventMessage.getSendTime();
-            if (sendTime < startTime) {
-                log.info("忽略 agent 启动前 mgr 发送的事件...");
-                return;
-            }
-
-            Event event = eventMessage.getEvent();
-            dispatcher.dispatch(event);
-        } catch (Exception e) {
-            String errMsg = e.getMessage();
-            if (e instanceof NullPointerException) {
-                errMsg = ExceptionUtil.stackTrace(e);
-            }
-
-            log.error("处理消息发生异常: {}", errMsg);
-        }
-    }
-}

agent/src/main/java/cn/reghao/bnt/agent/ws/event/handler/EvtAppDeployHandler.java

@@ -1,51 +0,0 @@
-package cn.reghao.bnt.agent.ws.event.handler;
-
-import cn.reghao.bnt.common.agent.app.iface.AppDeploy;
-import cn.reghao.bnt.common.machine.Machine;
-import cn.reghao.bnt.common.msg.MessageSender;
-import cn.reghao.bnt.common.msg.event.EvtAppDeploy;
-import cn.reghao.bnt.common.msg.event.EvtAppStatResult;
-import cn.reghao.jutil.jdk.event.handler.Handler;
-import cn.reghao.jutil.jdk.event.message.Event;
-import cn.reghao.jutil.jdk.event.message.EventMessage;
-import cn.reghao.jutil.jdk.exception.ExceptionUtil;
-import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.jdk.web.result.ResultStatus;
-
-import java.io.IOException;
-
-/**
- * @author reghao
- * @date 2023-03-01 10:52:04
- */
-public class EvtAppDeployHandler extends Handler {
-    private final MessageSender messageSender;
-    private final AppDeploy appDeploy;
-
-    public EvtAppDeployHandler(MessageSender messageSender, AppDeploy appDeploy) {
-        this.messageSender = messageSender;
-        this.appDeploy = appDeploy;
-    }
-
-    @Override
-    public void handle(Event evt) {
-        EvtAppDeploy deployParam = (EvtAppDeploy) evt;
-        String appId = deployParam.getAppId();
-        EvtAppStatResult statResult;
-        try {
-            statResult = appDeploy.deploy(deployParam);
-            statResult.setResult(Result.result(ResultStatus.SUCCESS));
-        } catch (Exception e) {
-            statResult = new EvtAppStatResult(appId, Machine.ID);
-            statResult.setResult(Result.result(ResultStatus.FAIL, ExceptionUtil.errorMsg(e)));
-        }
-
-        statResult.setDeploy(true);
-        EventMessage evtMsg = EventMessage.evt(statResult);
-        try {
-            messageSender.send("", evtMsg);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}

agent/src/main/java/cn/reghao/bnt/agent/ws/event/handler/EvtAppStatHandler.java

@@ -1,73 +0,0 @@
-package cn.reghao.bnt.agent.ws.event.handler;
-
-import cn.reghao.bnt.common.agent.app.iface.AppStat;
-import cn.reghao.bnt.common.machine.Machine;
-import cn.reghao.bnt.common.msg.MessageSender;
-import cn.reghao.bnt.common.msg.constant.AppStatOps;
-import cn.reghao.bnt.common.msg.event.EvtAppStat;
-import cn.reghao.bnt.common.msg.event.EvtAppStatResult;
-import cn.reghao.jutil.jdk.event.handler.Handler;
-import cn.reghao.jutil.jdk.event.message.Event;
-import cn.reghao.jutil.jdk.event.message.EventMessage;
-import cn.reghao.jutil.jdk.exception.ExceptionUtil;
-import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.jdk.web.result.ResultStatus;
-
-import java.io.IOException;
-
-/**
- * @author reghao
- * @date 2023-03-01 10:21:40
- */
-public class EvtAppStatHandler extends Handler {
-    private final MessageSender messageSender;
-    private final AppStat appStat;
-
-    public EvtAppStatHandler(MessageSender messageSender, AppStat appStat) {
-        this.messageSender = messageSender;
-        this.appStat = appStat;
-    }
-
-    @Override
-    public void handle(Event evt) {
-        EvtAppStat evtAppStat = (EvtAppStat) evt;
-        String appId = evtAppStat.getAppId();
-        String ops = evtAppStat.getOps();
-
-        EvtAppStatResult statResult;
-        try {
-            switch (AppStatOps.valueOf(ops)) {
-                case start:
-                    statResult = appStat.start(evtAppStat);
-                    statResult.setResult(Result.result(ResultStatus.SUCCESS));
-                    break;
-                case stop:
-                    statResult = appStat.stop(evtAppStat);
-                    statResult.setResult(Result.result(ResultStatus.SUCCESS));
-                    break;
-                case restart:
-                    statResult = appStat.restart(evtAppStat);
-                    statResult.setResult(Result.result(ResultStatus.SUCCESS));
-                    break;
-                case stat:
-                    statResult = appStat.stat(evtAppStat);
-                    statResult.setResult(Result.result(ResultStatus.SUCCESS));
-                    break;
-                default:
-                    statResult = new EvtAppStatResult(appId, Machine.ID);
-                    String msg = String.format("应用状态操作类型 %s 不存在", ops);
-                    statResult.setResult(Result.result(ResultStatus.ERROR, msg));
-            }
-        } catch (Exception e) {
-            statResult = new EvtAppStatResult(appId, Machine.ID);
-            statResult.setResult(Result.result(ResultStatus.FAIL, ExceptionUtil.errorMsg(e)));
-        }
-
-        EventMessage evtMsg = EventMessage.evt(statResult);
-        try {
-            messageSender.send(Machine.ID, evtMsg);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}

agent/src/main/java/cn/reghao/bnt/agent/ws/event/handler/EvtDockerHandler.java

@@ -1,91 +0,0 @@
-package cn.reghao.bnt.agent.ws.event.handler;
-
-import cn.reghao.bnt.agent.AgentApp;
-import cn.reghao.bnt.common.docker.Docker;
-import cn.reghao.bnt.common.docker.DockerService;
-import cn.reghao.bnt.common.docker.model.DockerQuery;
-import cn.reghao.bnt.common.machine.Machine;
-import cn.reghao.bnt.common.msg.MessageSender;
-import cn.reghao.bnt.common.msg.constant.DockerOps;
-import cn.reghao.bnt.common.msg.event.EvtDockerOps;
-import cn.reghao.bnt.common.msg.event.EvtDockerOpsResult;
-import cn.reghao.jutil.jdk.event.handler.Handler;
-import cn.reghao.jutil.jdk.event.message.Event;
-import cn.reghao.jutil.jdk.event.message.EventMessage;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import static cn.reghao.bnt.common.msg.constant.DockerOps.containerRm;
-
-/**
- * @author reghao
- * @date 2025-12-16 20:03:03
- */
-@Slf4j
-public class EvtDockerHandler extends Handler {
-    private final MessageSender messageSender;
-    private final DockerService dockerService;
-
-    public EvtDockerHandler(MessageSender messageSender) {
-        this.messageSender = messageSender;
-        this.dockerService = new DockerService(AgentApp.docker);
-    }
-
-    @Override
-    public void handle(Event evt) {
-        EvtDockerOps evtDockerOps = (EvtDockerOps) evt;
-
-        String ops = evtDockerOps.getOps();
-        DockerQuery dockerQuery = evtDockerOps.getDockerQuery();
-        List<String> payload = evtDockerOps.getPayload();
-        EvtDockerOpsResult evtDockerOpsResult = new EvtDockerOpsResult(ops, Machine.ID);
-        List<Object> list = new ArrayList<>();
-        try {
-            switch (DockerOps.valueOf(ops)) {
-                case imageList -> {
-                    list.addAll(dockerService.getDockerImages(dockerQuery));
-                }
-                case imageRm -> {
-                    dockerService.rmDockerImages(evtDockerOps);
-                }
-                case imageRmUnused -> {
-                    dockerService.rmDockerImagesUnused();
-                }
-                case containerList -> list.addAll(dockerService.getDockerContainers());
-                case containerRm -> {
-                    payload.forEach(obj -> {
-                        String containerId = (String) obj;
-                        dockerService.handleDockerContainer(containerRm.name(), containerId);
-                    });
-                }
-                default -> {
-                    log.error("Unsupported Docker operation: {}", ops);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        int maxSize = 100;
-        List<Object> list0 = new ArrayList<>();
-        if (list.size() > maxSize) {
-            list0.addAll(list.subList(0, maxSize));
-        }
-
-        if (list0.isEmpty()) {
-            evtDockerOpsResult.setResultList(list);
-        } else {
-            evtDockerOpsResult.setResultList(list0);
-        }
-
-        EventMessage evtMsg = EventMessage.evt(evtDockerOpsResult);
-        try {
-            messageSender.send(Machine.ID, evtMsg);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}

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

@@ -0,0 +1,112 @@
+package cn.reghao.devops.agent;
+
+import ch.qos.logback.classic.Level;
+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.AgentConfig;
+import cn.reghao.devops.agent.service.FileReader;
+import cn.reghao.devops.agent.ws.WsClient;
+import cn.reghao.devops.common.agent.app.iface.AppDeploy;
+import cn.reghao.devops.common.agent.app.iface.AppStat;
+import cn.reghao.devops.common.agent.app.iface.impl.AppDeployImpl;
+import cn.reghao.devops.common.agent.app.iface.impl.AppStatImpl;
+import cn.reghao.devops.common.agent.app.iface.impl.DockerApp;
+import cn.reghao.devops.common.docker.Docker;
+import cn.reghao.devops.common.docker.DockerImpl;
+import cn.reghao.devops.common.msg.MessageSender;
+import cn.reghao.jutil.jdk.serializer.JsonConverter;
+import cn.reghao.jutil.jdk.string.StringRegexp;
+import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
+import cn.reghao.jutil.jdk.util.SingleInstance;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.ScheduledExecutorService;
+
+@Slf4j
+public class AgentApp {
+	public static MessageSender messageSender;
+	public static ScheduledExecutorService scheduler = ThreadPoolWrapper.scheduledThreadPool("heartbeat", 5);
+	public static Docker docker = new DockerImpl();
+
+	static void setLogLevel() {
+		LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
+		Logger rootLogger = loggerContext.getLogger("ROOT");
+		rootLogger.setLevel(Level.INFO);
+		//LoggerConfig.initLogger(Appenders.fileAppender());
+	}
+	
+	static boolean 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);
+			return true;
+		} catch (IOException e) {
+			log.error("尝试建立到 {}:{} 的 Socket 连接失败", host, port);
+		}
+		return false;
+	}
+
+	static MessageSender getMessageSender(AgentConfig agentConfig) {
+		DockerApp dockerApp = new DockerApp(docker);
+		AppDeploy appDeploy = new AppDeployImpl(dockerApp);
+		AppStat appStat = new AppStatImpl(dockerApp);
+		FileReader fileReader = new FileReader(agentConfig.getLogFiles());
+
+		if (tryConnect(agentConfig.getHost(), agentConfig.getPort())) {
+			messageSender = new WsClient(agentConfig, fileReader, appDeploy, appStat);
+			return messageSender;
+		}
+
+		return null;
+	}
+
+	static void shutdownGracefully() {
+		Runtime.getRuntime().addShutdownHook(new Thread(new ShutdownHook(), "main-shutdown-hook"));
+	}
+
+	static class ShutdownHook implements Runnable {
+		@Override
+		public void run() {
+			messageSender.close();
+			log.info("资源清理完成，结束 devops-agent...");
+		}
+	}
+
+	public static void main(String[] args) {
+		setLogLevel();
+		if (args.length != 1) {
+			log.error("必须指定配置文件...");
+			return;
+		}
+
+		String configFilePath = ConfigFile.configFilePath(args[0], AgentApp.class);
+		AgentConfig agentConfig = JsonConverter.jsonFileToObject(new File(configFilePath), AgentConfig.class);
+		messageSender = getMessageSender(agentConfig);
+		if (messageSender == null) {
+			log.error("没有可用的 MessageSender, Agent 结束运行, 具体信息请查看日志");
+			System.exit(-1);
+		} else {
+			messageSender.connect();
+		}
+
+		shutdownGracefully();
+		SingleInstance.onlyOne(60001);
+	}
+}

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

@@ -0,0 +1,22 @@
+package cn.reghao.devops.agent.config;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author reghao
+ * @date 2023-02-23 11:37:32
+ */
+@AllArgsConstructor
+@Setter
+@Getter
+public class AgentConfig {
+    private String protocol;
+    private String host;
+    private int port;
+    private boolean logstash;
+    private List<LogFile> logFiles;
+}

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

@@ -0,0 +1,53 @@
+package cn.reghao.devops.agent.config;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.File;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * @author reghao
+ * @date 2021-03-03 18:47:01
+ */
+@Slf4j
+public class ConfigFile {
+    public static String configFilePath(String arg, Class<?> clazz) {
+        String configFilePath = null;
+        File configFile = new File(arg);
+        if (!configFile.exists()) {
+            if (arg.startsWith("./")) {
+                String filename = arg.replace(".", "")
+                        .replace("/", "");
+                configFilePath = runningHome(clazz) + "/" + filename;
+            } else if (!arg.contains("/")) {
+                configFilePath = runningHome(clazz) + "/" + arg;
+            } else {
+                log.error("相对路径的配置文件必须以 ./configFile 或 configFile 形式指定...");
+            }
+        } else {
+            // 绝对路径
+            configFilePath = arg;
+        }
+        return configFilePath;
+    }
+    
+    /**
+     * jar 文件运行目录
+     *
+     * @param
+     * @return
+     * @date 2021-03-03 下午6:33
+     */
+    public static String runningHome(Class<?> clazz) {
+        URL url = clazz.getProtectionDomain().getCodeSource().getLocation();
+        String jarFilePath = URLDecoder.decode(url.getPath(), StandardCharsets.UTF_8);
+        if (jarFilePath.endsWith(".jar")) {
+            jarFilePath = jarFilePath.substring(0, jarFilePath.lastIndexOf("/") + 1);
+        }
+
+        File file = new File(jarFilePath);
+        return file.getAbsolutePath();
+    }
+}

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

@@ -0,0 +1,29 @@
+package cn.reghao.devops.agent.config;
+
+import lombok.AllArgsConstructor;
+
+/**
+ * @author reghao
+ * @date 2022-05-20 18:28:21
+ */
+@AllArgsConstructor
+public class LogFile {
+    private String domain;
+    private String filePath;
+
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+    public String getFilePath() {
+        return filePath;
+    }
+}

agent/src/main/java/cn/reghao/devops/agent/machine/MachineEvent.java

@@ -0,0 +1,112 @@
+package cn.reghao.devops.agent.machine;
+
+import cn.reghao.devops.agent.AgentApp;
+import cn.reghao.devops.agent.task.ImageCleanTask;
+import cn.reghao.devops.agent.task.ProcScanTask;
+import cn.reghao.devops.common.agent.app.iface.AppStat;
+import cn.reghao.devops.common.docker.Docker;
+import cn.reghao.devops.common.machine.Machine;
+import cn.reghao.devops.common.msg.MessageSender;
+import cn.reghao.devops.common.msg.event.EvtAgentHeartbeat;
+import cn.reghao.devops.common.msg.event.EvtAgentStart;
+import cn.reghao.devops.common.msg.event.EvtAppStatResult;
+import cn.reghao.jutil.jdk.event.message.EventMessage;
+import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author reghao
+ * @date 2021-09-03 09:22:42
+ */
+@Slf4j
+public class MachineEvent {
+    private final ScheduledExecutorService scheduler;
+    private ScheduledFuture<?> heartbeatFuture;
+    private final Machine machine;
+    private final AppStat appStat;
+    private final MessageSender messageSender;
+    private final Docker docker;
+    
+    public MachineEvent(MessageSender messageSender, Machine machine, AppStat appStat) {
+        this.messageSender = messageSender;
+        this.machine = machine;
+        this.appStat = appStat;
+        this.scheduler = AgentApp.scheduler;
+        this.docker = AgentApp.docker;
+    }
+
+    public void agentStart() {
+        EvtAgentStart evtAgentStart = machine.detail();
+        EventMessage eventMessage = EventMessage.evt(evtAgentStart);
+        pub(eventMessage);
+
+        try {
+            List<EvtAppStatResult> list = appStat.stat();
+            list.forEach(evtAppStatResult -> {
+                EventMessage eventMessage1 = EventMessage.evt(evtAppStatResult);
+                pub(eventMessage1);
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        startTask();
+        agentHeartbeat();
+    }
+
+    public void agentShutdown() {
+        ThreadPoolWrapper.shutdownScheduler(scheduler);
+        EvtAgentHeartbeat machineStat = machine.stat();
+        EventMessage eventMessage = EventMessage.evt(machineStat);
+        pub(eventMessage);
+    }
+
+    public void agentHeartbeat() {
+        // 每 60s 发送一次心跳
+        int heartbeatInterval = 60;
+        heartbeatFuture = scheduler.scheduleAtFixedRate(new Heartbeat(), 5, heartbeatInterval, TimeUnit.SECONDS);
+    }
+
+    public void pauseHeartbeat() {
+        if (!heartbeatFuture.isCancelled()) {
+            heartbeatFuture.cancel(true);
+        }
+    }
+
+    private void pub(EventMessage eventMessage) {
+        if (messageSender.isConnected()) {
+            try {
+                messageSender.send("", eventMessage);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        } else {
+            log.error("连接断开");
+        }
+    }
+
+    class Heartbeat implements Runnable {
+        @Override
+        public void run() {
+            EvtAgentHeartbeat machineStat = machine.stat();
+            EventMessage eventMessage = EventMessage.evt(machineStat);
+            pub(eventMessage);
+        }
+    }
+
+    public void startTask() {
+        ProcScanTask procScanTask = new ProcScanTask(messageSender, docker);
+        scheduler.schedule(procScanTask, 0, TimeUnit.MINUTES);
+        scheduler.scheduleAtFixedRate(procScanTask, 1, 8, TimeUnit.HOURS);
+
+        ImageCleanTask cleanTask = new ImageCleanTask(messageSender, docker);
+        scheduler.schedule(cleanTask, 1, TimeUnit.MINUTES);
+        scheduler.scheduleAtFixedRate(cleanTask, 2, 8, TimeUnit.HOURS);
+    }
+}

agent/src/main/java/cn/reghao/devops/agent/service/FileReader.java

@@ -0,0 +1,33 @@
+package cn.reghao.devops.agent.service;
+
+import cn.reghao.devops.agent.config.LogFile;
+import cn.reghao.devops.agent.ws.WsClient;
+import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+
+/**
+ * @author reghao
+ * @date 2022-05-20 16:23:34
+ */
+public class FileReader {
+    private final ExecutorService threadPool = ThreadPoolWrapper.threadPool("logstash");
+    private final List<LogFile> logFiles;
+
+    public FileReader(List<LogFile> logFiles) {
+        this.logFiles = logFiles;
+    }
+
+    public void start(WsClient wsClient) {
+        for (LogFile logFile: logFiles) {
+            String filePath = logFile.getFilePath();
+            try {
+                TailReader tailReader = new TailReader(filePath, wsClient);
+                threadPool.submit(tailReader);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}

agent/src/main/java/cn/reghao/devops/agent/service/TailReader.java

@@ -0,0 +1,103 @@
+package cn.reghao.devops.agent.service;
+
+import cn.reghao.devops.agent.ws.WsClient;
+import cn.reghao.jutil.jdk.io.TextFile;
+import cn.reghao.jutil.jdk.serializer.JsonConverter;
+import cn.reghao.jutil.jdk.web.log.NginxLog;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+/**
+ * @author reghao
+ * @date 2022-05-20 11:41:08
+ */
+@Slf4j
+public class TailReader implements Runnable {
+    private final String filePath;
+    private final RandomAccessFile raf;
+    private long pointer;
+    private final WsClient wsClient;
+    private final TextFile textFile;
+    private final String errorLogPath;
+
+    public TailReader(String filePath, WsClient wsClient) throws FileNotFoundException {
+        this.filePath = filePath;
+        this.raf  = new RandomAccessFile(filePath, "r");
+        this.pointer = 0;
+        this.wsClient = wsClient;
+        this.textFile = new TextFile();
+        this.errorLogPath = System.getProperty("user.dir") + "/error.log";
+    }
+
+    @Override
+    public void run() {
+        try {
+            File errLogFile = new File(errorLogPath);
+            if (!errLogFile.exists()) {
+                errLogFile.createNewFile();
+            }
+
+            while (!Thread.interrupted()) {
+                try {
+                    long length = raf.length();
+                    if (length > pointer) {
+                        raf.seek(pointer);
+                        String line = raf.readLine();
+                        while (line != null) {
+                            parseAndPersist(line, errLogFile);
+                            line = raf.readLine();
+                        }
+                        pointer = length;
+                    } else {
+                        log.info("已读取到 {} 文件末尾, 休眠 10s 后再尝试读取...", filePath);
+                        Thread.sleep(10_000);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } catch (Exception e ) {
+            e.printStackTrace();
+        }
+    }
+
+    Queue<NginxLog> queue = new LinkedBlockingQueue<>();
+    private void parseAndPersist(String line, File errLogFile) throws InterruptedException {
+        NginxLog nginxLog = null;
+        try {
+            nginxLog = JsonConverter.jsonToObject(line, NginxLog.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+            try {
+                textFile.append(errLogFile.getAbsolutePath(), List.of(line));
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+        }
+
+        if (nginxLog != null) {
+            if (!wsClient.isConnected()) {
+                log.info("websocket disconnected, wait 10s...");
+                Thread.sleep(10_000);
+            }
+
+            try {
+                NginxLog nginxLog1 = queue.poll();
+                while (nginxLog1 != null) {
+                    wsClient.send("", nginxLog);
+                    nginxLog1 = queue.poll();
+                }
+                wsClient.send("", nginxLog);
+            } catch (Exception e) {
+                queue.add(nginxLog);
+            }
+        }
+    }
+}

agent/src/main/java/cn/reghao/devops/agent/task/ImageCleanTask.java

@@ -0,0 +1,91 @@
+package cn.reghao.devops.agent.task;
+
+import cn.reghao.devops.common.docker.Docker;
+import cn.reghao.devops.common.machine.Machine;
+import cn.reghao.devops.common.msg.MessageSender;
+import cn.reghao.devops.common.msg.event.EvtTaskResult;
+import cn.reghao.jutil.jdk.event.message.EventMessage;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.Image;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 删除和运行容器依赖镜像不同 tag 的镜像
+ *
+ * @author reghao
+ * @date 2024-07-29 16:17:47
+ */
+@Slf4j
+public class ImageCleanTask implements Runnable {
+    private final String taskName;
+    private final MessageSender messageSender;
+    private final Docker docker;
+
+    public ImageCleanTask(MessageSender messageSender, Docker docker) {
+        this.taskName = this.getClass().getSimpleName();
+        this.messageSender = messageSender;
+        this.docker = docker;
+    }
+
+    @Override
+    public void run() {
+        String result = "exec ImageCleanTask";
+        log.info("{}", result);
+        EvtTaskResult evtTaskResult = new EvtTaskResult(Machine.ID, taskName, result);
+        try {
+            EventMessage evtMsg = EventMessage.evt(evtTaskResult);
+            messageSender.send("", evtMsg);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        Map<String, Image> map = docker.images().stream()
+                .collect(Collectors.toMap(Image::getId, image -> image));
+        List<InspectContainerResponse> list = docker.psAll();
+        // repo -> imageId
+        Map<String, String> repoMap = new HashMap<>();
+        for (InspectContainerResponse response : list) {
+            String imageId = response.getImageId();
+            Image image = map.get(imageId);
+            if (image != null) {
+                String[] repoTags = image.getRepoTags();
+                if (repoTags != null && repoTags.length > 1) {
+                    String repo = repoTags[0].split(":")[0];
+                    repoMap.put(repo, imageId);
+                }
+            }
+        }
+
+        map.values().forEach(image -> {
+            String imageId = image.getId();
+            String[] repoTags = image.getRepoTags();
+            if (repoTags != null && repoTags.length > 1) {
+                String repo = repoTags[0].split(":")[0];
+                String imageId0 = repoMap.get(repo);
+                if (imageId0 != null && !imageId.equals(imageId0)) {
+                    rmImage(image);
+                }
+            }
+        });
+    }
+
+    private void rmImage(Image image) {
+        try {
+            String imageId = image.getId();
+            docker.imageRm(imageId);
+            String[] tags = image.getRepoTags();
+            String result = String.format("delete image %s", tags);
+            EvtTaskResult evtTaskResult = new EvtTaskResult(Machine.ID, taskName, result);
+            EventMessage evtMsg = EventMessage.evt(evtTaskResult);
+            messageSender.send("", evtMsg);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

agent/src/main/java/cn/reghao/devops/agent/task/ProcScanTask.java

@@ -0,0 +1,133 @@
+package cn.reghao.devops.agent.task;
+
+import cn.reghao.devops.common.docker.Docker;
+import cn.reghao.devops.common.machine.Machine;
+import cn.reghao.devops.common.machine.model.SysProcess;
+import cn.reghao.devops.common.msg.MessageSender;
+import cn.reghao.devops.common.msg.event.EvtTaskResult;
+import cn.reghao.jutil.jdk.event.message.EventMessage;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import lombok.extern.slf4j.Slf4j;
+import oshi.SystemInfo;
+import oshi.software.os.InternetProtocolStats;
+import oshi.software.os.OSThread;
+import oshi.software.os.OperatingSystem;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author reghao
+ * @date 2025-12-17 14:30:36
+ */
+@Slf4j
+public class ProcScanTask implements Runnable {
+    private final String taskName;
+    private final MessageSender messageSender;
+    private final Docker docker;
+    private final OperatingSystem os;
+
+    public ProcScanTask(MessageSender messageSender, Docker docker) {
+        this.taskName = this.getClass().getSimpleName();
+        this.messageSender = messageSender;
+        this.docker = docker;
+        SystemInfo si = new SystemInfo();
+        this.os = si.getOperatingSystem();
+    }
+
+    @Override
+    public void run() {
+        String result = "exec ProcScanTask";
+        log.info("{}", result);
+        EvtTaskResult evtTaskResult = new EvtTaskResult(Machine.ID, taskName, result);
+        try {
+            EventMessage evtMsg = EventMessage.evt(evtTaskResult);
+            messageSender.send("", evtMsg);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        Map<Integer, SysProcess> procMap = os.getProcesses().stream()
+                .map(osProcess -> {
+                    int pid = osProcess.getProcessID();
+                    String name = osProcess.getName();
+                    int ppid = osProcess.getParentProcessID();
+                    String state = osProcess.getState().name();
+                    List<OSThread> osThreadList = osProcess.getThreadDetails();
+                    String cmdLine = osProcess.getCommandLine();
+                    long startTime = osProcess.getStartTime();
+                    String user = osProcess.getUser();
+                    return new SysProcess(pid, name, ppid, cmdLine, startTime, user);
+                })
+                .collect(Collectors.toMap(SysProcess::getPid, sp -> sp));
+
+        String state = InternetProtocolStats.TcpState.LISTEN.name();
+        os.getInternetProtocolStats().getConnections().forEach(ipConnection -> {
+            if (!ipConnection.getState().name().equals(state)) {
+                return;
+            }
+
+            String connType = ipConnection.getType();
+            int pid = ipConnection.getowningProcessId();
+            byte[] localAddress = ipConnection.getLocalAddress();
+            String localAddressStr = byte2Str(localAddress);
+            int localPort = ipConnection.getLocalPort();
+            byte[] remoteAddress = ipConnection.getForeignAddress();
+            int remotePort = ipConnection.getForeignPort();
+            String hostPort = String.format("%s:%s", localAddressStr, localPort);
+
+            SysProcess sysProcess = procMap.get(pid);
+            if (sysProcess != null) {
+                sysProcess.getHostPorts().add(hostPort);
+            }
+        });
+
+        List<InspectContainerResponse> inspectContainerResponseList = docker.psAll();
+        for (InspectContainerResponse response : inspectContainerResponseList) {
+            Boolean running = response.getState().getRunning();
+            if (running != null && running) {
+                Integer pid = response.getState().getPid();
+                if (pid == null) {
+                    continue;
+                }
+
+                String containerId = response.getId();
+                String appId = response.getName().replace("/", "");
+                SysProcess sysProcess = procMap.get(pid);
+                if (sysProcess != null) {
+                    sysProcess.setContainerId(containerId);
+                    sysProcess.setAppId(appId);
+                } else {
+                    log.error("docker process {} not exist", pid);
+                }
+            }
+        }
+
+        List<SysProcess> listenProcessList = procMap.values().stream()
+                .filter(sysProcess -> !sysProcess.getHostPorts().isEmpty())
+                .collect(Collectors.toList());
+        evtTaskResult = new EvtTaskResult(Machine.ID, taskName, listenProcessList);
+        try {
+            EventMessage evtMsg = EventMessage.evt(evtTaskResult);
+            messageSender.send("", evtMsg);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private String byte2Str(byte[] buffer) {
+        String address = "-1.-1.-1.-1";
+        try {
+            InetAddress inetAddress = InetAddress.getByAddress(buffer);
+            address = inetAddress.getHostAddress();
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+
+        return address;
+    }
+}

agent/src/main/java/cn/reghao/devops/agent/ws/WebSocketListenerImpl.java

@@ -0,0 +1,102 @@
+package cn.reghao.devops.agent.ws;
+
+import cn.reghao.devops.agent.ws.event.EventCenter;
+import cn.reghao.devops.agent.machine.MachineEvent;
+import cn.reghao.jutil.jdk.event.message.EventMessage;
+import cn.reghao.jutil.jdk.serializer.JdkSerializer;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.Response;
+import okhttp3.WebSocket;
+import okhttp3.WebSocketListener;
+import okio.ByteString;
+
+/**
+ * @author reghao
+ * @date 2023-02-23 09:26:50
+ */
+@Slf4j
+public class WebSocketListenerImpl extends WebSocketListener {
+    private final WsClient wsClient;
+    private final EventCenter eventCenter;
+    private final MachineEvent machineEvent;
+    private final boolean logstash;
+
+    public WebSocketListenerImpl(WsClient wsClient, boolean logstash, EventCenter eventCenter, MachineEvent machineEvent) {
+        this.wsClient = wsClient;
+        this.logstash = logstash;
+        this.eventCenter = eventCenter;
+        this.machineEvent = machineEvent;
+    }
+
+    @Override
+    public void onOpen(WebSocket webSocket, Response response) {
+        log.info("WebSocket 连接成功");
+        wsClient.setConnected(true);
+        wsClient.resetRetryCount();
+
+        if (!logstash) {
+            machineEvent.agentStart();
+        }
+    }
+
+    @Override
+    public void onClosing(WebSocket webSocket, int code, String reason) {
+        log.error("WebSocket 连接正在关闭 -> {} - {}", code, reason);
+        wsClient.setConnected(false);
+
+        if (!logstash) {
+            machineEvent.pauseHeartbeat();
+        }
+
+        if (wsClient.isRetry()) {
+            reconnect();
+        }
+    }
+
+    @Override
+    public void onClosed(WebSocket webSocket, int code, String reason) {
+        log.error("WebSocket 连接关闭成功 -> {} - {}", code, reason);
+        wsClient.setConnected(false);
+    }
+
+    @Override
+    public void onFailure(WebSocket webSocket, Throwable throwable, Response response) {
+        log.info("WebSocket 异常事件: {}", throwable.getMessage());
+        wsClient.setConnected(false);
+        if (wsClient.isRetry()) {
+            reconnect();
+        }
+    }
+
+    private void reconnect() {
+        log.info("WebSocket 重连");
+        try {
+            if (wsClient.getRetryCount() > 10) {
+                log.info("WebSocket 重连超过 10 次, 休眠 1 分钟后再尝试");
+                Thread.sleep(60_000);
+                wsClient.resetRetryCount();
+            } else {
+                log.info("休眠 10s 后再尝试重连");
+                Thread.sleep(10_000);
+            }
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        wsClient.close0();
+        wsClient.retryCountIncr();
+        wsClient.connect();
+    }
+
+    @Override
+    public void onMessage(WebSocket webSocket, String text) {
+    }
+
+    @Override
+    public void onMessage(WebSocket webSocket, ByteString bytes) {
+        Object object = JdkSerializer.deserialize(bytes.toByteArray());
+        if (object instanceof EventMessage) {
+            EventMessage eventMessage = (EventMessage) object;
+            eventCenter.dispatch(eventMessage);
+        }
+    }
+}

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

@@ -0,0 +1,123 @@
+package cn.reghao.devops.agent.ws;
+
+import cn.reghao.devops.agent.config.AgentConfig;
+import cn.reghao.devops.agent.service.FileReader;
+import cn.reghao.devops.agent.ws.event.EventCenter;
+import cn.reghao.devops.agent.machine.MachineEvent;
+import cn.reghao.devops.common.agent.app.iface.AppDeploy;
+import cn.reghao.devops.common.agent.app.iface.AppStat;
+import cn.reghao.devops.common.machine.Machine;
+import cn.reghao.devops.common.msg.MessageSender;
+import cn.reghao.jutil.jdk.serializer.JdkSerializer;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.WebSocket;
+import okhttp3.WebSocketListener;
+import okio.ByteString;
+
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * @author reghao
+ * @date 2023-02-23 09:26:50
+ */
+public class WsClient implements MessageSender {
+    private final String url;
+    private WebSocket webSocket;
+    private boolean connected;
+    private final WebSocketListener webSocketListener;
+    private boolean retry;
+    private int retryCount;
+
+    public WsClient(AgentConfig agentConfig, FileReader fileReader, AppDeploy appDeploy, AppStat appStat) {
+        String protocol = agentConfig.getProtocol();
+        String host = agentConfig.getHost();
+        int port = agentConfig.getPort();
+        String app = "agent";
+        String host1 = "127.0.0.1";
+        this.url = String.format("%s://%s:%s/bgws/agent?token=%s&app=%s&host=%s", protocol, host, port, Machine.ID, app, host1);
+        boolean logstash = agentConfig.isLogstash();
+
+        EventCenter eventCenter = new EventCenter(this, appDeploy, appStat);
+        MachineEvent machineEvent = new MachineEvent(this, new Machine(), appStat);
+        this.webSocketListener = new WebSocketListenerImpl(this, logstash, eventCenter, machineEvent);
+        this.retry = true;
+        this.retryCount = 0;
+
+        if (logstash) {
+            fileReader.start(this);
+        }
+        Logger.getLogger(OkHttpClient.class.getName()).setLevel(Level.FINE);
+    }
+
+    public void setRetry(boolean retry) {
+        this.retry = retry;
+    }
+
+    public boolean isRetry() {
+        return retry;
+    }
+
+    public void retryCountIncr() {
+        this.retryCount += 1;
+    }
+
+    public void resetRetryCount() {
+        this.retryCount = 0;
+    }
+
+    public int getRetryCount() {
+        return retryCount;
+    }
+
+    @Override
+    public void connect() {
+        Request request = new Request.Builder()
+                .url(url)
+                .header("Authorization", "Bearer " + Machine.ID)
+                .build();
+
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .pingInterval(10, TimeUnit.SECONDS)
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .build();
+
+        if (this.webSocket != null) {
+            this.webSocket.cancel();
+        }
+
+
+        this.webSocket = okHttpClient.newWebSocket(request, webSocketListener);
+    }
+
+    @Override
+    public void setConnected(boolean status) {
+        this.connected = status;
+    }
+
+    @Override
+    public boolean isConnected() {
+        return connected;
+    }
+
+    @Override
+    public void send(String dest, Object message) {
+        if (isConnected()) {
+            byte[] bytes = JdkSerializer.serialize(message);
+            webSocket.send(ByteString.of(bytes));
+        }
+    }
+
+    public void close() {
+        setRetry(false);
+        webSocket.close(1000, "Client Close Connection");
+    }
+
+    public void close0() {
+        webSocket.close(1000, "Client Close Connection");
+    }
+}

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

@@ -0,0 +1,60 @@
+package cn.reghao.devops.agent.ws.event;
+
+import cn.reghao.devops.agent.ws.event.handler.EvtAppDeployHandler;
+import cn.reghao.devops.agent.ws.event.handler.EvtAppStatHandler;
+import cn.reghao.devops.agent.ws.event.handler.EvtDockerHandler;
+import cn.reghao.devops.common.agent.app.iface.AppDeploy;
+import cn.reghao.devops.common.agent.app.iface.AppStat;
+import cn.reghao.devops.common.msg.MessageSender;
+import cn.reghao.devops.common.msg.event.EvtAppDeploy;
+import cn.reghao.devops.common.msg.event.EvtAppStat;
+import cn.reghao.devops.common.msg.event.EvtDockerOps;
+import cn.reghao.jutil.jdk.event.message.Event;
+import cn.reghao.jutil.jdk.event.message.EventMessage;
+import cn.reghao.jutil.jdk.event.router.EventDispatcher;
+import cn.reghao.jutil.jdk.exception.ExceptionUtil;
+import lombok.extern.slf4j.Slf4j;
+
+import java.lang.management.ManagementFactory;
+
+/**
+ * @author reghao
+ * @date 2023-02-23 09:18:11
+ */
+@Slf4j
+public class EventCenter {
+    private final long startTime;
+    private final EventDispatcher dispatcher;
+
+    public EventCenter(MessageSender messageSender, AppDeploy appDeploy, AppStat appStat) {
+        this.startTime = ManagementFactory.getRuntimeMXBean().getStartTime();
+        this.dispatcher = new EventDispatcher();
+        initDispatcher(messageSender, appDeploy, appStat);
+    }
+
+    private void initDispatcher(MessageSender messageSender, AppDeploy appDeploy, AppStat appStat) {
+        dispatcher.register(EvtAppDeploy.class, new EvtAppDeployHandler(messageSender, appDeploy));
+        dispatcher.register(EvtAppStat.class, new EvtAppStatHandler(messageSender, appStat));
+        dispatcher.register(EvtDockerOps.class, new EvtDockerHandler(messageSender));
+    }
+
+    public void dispatch(EventMessage eventMessage) {
+        try {
+            long sendTime = eventMessage.getSendTime();
+            if (sendTime < startTime) {
+                log.info("忽略 agent 启动前 mgr 发送的事件...");
+                return;
+            }
+
+            Event event = eventMessage.getEvent();
+            dispatcher.dispatch(event);
+        } catch (Exception e) {
+            String errMsg = e.getMessage();
+            if (e instanceof NullPointerException) {
+                errMsg = ExceptionUtil.stackTrace(e);
+            }
+
+            log.error("处理消息发生异常: {}", errMsg);
+        }
+    }
+}

agent/src/main/java/cn/reghao/devops/agent/ws/event/handler/EvtAppDeployHandler.java

@@ -0,0 +1,51 @@
+package cn.reghao.devops.agent.ws.event.handler;
+
+import cn.reghao.devops.common.agent.app.iface.AppDeploy;
+import cn.reghao.devops.common.machine.Machine;
+import cn.reghao.devops.common.msg.MessageSender;
+import cn.reghao.devops.common.msg.event.EvtAppDeploy;
+import cn.reghao.devops.common.msg.event.EvtAppStatResult;
+import cn.reghao.jutil.jdk.event.handler.Handler;
+import cn.reghao.jutil.jdk.event.message.Event;
+import cn.reghao.jutil.jdk.event.message.EventMessage;
+import cn.reghao.jutil.jdk.exception.ExceptionUtil;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
+
+import java.io.IOException;
+
+/**
+ * @author reghao
+ * @date 2023-03-01 10:52:04
+ */
+public class EvtAppDeployHandler extends Handler {
+    private final MessageSender messageSender;
+    private final AppDeploy appDeploy;
+
+    public EvtAppDeployHandler(MessageSender messageSender, AppDeploy appDeploy) {
+        this.messageSender = messageSender;
+        this.appDeploy = appDeploy;
+    }
+
+    @Override
+    public void handle(Event evt) {
+        EvtAppDeploy deployParam = (EvtAppDeploy) evt;
+        String appId = deployParam.getAppId();
+        EvtAppStatResult statResult;
+        try {
+            statResult = appDeploy.deploy(deployParam);
+            statResult.setResult(Result.result(ResultStatus.SUCCESS));
+        } catch (Exception e) {
+            statResult = new EvtAppStatResult(appId, Machine.ID);
+            statResult.setResult(Result.result(ResultStatus.FAIL, ExceptionUtil.errorMsg(e)));
+        }
+
+        statResult.setDeploy(true);
+        EventMessage evtMsg = EventMessage.evt(statResult);
+        try {
+            messageSender.send("", evtMsg);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}

agent/src/main/java/cn/reghao/devops/agent/ws/event/handler/EvtAppStatHandler.java

@@ -0,0 +1,73 @@
+package cn.reghao.devops.agent.ws.event.handler;
+
+import cn.reghao.devops.common.agent.app.iface.AppStat;
+import cn.reghao.devops.common.machine.Machine;
+import cn.reghao.devops.common.msg.MessageSender;
+import cn.reghao.devops.common.msg.constant.AppStatOps;
+import cn.reghao.devops.common.msg.event.EvtAppStat;
+import cn.reghao.devops.common.msg.event.EvtAppStatResult;
+import cn.reghao.jutil.jdk.event.handler.Handler;
+import cn.reghao.jutil.jdk.event.message.Event;
+import cn.reghao.jutil.jdk.event.message.EventMessage;
+import cn.reghao.jutil.jdk.exception.ExceptionUtil;
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
+
+import java.io.IOException;
+
+/**
+ * @author reghao
+ * @date 2023-03-01 10:21:40
+ */
+public class EvtAppStatHandler extends Handler {
+    private final MessageSender messageSender;
+    private final AppStat appStat;
+
+    public EvtAppStatHandler(MessageSender messageSender, AppStat appStat) {
+        this.messageSender = messageSender;
+        this.appStat = appStat;
+    }
+
+    @Override
+    public void handle(Event evt) {
+        EvtAppStat evtAppStat = (EvtAppStat) evt;
+        String appId = evtAppStat.getAppId();
+        String ops = evtAppStat.getOps();
+
+        EvtAppStatResult statResult;
+        try {
+            switch (AppStatOps.valueOf(ops)) {
+                case start:
+                    statResult = appStat.start(evtAppStat);
+                    statResult.setResult(Result.result(ResultStatus.SUCCESS));
+                    break;
+                case stop:
+                    statResult = appStat.stop(evtAppStat);
+                    statResult.setResult(Result.result(ResultStatus.SUCCESS));
+                    break;
+                case restart:
+                    statResult = appStat.restart(evtAppStat);
+                    statResult.setResult(Result.result(ResultStatus.SUCCESS));
+                    break;
+                case stat:
+                    statResult = appStat.stat(evtAppStat);
+                    statResult.setResult(Result.result(ResultStatus.SUCCESS));
+                    break;
+                default:
+                    statResult = new EvtAppStatResult(appId, Machine.ID);
+                    String msg = String.format("应用状态操作类型 %s 不存在", ops);
+                    statResult.setResult(Result.result(ResultStatus.ERROR, msg));
+            }
+        } catch (Exception e) {
+            statResult = new EvtAppStatResult(appId, Machine.ID);
+            statResult.setResult(Result.result(ResultStatus.FAIL, ExceptionUtil.errorMsg(e)));
+        }
+
+        EventMessage evtMsg = EventMessage.evt(statResult);
+        try {
+            messageSender.send(Machine.ID, evtMsg);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}

agent/src/main/java/cn/reghao/devops/agent/ws/event/handler/EvtDockerHandler.java

@@ -0,0 +1,90 @@
+package cn.reghao.devops.agent.ws.event.handler;
+
+import cn.reghao.devops.agent.AgentApp;
+import cn.reghao.devops.common.docker.DockerService;
+import cn.reghao.devops.common.docker.model.DockerQuery;
+import cn.reghao.devops.common.machine.Machine;
+import cn.reghao.devops.common.msg.MessageSender;
+import cn.reghao.devops.common.msg.constant.DockerOps;
+import cn.reghao.devops.common.msg.event.EvtDockerOps;
+import cn.reghao.devops.common.msg.event.EvtDockerOpsResult;
+import cn.reghao.jutil.jdk.event.handler.Handler;
+import cn.reghao.jutil.jdk.event.message.Event;
+import cn.reghao.jutil.jdk.event.message.EventMessage;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static cn.reghao.devops.common.msg.constant.DockerOps.containerRm;
+
+/**
+ * @author reghao
+ * @date 2025-12-16 20:03:03
+ */
+@Slf4j
+public class EvtDockerHandler extends Handler {
+    private final MessageSender messageSender;
+    private final DockerService dockerService;
+
+    public EvtDockerHandler(MessageSender messageSender) {
+        this.messageSender = messageSender;
+        this.dockerService = new DockerService(AgentApp.docker);
+    }
+
+    @Override
+    public void handle(Event evt) {
+        EvtDockerOps evtDockerOps = (EvtDockerOps) evt;
+
+        String ops = evtDockerOps.getOps();
+        DockerQuery dockerQuery = evtDockerOps.getDockerQuery();
+        List<String> payload = evtDockerOps.getPayload();
+        EvtDockerOpsResult evtDockerOpsResult = new EvtDockerOpsResult(ops, Machine.ID);
+        List<Object> list = new ArrayList<>();
+        try {
+            switch (DockerOps.valueOf(ops)) {
+                case imageList -> {
+                    list.addAll(dockerService.getDockerImages(dockerQuery));
+                }
+                case imageRm -> {
+                    dockerService.rmDockerImages(evtDockerOps);
+                }
+                case imageRmUnused -> {
+                    dockerService.rmDockerImagesUnused();
+                }
+                case containerList -> list.addAll(dockerService.getDockerContainers());
+                case containerRm -> {
+                    payload.forEach(obj -> {
+                        String containerId = (String) obj;
+                        dockerService.handleDockerContainer(containerRm.name(), containerId);
+                    });
+                }
+                default -> {
+                    log.error("Unsupported Docker operation: {}", ops);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        int maxSize = 100;
+        List<Object> list0 = new ArrayList<>();
+        if (list.size() > maxSize) {
+            list0.addAll(list.subList(0, maxSize));
+        }
+
+        if (list0.isEmpty()) {
+            evtDockerOpsResult.setResultList(list);
+        } else {
+            evtDockerOpsResult.setResultList(list0);
+        }
+
+        EventMessage evtMsg = EventMessage.evt(evtDockerOpsResult);
+        try {
+            messageSender.send(Machine.ID, evtMsg);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}

agent/src/test/java/AgentTest.java

@@ -1,7 +1,7 @@
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
-import cn.reghao.bnt.common.machine.model.NetworkCard;
+import cn.reghao.devops.common.machine.model.NetworkCard;
 import cn.reghao.jutil.jdk.converter.ByteConverter;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;

agent/src/test/java/WebSocketClient.java

@@ -1,4 +1,4 @@
-import cn.reghao.bnt.common.machine.Machine;
+import cn.reghao.devops.common.machine.Machine;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

bin/logstash/devopslogstash.json

@@ -1,9 +0,0 @@
-{
-  "wsUrl": "ws://localhost:4030/bgws/log/push",
-  "logFiles": [
-    {
-      "domain": "reghao.cn",
-      "filePath": "/home/reghao/data/log/reghao.cn.access.log"
-    }
-  ]
-}

bin/logstash/shutdown.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-app_name='devops-logstash.jar'
-pid=`ps -ef | grep ${app_name} | grep -v grep | awk '{print $2}'`
-if [[ -z ${pid} ]];
-then
-  echo ${app_name}" killed"
-else
-  echo "kill "${app_name}" with pid "${pid}
-  kill -15 ${pid}
-fi

bin/logstash/start.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-app_dir=`pwd`
-app_name='devops-logstash.jar'
-java -jar ${app_dir}"/"${app_name} ${app_dir}/devopslogstash.json > console.log 2>&1 &

bin/mgr/bntweb.yml

@@ -1,5 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:mysql://127.0.0.1/bnt_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
-    username: dev
-    password: 123456

bin/mgr/devopsmgr.yml

@@ -0,0 +1,5 @@
+spring:
+  datasource:
+    url: jdbc:mysql://127.0.0.1/devops_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
+    username: dev
+    password: 123456

bin/mgr/restart.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-app_name='bntweb.jar'
+app_name='devopsmgr.jar'
 pid=`ps -ef | grep ${app_name} | grep -v grep | awk '{print $2}'`
 if [[ -z ${pid} ]];
 then
@@ -14,8 +14,8 @@ echo 'sleep 10s to wait process shutdown...'
 sleep 10
 app_dir=`pwd`
 # 使用 mvn clean package -Dmaven.test.skip -Ptest 生成 jar
-# 运行时加载 application.yml 和 bntweb.yml 两个配置文件, 分别位于 classpath 和文件系统路径
-# 外部指定的 bntweb.yml 文件会覆盖 resources/application-test.yml 文件
+# 运行时加载 application.yml 和 devopsmgr.yml 两个配置文件, 分别位于 classpath 和文件系统路径
+# 外部指定的 devopsmgr.yml 文件会覆盖 resources/application-test.yml 文件
 java -jar ${app_dir}"/"${app_name} \
---spring.config.location=classpath:/application.yml,file:${app_dir}/bntweb.yml \
+--spring.config.location=classpath:/application.yml,file:${app_dir}/devopsmgr.yml \
 > console.log 2>&1 &

bin/mgr/shutdown.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-app_name='bntweb.jar'
+app_name='devopsmgr.jar'
 pid=`ps -ef | grep ${app_name} | grep -v grep | awk '{print $2}'`
 if [[ -z ${pid} ]];
 then

bin/mgr/start.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
 app_dir=`pwd`
-app_name='bntweb.jar'
+app_name='devopsmgr.jar'
 
 # 使用 mvn clean package -Dmaven.test.skip -Ptest 生成 jar
-# 运行时加载 application.yml 和 bntweb.yml 两个配置文件, 分别位于 classpath 和文件系统路径
-# 外部指定的 bntweb.yml 文件会覆盖 resources/application-test.yml 文件
+# 运行时加载 application.yml 和 devopsmgr.yml 两个配置文件, 分别位于 classpath 和文件系统路径
+# 外部指定的 devopsmgr.yml 文件会覆盖 resources/application-test.yml 文件
 java -jar ${app_dir}"/"${app_name} \
---spring.config.location=classpath:/application.yml,file:${app_dir}/bntweb.yml \
+--spring.config.location=classpath:/application.yml,file:${app_dir}/devopsmgr.yml \
 > console.log 2>&1 &

bin/mgr/start1.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 app_dir=`pwd`
-app_name='bntweb.jar'
+app_name='devopsmgr.jar'
 java -jar ${app_dir}"/"${app_name} > console.log 2>&1 &

common/pom.xml

@@ -3,8 +3,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>bnt</artifactId>
-        <groupId>cn.reghao.bnt</groupId>
+        <artifactId>devops</artifactId>
+        <groupId>cn.reghao.devops</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

common/src/main/java/cn/reghao/bnt/common/agent/app/dto/AppInfo.java

@@ -1,18 +0,0 @@
-package cn.reghao.bnt.common.agent.app.dto;
-
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2023-03-08 10:01:20
- */
-@Getter
-public class AppInfo {
-    private final String packType;
-    private final String appId;
-
-    public AppInfo(String packType, String appId) {
-        this.packType = packType;
-        this.appId = appId;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/agent/app/iface/AppDeploy.java

@@ -1,12 +0,0 @@
-package cn.reghao.bnt.common.agent.app.iface;
-
-import cn.reghao.bnt.common.msg.event.EvtAppDeploy;
-import cn.reghao.bnt.common.msg.event.EvtAppStatResult;
-
-/**
- * @author reghao
- * @date 2023-03-06 16:21:07
- */
-public interface AppDeploy {
-    EvtAppStatResult deploy(EvtAppDeploy deployParam) throws Exception;
-}

common/src/main/java/cn/reghao/bnt/common/agent/app/iface/AppStat.java

@@ -1,20 +0,0 @@
-package cn.reghao.bnt.common.agent.app.iface;
-
-import cn.reghao.bnt.common.msg.event.EvtAppStat;
-import cn.reghao.bnt.common.msg.event.EvtAppStatResult;
-
-import java.util.List;
-
-/**
- * 应用状态管理
- *
- * @author reghao
- * @date 2023-03-06 15:22:48
- */
-public interface AppStat {
-    EvtAppStatResult start(EvtAppStat evtAppStat) throws Exception;
-    EvtAppStatResult stop(EvtAppStat evtAppStat) throws Exception;
-    EvtAppStatResult restart(EvtAppStat evtAppStat) throws Exception;
-    EvtAppStatResult stat(EvtAppStat evtAppStat) throws Exception;
-    List<EvtAppStatResult> stat() throws Exception;
-}

common/src/main/java/cn/reghao/bnt/common/agent/app/iface/impl/AppDeployImpl.java

@@ -1,28 +0,0 @@
-package cn.reghao.bnt.common.agent.app.iface.impl;
-
-import cn.reghao.bnt.common.agent.app.iface.AppDeploy;
-import cn.reghao.bnt.common.msg.constant.PackType;
-import cn.reghao.bnt.common.msg.event.EvtAppDeploy;
-import cn.reghao.bnt.common.msg.event.EvtAppStatResult;
-
-/**
- * @author reghao
- * @date 2023-03-06 16:21:30
- */
-public class AppDeployImpl implements AppDeploy {
-    private final DockerApp dockerApp;
-
-    public AppDeployImpl(DockerApp dockerApp) {
-        this.dockerApp = dockerApp;
-    }
-
-    @Override
-    public EvtAppStatResult deploy(EvtAppDeploy deployParam) throws Exception {
-        String packType = deployParam.getPackType();
-        if (packType.equals(PackType.docker.name())) {
-            return dockerApp.deploy(deployParam);
-        } else {
-            throw new Exception("zip 打包没有实现");
-        }
-    }
-}

common/src/main/java/cn/reghao/bnt/common/agent/app/iface/impl/AppStatImpl.java

@@ -1,73 +0,0 @@
-package cn.reghao.bnt.common.agent.app.iface.impl;
-
-import cn.reghao.bnt.common.agent.app.iface.AppStat;
-import cn.reghao.bnt.common.msg.constant.PackType;
-import cn.reghao.bnt.common.msg.event.EvtAppStat;
-import cn.reghao.bnt.common.msg.event.EvtAppStatResult;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2023-03-06 16:19:24
- */
-public class AppStatImpl implements AppStat {
-    private final DockerApp dockerApp;
-
-    public AppStatImpl(DockerApp dockerApp) {
-        this.dockerApp = dockerApp;
-    }
-
-    @Override
-    public EvtAppStatResult start(EvtAppStat evtAppStat) throws Exception {
-        String packType = evtAppStat.getPackType();
-        String appId = evtAppStat.getAppId();
-
-        if (packType.equals(PackType.docker.name())) {
-            return dockerApp.start(appId);
-        } else {
-            throw new Exception("zip 打包没有实现");
-        }
-    }
-
-    @Override
-    public EvtAppStatResult stop(EvtAppStat evtAppStat) throws Exception {
-        String packType = evtAppStat.getPackType();
-        String appId = evtAppStat.getAppId();
-
-        if (packType.equals(PackType.docker.name())) {
-            return dockerApp.stop(appId);
-        } else {
-            throw new Exception("zip 打包没有实现");
-        }
-    }
-
-    @Override
-    public EvtAppStatResult restart(EvtAppStat evtAppStat) throws Exception {
-        String packType = evtAppStat.getPackType();
-        String appId = evtAppStat.getAppId();
-
-        if (packType.equals(PackType.docker.name())) {
-            return dockerApp.restart(appId);
-        } else {
-            throw new Exception("zip 打包没有实现");
-        }
-    }
-
-    @Override
-    public EvtAppStatResult stat(EvtAppStat evtAppStat) throws Exception {
-        String packType = evtAppStat.getPackType();
-        String appId = evtAppStat.getAppId();
-
-        if (packType.equals(PackType.docker.name())) {
-            return dockerApp.stat(appId);
-        } else {
-            throw new Exception("zip 打包没有实现");
-        }
-    }
-
-    @Override
-    public List<EvtAppStatResult> stat() throws Exception {
-        return dockerApp.stat();
-    }
-}

common/src/main/java/cn/reghao/bnt/common/agent/app/iface/impl/DockerApp.java

@@ -1,122 +0,0 @@
-package cn.reghao.bnt.common.agent.app.iface.impl;
-
-import cn.reghao.bnt.common.docker.Docker;
-import cn.reghao.bnt.common.docker.DockerImpl;
-import cn.reghao.bnt.common.docker.model.Config;
-import cn.reghao.bnt.common.docker.model.DockerAuth;
-import cn.reghao.bnt.common.docker.model.HostConfig;
-import cn.reghao.bnt.common.machine.Machine;
-import cn.reghao.bnt.common.msg.constant.NodeStatus;
-import cn.reghao.bnt.common.msg.event.EvtAppDeploy;
-import cn.reghao.bnt.common.msg.event.EvtAppStatResult;
-import cn.reghao.jutil.jdk.web.result.NotAvailable;
-import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.jutil.jdk.serializer.JsonConverter;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @author reghao
- * @date 2023-03-06 15:26:22
- */
-public class DockerApp {
-    private Map<String, Docker> map = new HashMap<>();
-
-    public DockerApp(Docker docker) {
-        this.map.put("noAuth", docker);
-    }
-
-    public EvtAppStatResult deploy(EvtAppDeploy deployParam) throws Exception {
-        String appId = deployParam.getAppId();
-        String packagePath = deployParam.getPackagePath();
-        Config containerConfig = JsonConverter.jsonToObject(deployParam.getStartScript(), Config.class);
-        if (containerConfig == null) {
-            containerConfig = new Config(packagePath);
-        } else {
-            containerConfig.setImage(packagePath);
-            if (containerConfig.getHostConfig() == null) {
-                containerConfig.setHostConfig(new HostConfig());
-            }
-        }
-
-        Docker docker;
-        DockerAuth dockerAuth = deployParam.getDockerAuth();
-        if (dockerAuth != null) {
-            String registryUrl = dockerAuth.getRegistryUrl();
-            docker = map.get(registryUrl);
-            if (docker == null) {
-                // TODO DockerAuth 修改后 map 中的 Docker 实例无效
-                docker = new DockerImpl(dockerAuth);
-                map.put(registryUrl, docker);
-            }
-        } else {
-            docker = map.get("noAuth");
-        }
-        docker.pull(packagePath);
-        InspectContainerResponse containerInfo = docker.createAndRun(appId, containerConfig);
-        return getStat(appId, containerInfo);
-    }
-
-    public EvtAppStatResult start(String appId) throws Exception {
-        Docker docker = map.get("noAuth");
-        InspectContainerResponse containerInfo = docker.start(appId);
-        return getStat(appId, containerInfo);
-    }
-
-    public EvtAppStatResult stop(String appId) throws Exception {
-        Docker docker = map.get("noAuth");
-        InspectContainerResponse containerInfo = docker.stop(appId);
-        return getStat(appId, containerInfo);
-    }
-
-    public EvtAppStatResult restart(String appId) throws Exception {
-        Docker docker = map.get("noAuth");
-        InspectContainerResponse containerInfo = docker.restart(appId);
-        return getStat(appId, containerInfo);
-    }
-
-    public EvtAppStatResult stat(String appId) throws Exception {
-        Docker docker = map.get("noAuth");
-        InspectContainerResponse containerInfo = docker.inspectContainer(appId);
-        return getStat(appId, containerInfo);
-    }
-
-    public List<EvtAppStatResult> stat() throws Exception {
-        Docker docker = map.get("noAuth");
-        List<InspectContainerResponse> list = docker.psAll();
-        return list.stream().map(response -> {
-            String containerName = response.getName();
-            String appId = containerName.replace("/", "");
-            return getStat(appId, response);
-        }).collect(Collectors.toList());
-    }
-
-    private EvtAppStatResult getStat(String appId, InspectContainerResponse containerInfo) {
-        EvtAppStatResult appStatResult = new EvtAppStatResult(appId, Machine.ID);
-        String image = containerInfo.getConfig().getImage();
-        if (image != null && image.contains(":")) {
-            appStatResult.setCommitId(image.split(":")[1]);
-        } else {
-            appStatResult.setCommitId(NotAvailable.na.getDesc());
-        }
-
-        InspectContainerResponse.ContainerState state = containerInfo.getState();
-        if (state == null || Boolean.FALSE.equals(state.getRunning())) {
-            //appStatResult.setStatus(NodeStatus.Offline.name());
-            appStatResult.setStartTime(null);
-            appStatResult.setPid(-1);
-        } else {
-            String startedAt = state.getStartedAt();
-            //appStatResult.setStatus(NodeStatus.Online.name());
-            appStatResult.setRunning(true);
-            appStatResult.setStartTime(DateTimeConverter.localDateTime(startedAt));
-            appStatResult.setPid(state.getPidLong().intValue());
-        }
-
-        return appStatResult;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/docker/Docker.java

@@ -1,34 +0,0 @@
-package cn.reghao.bnt.common.docker;
-
-import cn.reghao.bnt.common.docker.model.Config;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.Image;
-import com.github.dockerjava.api.model.Version;
-
-import java.util.List;
-
-/**
- * Docker 客户端
- *
- * @author reghao
- * @date 2021-10-27 04:17:38
- */
-public interface Docker {
-    void auth();
-    Version version();
-    void build(String repoTag, String compileHome, String dockerfileContent) throws Exception;
-    void push(String image) throws Exception;
-    void pull(String repoTag) throws Exception;
-    void stopAndDelete(String containerName) throws Exception;
-    InspectContainerResponse createAndRun(String containerName, Config containerConfig) throws Exception;
-    void runAndRm(Config containerConfig) throws Exception;
-    InspectContainerResponse start(String containerName);
-    InspectContainerResponse stop(String containerName);
-    InspectContainerResponse restart(String containerName);
-    InspectContainerResponse inspectContainer(String containerName);
-    List<Image> images();
-    void imageRm(String imageId);
-    void rm(String containerId);
-    List<InspectContainerResponse> psAll();
-    InspectContainerResponse ps(String containerName);
-}

common/src/main/java/cn/reghao/bnt/common/docker/DockerImpl.java

@@ -1,452 +0,0 @@
-package cn.reghao.bnt.common.docker;
-
-import cn.reghao.bnt.common.docker.model.DockerAuth;
-import cn.reghao.jutil.jdk.exception.ExceptionUtil;
-import cn.reghao.jutil.jdk.io.TextFile;
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.command.*;
-import com.github.dockerjava.api.model.*;
-import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.core.DockerClientImpl;
-import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
-import com.github.dockerjava.transport.DockerHttpClient;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.time.Duration;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-/**
- * Docker 客户端
- *
- * @author reghao
- * @date 2021-10-27 03:41:38
- */
-@Slf4j
-public class DockerImpl implements Docker {
-    private DockerClient dockerClient;
-    private final TextFile textFile = new TextFile();
-    private final String unixSock = "/var/run/docker.sock";
-
-    public DockerImpl() {
-        DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
-                .withDockerHost("unix://" + unixSock)
-                .withDockerTlsVerify(false)
-                //.withDockerCertPath(String.format("%s/.docker", System.getProperty("user.home")))
-                //.withRegistryUsername("username")
-                //.withRegistryPassword("password")
-                //.withRegistryEmail(registryMail)
-                //.withRegistryUrl(registryUrl)
-                .build();
-        init(config);
-    }
-
-    public DockerImpl(DockerAuth dockerAuth) {
-        DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
-                .withDockerHost("unix://" + unixSock)
-                .withDockerTlsVerify(false)
-                //.withDockerCertPath(String.format("%s/.docker", System.getProperty("user.home")))
-                .withRegistryUrl(dockerAuth.getRegistryUrl())
-                .withRegistryUsername(dockerAuth.getUsername())
-                .withRegistryPassword(dockerAuth.getPassword())
-                //.withRegistryEmail(registryMail)
-                .build();
-        init(config);
-    }
-
-    private void init(DockerClientConfig config) {
-        DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder()
-                .dockerHost(config.getDockerHost())
-                .sslConfig(config.getSSLConfig())
-                .maxConnections(100)
-                .connectionTimeout(Duration.ofSeconds(60))
-                .responseTimeout(Duration.ofSeconds(60))
-                .build();
-        this.dockerClient = DockerClientImpl.getInstance(config, httpClient);
-    }
-
-    @Override
-    public void auth() {
-        dockerClient.authCmd().exec();
-    }
-
-    @Override
-    public Version version() {
-        return dockerClient.versionCmd().exec();
-    }
-
-    @Override
-    public void build(String repoTag, String compileHome, String dockerfileContent) throws Exception {
-        File dockerfile = new File(compileHome + "/Dockerfile.tmp");
-        try {
-            textFile.write(dockerfile, dockerfileContent);
-            String imageId = dockerClient.buildImageCmd()
-                    .withDockerfile(dockerfile)
-                    // repoTag 格式为 docker.reghao.cn/devops:12345678
-                    .withTags(Set.of(repoTag))
-                    .start()
-                    .awaitImageId(300, TimeUnit.SECONDS);
-        } catch (Exception e) {
-            throw new Exception(ExceptionUtil.errorMsg(e));
-        }
-    }
-
-    public void build(String repoTag, String compileHome) throws Exception {
-        String dockerfilePath = compileHome + "/Dockerfile";
-        dockerClient.buildImageCmd()
-                .withDockerfile(new File(dockerfilePath))
-                .withTags(Set.of(repoTag))
-                .start()
-                .awaitImageId(300, TimeUnit.SECONDS);
-    }
-
-    @Override
-    public void push(String image) throws Exception {
-        try {
-            ResultCallback.Adapter<PushResponseItem> callback = new PushCallback();
-            dockerClient.pushImageCmd(image)
-                    //.exec(new ResultCallback.Adapter<>())
-                    .exec(callback)
-                    .awaitCompletion(300, TimeUnit.SECONDS);
-            PushCallback pushCallback = (PushCallback) callback;
-            int code = pushCallback.getCode();
-            if (code != 0) {
-                throw new Exception(pushCallback.getMsg());
-            }
-        } catch (InterruptedException e) {
-            throw new Exception(ExceptionUtil.errorMsg(e));
-        }
-    }
-
-    @Override
-    public void pull(String image) throws Exception {
-        try {
-            dockerClient.pullImageCmd(image).exec(new PullImageResultCallback()).awaitCompletion();
-        } catch (InterruptedException e) {
-            throw new Exception(ExceptionUtil.errorMsg(e));
-        }
-        /*dockerClient.pullImageCmd(image).exec(new ResultCallback<PullResponseItem>() {
-            public void onStart(Closeable closeable) {
-                System.out.println("开始下载!");
-            }
-
-            public void onNext(PullResponseItem object) {
-                // 实时显示出下载信息
-                System.out.println(object.getStatus());
-            }
-
-            public void onError(Throwable throwable) {
-                throwable.printStackTrace();
-            }
-
-            public void onComplete() {
-                System.out.println("下载完毕!");
-            }
-
-            public void close() throws IOException {
-                System.out.println("下载完毕...");
-            }
-        }).onComplete();*/
-    }
-
-    private String getContainerIdByName(String containerName) {
-        List<Container> list = dockerClient.listContainersCmd()
-                .withShowAll(true)
-                .withNameFilter(List.of(containerName))
-                .exec();
-
-        for (Container container : list) {
-            Set<String> set = new HashSet<>(Arrays.asList(container.getNames()));
-            if (set.contains("/" + containerName)) {
-                return container.getId();
-            }
-        }
-
-        return null;
-    }
-
-    @Override
-    public void stopAndDelete(String containerName) {
-        String containerId = getContainerIdByName(containerName);
-        if (containerId != null) {
-            InspectContainerResponse containerInfo = dockerClient.inspectContainerCmd(containerId).exec();
-            InspectContainerResponse.ContainerState state = containerInfo.getState();
-            boolean isRunning = state.getRunning() != null ? state.getRunning() : false;
-            if (isRunning) {
-                dockerClient.stopContainerCmd(containerId).exec();
-            }
-            dockerClient.removeContainerCmd(containerId).exec();
-        }
-    }
-
-    @Override
-    public InspectContainerResponse createAndRun(String containerName, cn.reghao.bnt.common.docker.model.Config containerConfig) throws Exception {
-        stopAndDelete(containerName);
-
-        String image = containerConfig.getImage();
-        CreateContainerCmd createContainerCmd = dockerClient.createContainerCmd(image)
-                .withName(containerName);
-
-        List<String> env = containerConfig.getEnv();
-        if (env != null) {
-            createContainerCmd.withEnv(env);
-        }
-
-        RestartPolicy restartPolicy = RestartPolicy.onFailureRestart(3);
-        HostConfig hostConfig = HostConfig.newHostConfig()
-                // --init 参数
-                //.withInit(true)
-                .withNetworkMode("host")
-                .withRestartPolicy(restartPolicy);
-        if (containerConfig.getVolumes() != null) {
-            Map<String, String> map = containerConfig.getVolumes().getMap();
-            List<Bind> list = new ArrayList<>();
-            for (Map.Entry<String, String> entry : map.entrySet()) {
-                String key = entry.getKey();
-                String value = entry.getValue();
-                Volume volume2 = new Volume(value);
-                Bind bind = new Bind(key, volume2);
-                list.add(bind);
-            }
-            hostConfig.withBinds(list);
-        }
-
-        if (containerConfig.getHostConfig().getInit() != null) {
-            hostConfig.withInit(containerConfig.getHostConfig().getInit());
-        }
-
-        createContainerCmd.withHostConfig(hostConfig);
-        CreateContainerResponse response = createContainerCmd.exec();
-        String containerId = response.getId();
-        dockerClient.startContainerCmd(containerId).exec();
-        return dockerClient.inspectContainerCmd(containerId).exec();
-    }
-
-    public void createAndRun() {
-        String image = "";
-        CreateContainerResponse container = dockerClient.createContainerCmd(image)
-                .withHostConfig(HostConfig.newHostConfig()
-                        .withMemory(1024 * 1024 * 1024L)      // 限制 1GB 内存
-                        .withMemoryReservation(512 * 1024 * 1024L) // 保证 512MB 内存
-                        .withCpuQuota(50000L)                 // 限制使用 0.5 核 (周期默认为 100000)
-                        .withBlkioWeight(500)                 // 设置磁盘 IO 权重
-                        .withNetworkMode("host")
-                        .withRestartPolicy(RestartPolicy.noRestart())
-                )
-                .exec();
-    }
-
-    public void runAndRm(cn.reghao.bnt.common.docker.model.Config containerConfig) throws Exception {
-        String image = containerConfig.getImage();
-        CreateContainerCmd createContainerCmd = dockerClient.createContainerCmd(image).withCmd("rm");
-
-        List<String> env = containerConfig.getEnv();
-        if (env != null) {
-            createContainerCmd.withEnv(env);
-        }
-
-        HostConfig hostConfig = HostConfig.newHostConfig()
-                .withNetworkMode("host")
-                .withRestartPolicy(RestartPolicy.noRestart());
-        if (containerConfig.getVolumes() != null) {
-            Map<String, String> map = containerConfig.getVolumes().getMap();
-            List<Bind> list = new ArrayList<>();
-            for (Map.Entry<String, String> entry : map.entrySet()) {
-                String hostPath = entry.getValue();
-                String containerPath = entry.getKey();
-
-                Volume volume2 = new Volume(containerPath);
-                Bind bind = new Bind(hostPath, volume2);
-                list.add(bind);
-            }
-            hostConfig.withBinds(list);
-        }
-
-        if (containerConfig.getCmd() != null) {
-            createContainerCmd.withCmd(containerConfig.getCmd());
-        }
-
-        createContainerCmd.withHostConfig(hostConfig);
-        CreateContainerResponse response = createContainerCmd.exec();
-        String containerId = response.getId();
-        dockerClient.startContainerCmd(containerId).exec();
-
-        List<String> list = new ArrayList<>();
-        LogContainerCmd logContainerCmd = dockerClient.logContainerCmd(containerId);
-        logContainerCmd.withStdOut(true).withStdErr(true).withFollowStream(true);
-        logContainerCmd.exec(new ResultCallback<Frame>() {
-            @Override
-            public void onStart(Closeable closeable) {
-            }
-
-            @Override
-            public void onNext(Frame object) {
-                if (object.getStreamType().equals(StreamType.STDERR)) {
-                    list.add(object.toString());
-                }
-            }
-
-            @Override
-            public void onError(Throwable throwable) {
-                log.info(throwable.toString());
-            }
-
-            @Override
-            public void onComplete() {
-            }
-
-            @Override
-            public void close() throws IOException {
-            }
-        });
-
-        dockerClient.waitContainerCmd(containerId).exec(new ResultCallback.Adapter<>())
-                .awaitCompletion(300, TimeUnit.SECONDS);
-
-        InspectContainerResponse response1 = dockerClient.inspectContainerCmd(containerId).exec();
-        InspectContainerResponse.ContainerState state = response1.getState();
-        Long exitCode = state.getExitCodeLong();
-        if (Boolean.TRUE.equals(state.getRunning())) {
-            dockerClient.stopContainerCmd(containerId).exec();
-            dockerClient.removeContainerCmd(containerId).exec();
-            throw new Exception("docker build timeout after 300 seconds");
-        } else if (exitCode != null && exitCode == 0) {
-            dockerClient.removeContainerCmd(containerId).exec();
-        } else {
-            dockerClient.removeContainerCmd(containerId).exec();
-            StringBuilder sb = new StringBuilder();
-            list.forEach(line -> {
-                sb.append(line).append(System.lineSeparator());
-            });
-            throw new Exception("docker build failed:\n" + sb.toString());
-        }
-    }
-
-    @Override
-    public InspectContainerResponse start(String containerName) {
-        String containerId = getContainerIdByName(containerName);
-        dockerClient.startContainerCmd(containerId).exec();
-        return dockerClient.inspectContainerCmd(containerId).exec();
-    }
-
-    @Override
-    public InspectContainerResponse stop(String containerName) {
-        String containerId = getContainerIdByName(containerName);
-        dockerClient.stopContainerCmd(containerId).exec();
-        return dockerClient.inspectContainerCmd(containerId).exec();
-    }
-
-    @Override
-    public InspectContainerResponse restart(String containerName) {
-        String containerId = getContainerIdByName(containerName);
-        dockerClient.restartContainerCmd(containerId).exec();
-        return dockerClient.inspectContainerCmd(containerId).exec();
-    }
-
-    @Override
-    public InspectContainerResponse inspectContainer(String containerName) {
-        String containerId = getContainerIdByName(containerName);
-        return dockerClient.inspectContainerCmd(containerId).exec();
-    }
-
-    @Override
-    public List<Image> images() {
-        List<Image> images = dockerClient.listImagesCmd().exec();
-        return images;
-        /*return images.stream().map(image -> {
-            long created = image.getCreated();
-            String[] repoTags = image.getRepoTags();
-            if (repoTags.length == 0) {
-                return null;
-            }
-
-            String imageId = image.getId();
-            String[] repoTag = repoTags[0].split(":");
-            String repo = repoTag[0];
-            String tag = repoTag[1];
-            LocalDateTime created1 = DateTimeConverter.localDateTime(created*1000);
-            return new ImageInfo(repo, tag, imageId, created1);
-        }).filter(Objects::nonNull).collect(Collectors.toList());*/
-    }
-
-    @Override
-    public void imageRm(String imageId) {
-        dockerClient.removeImageCmd(imageId).exec();
-    }
-
-    @Override
-    public void rm(String containerId) {
-        dockerClient.removeContainerCmd(containerId).exec();
-    }
-
-    @Override
-    public List<InspectContainerResponse> psAll() {
-        List<Container> list = dockerClient.listContainersCmd()
-                .withShowAll(true)
-                .exec();
-        return list.stream().map(container -> {
-            String containerId = container.getId();
-            return dockerClient.inspectContainerCmd(containerId).exec();
-        }).collect(Collectors.toList());
-    }
-
-    @Override
-    public InspectContainerResponse ps(String appId) {
-        List<Container> list = dockerClient.listContainersCmd()
-                .withNameFilter(List.of(appId))
-                .exec();
-
-        if (list.isEmpty()) {
-            return null;
-        }
-
-        Container container = list.get(0);
-        String containerId = container.getId();
-        return dockerClient.inspectContainerCmd(containerId).exec();
-    }
-
-    static class PushCallback extends ResultCallback.Adapter<PushResponseItem> {
-        private int code;
-        private String msg;
-
-        public PushCallback() {
-            this.code = 0;
-        }
-
-        public int getCode() {
-            return code;
-        }
-
-        public String getMsg() {
-            return msg;
-        }
-
-        @Override
-        public void onNext(PushResponseItem object) {
-            PushResponseItem.ErrorDetail errorDetail = object.getErrorDetail();
-            if (errorDetail != null) {
-                //log.info("error: {} {}", errorDetail.getCode(), errorDetail.getMessage());
-                code = 1;
-                msg = errorDetail.getMessage();
-            } else {
-                //log.info("info: {} {} {}", object.getStatus(), object.getId(), object.getProgressDetail());
-            }
-        }
-
-        @Override
-        public void onComplete() {
-            super.onComplete();
-        }
-
-        @Override
-        public void onError(Throwable throwable) {
-            throwable.printStackTrace();
-        }
-    }
-}

common/src/main/java/cn/reghao/bnt/common/docker/DockerService.java

@@ -1,130 +0,0 @@
-package cn.reghao.bnt.common.docker;
-
-import cn.reghao.bnt.common.docker.model.DockerContainer;
-import cn.reghao.bnt.common.docker.model.DockerImage;
-import cn.reghao.bnt.common.docker.model.DockerQuery;
-import cn.reghao.bnt.common.msg.event.EvtDockerOps;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.Image;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import static cn.reghao.bnt.common.msg.constant.DockerOps.containerRm;
-
-/**
- * @author reghao
- * @date 2025-12-09 11:01:17
- */
-@Slf4j
-public class DockerService {
-    private final Docker docker;
-
-    public DockerService(Docker docker) {
-        this.docker = docker;
-    }
-
-    public List<DockerImage> getDockerImages(DockerQuery dockerQuery) {
-        String keyword = dockerQuery.getKeyword();
-        int type = dockerQuery.getType();
-        // imageId -> container
-        Map<String, List<InspectContainerResponse>> containerMap = docker.psAll().stream()
-                .collect(Collectors.groupingBy(InspectContainerResponse::getImageId));
-        return docker.images().stream()
-                .map(image -> {
-                    String repoTag = "<none>:<none>";
-                    if (image.getRepoTags() != null && image.getRepoTags().length > 0) {
-                        repoTag = image.getRepoTags()[0];
-                    }
-
-                    boolean matched = false;
-                    if (keyword != null && !keyword.isBlank()) {
-                        if (type == 1) {
-                            // 关键字匹配
-                            matched = repoTag.contains(keyword);
-                        } else if (type == 2) {
-                            // 前缀匹配
-                            matched = repoTag.startsWith(keyword);
-                        }
-
-                        if (!matched) {
-                            return null;
-                        }
-                    }
-
-                    int totalContainers = 0;
-                    String imageId = image.getId();
-                    List<InspectContainerResponse> list = containerMap.get(imageId);
-                    if (list != null) {
-                        totalContainers = list.size();
-                    }
-                    return new DockerImage(image, repoTag, totalContainers);
-                })
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-    }
-
-    public void rmDockerImagesUnused() {
-        Map<String, Image> map = docker.images().stream()
-                .collect(Collectors.toMap(Image::getId, image -> image));
-        List<InspectContainerResponse> list = docker.psAll();
-        for (InspectContainerResponse response : list) {
-            String imageId = response.getImageId();
-            map.remove(imageId);
-        }
-
-        for (Image image : map.values()) {
-            try {
-                docker.imageRm(image.getId());
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public void rmDockerImages(EvtDockerOps evtDockerOps) {
-        List<String> imageIds = evtDockerOps.getPayload();
-        imageIds.forEach(docker::imageRm);
-    }
-
-    public List<DockerContainer> getDockerContainers() {
-        Map<String, Image> imageMap = docker.images().stream()
-                .collect(Collectors.toMap(Image::getId, v -> v));
-        return docker.psAll().stream().map(inspectContainerResponse -> {
-            String imageId = inspectContainerResponse.getImageId();
-            Image image = imageMap.get(imageId);
-            if (image == null) {
-                log.error("container {}'s imageId {} not found" , inspectContainerResponse.getId(), imageId);
-                return null;
-            }
-            String repoTag = "<none>:<none>";
-            if (image.getRepoTags() != null && image.getRepoTags().length > 0) {
-                repoTag = image.getRepoTags()[0];
-            }
-            return new DockerContainer(inspectContainerResponse, repoTag);
-        }).filter(Objects::nonNull).collect(Collectors.toList());
-    }
-
-    public void handleDockerContainer(String ops, String containerId) {
-        if (!containerRm.name().equals(ops)) {
-            return;
-        }
-
-        // containerId -> InspectContainerResponse
-        Map<String, InspectContainerResponse> containerMap = docker.psAll().stream()
-                .collect(Collectors.groupingBy(
-                        InspectContainerResponse::getId,
-                        Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))
-                ));
-
-        InspectContainerResponse response = containerMap.get(containerId);
-        if (response == null) {
-            log.error("containerId {} not exist", containerId);
-            return;
-        }
-        docker.rm(containerId);
-    }
-}

common/src/main/java/cn/reghao/bnt/common/docker/model/Config.java

@@ -1,55 +0,0 @@
-package cn.reghao.bnt.common.docker.model;
-
-import com.google.gson.annotations.SerializedName;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * docker 容器创建时的配置
- *
- * @author reghao
- * @date 2020-01-14 23:11:21
- */
-@Data
-public class Config implements Cloneable {
-    @SerializedName("AttachStderr") private boolean attachStderr;
-    @SerializedName("AttachStdin") private boolean attachStdin;
-    @SerializedName("AttachStdout") private boolean attachStdout;
-    @SerializedName("Cmd") private List<String> cmd;
-    @SerializedName("Domainname") private String domainname;
-    @SerializedName("Env") private List<String> env;
-    @SerializedName("Healthcheck") private Healthcheck healthcheck;
-    @SerializedName("Hostname") private String hostname;
-    @SerializedName("Image") private String image;
-    @SerializedName("Labels") private Labels labels;
-    @SerializedName("MacAddress") private String macAddress;
-    @SerializedName("NetworkDisabled") private boolean networkDisabled;
-    @SerializedName("OpenStdin") private boolean openStdin;
-    @SerializedName("StdinOnce") private boolean stdinOnce;
-    @SerializedName("Tty") private boolean tty;
-    @SerializedName("User") private String user;
-    @SerializedName("Volumes") private Volumes volumes;
-    @SerializedName("WorkingDir") private String workingDir;
-    @SerializedName("StopSignal") private String stopSignal;
-    @SerializedName("StopTimeout") private int stopTimeout;
-
-    @SerializedName("Entrypoint") private String entrypoint;
-    @SerializedName("ExposedPorts") private ExposedPorts exposedPorts;
-    @SerializedName("HostConfig") private HostConfig hostConfig;
-    @SerializedName("NetworkingConfig") private NetworkingConfig networkingConfig;
-
-    public Config() {
-        this.hostConfig = new HostConfig();
-    }
-
-    public Config(String image) {
-        this.image = image;
-        this.hostConfig = new HostConfig();
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-}

common/src/main/java/cn/reghao/bnt/common/docker/model/DockerAuth.java

@@ -1,32 +0,0 @@
-package cn.reghao.bnt.common.docker.model;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2024-07-26 17:29:56
- */
-@NoArgsConstructor
-@AllArgsConstructor
-@Setter
-@Getter
-public class DockerAuth implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @NotBlank(message = "url 不能为空")
-    @Size(max = 255, message = "url 的最大长度不能超过 255 个字符")
-    private String registryUrl;
-    @NotBlank(message = "帐号不能为空")
-    @Size(max = 255, message = "帐号的最大长度不能超过 255 个字符")
-    private String username;
-    @NotBlank(message = "密码不能为空")
-    @Size(max = 255, message = "密码的最大长度不能超过 255 个字符")
-    private String password;
-}

common/src/main/java/cn/reghao/bnt/common/docker/model/DockerContainer.java

@@ -1,32 +0,0 @@
-package cn.reghao.bnt.common.docker.model;
-
-import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import lombok.Getter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2025-12-09 11:01:46
- */
-@Getter
-public class DockerContainer implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String containerId;
-    private String name;
-    private String createdAt;
-    private String status;
-    private String imageId;
-    private String repoTag;
-
-    public DockerContainer(InspectContainerResponse inspectContainerResponse,String repoTag) {
-        this.containerId = inspectContainerResponse.getId();
-        this.name = inspectContainerResponse.getName();
-        this.imageId = inspectContainerResponse.getImageId();
-        this.createdAt = DateTimeConverter.format(inspectContainerResponse.getCreated());
-        this.status = inspectContainerResponse.getState().getStatus();
-        this.repoTag = repoTag;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/docker/model/DockerImage.java

@@ -1,29 +0,0 @@
-package cn.reghao.bnt.common.docker.model;
-
-import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import com.github.dockerjava.api.model.Image;
-import lombok.Getter;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2025-12-09 11:01:37
- */
-@Getter
-public class DockerImage implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String imageId;
-    private String repoTag;
-    private String createdAt;
-    private int totalContainers;
-
-    public DockerImage(Image image, String repoTag, int totalContainers) {
-        this.imageId = image.getId();
-        this.repoTag = repoTag;
-        this.createdAt = DateTimeConverter.format(image.getCreated()*1000);
-        this.totalContainers = totalContainers;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/docker/model/DockerPayload.java

@@ -1,23 +0,0 @@
-package cn.reghao.bnt.common.docker.model;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2025-12-16 22:26:20
- */
-@Setter
-@Getter
-public class DockerPayload implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String ops;
-    private String machineId;
-    private DockerQuery dockerQuery;
-    private List<String> payload = new ArrayList<>();
-}

common/src/main/java/cn/reghao/bnt/common/docker/model/DockerQuery.java

@@ -1,24 +0,0 @@
-package cn.reghao.bnt.common.docker.model;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * @author reghao
- * @date 2025-12-16 14:47:01
- */
-@Setter
-@Getter
-public class DockerQuery implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private int type;
-    private String keyword;
-
-    public DockerQuery() {
-        this.type = 1;
-        this.keyword = "";
-    }
-}

common/src/main/java/cn/reghao/bnt/common/docker/model/ExposedPorts.java

@@ -1,11 +0,0 @@
-package cn.reghao.bnt.common.docker.model;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2021-02-10 01:30:17
- */
-@Data
-public class ExposedPorts {
-}

common/src/main/java/cn/reghao/bnt/common/docker/model/Healthcheck.java

@@ -1,15 +0,0 @@
-package cn.reghao.bnt.common.docker.model;
-
-import com.google.gson.annotations.SerializedName;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2021-02-25 10:02:59
- */
-@Data
-public class Healthcheck {
-    @SerializedName("Test") private List<String> test;
-}

common/src/main/java/cn/reghao/bnt/common/docker/model/HostConfig.java

@@ -1,24 +0,0 @@
-package cn.reghao.bnt.common.docker.model;
-
-import com.google.gson.annotations.SerializedName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-/**
- * TODO 部分
- *
- * @author reghao
- * @date 2020-01-14 23:16:52
- */
-@AllArgsConstructor
-@Data
-public class HostConfig {
-    @SerializedName("NetworkMode") private String networkMode;
-    @SerializedName("RestartPolicy") private RestartPolicy restartPolicy;
-    @SerializedName("Init") private Boolean init;
-
-    public HostConfig() {
-        this.networkMode = "host";
-        this.restartPolicy = new RestartPolicy();
-    }
-}

common/src/main/java/cn/reghao/bnt/common/docker/model/Labels.java

@@ -1,14 +0,0 @@
-package cn.reghao.bnt.common.docker.model;
-
-import lombok.Data;
-
-import java.util.Map;
-
-/**
- * @author reghao
- * @date 2021-02-10 01:28:38
- */
-@Data
-public class Labels {
-    private Map<String, String> map;
-}

common/src/main/java/cn/reghao/bnt/common/docker/model/NetworkingConfig.java

@@ -1,11 +0,0 @@
-package cn.reghao.bnt.common.docker.model;
-
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2021-02-10 01:33:05
- */
-@Data
-public class NetworkingConfig {
-}

common/src/main/java/cn/reghao/bnt/common/docker/model/RestartPolicy.java

@@ -1,21 +0,0 @@
-package cn.reghao.bnt.common.docker.model;
-
-import com.google.gson.annotations.SerializedName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2020-05-19 15:00:50
- */
-@AllArgsConstructor
-@Data
-public class RestartPolicy {
-    @SerializedName("Name") private String name;
-    @SerializedName("MaximumRetryCount") private int maximumRetryCount;
-
-    public RestartPolicy() {
-        this.name = "on-failure";
-        this.maximumRetryCount = 3;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/docker/model/Volumes.java

@@ -1,15 +0,0 @@
-package cn.reghao.bnt.common.docker.model;
-
-import lombok.Data;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author reghao
- * @date 2021-02-10 01:29:10
- */
-@Data
-public class Volumes {
-    private Map<String, String> map = new HashMap<>();
-}

common/src/main/java/cn/reghao/bnt/common/machine/CPU.java

@@ -1,40 +0,0 @@
-package cn.reghao.bnt.common.machine;
-
-import cn.reghao.bnt.common.machine.model.CPUInfo;
-import cn.reghao.jutil.jdk.machine.data.MachineData;
-import cn.reghao.jutil.jdk.machine.data.detail.CpuDetail;
-import cn.reghao.jutil.jdk.machine.data.stat.CpuStat;
-import oshi.SystemInfo;
-import oshi.hardware.CentralProcessor;
-import oshi.hardware.HardwareAbstractionLayer;
-
-/**
- * @author reghao
- * @date 2019-10-25 13:12:36
- */
-public class CPU implements MachineData<CpuDetail, CpuStat> {
-    private final CentralProcessor processor;
-
-    public CPU(SystemInfo si) {
-        this.processor = si.getHardware().getProcessor();
-    }
-
-    @Override
-    public CpuDetail detail() {
-        CentralProcessor.ProcessorIdentifier processorIdentifier = processor.getProcessorIdentifier();
-        String vendor = processorIdentifier.getVendor();
-        String name = processorIdentifier.getName();
-        int physicalCore = processor.getPhysicalProcessorCount();
-        int logicalCore = processor.getLogicalProcessorCount();
-        return new CpuDetail(vendor, name, physicalCore, logicalCore);
-    }
-
-    @Override
-    public CpuStat stat() {
-        return null;
-    }
-
-    public CPUInfo getCPUInfo() {
-        return null;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/machine/Disk.java

@@ -1,158 +0,0 @@
-package cn.reghao.bnt.common.machine;
-
-import cn.reghao.bnt.common.machine.model.DiskInfo;
-import cn.reghao.bnt.common.machine.model.DiskPartition;
-import cn.reghao.jutil.jdk.converter.ByteConverter;
-import cn.reghao.jutil.jdk.machine.data.MachineData;
-import cn.reghao.jutil.jdk.machine.data.detail.DiskDetail;
-import cn.reghao.jutil.jdk.machine.data.stat.DiskStat;
-import cn.reghao.jutil.jdk.math.Calculator;
-import oshi.SystemInfo;
-import oshi.hardware.HardwareAbstractionLayer;
-import oshi.software.os.OperatingSystem;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @author reghao
- * @date 2019-10-25 13:21:25
- */
-public class Disk implements MachineData<List<DiskDetail>, List<DiskStat>> {
-    private final HardwareAbstractionLayer hal;
-    private final OperatingSystem os;
-    private final ByteConverter byteConverter;
-
-    public Disk(SystemInfo si, ByteConverter byteConverter) {
-        this.hal = si.getHardware();
-        this.os = si.getOperatingSystem();
-        this.byteConverter = byteConverter;
-    }
-
-    @Override
-    public List<DiskDetail> detail() {
-        return os.getFileSystem().getFileStores().stream()
-                .filter(osFileStore -> osFileStore.getVolume().startsWith("/dev/"))
-                .map(osFileStore -> {
-                    String vol = osFileStore.getVolume();
-                    String mount = osFileStore.getMount();
-                    String fsType = osFileStore.getType();
-
-                    long total = osFileStore.getTotalSpace();
-                    // non-root 用户可用的磁盘空间
-                    long userAvail = osFileStore.getUsableSpace();
-                    // root 用户可用的磁盘空间
-                    long rootAvail = osFileStore.getFreeSpace();
-
-                    long inodeTotal = osFileStore.getTotalInodes();
-                    long inodeFree = osFileStore.getFreeInodes();
-
-                    return new DiskDetail(vol, mount, fsType, total, userAvail, total-userAvail, inodeTotal, inodeFree);
-                })
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public List<DiskStat> stat() {
-        return null;
-    }
-
-    /**
-     * 根据一个路径确定它所在的分区
-     *
-     * @param
-     * @return
-     * @date 2021-02-06 下午11:25
-     */
-    public DiskDetail diskDetail(String path) {
-        List<DiskDetail> diskInfos = detail();
-        // 根据挂载路径的长度降序
-        diskInfos.sort((o1, o2) -> o2.getMountedOn().length() - o1.getMountedOn().length());
-
-        List<DiskDetail> candidates = new ArrayList<>();
-        for (DiskDetail diskInfo : diskInfos) {
-            String mountedOn = diskInfo.getMountedOn();
-            String[] array = path.split(mountedOn);
-            if (array.length == 0) {
-                return diskInfo;
-            } else if (array.length == 2) {
-                if (array[1].startsWith("/") || "/".equals(mountedOn)) {
-                    candidates.add(diskInfo);
-                }
-            } else if (array.length > 2) {
-                candidates.add(diskInfo);
-            }
-        }
-
-        if (!candidates.isEmpty()) {
-            // TODO 如果 candidates 大于 0 则判断准确的那个
-            return candidates.get(0);
-        } else {
-            return null;
-        }
-    }
-
-    public List<DiskInfo> getDisks() {
-        List<DiskInfo> diskInfoList = new ArrayList<>();
-        hal.getDiskStores().forEach(hwDiskStore -> {
-            String model = hwDiskStore.getModel();
-            String name = hwDiskStore.getName();
-            long size = hwDiskStore.getSize();
-            String sizeStr = byteConverter.convert(size);
-            DiskInfo diskInfo = new DiskInfo(model, name, size, sizeStr);
-            hwDiskStore.getPartitions().forEach(hwPartition -> {
-                String uuid = hwPartition.getUuid();
-                String id = hwPartition.getIdentification();
-                String mountedOn = hwPartition.getMountPoint();
-                String fsType = hwPartition.getType();
-                long pSize = hwPartition.getSize();
-
-                DiskPartition diskPartition = new DiskPartition(name, pSize, uuid, id, mountedOn, fsType);
-                diskPartition.setTotalSpace(pSize);
-                diskInfo.getDiskPartitionList().add(diskPartition);
-            });
-
-            diskInfoList.add(diskInfo);
-        });
-
-        Map<String, DiskPartition> map = diskInfoList.stream()
-                .map(DiskInfo::getDiskPartitionList)
-                .flatMap(Collection::stream)
-                .collect(Collectors.groupingBy(DiskPartition::getUuid,
-                        Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
-        os.getFileSystem().getFileStores().forEach(osFileStore -> {
-            String uuid = osFileStore.getUUID();
-            String vol = osFileStore.getVolume();
-            long totalSpace = osFileStore.getTotalSpace();
-            String totalSpaceStr = byteConverter.convert(totalSpace);
-            long freeSpace = osFileStore.getFreeSpace();
-            String freeSpaceStr = byteConverter.convert(freeSpace);
-            long usableSpace = osFileStore.getUsableSpace();
-            String usableSpaceStr = byteConverter.convert(usableSpace);
-            long totalInode = osFileStore.getTotalInodes();
-            long freeInode = osFileStore.getFreeInodes();
-
-            DiskPartition diskPartition = map.get(uuid);
-            if (diskPartition != null) {
-                diskPartition.setTotalSpace(totalSpace);
-                diskPartition.setTotalSpaceStr(totalSpaceStr);
-                diskPartition.setFreeSpace(freeSpace);
-                diskPartition.setFreeSpaceStr(freeSpaceStr);
-                diskPartition.setUsableSpace(usableSpace);
-                diskPartition.setUsableSpaceStr(usableSpaceStr);
-                double freeSpacePercent = Calculator.divide(freeSpace, totalSpace)*100;
-                diskPartition.setFreeSpacePercent(freeSpacePercent);
-
-                diskPartition.setTotalInode(totalInode);
-                diskPartition.setFreeInode(freeInode);
-                double freeInodePercent = Calculator.divide(freeInode, totalInode)*100;
-                diskPartition.setFreeInodePercent(freeInodePercent);
-            }
-        });
-
-        return diskInfoList;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/machine/Machine.java

@@ -1,76 +0,0 @@
-package cn.reghao.bnt.common.machine;
-
-import cn.reghao.bnt.common.msg.event.EvtAgentHeartbeat;
-import cn.reghao.bnt.common.msg.event.EvtAgentStart;
-import cn.reghao.jutil.jdk.converter.ByteConverter;
-import cn.reghao.jutil.jdk.machine.data.detail.*;
-import cn.reghao.jutil.jdk.machine.id.MachineId;
-import cn.reghao.jutil.jdk.machine.id.MachineIdLinux;
-import cn.reghao.jutil.jdk.web.result.AppVersion;
-import oshi.SystemInfo;
-import oshi.hardware.HardwareAbstractionLayer;
-import oshi.software.os.OperatingSystem;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author reghao
- * @date 2020-10-22 15:47:58
- */
-public class Machine {
-    public final static String ID;
-    public final static String IPV4;
-    static {
-        MachineId machineId = new MachineIdLinux();
-        ID = machineId.id();
-        // TODO ip 发生变化时会引发数据不一致
-        IPV4 = machineId.ipv4();
-    }
-
-    private final CPU cpu;
-    private final Memory memory;
-    private final Disk disk;
-    private final Network network;
-    private final OS os;
-
-    public Machine() {
-        ByteConverter byteConverter = new ByteConverter();
-        SystemInfo si = new SystemInfo();
-        HardwareAbstractionLayer hal = si.getHardware();
-        OperatingSystem operatingSystem = si.getOperatingSystem();
-
-        this.cpu = new CPU(si);
-        this.memory = new Memory(si, byteConverter);
-        this.disk = new Disk(si, byteConverter);
-        this.network = new Network(si, byteConverter);
-        this.os = new OS(si, byteConverter);
-    }
-
-    public EvtAgentStart detail() {
-        EvtAgentStart machineDetail = new EvtAgentStart();
-        machineDetail.setMachineId(Machine.ID);
-        machineDetail.setAppVersion(AppVersion.getVersion());
-
-        machineDetail.setOsDetail(os.detail());
-        List<NetworkDetail> list = network.detail().stream()
-                .peek(networkDetail -> {
-                    networkDetail.setPubicIpv4("0.0.0.0");
-                })
-                .collect(Collectors.toList());
-        machineDetail.setNetworkDetails(list);
-
-        machineDetail.setCpuDetail(cpu.detail());
-        machineDetail.setMemoryDetail(memory.detail());
-        machineDetail.setDiskDetails(disk.detail());
-        return machineDetail;
-    }
-
-    public EvtAgentHeartbeat stat() {
-        EvtAgentHeartbeat machineStat = new EvtAgentHeartbeat();
-        machineStat.setMachineId(Machine.ID);
-        machineStat.setMemoryDetail(memory.detail());
-        machineStat.setDiskDetails(disk.detail());
-        return machineStat;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/machine/Memory.java

@@ -1,76 +0,0 @@
-package cn.reghao.bnt.common.machine;
-
-import cn.reghao.bnt.common.machine.model.MemoryInfo;
-import cn.reghao.bnt.common.machine.model.MemoryStat;
-import cn.reghao.jutil.jdk.converter.ByteConverter;
-import cn.reghao.jutil.jdk.machine.data.MachineData;
-import cn.reghao.jutil.jdk.machine.data.detail.MemoryDetail;
-import cn.reghao.jutil.jdk.math.Calculator;
-import oshi.SystemInfo;
-import oshi.hardware.GlobalMemory;
-import oshi.hardware.VirtualMemory;
-
-/**
- * @author reghao
- * @date 2019-10-25 13:21:25
- */
-public class Memory implements MachineData<MemoryDetail, MemoryStat> {
-    private final GlobalMemory globalMemory;
-    private final VirtualMemory virtualMemory;
-    private MemoryDetail memoryDetail;
-    private ByteConverter byteConverter;
-
-    public Memory(SystemInfo si, ByteConverter byteConverter) {
-        GlobalMemory globalMemory = si.getHardware().getMemory();
-        this.globalMemory = globalMemory;
-        this.virtualMemory = globalMemory.getVirtualMemory();
-        this.byteConverter = byteConverter;
-    }
-
-    @Override
-    public MemoryDetail detail() {
-        long total = globalMemory.getTotal();
-        long avail = globalMemory.getAvailable();
-        long swapTotal = virtualMemory.getSwapTotal();
-        long swapUsed = virtualMemory.getSwapUsed();
-
-        if (memoryDetail == null) {
-            memoryDetail = new MemoryDetail(total, avail, total-avail, swapTotal, swapTotal-swapUsed);
-        }
-
-        return memoryDetail;
-    }
-
-    @Override
-    public MemoryStat stat() {
-        if (memoryDetail == null) {
-            memoryDetail = detail();
-        }
-
-        long total = globalMemory.getTotal();
-        long avail = globalMemory.getAvailable();
-        memoryDetail.setAvail(avail);
-        memoryDetail.setUsed(total-avail);
-
-        long swapTotal = virtualMemory.getSwapTotal();
-        long swapUsed = virtualMemory.getSwapUsed();
-        memoryDetail.setAvail(swapTotal-swapUsed);
-        return null;
-    }
-
-    public MemoryInfo getMemoryInfo() {
-        long total = globalMemory.getTotal();
-        String totalStr = byteConverter.convert(total);
-        long avail = globalMemory.getAvailable();
-        String availStr = byteConverter.convert(avail);
-        double availPercent = Calculator.divide(avail, total)*100;
-
-        long swapTotal = virtualMemory.getSwapTotal();
-        String swapTotalStr = byteConverter.convert(swapTotal);
-        long swapAvail = swapTotal - virtualMemory.getSwapUsed();
-        String swapAvailStr = byteConverter.convert(swapAvail);
-        double swapPercent = Calculator.divide(swapAvail, swapTotal)*100;
-        return new MemoryInfo(total, totalStr, avail, availStr, availPercent,
-                swapTotal, swapTotalStr, swapAvail, swapAvailStr, swapPercent);
-    }
-}

common/src/main/java/cn/reghao/bnt/common/machine/Network.java

@@ -1,107 +0,0 @@
-package cn.reghao.bnt.common.machine;
-
-import cn.reghao.bnt.common.machine.model.NetworkCard;
-import cn.reghao.jutil.jdk.converter.ByteConverter;
-import cn.reghao.jutil.jdk.machine.data.MachineData;
-import cn.reghao.jutil.jdk.machine.data.detail.NetworkDetail;
-import cn.reghao.jutil.jdk.machine.data.stat.NetworkStat;
-import oshi.SystemInfo;
-import oshi.hardware.HardwareAbstractionLayer;
-import oshi.software.os.OperatingSystem;
-
-import java.net.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2021-10-16 18:45:39
- */
-public class Network implements MachineData<List<NetworkDetail>, NetworkStat> {
-    private final HardwareAbstractionLayer hal;
-    private OperatingSystem os;
-    private final ByteConverter byteConverter;
-
-    public Network(SystemInfo si, ByteConverter byteConverter) {
-        this.hal = si.getHardware();
-        this.os = si.getOperatingSystem();
-        this.byteConverter = byteConverter;
-    }
-
-    @Override
-    public List<NetworkDetail> detail() {
-        List<NetworkDetail> list = new ArrayList<>();
-        try {
-            Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
-            // 遍历主机的网络接口
-            while (interfaces.hasMoreElements()) {
-                NetworkInterface iface = interfaces.nextElement();
-                String ifaceName = iface.getName();
-                // 过滤掉 localhost 和虚拟网卡
-                if (ifaceName.startsWith("enp")
-                        || ifaceName.startsWith("wlp")
-                        || ifaceName.startsWith("eth")
-                        || ifaceName.startsWith("wlan")
-                        || ifaceName.startsWith("em")) {
-                    String ifaceMac = macAddr(iface.getHardwareAddress());
-                    NetworkDetail networkDetail = new NetworkDetail(ifaceName, ifaceMac);
-
-                    Enumeration<InetAddress> inetAddrs = iface.getInetAddresses();
-                    while (inetAddrs.hasMoreElements()) {
-                        InetAddress address = inetAddrs.nextElement();
-                        if (!address.isLoopbackAddress()) {
-                            if (address instanceof Inet4Address) {
-                                networkDetail.setIpv4(address.getHostAddress());
-                            } else if (address instanceof Inet6Address) {
-                                networkDetail.setIpv6(address.getHostAddress());
-                            }
-                        }
-                    }
-
-                    list.add(networkDetail);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return list;
-    }
-
-    /**
-     * 返回 52-54-00-bf-ab-2d 格式的 MAC 地址
-     *
-     * @param
-     * @return
-     * @date 2020-10-14 下午1:53
-     */
-    private static String macAddr(byte[] addr) {
-        String[] hexadecimal = new String[addr.length];
-        for (int i = 0; i < addr.length; i++) {
-            hexadecimal[i] = String.format("%02x", addr[i]);
-        }
-        return String.join("-", hexadecimal);
-    }
-
-    @Override
-    public NetworkStat stat() {
-        return null;
-    }
-
-    public List<NetworkCard> getNetworkCards() {
-        List<NetworkCard> list = new ArrayList<>();
-        hal.getNetworkIFs().forEach(net -> {
-            String iface = net.getName();
-            String mac = net.getMacaddr();
-            String ipv4 = Arrays.toString(net.getIPv4addr());
-            String ipv6 = Arrays.toString(net.getIPv6addr());
-            long mtu = net.getMTU();
-            long speed = net.getSpeed();
-            String speedStr = byteConverter.convert(speed);
-            list.add(new NetworkCard(iface, mac, ipv4, ipv6, mtu, speed, speedStr));
-        });
-
-        return list;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/machine/OS.java

@@ -1,40 +0,0 @@
-package cn.reghao.bnt.common.machine;
-
-import cn.reghao.jutil.jdk.converter.ByteConverter;
-import cn.reghao.jutil.jdk.machine.data.MachineData;
-import cn.reghao.jutil.jdk.machine.data.detail.OsDetail;
-import cn.reghao.jutil.jdk.machine.data.stat.OsStat;
-import oshi.SystemInfo;
-import oshi.hardware.HardwareAbstractionLayer;
-import oshi.software.os.OperatingSystem;
-
-/**
- * @author reghao
- * @date 2020-10-20 23:17:30
- */
-public class OS implements MachineData<OsDetail, OsStat> {
-    private final HardwareAbstractionLayer hal;
-    private OperatingSystem os;
-    private final ByteConverter byteConverter;
-
-    public OS(SystemInfo si, ByteConverter byteConverter) {
-        this.hal = si.getHardware();
-        this.os = si.getOperatingSystem();
-        this.byteConverter = byteConverter;
-    }
-
-    @Override
-    public OsDetail detail() {
-        OsDetail osDetail = new OsDetail();
-        osDetail.setBootTime(os.getSystemBootTime());
-        return osDetail;
-    }
-
-    @Override
-    public OsStat stat() {
-        return null;
-    }
-
-    public void getOSInfo() {
-    }
-}

common/src/main/java/cn/reghao/bnt/common/machine/model/CPUInfo.java

@@ -1,8 +0,0 @@
-package cn.reghao.bnt.common.machine.model;
-
-/**
- * @author reghao
- * @date 2025-09-26 17:29:00
- */
-public class CPUInfo {
-}

common/src/main/java/cn/reghao/bnt/common/machine/model/DiskInfo.java

@@ -1,31 +0,0 @@
-package cn.reghao.bnt.common.machine.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2025-09-26 13:51:05
- */
-@AllArgsConstructor
-@Getter
-@Setter
-public class DiskInfo {
-    private String model;
-    private String name;
-    private long size;
-    private String sizeStr;
-    private List<DiskPartition> diskPartitionList;
-
-    public DiskInfo(String model, String name, long size, String sizeStr) {
-        this.model = model;
-        this.name = name;
-        this.size = size;
-        this.sizeStr = sizeStr;
-        this.diskPartitionList = new ArrayList<>();
-    }
-}

common/src/main/java/cn/reghao/bnt/common/machine/model/DiskPartition.java

@@ -1,40 +0,0 @@
-package cn.reghao.bnt.common.machine.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author reghao
- * @date 2025-09-26 13:51:15
- */
-@AllArgsConstructor
-@Getter
-@Setter
-public class DiskPartition {
-    private String diskName;
-    private long partitionSize;
-    private String uuid;
-    private String vol;
-    private String mountedOn;
-    private String fsType;
-    private long totalSpace;
-    private String totalSpaceStr;
-    private long freeSpace;
-    private String freeSpaceStr;
-    private double freeSpacePercent;
-    private long usableSpace;
-    private String usableSpaceStr;
-    private long totalInode;
-    private long freeInode;
-    private double freeInodePercent;
-
-    public DiskPartition(String diskName, long partitionSize, String uuid, String vol, String mountedOn, String fsType) {
-        this.diskName = diskName;
-        this.partitionSize = partitionSize;
-        this.uuid = uuid;
-        this.vol = vol;
-        this.mountedOn = mountedOn;
-        this.fsType = fsType;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/machine/model/MemoryInfo.java

@@ -1,28 +0,0 @@
-package cn.reghao.bnt.common.machine.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-/**
- * @author reghao
- * @date 2025-09-26 17:29:17
- */
-@NoArgsConstructor
-@AllArgsConstructor
-@Getter
-@Setter
-public class MemoryInfo {
-    private long total;
-    private String totalStr;
-    private long avail;
-    private String availStr;
-    private double availPercent;
-
-    private long swapTotal;
-    private String swapTotalStr;
-    private long swapAvail;
-    private String swapAvailStr;
-    private double swapAvailPercent;
-}

common/src/main/java/cn/reghao/bnt/common/machine/model/MemoryStat.java

@@ -1,27 +0,0 @@
-package cn.reghao.bnt.common.machine.model;
-
-import cn.reghao.jutil.jdk.converter.ByteConverter;
-import cn.reghao.jutil.jdk.converter.ByteType;
-import lombok.Data;
-
-import java.lang.management.MemoryUsage;
-
-/**
- * @author reghao
- * @date 2020-10-21 15:49:56
- */
-@Data
-public class MemoryStat {
-    private String init;
-    private String max;
-    private String used;
-    private String committed;
-
-    public MemoryStat(MemoryUsage memoryUsage) {
-        ByteConverter convert = new ByteConverter();
-        this.init = convert.convert(memoryUsage.getInit());
-        this.max = convert.convert(memoryUsage.getMax());
-        this.used = convert.convert(memoryUsage.getUsed());
-        this.committed = convert.convert(memoryUsage.getCommitted());
-    }
-}

common/src/main/java/cn/reghao/bnt/common/machine/model/NetworkCard.java

@@ -1,20 +0,0 @@
-package cn.reghao.bnt.common.machine.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2025-09-26 16:59:22
- */
-@AllArgsConstructor
-@Getter
-public class NetworkCard {
-    private String iface;
-    private String mac;
-    private String ipv4;
-    private String ipv6;
-    private long mtu;
-    private long speed;
-    private String speedStr;
-}

common/src/main/java/cn/reghao/bnt/common/machine/model/SysProcess.java

@@ -1,42 +0,0 @@
-package cn.reghao.bnt.common.machine.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author reghao
- * @date 2025-12-17 14:34:09
- */
-@AllArgsConstructor
-@NoArgsConstructor
-@Setter
-@Getter
-public class SysProcess implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private int pid;
-    private String name;
-    private int ppid;
-    private String cmdLine;
-    private Set<String> hostPorts;
-    private long startTime;
-    private String user;
-    private String containerId;
-    private String appId;
-
-    public SysProcess(int pid, String name, int ppid, String cmdLine, long startTime, String user) {
-        this.pid = pid;
-        this.name = name;
-        this.ppid = ppid;
-        this.cmdLine = cmdLine.length() > 255 ? cmdLine.substring(0, 255) : cmdLine;
-        this.hostPorts = new HashSet<>();
-        this.startTime = startTime;
-        this.user = user;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/model/FileTree.java

@@ -1,31 +0,0 @@
-package cn.reghao.bnt.common.model;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2025-12-21 11:58:28
- */
-@Setter
-@Getter
-public class FileTree {
-    private String pid;
-    private String id;
-    private String type;
-    private String path;
-    private List<FileTree> children;
-    private String label;
-    private String value;
-
-    public FileTree(String type, String path) {
-        this.type = type;
-        this.path = path;
-        this.children = new ArrayList<>();
-        this.label = path;
-        this.value = path;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/msg/MessageSender.java

@@ -1,17 +0,0 @@
-package cn.reghao.bnt.common.msg;
-
-import java.io.IOException;
-
-/**
- * @author reghao
- * @date 2023-02-23 09:25:57
- */
-public interface MessageSender {
-    default void connect() {
-    }
-    void setConnected(boolean status);
-    boolean isConnected();
-    void send(String dest, Object message) throws IOException;
-    default void close() {
-    }
-}

common/src/main/java/cn/reghao/bnt/common/msg/constant/AppId.java

@@ -1,9 +0,0 @@
-package cn.reghao.bnt.common.msg.constant;
-
-/**
- * @author reghao
- * @date 2021-08-27 17:32:08
- */
-public enum AppId {
-    mgr, build, agent
-}

common/src/main/java/cn/reghao/bnt/common/msg/constant/AppStatOps.java

@@ -1,9 +0,0 @@
-package cn.reghao.bnt.common.msg.constant;
-
-/**
- * @author reghao
- * @date 2020-12-25 19:15:00
- */
-public enum AppStatOps {
-    start, stop, restart, stat
-}

common/src/main/java/cn/reghao/bnt/common/msg/constant/DockerOps.java

@@ -1,9 +0,0 @@
-package cn.reghao.bnt.common.msg.constant;
-
-/**
- * @author reghao
- * @date 2025-12-16 20:18:53
- */
-public enum DockerOps {
-    imageList, imageRm, imageRmUnused, containerList, containerRm
-}

common/src/main/java/cn/reghao/bnt/common/msg/constant/NodeStatus.java

@@ -1,21 +0,0 @@
-package cn.reghao.bnt.common.msg.constant;
-
-/**
- * @author reghao
- * @date 2021-08-27 17:33:20
- */
-public enum NodeStatus {
-    Online(1),
-    Offline(2),
-    Deprecated(3);
-
-    private final Integer code;
-
-    NodeStatus(Integer code) {
-        this.code = code;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/msg/constant/PackType.java

@@ -1,19 +0,0 @@
-package cn.reghao.bnt.common.msg.constant;
-
-/**
- * 打包方式类型
- *
- * @author reghao
- * @date 2019-11-15 21:59:35
- */
-public enum PackType {
-    none, docker, zip, staticFiles;
-
-    public String getName() {
-        return this.name();
-    }
-
-    public String getValue() {
-        return this.name();
-    }
-}

common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAgentHeartbeat.java

@@ -1,26 +0,0 @@
-package cn.reghao.bnt.common.msg.event;
-
-import cn.reghao.jutil.jdk.event.message.Event;
-import cn.reghao.jutil.jdk.machine.data.detail.DiskDetail;
-import cn.reghao.jutil.jdk.machine.data.detail.MemoryDetail;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-05-05 13:59:15
- */
-@Getter
-@Setter
-public class EvtAgentHeartbeat extends Event {
-    private String machineId;
-    private MemoryDetail memoryDetail;
-    private List<DiskDetail> diskDetails;
-    private Long timestamp;
-
-    public EvtAgentHeartbeat() {
-        this.timestamp = System.currentTimeMillis();
-    }
-}

common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAgentStart.java

@@ -1,33 +0,0 @@
-package cn.reghao.bnt.common.msg.event;
-
-import cn.reghao.jutil.jdk.web.result.AppVersion;
-import cn.reghao.jutil.jdk.event.message.Event;
-import cn.reghao.jutil.jdk.machine.data.detail.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-05-05 13:59:15
- */
-@Getter
-@Setter
-public class EvtAgentStart extends Event {
-    @Deprecated
-    private String protocol;
-    private String machineId;
-    private AppVersion appVersion;
-
-    private OsDetail osDetail;
-    private List<NetworkDetail> networkDetails;
-    private CpuDetail cpuDetail;
-    private MemoryDetail memoryDetail;
-    private List<DiskDetail> diskDetails;
-    private Long timestamp;
-
-    public EvtAgentStart() {
-        this.timestamp = System.currentTimeMillis();
-    }
-}

common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAppDeploy.java

@@ -1,21 +0,0 @@
-package cn.reghao.bnt.common.msg.event;
-
-import cn.reghao.bnt.common.docker.model.DockerAuth;
-import cn.reghao.jutil.jdk.event.message.Event;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author reghao
- * @date 2022-05-05 13:56:22
- */
-@Getter
-@Setter
-public class EvtAppDeploy extends Event {
-    private String packType;
-    private String appId;
-    private String packagePath;
-    private String startScript;
-    private String startHome;
-    private DockerAuth dockerAuth;
-}

common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAppStat.java

@@ -1,22 +0,0 @@
-package cn.reghao.bnt.common.msg.event;
-
-import cn.reghao.bnt.common.msg.constant.AppStatOps;
-import cn.reghao.jutil.jdk.event.message.Event;
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2023-03-06 16:04:48
- */
-@Getter
-public class EvtAppStat extends Event {
-    private final String packType;
-    private final String appId;
-    private final String ops;
-
-    public EvtAppStat(String packType, String appId, AppStatOps appStatOps) {
-        this.packType = packType;
-        this.appId = appId;
-        this.ops = appStatOps.name();
-    }
-}

common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAppStatResult.java

@@ -1,32 +0,0 @@
-package cn.reghao.bnt.common.msg.event;
-
-import cn.reghao.jutil.jdk.event.message.Event;
-import cn.reghao.jutil.jdk.web.result.Result;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.time.LocalDateTime;
-
-/**
- * @author reghao
- * @date 2023-03-06 15:24:22
- */
-@Setter
-@Getter
-public class EvtAppStatResult extends Event {
-    private String machineId;
-    private String appId;
-    private String commitId;
-    private Boolean running;
-    private LocalDateTime startTime;
-    private Integer pid;
-    private Boolean deploy;
-    private Result result;
-
-    public EvtAppStatResult(String appId, String machineId) {
-        this.appId = appId;
-        this.machineId = machineId;
-        this.running = false;
-        this.deploy = false;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/msg/event/EvtBuildApp.java

@@ -1,10 +0,0 @@
-package cn.reghao.bnt.common.msg.event;
-
-import cn.reghao.jutil.jdk.event.message.Event;
-
-/**
- * @author reghao
- * @date 2023-03-16 16:21:35
- */
-public class EvtBuildApp extends Event {
-}

common/src/main/java/cn/reghao/bnt/common/msg/event/EvtBuildAppResult.java

@@ -1,10 +0,0 @@
-package cn.reghao.bnt.common.msg.event;
-
-import cn.reghao.jutil.jdk.event.message.Event;
-
-/**
- * @author reghao
- * @date 2023-03-16 16:22:28
- */
-public class EvtBuildAppResult extends Event {
-}

common/src/main/java/cn/reghao/bnt/common/msg/event/EvtDockerOps.java

@@ -1,31 +0,0 @@
-package cn.reghao.bnt.common.msg.event;
-
-import cn.reghao.bnt.common.docker.model.DockerPayload;
-import cn.reghao.bnt.common.docker.model.DockerQuery;
-import cn.reghao.jutil.jdk.event.message.Event;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2025-12-16 20:20:15
- */
-@NoArgsConstructor
-@AllArgsConstructor
-@Getter
-public class EvtDockerOps extends Event {
-    private String ops;
-    private String machineId;
-    private DockerQuery dockerQuery;
-    private List<String> payload;
-
-    public EvtDockerOps(DockerPayload dockerPayload) {
-        this.ops = dockerPayload.getOps();
-        this.machineId = dockerPayload.getMachineId();
-        this.dockerQuery = dockerPayload.getDockerQuery();
-        this.payload = dockerPayload.getPayload();
-    }
-}

common/src/main/java/cn/reghao/bnt/common/msg/event/EvtDockerOpsResult.java

@@ -1,26 +0,0 @@
-package cn.reghao.bnt.common.msg.event;
-
-import cn.reghao.jutil.jdk.event.message.Event;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2025-12-16 20:20:29
- */
-@AllArgsConstructor
-@Setter
-@Getter
-public class EvtDockerOpsResult extends Event {
-    private String ops;
-    private String machineId;
-    private List<Object> resultList;
-
-    public EvtDockerOpsResult(String ops, String machineId) {
-        this.ops = ops;
-        this.machineId = machineId;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/msg/event/EvtTaskResult.java

@@ -1,38 +0,0 @@
-package cn.reghao.bnt.common.msg.event;
-
-import cn.reghao.bnt.common.machine.model.SysProcess;
-import cn.reghao.jutil.jdk.event.message.Event;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2025-12-16 10:45:44
- */
-@NoArgsConstructor
-@Setter
-@Getter
-public class EvtTaskResult extends Event {
-    private String machineId;
-    private String taskName;
-    private int resultType;
-    private String result;
-    private List<SysProcess> listenProcessList;
-
-    public EvtTaskResult(String machineId, String taskName, String result) {
-        this.machineId = machineId;
-        this.taskName = taskName;
-        this.resultType = 1;
-        this.result = result;
-    }
-
-    public EvtTaskResult(String machineId, String taskName, List<SysProcess> listenProcessList) {
-        this.machineId = machineId;
-        this.taskName = taskName;
-        this.resultType = 2;
-        this.listenProcessList = listenProcessList;
-    }
-}

common/src/main/java/cn/reghao/bnt/common/ws/WebSocketListenerImpl.java

@@ -1,90 +0,0 @@
-package cn.reghao.bnt.common.ws;
-
-import cn.reghao.jutil.jdk.serializer.JdkSerializer;
-import lombok.extern.slf4j.Slf4j;
-import okhttp3.Response;
-import okhttp3.WebSocket;
-import okhttp3.WebSocketListener;
-import okio.ByteString;
-
-import java.io.EOFException;
-import java.net.ConnectException;
-import java.net.ProtocolException;
-
-/**
- * @author reghao
- * @date 2023-02-23 09:26:50
- */
-@Slf4j
-public class WebSocketListenerImpl extends WebSocketListener {
-    private final WsClient wsClient;
-
-    public WebSocketListenerImpl(WsClient wsClient) {
-        this.wsClient = wsClient;
-    }
-
-    @Override
-    public void onOpen(WebSocket webSocket, Response response) {
-        log.info("WebSocket 连接成功");
-        wsClient.setConnected(true);
-        wsClient.resetRetryCount();
-    }
-
-    @Override
-    public void onClosing(WebSocket webSocket, int code, String reason) {
-        log.error("WebSocket 连接被动断开 -> {} - {}", code, reason);
-        wsClient.setConnected(false);
-
-        if (wsClient.isRetry()) {
-            reconnect();
-        }
-    }
-
-    @Override
-    public void onClosed(WebSocket webSocket, int code, String reason) {
-        log.error("WebSocket 连接主动断开 -> {} - {}", code, reason);
-        wsClient.setConnected(false);
-    }
-
-    @Override
-    public void onFailure(WebSocket webSocket, Throwable throwable, Response response) {
-        log.info("WebSocket 异常事件: {}", throwable.toString());
-        if (throwable instanceof ConnectException
-                || throwable instanceof EOFException
-                || throwable instanceof ProtocolException) {
-            wsClient.setConnected(false);
-            if (wsClient.isRetry()) {
-                reconnect();
-            }
-        } else {
-            throwable.printStackTrace();
-        }
-    }
-
-    private void reconnect() {
-        log.info("WebSocket 重连");
-        try {
-            if (wsClient.getRetryCount() > 10) {
-                log.info("WebSocket 重连超过 10 次, 休眠 1 分钟后再尝试");
-                Thread.sleep(60_000);
-                wsClient.resetRetryCount();
-            } else {
-                log.info("休眠 10s 后再尝试重连");
-                Thread.sleep(10_000);
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        wsClient.retryCountIncr();
-        wsClient.connect();
-    }
-
-    @Override
-    public void onMessage(WebSocket webSocket, String text) {
-    }
-
-    @Override
-    public void onMessage(WebSocket webSocket, ByteString bytes) {
-        Object object = JdkSerializer.deserialize(bytes.toByteArray());
-    }
-}

common/src/main/java/cn/reghao/bnt/common/ws/WsClient.java

@@ -1,106 +0,0 @@
-package cn.reghao.bnt.common.ws;
-
-import cn.reghao.jutil.jdk.serializer.JdkSerializer;
-import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.WebSocket;
-import okhttp3.WebSocketListener;
-import okio.ByteString;
-
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author reghao
- * @date 2023-02-23 09:26:50
- */
-public class WsClient {
-    private final ScheduledExecutorService scheduler = ThreadPoolWrapper.scheduledThreadPool("ws-heartbeat", 1);
-    private Future<?> heartbeatFuture;
-
-    private final String url;
-    private String token;
-    private WebSocket webSocket;
-    private boolean connected;
-    private final WebSocketListener webSocketListener;
-    private boolean retry;
-    private int retryCount;
-
-    public WsClient(String url) {
-        this.url = url;
-        //this.token = token;
-        this.webSocketListener = new WebSocketListenerImpl(this);
-        this.retry = true;
-        this.retryCount = 0;
-    }
-
-    public void setRetry(boolean retry) {
-        this.retry = retry;
-    }
-
-    public boolean isRetry() {
-        return retry;
-    }
-
-    public void retryCountIncr() {
-        this.retryCount += 1;
-    }
-
-    public void resetRetryCount() {
-        this.retryCount = 0;
-    }
-
-    public int getRetryCount() {
-        return retryCount;
-    }
-
-    public void connect() {
-        Request request = new Request.Builder()
-                .url(url)
-                //.header("Authorization", "Bearer " + token)
-                .build();
-
-        OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                .connectTimeout(30, TimeUnit.SECONDS)
-                .readTimeout(30, TimeUnit.SECONDS)
-                .writeTimeout(30, TimeUnit.SECONDS)
-                .build();
-        this.webSocket = okHttpClient.newWebSocket(request, webSocketListener);
-    }
-
-    public void setConnected(boolean status) {
-        this.connected = status;
-        if (status) {
-            heartbeatFuture = scheduler.scheduleAtFixedRate(new HeartbeatTask(), 0, 10, TimeUnit.SECONDS);
-        } else {
-            if (heartbeatFuture != null && !heartbeatFuture.isCancelled()) {
-                heartbeatFuture.cancel(true);
-            }
-        }
-    }
-
-    public boolean isConnected() {
-        return connected;
-    }
-
-    public void send(Object message) {
-        if (isConnected()) {
-            byte[] bytes = JdkSerializer.serialize(message);
-            webSocket.send(ByteString.of(bytes));
-        }
-    }
-
-    public void close() {
-        setRetry(false);
-        webSocket.close(1000, "Client Close Connection");
-    }
-
-    class HeartbeatTask implements Runnable {
-        @Override
-        public void run() {
-            send("");
-        }
-    }
-}

common/src/main/java/cn/reghao/devops/common/agent/app/dto/AppInfo.java

@@ -0,0 +1,18 @@
+package cn.reghao.devops.common.agent.app.dto;
+
+import lombok.Getter;
+
+/**
+ * @author reghao
+ * @date 2023-03-08 10:01:20
+ */
+@Getter
+public class AppInfo {
+    private final String packType;
+    private final String appId;
+
+    public AppInfo(String packType, String appId) {
+        this.packType = packType;
+        this.appId = appId;
+    }
+}

common/src/main/java/cn/reghao/devops/common/agent/app/iface/AppDeploy.java

@@ -0,0 +1,12 @@
+package cn.reghao.devops.common.agent.app.iface;
+
+import cn.reghao.devops.common.msg.event.EvtAppDeploy;
+import cn.reghao.devops.common.msg.event.EvtAppStatResult;
+
+/**
+ * @author reghao
+ * @date 2023-03-06 16:21:07
+ */
+public interface AppDeploy {
+    EvtAppStatResult deploy(EvtAppDeploy deployParam) throws Exception;
+}