Просмотр исходного кода

1.将项目名由 devops 修改为 bnt
2.bnt 项目作为一个 monolithic application, 与之对应的是 tnb 项目, 它是一个 microservices

reghao 1 год назад
Родитель
Сommit
b6db5176cb
100 измененных файлов с 2530 добавлено и 1362 удалено
  1. 1 1
      .gitignore
  2. 1 2
      README.md
  3. 1 1
      agent/bin/restart.sh
  4. 1 1
      agent/bin/shutdown.sh
  5. 1 1
      agent/bin/start.sh
  6. 5 5
      agent/pom.xml
  7. 104 0
      agent/src/main/java/cn/reghao/bnt/agent/AgentApp.java
  8. 53 0
      agent/src/main/java/cn/reghao/bnt/agent/config/ConfigFile.java
  9. 15 0
      agent/src/main/java/cn/reghao/bnt/agent/config/DagentConfig.java
  10. 51 0
      agent/src/main/java/cn/reghao/bnt/agent/event/EventCenter.java
  11. 52 0
      agent/src/main/java/cn/reghao/bnt/agent/event/handler/EvtAppDeployHandler.java
  12. 73 0
      agent/src/main/java/cn/reghao/bnt/agent/event/handler/EvtAppStatHandler.java
  13. 94 0
      agent/src/main/java/cn/reghao/bnt/agent/event/ws/WebSocketListenerImpl.java
  14. 99 0
      agent/src/main/java/cn/reghao/bnt/agent/event/ws/WsClient.java
  15. 0 104
      agent/src/main/java/cn/reghao/devops/agent/AgentApp.java
  16. 0 53
      agent/src/main/java/cn/reghao/devops/agent/config/ConfigFile.java
  17. 0 15
      agent/src/main/java/cn/reghao/devops/agent/config/DagentConfig.java
  18. 0 51
      agent/src/main/java/cn/reghao/devops/agent/event/EventCenter.java
  19. 0 52
      agent/src/main/java/cn/reghao/devops/agent/event/handler/EvtAppDeployHandler.java
  20. 0 73
      agent/src/main/java/cn/reghao/devops/agent/event/handler/EvtAppStatHandler.java
  21. 0 99
      agent/src/main/java/cn/reghao/devops/agent/event/ws/WebSocketListenerImpl.java
  22. 0 99
      agent/src/main/java/cn/reghao/devops/agent/event/ws/WsClient.java
  23. 1 1
      agent/src/test/java/WebSocketClient.java
  24. 2 2
      common/pom.xml
  25. 18 0
      common/src/main/java/cn/reghao/bnt/common/agent/app/dto/AppInfo.java
  26. 12 0
      common/src/main/java/cn/reghao/bnt/common/agent/app/iface/AppDeploy.java
  27. 17 0
      common/src/main/java/cn/reghao/bnt/common/agent/app/iface/AppStat.java
  28. 28 0
      common/src/main/java/cn/reghao/bnt/common/agent/app/iface/impl/AppDeployService.java
  29. 66 0
      common/src/main/java/cn/reghao/bnt/common/agent/app/iface/impl/AppStatService.java
  30. 84 0
      common/src/main/java/cn/reghao/bnt/common/agent/app/iface/impl/DockerApp.java
  31. 81 0
      common/src/main/java/cn/reghao/bnt/common/agent/machine/MachineEvent.java
  32. 30 0
      common/src/main/java/cn/reghao/bnt/common/docker/Docker.java
  33. 279 0
      common/src/main/java/cn/reghao/bnt/common/docker/DockerImpl.java
  34. 46 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/Config.java
  35. 18 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/Data.java
  36. 11 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/ExposedPorts.java
  37. 16 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/GraphDriver.java
  38. 17 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/Health.java
  39. 15 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/Healthcheck.java
  40. 23 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/HostConfig.java
  41. 14 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/Labels.java
  42. 16 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/Log.java
  43. 11 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/NetworkingConfig.java
  44. 21 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/RestartPolicy.java
  45. 24 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/State.java
  46. 14 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/Volumes.java
  47. 21 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/result/Bridge.java
  48. 33 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/result/Container.java
  49. 47 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/result/ContainerInfo.java
  50. 19 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/result/Mount.java
  51. 13 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/result/NetworkSettings.java
  52. 13 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/result/Networks.java
  53. 15 0
      common/src/main/java/cn/reghao/bnt/common/docker/po/result/Port.java
  54. 33 0
      common/src/main/java/cn/reghao/bnt/common/machine/Cpu.java
  55. 86 0
      common/src/main/java/cn/reghao/bnt/common/machine/Disk.java
  56. 69 0
      common/src/main/java/cn/reghao/bnt/common/machine/Machine.java
  57. 52 0
      common/src/main/java/cn/reghao/bnt/common/machine/Memory.java
  58. 27 0
      common/src/main/java/cn/reghao/bnt/common/machine/MemoryStat.java
  59. 73 0
      common/src/main/java/cn/reghao/bnt/common/machine/Network.java
  60. 30 0
      common/src/main/java/cn/reghao/bnt/common/machine/Os.java
  61. 17 0
      common/src/main/java/cn/reghao/bnt/common/msg/MessageSender.java
  62. 14 0
      common/src/main/java/cn/reghao/bnt/common/msg/MsgQueue.java
  63. 9 0
      common/src/main/java/cn/reghao/bnt/common/msg/constant/AppId.java
  64. 9 0
      common/src/main/java/cn/reghao/bnt/common/msg/constant/AppStatOps.java
  65. 9 0
      common/src/main/java/cn/reghao/bnt/common/msg/constant/NodeStatus.java
  66. 15 0
      common/src/main/java/cn/reghao/bnt/common/msg/constant/PackType.java
  67. 11 0
      common/src/main/java/cn/reghao/bnt/common/msg/constant/Protocol.java
  68. 26 0
      common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAgentHeartbeat.java
  69. 33 0
      common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAgentStart.java
  70. 19 0
      common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAppDeploy.java
  71. 22 0
      common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAppStat.java
  72. 31 0
      common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAppStatResult.java
  73. 10 0
      common/src/main/java/cn/reghao/bnt/common/msg/event/EvtBuildApp.java
  74. 10 0
      common/src/main/java/cn/reghao/bnt/common/msg/event/EvtBuildAppResult.java
  75. 19 0
      common/src/main/java/cn/reghao/bnt/common/util/NotAvailable.java
  76. 13 0
      common/src/main/java/cn/reghao/bnt/common/util/text/FileProcessor.java
  77. 35 0
      common/src/main/java/cn/reghao/bnt/common/util/text/ReplaceCharacter.java
  78. 65 0
      common/src/main/java/cn/reghao/bnt/common/version/AppVersion.java
  79. 18 0
      common/src/main/java/cn/reghao/bnt/common/ws/MessageDispatcher.java
  80. 93 0
      common/src/main/java/cn/reghao/bnt/common/ws/WebSocketListenerImpl.java
  81. 106 0
      common/src/main/java/cn/reghao/bnt/common/ws/WsClient.java
  82. 0 18
      common/src/main/java/cn/reghao/devops/common/agent/app/dto/AppInfo.java
  83. 0 12
      common/src/main/java/cn/reghao/devops/common/agent/app/iface/AppDeploy.java
  84. 0 17
      common/src/main/java/cn/reghao/devops/common/agent/app/iface/AppStat.java
  85. 0 28
      common/src/main/java/cn/reghao/devops/common/agent/app/iface/impl/AppDeployService.java
  86. 0 66
      common/src/main/java/cn/reghao/devops/common/agent/app/iface/impl/AppStatService.java
  87. 0 84
      common/src/main/java/cn/reghao/devops/common/agent/app/iface/impl/DockerApp.java
  88. 0 81
      common/src/main/java/cn/reghao/devops/common/agent/machine/MachineEvent.java
  89. 0 30
      common/src/main/java/cn/reghao/devops/common/docker/Docker.java
  90. 0 279
      common/src/main/java/cn/reghao/devops/common/docker/DockerImpl.java
  91. 0 46
      common/src/main/java/cn/reghao/devops/common/docker/po/Config.java
  92. 0 18
      common/src/main/java/cn/reghao/devops/common/docker/po/Data.java
  93. 0 11
      common/src/main/java/cn/reghao/devops/common/docker/po/ExposedPorts.java
  94. 0 16
      common/src/main/java/cn/reghao/devops/common/docker/po/GraphDriver.java
  95. 0 17
      common/src/main/java/cn/reghao/devops/common/docker/po/Health.java
  96. 0 15
      common/src/main/java/cn/reghao/devops/common/docker/po/Healthcheck.java
  97. 0 23
      common/src/main/java/cn/reghao/devops/common/docker/po/HostConfig.java
  98. 0 14
      common/src/main/java/cn/reghao/devops/common/docker/po/Labels.java
  99. 0 16
      common/src/main/java/cn/reghao/devops/common/docker/po/Log.java
  100. 0 11
      common/src/main/java/cn/reghao/devops/common/docker/po/NetworkingConfig.java

+ 1 - 1
.gitignore

@@ -6,4 +6,4 @@
 *.jar
 *.log*
 *git.properties*
-devops_data/
+bnt_data/

+ 1 - 2
README.md

@@ -1,2 +1 @@
-# devops
-一个 DevOps 自动化系统,分为 manager 和 agent 两个应用。
+# bnt

+ 1 - 1
agent/bin/restart.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 app_dir=`pwd`
-app_name='devops-agent.jar'
+app_name='bnt-agent.jar'
 
 pid=`ps aux | grep ${app_name} | grep -v 'grep' | tr -s ' '| cut -d ' ' -f 2`
 echo "process id: "${pid}

+ 1 - 1
agent/bin/shutdown.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-app_name='devops-agent.jar'
+app_name='bnt-agent.jar'
 
 pid=`ps aux | grep ${app_name} | grep -v 'grep' | tr -s ' '| cut -d ' ' -f 2`
 echo "process id: "${pid}

+ 1 - 1
agent/bin/start.sh

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

+ 5 - 5
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>devops</artifactId>
-        <groupId>cn.reghao.devops</groupId>
+        <artifactId>bnt</artifactId>
+        <groupId>cn.reghao.bnt</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>cn.reghao.devops</groupId>
+            <groupId>cn.reghao.bnt</groupId>
             <artifactId>common</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
@@ -35,7 +35,7 @@
     </dependencies>
 
     <build>
-        <finalName>devops-${project.artifactId}</finalName>
+        <finalName>bnt-${project.artifactId}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -55,7 +55,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>cn.reghao.devops.agent.AgentApp</mainClass>
+                            <mainClass>cn.reghao.bnt.agent.AgentApp</mainClass>
                         </manifest>
                     </archive>
                     <descriptorRefs>

+ 104 - 0
agent/src/main/java/cn/reghao/bnt/agent/AgentApp.java

@@ -0,0 +1,104 @@
+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.event.ws.WsClient;
+import cn.reghao.bnt.agent.config.ConfigFile;
+import cn.reghao.bnt.agent.config.DagentConfig;
+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.AppDeployService;
+import cn.reghao.bnt.common.agent.app.iface.impl.AppStatService;
+import cn.reghao.bnt.common.agent.app.iface.impl.DockerApp;
+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.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;
+
+@Slf4j
+public class AgentApp {
+	static MessageSender messageSender;
+
+	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(DagentConfig dagentConfig) {
+		DockerApp dockerApp = new DockerApp();
+		AppDeploy appDeploy = new AppDeployService(dockerApp);
+		AppStat appStat = new AppStatService(dockerApp);
+
+		if (tryConnect(dagentConfig.getManagerAddress(), dagentConfig.getManagerPort())) {
+			messageSender = new WsClient(dagentConfig, 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("资源清理完成,结束 bnt-agent...");
+		}
+	}
+
+	public static void main(String[] args) {
+		setLogLevel();
+		if (args.length != 1) {
+			log.error("必须指定配置文件...");
+			return;
+		}
+
+		String configFilePath = ConfigFile.configFilePath(args[0], AgentApp.class);
+		DagentConfig dagentConfig = JsonConverter.jsonFileToObject(new File(configFilePath), DagentConfig.class);
+		messageSender = getMessageSender(dagentConfig);
+		if (messageSender == null) {
+			log.error("没有可用的 MessageSender, Agent 结束运行, 具体信息请查看日志");
+			System.exit(-1);
+		} else {
+			messageSender.connect();
+		}
+
+		shutdownGracefully();
+		SingleInstance.onlyOne(60001);
+	}
+}

+ 53 - 0
agent/src/main/java/cn/reghao/bnt/agent/config/ConfigFile.java

@@ -0,0 +1,53 @@
+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();
+    }
+}

+ 15 - 0
agent/src/main/java/cn/reghao/bnt/agent/config/DagentConfig.java

@@ -0,0 +1,15 @@
+package cn.reghao.bnt.agent.config;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author reghao
+ * @date 2023-02-23 11:37:32
+ */
+@AllArgsConstructor
+@Getter
+public class DagentConfig {
+    private String managerAddress;
+    private int managerPort;
+}

+ 51 - 0
agent/src/main/java/cn/reghao/bnt/agent/event/EventCenter.java

@@ -0,0 +1,51 @@
+package cn.reghao.bnt.agent.event;
+
+import cn.reghao.bnt.agent.event.handler.EvtAppDeployHandler;
+import cn.reghao.bnt.agent.event.handler.EvtAppStatHandler;
+import cn.reghao.bnt.common.agent.app.iface.AppDeploy;
+import cn.reghao.bnt.common.agent.app.iface.AppStat;
+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.jutil.jdk.event.message.Event;
+import cn.reghao.jutil.jdk.event.router.EventDispatcher;
+import cn.reghao.jutil.jdk.event.message.EventMessage;
+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));
+    }
+
+    public void dispatch(EventMessage eventMessage) {
+        try {
+            long sendTime = eventMessage.getSendTime();
+            if (sendTime < startTime) {
+                log.info("忽略 agent 启动前 manager 发送的事件...");
+                return;
+            }
+
+            Event event = eventMessage.getEvent();
+            dispatcher.dispatch(event);
+        } catch (Exception e) {
+            log.error("处理消息发生异常: {}", e.getMessage());
+        }
+    }
+}

+ 52 - 0
agent/src/main/java/cn/reghao/bnt/agent/event/handler/EvtAppDeployHandler.java

@@ -0,0 +1,52 @@
+package cn.reghao.bnt.agent.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.MsgQueue;
+import cn.reghao.bnt.common.msg.event.EvtAppStatResult;
+import cn.reghao.jutil.jdk.event.message.Event;
+import cn.reghao.jutil.jdk.event.message.EventMessage;
+import cn.reghao.jutil.jdk.event.handler.Handler;
+import cn.reghao.bnt.common.msg.event.EvtAppDeploy;
+import cn.reghao.jutil.jdk.exception.ExceptionUtil;
+import cn.reghao.jutil.jdk.result.Result;
+import cn.reghao.jutil.jdk.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(MsgQueue.managerTopic(), evtMsg);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}

+ 73 - 0
agent/src/main/java/cn/reghao/bnt/agent/event/handler/EvtAppStatHandler.java

@@ -0,0 +1,73 @@
+package cn.reghao.bnt.agent.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.result.Result;
+import cn.reghao.jutil.jdk.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();
+        }
+    }
+}

+ 94 - 0
agent/src/main/java/cn/reghao/bnt/agent/event/ws/WebSocketListenerImpl.java

@@ -0,0 +1,94 @@
+package cn.reghao.bnt.agent.event.ws;
+
+import cn.reghao.bnt.agent.event.EventCenter;
+import cn.reghao.bnt.common.agent.machine.MachineEvent;
+import cn.reghao.jutil.jdk.serializer.JdkSerializer;
+import cn.reghao.jutil.jdk.event.message.EventMessage;
+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 EventCenter eventCenter;
+    private final WsClient wsClient;
+    private final MachineEvent machineEvent;
+
+    public WebSocketListenerImpl(WsClient wsClient, EventCenter eventCenter, MachineEvent machineEvent) {
+        this.eventCenter = eventCenter;
+        this.wsClient = wsClient;
+        this.machineEvent = machineEvent;
+    }
+
+    @Override
+    public void onOpen(WebSocket webSocket, Response response) {
+        log.info("WebSocket 连接成功");
+        wsClient.setConnected(true);
+        wsClient.resetRetryCount();
+
+        machineEvent.agentStart();
+    }
+
+    @Override
+    public void onClosing(WebSocket webSocket, int code, String reason) {
+        log.error("WebSocket 连接被动断开 -> {} - {}", code, reason);
+        wsClient.setConnected(false);
+
+        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.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);
+        }
+    }
+}

+ 99 - 0
agent/src/main/java/cn/reghao/bnt/agent/event/ws/WsClient.java

@@ -0,0 +1,99 @@
+package cn.reghao.bnt.agent.event.ws;
+
+import cn.reghao.bnt.agent.config.DagentConfig;
+import cn.reghao.bnt.agent.event.EventCenter;
+import cn.reghao.bnt.common.agent.app.iface.AppDeploy;
+import cn.reghao.bnt.common.agent.app.iface.AppStat;
+import cn.reghao.bnt.common.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.*;
+import okio.ByteString;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @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(DagentConfig dagentConfig, AppDeploy appDeploy, AppStat appStat) {
+        String host = dagentConfig.getManagerAddress();
+        int port = dagentConfig.getManagerPort();
+        this.url = String.format("ws://%s:%s/ws/agent?token=%s", host, port, Machine.ID);
+
+        EventCenter eventCenter = new EventCenter(this, appDeploy, appStat);
+        // 每 10s 发送一次心跳
+        int heartbeatInterval = 10;
+        MachineEvent machineEvent = new MachineEvent(this, new Machine(), heartbeatInterval);
+        this.webSocketListener = new WebSocketListenerImpl(this, eventCenter, machineEvent);
+        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;
+    }
+
+    @Override
+    public void connect() {
+        Request request = new Request.Builder()
+                .url(url)
+                .header("Authorization", "Bearer " + Machine.ID)
+                .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);
+    }
+
+    @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");
+    }
+}

+ 0 - 104
agent/src/main/java/cn/reghao/devops/agent/AgentApp.java

@@ -1,104 +0,0 @@
-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.DagentConfig;
-import cn.reghao.devops.agent.event.ws.WsClient;
-import cn.reghao.devops.common.agent.app.iface.AppDeploy;
-import cn.reghao.devops.common.agent.app.iface.AppStat;
-import cn.reghao.devops.common.agent.app.iface.impl.AppDeployService;
-import cn.reghao.devops.common.agent.app.iface.impl.AppStatService;
-import cn.reghao.devops.common.agent.app.iface.impl.DockerApp;
-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.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;
-
-@Slf4j
-public class AgentApp {
-	static MessageSender messageSender;
-
-	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(DagentConfig dagentConfig) {
-		DockerApp dockerApp = new DockerApp();
-		AppDeploy appDeploy = new AppDeployService(dockerApp);
-		AppStat appStat = new AppStatService(dockerApp);
-
-		if (tryConnect(dagentConfig.getManagerAddress(), dagentConfig.getManagerPort())) {
-			messageSender = new WsClient(dagentConfig, 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);
-		DagentConfig dagentConfig = JsonConverter.jsonFileToObject(new File(configFilePath), DagentConfig.class);
-		messageSender = getMessageSender(dagentConfig);
-		if (messageSender == null) {
-			log.error("没有可用的 MessageSender, Agent 结束运行, 具体信息请查看日志");
-			System.exit(-1);
-		} else {
-			messageSender.connect();
-		}
-
-		shutdownGracefully();
-		SingleInstance.onlyOne(60001);
-	}
-}

+ 0 - 53
agent/src/main/java/cn/reghao/devops/agent/config/ConfigFile.java

@@ -1,53 +0,0 @@
-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();
-    }
-}

+ 0 - 15
agent/src/main/java/cn/reghao/devops/agent/config/DagentConfig.java

@@ -1,15 +0,0 @@
-package cn.reghao.devops.agent.config;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author reghao
- * @date 2023-02-23 11:37:32
- */
-@AllArgsConstructor
-@Getter
-public class DagentConfig {
-    private String managerAddress;
-    private int managerPort;
-}

+ 0 - 51
agent/src/main/java/cn/reghao/devops/agent/event/EventCenter.java

@@ -1,51 +0,0 @@
-package cn.reghao.devops.agent.event;
-
-import cn.reghao.devops.agent.event.handler.EvtAppDeployHandler;
-import cn.reghao.devops.agent.event.handler.EvtAppStatHandler;
-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.jutil.jdk.event.message.Event;
-import cn.reghao.jutil.jdk.event.router.EventDispatcher;
-import cn.reghao.jutil.jdk.event.message.EventMessage;
-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));
-    }
-
-    public void dispatch(EventMessage eventMessage) {
-        try {
-            long sendTime = eventMessage.getSendTime();
-            if (sendTime < startTime) {
-                log.info("忽略 agent 启动前 manager 发送的事件...");
-                return;
-            }
-
-            Event event = eventMessage.getEvent();
-            dispatcher.dispatch(event);
-        } catch (Exception e) {
-            log.error("处理消息发生异常: {}", e.getMessage());
-        }
-    }
-}

+ 0 - 52
agent/src/main/java/cn/reghao/devops/agent/event/handler/EvtAppDeployHandler.java

@@ -1,52 +0,0 @@
-package cn.reghao.devops.agent.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.MsgQueue;
-import cn.reghao.devops.common.msg.event.EvtAppStatResult;
-import cn.reghao.jutil.jdk.event.message.Event;
-import cn.reghao.jutil.jdk.event.message.EventMessage;
-import cn.reghao.jutil.jdk.event.handler.Handler;
-import cn.reghao.devops.common.msg.event.EvtAppDeploy;
-import cn.reghao.jutil.jdk.exception.ExceptionUtil;
-import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.jutil.jdk.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(MsgQueue.managerTopic(), evtMsg);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}

+ 0 - 73
agent/src/main/java/cn/reghao/devops/agent/event/handler/EvtAppStatHandler.java

@@ -1,73 +0,0 @@
-package cn.reghao.devops.agent.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.result.Result;
-import cn.reghao.jutil.jdk.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();
-        }
-    }
-}

+ 0 - 99
agent/src/main/java/cn/reghao/devops/agent/event/ws/WebSocketListenerImpl.java

@@ -1,99 +0,0 @@
-package cn.reghao.devops.agent.event.ws;
-
-import cn.reghao.devops.agent.event.EventCenter;
-import cn.reghao.devops.common.agent.machine.MachineEvent;
-import cn.reghao.devops.common.machine.Machine;
-import cn.reghao.jutil.jdk.serializer.JdkSerializer;
-import cn.reghao.jutil.jdk.event.message.EventMessage;
-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 EventCenter eventCenter;
-    private final WsClient wsClient;
-    private final MachineEvent machineEvent;
-
-    public WebSocketListenerImpl(WsClient wsClient, EventCenter eventCenter, MachineEvent machineEvent) {
-        this.eventCenter = eventCenter;
-        this.wsClient = wsClient;
-        this.machineEvent = machineEvent;
-    }
-
-    @Override
-    public void onOpen(WebSocket webSocket, Response response) {
-        log.info("WebSocket 连接成功");
-        wsClient.setConnected(true);
-        wsClient.resetRetryCount();
-
-        machineEvent.agentStart();
-    }
-
-    @Override
-    public void onClosing(WebSocket webSocket, int code, String reason) {
-        log.error("WebSocket 连接被动断开 -> {} - {}", code, reason);
-        wsClient.setConnected(false);
-
-        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.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);
-        }
-    }
-}

+ 0 - 99
agent/src/main/java/cn/reghao/devops/agent/event/ws/WsClient.java

@@ -1,99 +0,0 @@
-package cn.reghao.devops.agent.event.ws;
-
-import cn.reghao.devops.agent.config.DagentConfig;
-import cn.reghao.devops.agent.event.EventCenter;
-import cn.reghao.devops.common.agent.app.iface.AppDeploy;
-import cn.reghao.devops.common.agent.app.iface.AppStat;
-import cn.reghao.devops.common.agent.machine.MachineEvent;
-import cn.reghao.devops.common.machine.Machine;
-import cn.reghao.devops.common.msg.MessageSender;
-import cn.reghao.jutil.jdk.serializer.JdkSerializer;
-import okhttp3.*;
-import okio.ByteString;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * @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(DagentConfig dagentConfig, AppDeploy appDeploy, AppStat appStat) {
-        String host = dagentConfig.getManagerAddress();
-        int port = dagentConfig.getManagerPort();
-        this.url = String.format("ws://%s:%s/ws/agent?token=%s", host, port, Machine.ID);
-
-        EventCenter eventCenter = new EventCenter(this, appDeploy, appStat);
-        // 每 10s 发送一次心跳
-        int heartbeatInterval = 10;
-        MachineEvent machineEvent = new MachineEvent(this, new Machine(), heartbeatInterval);
-        this.webSocketListener = new WebSocketListenerImpl(this, eventCenter, machineEvent);
-        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;
-    }
-
-    @Override
-    public void connect() {
-        Request request = new Request.Builder()
-                .url(url)
-                .header("Authorization", "Bearer " + Machine.ID)
-                .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);
-    }
-
-    @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");
-    }
-}

+ 1 - 1
agent/src/test/java/WebSocketClient.java

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

+ 2 - 2
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>devops</artifactId>
-        <groupId>cn.reghao.devops</groupId>
+        <artifactId>bnt</artifactId>
+        <groupId>cn.reghao.bnt</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

+ 18 - 0
common/src/main/java/cn/reghao/bnt/common/agent/app/dto/AppInfo.java

@@ -0,0 +1,18 @@
+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;
+    }
+}

+ 12 - 0
common/src/main/java/cn/reghao/bnt/common/agent/app/iface/AppDeploy.java

@@ -0,0 +1,12 @@
+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;
+}

+ 17 - 0
common/src/main/java/cn/reghao/bnt/common/agent/app/iface/AppStat.java

@@ -0,0 +1,17 @@
+package cn.reghao.bnt.common.agent.app.iface;
+
+import cn.reghao.bnt.common.msg.event.EvtAppStat;
+import cn.reghao.bnt.common.msg.event.EvtAppStatResult;
+
+/**
+ * 应用状态管理
+ *
+ * @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;
+}

+ 28 - 0
common/src/main/java/cn/reghao/bnt/common/agent/app/iface/impl/AppDeployService.java

@@ -0,0 +1,28 @@
+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 AppDeployService implements AppDeploy {
+    private final DockerApp dockerApp;
+
+    public AppDeployService(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 打包没有实现");
+        }
+    }
+}

+ 66 - 0
common/src/main/java/cn/reghao/bnt/common/agent/app/iface/impl/AppStatService.java

@@ -0,0 +1,66 @@
+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;
+
+/**
+ * @author reghao
+ * @date 2023-03-06 16:19:24
+ */
+public class AppStatService implements AppStat {
+    private final DockerApp dockerApp;
+
+    public AppStatService(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 打包没有实现");
+        }
+    }
+}

+ 84 - 0
common/src/main/java/cn/reghao/bnt/common/agent/app/iface/impl/DockerApp.java

@@ -0,0 +1,84 @@
+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.po.Config;
+import cn.reghao.bnt.common.docker.po.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.bnt.common.util.NotAvailable;
+import cn.reghao.jutil.jdk.converter.DateTimeConverter;
+import cn.reghao.jutil.jdk.serializer.JsonConverter;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+
+/**
+ * @author reghao
+ * @date 2023-03-06 15:26:22
+ */
+public class DockerApp {
+    private final Docker docker = new DockerImpl();
+
+    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.pull(packagePath);
+        InspectContainerResponse containerInfo = docker.createAndRun(appId, containerConfig);
+        return getStat(appId, containerInfo);
+    }
+
+    public EvtAppStatResult start(String appId) throws Exception {
+        InspectContainerResponse containerInfo = docker.start(appId);
+        return getStat(appId, containerInfo);
+    }
+
+    public EvtAppStatResult stop(String appId) throws Exception {
+        InspectContainerResponse containerInfo = docker.stop(appId);
+        return getStat(appId, containerInfo);
+    }
+
+    public EvtAppStatResult restart(String appId) throws Exception {
+        InspectContainerResponse containerInfo = docker.restart(appId);
+        return getStat(appId, containerInfo);
+    }
+
+    public EvtAppStatResult stat(String appId) throws Exception {
+        InspectContainerResponse containerInfo = docker.inspectContainer(appId);
+        return getStat(appId, containerInfo);
+    }
+
+    private EvtAppStatResult getStat(String appId, InspectContainerResponse containerInfo) {
+        EvtAppStatResult appStatResult = new EvtAppStatResult(appId, Machine.ID);
+        String image = containerInfo.getConfig().getImage();
+        if (image != null) {
+            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.setStartTime(DateTimeConverter.localDateTime(startedAt));
+            appStatResult.setPid(state.getPidLong().intValue());
+        }
+
+        return appStatResult;
+    }
+}

+ 81 - 0
common/src/main/java/cn/reghao/bnt/common/agent/machine/MachineEvent.java

@@ -0,0 +1,81 @@
+package cn.reghao.bnt.common.agent.machine;
+
+import cn.reghao.bnt.common.machine.Machine;
+import cn.reghao.bnt.common.msg.MessageSender;
+import cn.reghao.bnt.common.msg.MsgQueue;
+import cn.reghao.bnt.common.msg.event.EvtAgentHeartbeat;
+import cn.reghao.bnt.common.msg.event.EvtAgentStart;
+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.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 MessageSender messageSender;
+    private final int heartbeatInterval;
+    
+    public MachineEvent(MessageSender messageSender, Machine machine, int heartbeatInterval) {
+        this.scheduler = ThreadPoolWrapper.scheduledThreadPool("heartbeat", 1);
+        this.machine = machine;
+        this.messageSender = messageSender;
+        this.heartbeatInterval = heartbeatInterval;
+    }
+
+    public void agentStart() {
+        EvtAgentStart evtAgentStart = machine.detail();
+        EventMessage eventMessage = EventMessage.evt(evtAgentStart);
+        pub(eventMessage);
+
+        agentHeartbeat();
+    }
+
+    public void agentShutdown() {
+        ThreadPoolWrapper.shutdownScheduler(scheduler);
+        EvtAgentHeartbeat machineStat = machine.stat();
+        EventMessage eventMessage = EventMessage.evt(machineStat);
+        pub(eventMessage);
+    }
+
+    public void agentHeartbeat() {
+        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(MsgQueue.managerTopic(), 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);
+        }
+    }
+}

+ 30 - 0
common/src/main/java/cn/reghao/bnt/common/docker/Docker.java

@@ -0,0 +1,30 @@
+package cn.reghao.bnt.common.docker;
+
+import cn.reghao.bnt.common.docker.po.Config;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.api.model.Image;
+
+import java.util.List;
+
+/**
+ * Docker 客户端
+ *
+ * @author reghao
+ * @date 2021-10-27 04:17:38
+ */
+public interface Docker {
+    void build(String repoTag, String compileHome, String dockerfileContent) throws Exception;
+    void build(String repoTag, String compileHome) 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;
+    InspectContainerResponse start(String containerName);
+    InspectContainerResponse stop(String containerName);
+    InspectContainerResponse restart(String containerName);
+    InspectContainerResponse inspectContainer(String containerName);
+    List<Image> images();
+    List<Container> ps(boolean isAll);
+    InspectContainerResponse ps(String containerName);
+}

+ 279 - 0
common/src/main/java/cn/reghao/bnt/common/docker/DockerImpl.java

@@ -0,0 +1,279 @@
+package cn.reghao.bnt.common.docker;
+
+import cn.reghao.bnt.common.docker.po.Config;
+import cn.reghao.jutil.jdk.exception.ExceptionUtil;
+import cn.reghao.jutil.jdk.converter.DateTimeConverter;
+import cn.reghao.jutil.jdk.text.TextFile;
+import com.github.dockerjava.api.DockerClient;
+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.core.command.PushImageResultCallback;
+import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
+import com.github.dockerjava.transport.DockerHttpClient;
+
+import java.io.File;
+import java.time.Duration;
+import java.util.*;
+
+/**
+ * Docker 客户端
+ *
+ * @author reghao
+ * @date 2021-10-27 03:41:38
+ */
+public class DockerImpl implements Docker {
+    private final DockerClient dockerClient;
+    private final TextFile textFile = new TextFile();
+
+    public DockerImpl() {
+        DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
+                .withDockerHost("unix:///var/run/docker.sock")
+                .withDockerTlsVerify(false)
+                .withDockerCertPath(String.format("%s/.docker", System.getProperty("user.home")))
+                //.withRegistryUsername("username")
+                //.withRegistryPassword("password")
+                //.withRegistryEmail(registryMail)
+                //.withRegistryUrl(registryUrl)
+                .build();
+
+        DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder()
+                .dockerHost(config.getDockerHost())
+                .sslConfig(config.getSSLConfig())
+                .maxConnections(100)
+                .connectionTimeout(Duration.ofSeconds(30))
+                .responseTimeout(Duration.ofSeconds(45))
+                .build();
+
+        this.dockerClient = DockerClientImpl.getInstance(config, httpClient);
+    }
+
+    @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/bnt:12345678
+                    .withTags(Set.of(repoTag))
+                    .start()
+                    .awaitImageId();
+        } catch (Exception e) {
+            throw new Exception(ExceptionUtil.errorMsg(e));
+        }
+    }
+
+    @Override
+    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();
+    }
+
+    @Override
+    public void push(String image) throws Exception {
+        try {
+            dockerClient.pushImageCmd(image).exec(new PushImageResultCallback()).awaitCompletion();
+        } catch (InterruptedException e) {
+            throw new Exception(ExceptionUtil.errorMsg(e));
+        }
+        /*dockerClient.pushImageCmd(image).exec(new ResultCallback<PushResponseItem>() {
+            @Override
+            public void onStart(Closeable closeable) {
+
+            }
+
+            @Override
+            public void onNext(PushResponseItem object) {
+                System.out.println(object.getStatus());
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+
+            }
+
+            @Override
+            public void onComplete() {
+
+            }
+
+            @Override
+            public void close() throws IOException {
+
+            }
+        }).onComplete();*/
+    }
+
+    @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, 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);
+        }
+
+        HostConfig hostConfig = HostConfig.newHostConfig()
+                .withNetworkMode("host")
+                .withRestartPolicy(RestartPolicy.unlessStoppedRestart());
+        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);
+        }
+
+        createContainerCmd.withHostConfig(hostConfig);
+        CreateContainerResponse response = createContainerCmd.exec();
+        String containerId = response.getId();
+        dockerClient.startContainerCmd(containerId).exec();
+        return dockerClient.inspectContainerCmd(containerId).exec();
+    }
+
+    @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();
+
+        images.forEach(image -> {
+            long created = image.getCreated();
+            String[] repoTags = image.getRepoTags();
+            if (repoTags.length == 0) {
+                return;
+            }
+
+            String[] repoTag = repoTags[0].split(":");
+            String repo = repoTag[0];
+            String tag = repoTag[1];
+            System.out.printf("%s:%s -> %s\n", repo, tag, DateTimeConverter.format(created*1000));
+        });
+
+        return images;
+    }
+
+    @Override
+    public List<Container> ps(boolean isAll) {
+        return dockerClient.listContainersCmd()
+                .withShowAll(isAll)
+                .exec();
+    }
+
+    @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();
+    }
+}

+ 46 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/Config.java

@@ -0,0 +1,46 @@
+package cn.reghao.bnt.common.docker.po;
+
+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 {
+    @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(String image) {
+        this.image = image;
+        this.hostConfig = new HostConfig();
+    }
+}

+ 18 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/Data.java

@@ -0,0 +1,18 @@
+package cn.reghao.bnt.common.docker.po;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author reghao
+ * @date 2020-05-19 20:50:24
+ */
+@Getter
+@Setter
+public class Data {
+    @SerializedName("LowerDir") private String lowerDir;
+    @SerializedName("MergedDir") private String mergedDir;
+    @SerializedName("UpperDir") private String upperDir;
+    @SerializedName("WorkDir") private String workDir;
+}

+ 11 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/ExposedPorts.java

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

+ 16 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/GraphDriver.java

@@ -0,0 +1,16 @@
+package cn.reghao.bnt.common.docker.po;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author reghao
+ * @date 2020-05-19 20:51:13
+ */
+@Getter
+@Setter
+public class GraphDriver {
+    @SerializedName("Data") private Data data;
+    @SerializedName("Name") private String name;
+}

+ 17 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/Health.java

@@ -0,0 +1,17 @@
+package cn.reghao.bnt.common.docker.po;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author reghao
+ * @date 2021-02-25 10:16:50
+ */
+@Data
+public class Health {
+    @SerializedName("Status") private String status;
+    @SerializedName("FailingStreak") private int failingStreak;
+    @SerializedName("Log") private List<Log> log;
+}

+ 15 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/Healthcheck.java

@@ -0,0 +1,15 @@
+package cn.reghao.bnt.common.docker.po;
+
+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;
+}

+ 23 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/HostConfig.java

@@ -0,0 +1,23 @@
+package cn.reghao.bnt.common.docker.po;
+
+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;
+
+    public HostConfig() {
+        this.networkMode = "host";
+        this.restartPolicy = new RestartPolicy();
+    }
+}

+ 14 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/Labels.java

@@ -0,0 +1,14 @@
+package cn.reghao.bnt.common.docker.po;
+
+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;
+}

+ 16 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/Log.java

@@ -0,0 +1,16 @@
+package cn.reghao.bnt.common.docker.po;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2021-02-25 10:19:45
+ */
+@Data
+public class Log {
+    @SerializedName("Start") private String start;
+    @SerializedName("End") private String end;
+    @SerializedName("ExitCode") private int exitCode;
+    @SerializedName("Output") private String output;
+}

+ 11 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/NetworkingConfig.java

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

+ 21 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/RestartPolicy.java

@@ -0,0 +1,21 @@
+package cn.reghao.bnt.common.docker.po;
+
+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;
+    }
+}

+ 24 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/State.java

@@ -0,0 +1,24 @@
+package cn.reghao.bnt.common.docker.po;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2020-05-19 21:04:06
+ */
+@Data
+public class State {
+    @SerializedName("Error") private String error;
+    @SerializedName("ExitCode") private int exitCode;
+    @SerializedName("FinishedAt") private String finishedAt;
+    @SerializedName("Health") private Health health;
+    @SerializedName("OOMKilled") private boolean oomKilled;
+    @SerializedName("Dead") private boolean dead;
+    @SerializedName("Paused") private boolean paused;
+    @SerializedName("Pid") private int pid;
+    @SerializedName("Running") private boolean running;
+    @SerializedName("Restarting") private boolean restarting;
+    @SerializedName("StartedAt") private String startedAt;
+    @SerializedName("Status") private String status;
+}

+ 14 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/Volumes.java

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

+ 21 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/result/Bridge.java

@@ -0,0 +1,21 @@
+package cn.reghao.bnt.common.docker.po.result;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2021-02-25 09:37:50
+ */
+@Data
+public class Bridge {
+    @SerializedName("NetworkID") private String networkId;
+    @SerializedName("EndpointID") private String endpointId;
+    @SerializedName("Gateway") private String gateway;
+    @SerializedName("IPAddress") private String ipAddress;
+    @SerializedName("IPPrefixLen") private String ipPrefixLen;
+    @SerializedName("IPv6Gateway") private String ipv6Gateway;
+    @SerializedName("GlobalIPv6Address") private String globalIpv6Address;
+    @SerializedName("GlobalIPv6PrefixLen") private String globalIpv6PrefixLen;
+    @SerializedName("MacAddress") private String macAddress;
+}

+ 33 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/result/Container.java

@@ -0,0 +1,33 @@
+package cn.reghao.bnt.common.docker.po.result;
+
+import cn.reghao.bnt.common.docker.po.Labels;
+import cn.reghao.bnt.common.docker.po.HostConfig;
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * docker ps 返回值
+ *
+ * @author reghao
+ * @date 2019-12-10 18:30:02
+ */
+@Data
+public class Container {
+    @SerializedName("Id") private String id;
+    @SerializedName("Names") private List<String> names;
+    @SerializedName("Image") private String image;
+    @SerializedName("ImageID") private String imageId;
+    @SerializedName("Command") private String command;
+    @SerializedName("Created") private long created;
+    @SerializedName("State") private String state;
+    @SerializedName("Status") private String status;
+    @SerializedName("Ports") private List<Port> ports;
+    @SerializedName("Labels") private Labels labels;
+    @SerializedName("SizeRw") private int sizeRw;
+    @SerializedName("SizeRootFs") private int sizeRootFs;
+    @SerializedName("HostConfig") private HostConfig hostConfig;
+    @SerializedName("NetworkSettings") private NetworkSettings networkSettings;
+    @SerializedName("Mounts") private List<Mount> mounts;
+}

+ 47 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/result/ContainerInfo.java

@@ -0,0 +1,47 @@
+package cn.reghao.bnt.common.docker.po.result;
+
+import cn.reghao.bnt.common.docker.po.GraphDriver;
+import cn.reghao.bnt.common.docker.po.HostConfig;
+import cn.reghao.bnt.common.docker.po.State;
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * docker inspect 返回值
+ *
+ * @author reghao
+ * @date 2019-12-10 18:30:02
+ */
+@Data
+public class ContainerInfo {
+    @SerializedName("AppArmorProfile") private String appArmorProfile;
+    @SerializedName("Args") private List<String> args;
+    @SerializedName("Config") private Config config;
+    @SerializedName("Created") private String created;
+    @SerializedName("Driver") private String driver;
+    @SerializedName("ExecIDs") private List<String> execIds;
+    @SerializedName("GraphDriver") private GraphDriver graphDriver;
+    @SerializedName("HostConfig") private HostConfig hostConfig;
+    @SerializedName("HostnamePath") private String hostnamePath;
+    @SerializedName("HostsPath") private String hostsPath;
+    @SerializedName("LogPath") private String logPath;
+    @SerializedName("Id") private String id;
+    @SerializedName("Image") private String image;
+    @SerializedName("MountLabel") private String mountLabel;
+    @SerializedName("Name") private String name;
+    @SerializedName("NetworkSettings") private NetworkSettings networkSettings;
+    @SerializedName("Path") private String path;
+    @SerializedName("ProcessLabel") private String processLabel;
+    @SerializedName("ResolvConfPath") private String resolvConfPath;
+    @SerializedName("RestartCount") private int restartCount;
+    @SerializedName("State") private State state;
+    @SerializedName("Mounts") private List<Mount> mounts;
+
+    @Data
+    static public class Config {
+        @SerializedName("Image") private String image;
+        @SerializedName("StopSignal") private String stopSignal;
+    }
+}

+ 19 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/result/Mount.java

@@ -0,0 +1,19 @@
+package cn.reghao.bnt.common.docker.po.result;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2021-02-25 09:43:58
+ */
+@Data
+public class Mount {
+    @SerializedName("Name") private String name;
+    @SerializedName("Source") private String source;
+    @SerializedName("Destination") private String destination;
+    @SerializedName("Driver") private String driver;
+    @SerializedName("Mode") private String mode;
+    @SerializedName("RW") private boolean rw;
+    @SerializedName("Propagation") private String propagation;
+}

+ 13 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/result/NetworkSettings.java

@@ -0,0 +1,13 @@
+package cn.reghao.bnt.common.docker.po.result;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2021-02-25 09:41:50
+ */
+@Data
+public class NetworkSettings {
+    @SerializedName("Networks") private Networks networks;
+}

+ 13 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/result/Networks.java

@@ -0,0 +1,13 @@
+package cn.reghao.bnt.common.docker.po.result;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2021-02-25 09:41:10
+ */
+@Data
+public class Networks {
+    @SerializedName("bridge") private Bridge bridge;
+}

+ 15 - 0
common/src/main/java/cn/reghao/bnt/common/docker/po/result/Port.java

@@ -0,0 +1,15 @@
+package cn.reghao.bnt.common.docker.po.result;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+/**
+ * @author reghao
+ * @date 2021-02-25 09:33:19
+ */
+@Data
+public class Port {
+    @SerializedName("PrivatePort") private int privatePort;
+    @SerializedName("PublicPort") private int publicPort;
+    @SerializedName("Type") private String type;
+}

+ 33 - 0
common/src/main/java/cn/reghao/bnt/common/machine/Cpu.java

@@ -0,0 +1,33 @@
+package cn.reghao.bnt.common.machine;
+
+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.hardware.CentralProcessor;
+
+/**
+ * @author reghao
+ * @date 2019-10-25 13:12:36
+ */
+public class Cpu implements MachineData<CpuDetail, CpuStat> {
+    private CentralProcessor processor;
+
+    public Cpu(CentralProcessor processor) {
+        this.processor = processor;
+    }
+
+    @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;
+    }
+}

+ 86 - 0
common/src/main/java/cn/reghao/bnt/common/machine/Disk.java

@@ -0,0 +1,86 @@
+package cn.reghao.bnt.common.machine;
+
+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 oshi.SystemInfo;
+import oshi.software.os.OperatingSystem;
+
+import java.util.ArrayList;
+import java.util.List;
+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 OperatingSystem os;
+
+    public Disk(SystemInfo si) {
+        this.os = si.getOperatingSystem();
+        //this.os = new SystemInfo().getOperatingSystem();
+    }
+
+    @Override
+    public List<DiskDetail> detail() {
+        return os.getFileSystem().getFileStores().stream()
+                .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;
+        }
+    }
+}

+ 69 - 0
common/src/main/java/cn/reghao/bnt/common/machine/Machine.java

@@ -0,0 +1,69 @@
+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.bnt.common.version.AppVersion;
+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 oshi.SystemInfo;
+
+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 Os os;
+    private final Network network;
+    private final Cpu cpu;
+    private final Memory memory;
+    private final Disk disk;
+
+    public Machine() {
+        SystemInfo si = new SystemInfo();
+        this.os = new Os(si.getOperatingSystem());
+        this.network = new Network();
+        this.cpu = new Cpu(si.getHardware().getProcessor());
+        this.memory = new Memory(si.getHardware().getMemory());
+        this.disk = new Disk(si);
+    }
+
+    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;
+    }
+}

+ 52 - 0
common/src/main/java/cn/reghao/bnt/common/machine/Memory.java

@@ -0,0 +1,52 @@
+package cn.reghao.bnt.common.machine;
+
+import cn.reghao.jutil.jdk.machine.data.MachineData;
+import cn.reghao.jutil.jdk.machine.data.detail.MemoryDetail;
+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;
+
+    public Memory(GlobalMemory globalMemory) {
+        this.globalMemory = globalMemory;
+        this.virtualMemory = globalMemory.getVirtualMemory();
+    }
+
+    @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;
+    }
+}

+ 27 - 0
common/src/main/java/cn/reghao/bnt/common/machine/MemoryStat.java

@@ -0,0 +1,27 @@
+package cn.reghao.bnt.common.machine;
+
+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.convertStr(ByteType.Bytes, ByteType.MiB, memoryUsage.getInit());
+        this.max = convert.convertStr(ByteType.Bytes, ByteType.MiB, memoryUsage.getMax());
+        this.used = convert.convertStr(ByteType.Bytes, ByteType.MiB, memoryUsage.getUsed());
+        this.committed = convert.convertStr(ByteType.Bytes, ByteType.MiB, memoryUsage.getCommitted());
+    }
+}

+ 73 - 0
common/src/main/java/cn/reghao/bnt/common/machine/Network.java

@@ -0,0 +1,73 @@
+package cn.reghao.bnt.common.machine;
+
+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 java.net.*;
+import java.util.ArrayList;
+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> {
+    @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("lo") || ifaceName.startsWith("docker")
+                        || ifaceName.startsWith("v") || ifaceName.startsWith("br")) {
+                    continue;
+                }
+                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 (SocketException 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;
+    }
+}

+ 30 - 0
common/src/main/java/cn/reghao/bnt/common/machine/Os.java

@@ -0,0 +1,30 @@
+package cn.reghao.bnt.common.machine;
+
+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.software.os.OperatingSystem;
+
+/**
+ * @author reghao
+ * @date 2020-10-20 23:17:30
+ */
+public class Os implements MachineData<OsDetail, OsStat> {
+    private OperatingSystem os;
+
+    public Os(OperatingSystem os) {
+        this.os = os;
+    }
+
+    @Override
+    public OsDetail detail() {
+        OsDetail osDetail = new OsDetail();
+        osDetail.setBootTime(os.getSystemBootTime());
+        return osDetail;
+    }
+
+    @Override
+    public OsStat stat() {
+        return null;
+    }
+}

+ 17 - 0
common/src/main/java/cn/reghao/bnt/common/msg/MessageSender.java

@@ -0,0 +1,17 @@
+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() {
+    }
+}

+ 14 - 0
common/src/main/java/cn/reghao/bnt/common/msg/MsgQueue.java

@@ -0,0 +1,14 @@
+package cn.reghao.bnt.common.msg;
+
+import cn.reghao.bnt.common.msg.constant.AppId;
+
+/**
+ * @author reghao
+ * @date 2021-09-14 17:10:31
+ */
+@Deprecated
+public class MsgQueue {
+    public static String managerTopic() {
+        return String.format("bnt.%s", AppId.manager.name());
+    }
+}

+ 9 - 0
common/src/main/java/cn/reghao/bnt/common/msg/constant/AppId.java

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

+ 9 - 0
common/src/main/java/cn/reghao/bnt/common/msg/constant/AppStatOps.java

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

+ 9 - 0
common/src/main/java/cn/reghao/bnt/common/msg/constant/NodeStatus.java

@@ -0,0 +1,9 @@
+package cn.reghao.bnt.common.msg.constant;
+
+/**
+ * @author reghao
+ * @date 2021-08-27 17:33:20
+ */
+public enum NodeStatus {
+    Online, Offline, Timeout
+}

+ 15 - 0
common/src/main/java/cn/reghao/bnt/common/msg/constant/PackType.java

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

+ 11 - 0
common/src/main/java/cn/reghao/bnt/common/msg/constant/Protocol.java

@@ -0,0 +1,11 @@
+package cn.reghao.bnt.common.msg.constant;
+
+/**
+ * agent 和 manager 通信使用的协议
+ *
+ * @author reghao
+ * @date 2023-03-01 13:47:55
+ */
+public enum Protocol {
+    local, ws, amqp
+}

+ 26 - 0
common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAgentHeartbeat.java

@@ -0,0 +1,26 @@
+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();
+    }
+}

+ 33 - 0
common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAgentStart.java

@@ -0,0 +1,33 @@
+package cn.reghao.bnt.common.msg.event;
+
+import cn.reghao.bnt.common.version.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();
+    }
+}

+ 19 - 0
common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAppDeploy.java

@@ -0,0 +1,19 @@
+package cn.reghao.bnt.common.msg.event;
+
+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;
+}

+ 22 - 0
common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAppStat.java

@@ -0,0 +1,22 @@
+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();
+    }
+}

+ 31 - 0
common/src/main/java/cn/reghao/bnt/common/msg/event/EvtAppStatResult.java

@@ -0,0 +1,31 @@
+package cn.reghao.bnt.common.msg.event;
+
+import cn.reghao.jutil.jdk.event.message.Event;
+import cn.reghao.jutil.jdk.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 String status;
+    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.deploy = false;
+    }
+}

+ 10 - 0
common/src/main/java/cn/reghao/bnt/common/msg/event/EvtBuildApp.java

@@ -0,0 +1,10 @@
+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 {
+}

+ 10 - 0
common/src/main/java/cn/reghao/bnt/common/msg/event/EvtBuildAppResult.java

@@ -0,0 +1,10 @@
+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 {
+}

+ 19 - 0
common/src/main/java/cn/reghao/bnt/common/util/NotAvailable.java

@@ -0,0 +1,19 @@
+package cn.reghao.bnt.common.util;
+
+/**
+ * @author reghao
+ * @date 2021-11-08 16:53:59
+ */
+public enum NotAvailable {
+    na("N/A");
+
+    private String desc;
+
+    NotAvailable(String desc) {
+        this.desc = desc;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

+ 13 - 0
common/src/main/java/cn/reghao/bnt/common/util/text/FileProcessor.java

@@ -0,0 +1,13 @@
+package cn.reghao.bnt.common.util.text;
+
+import java.io.File;
+
+/**
+ * 文本处理器
+ *
+ * @author reghao
+ * @date 2019-09-06 17:14:04
+ */
+public interface FileProcessor {
+    void process(File file);
+}

+ 35 - 0
common/src/main/java/cn/reghao/bnt/common/util/text/ReplaceCharacter.java

@@ -0,0 +1,35 @@
+package cn.reghao.bnt.common.util.text;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import cn.reghao.jutil.jdk.text.TextFile;
+
+/**
+ * 将 Windows 中的 \ 字符替换为 Linux 中的 / 字符
+ *
+ * @author reghao
+ * @date 2019-09-06 17:16:23
+ */
+public class ReplaceCharacter implements FileProcessor {
+    @Override
+    public void process(File file) {
+        String absolutePath = file.getPath();
+        if (!absolutePath.endsWith("csproj")) {
+            return;
+        }
+
+        TextFile textFile = new TextFile();
+        List<String> content = textFile.read(absolutePath);
+        List<String> tmp = new ArrayList<>();
+        content.forEach(line -> {
+            if (line.contains("\\")) {
+                tmp.add(line.replace("\\", "/"));
+            } else {
+                tmp.add(line);
+            }
+        });
+
+        textFile.write(absolutePath, tmp);
+    }
+}

+ 65 - 0
common/src/main/java/cn/reghao/bnt/common/version/AppVersion.java

@@ -0,0 +1,65 @@
+package cn.reghao.bnt.common.version;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.Properties;
+
+/**
+ * @author reghao
+ * @date 2022-05-11 22:29:49
+ */
+public class AppVersion implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private final String repo;
+    private final String branch;
+    private final String commitId;
+    private final String commitTime;
+    private final String buildTime;
+
+    private AppVersion(String repo, String branch, String commitId, String commitTime, String builtTime) {
+        this.repo = repo;
+        this.branch = branch;
+        this.commitId = commitId;
+        this.commitTime = commitTime;
+        this.buildTime = builtTime;
+    }
+
+    public String getRepo() {
+        return repo;
+    }
+
+    public String getBranch() {
+        return branch;
+    }
+
+    public String getCommitId() {
+        return commitId;
+    }
+
+    public String getCommitTime() {
+        return commitTime;
+    }
+
+    public String getBuildTime() {
+        return buildTime;
+    }
+
+    public static AppVersion getVersion() {
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        try {
+            // 读取 src/main/resources 目录下的文件
+            InputStream inputStream = classLoader.getResourceAsStream("git.properties");
+            Properties props = new Properties();
+            props.load(inputStream);String repo = props.get("repo").toString();
+            String branch = props.get("branch").toString();
+            String commitId = props.get("commitId").toString();
+            String commitTime = props.get("commitTime").toString();
+            String buildTime = props.get("buildTime").toString();
+            return new AppVersion(repo, branch, commitId, commitTime, buildTime);
+        } catch (IOException ignore) {
+        }
+        return null;
+    }
+}

+ 18 - 0
common/src/main/java/cn/reghao/bnt/common/ws/MessageDispatcher.java

@@ -0,0 +1,18 @@
+package cn.reghao.bnt.common.ws;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author reghao
+ * @date 2023-11-01 14:34:19
+ */
+@Slf4j
+public class MessageDispatcher {
+    public void dispatch(String text) {
+        log.info("text message from server");
+    }
+
+    public void dispatch(Object object) {
+        log.info("binary message from server");
+    }
+}

+ 93 - 0
common/src/main/java/cn/reghao/bnt/common/ws/WebSocketListenerImpl.java

@@ -0,0 +1,93 @@
+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;
+    private MessageDispatcher dispatcher;
+
+    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) {
+        dispatcher.dispatch(text);
+    }
+
+    @Override
+    public void onMessage(WebSocket webSocket, ByteString bytes) {
+        Object object = JdkSerializer.deserialize(bytes.toByteArray());
+        dispatcher.dispatch(object);
+    }
+}

+ 106 - 0
common/src/main/java/cn/reghao/bnt/common/ws/WsClient.java

@@ -0,0 +1,106 @@
+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("");
+        }
+    }
+}

+ 0 - 18
common/src/main/java/cn/reghao/devops/common/agent/app/dto/AppInfo.java

@@ -1,18 +0,0 @@
-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;
-    }
-}

+ 0 - 12
common/src/main/java/cn/reghao/devops/common/agent/app/iface/AppDeploy.java

@@ -1,12 +0,0 @@
-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;
-}

+ 0 - 17
common/src/main/java/cn/reghao/devops/common/agent/app/iface/AppStat.java

@@ -1,17 +0,0 @@
-package cn.reghao.devops.common.agent.app.iface;
-
-import cn.reghao.devops.common.msg.event.EvtAppStat;
-import cn.reghao.devops.common.msg.event.EvtAppStatResult;
-
-/**
- * 应用状态管理
- *
- * @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;
-}

+ 0 - 28
common/src/main/java/cn/reghao/devops/common/agent/app/iface/impl/AppDeployService.java

@@ -1,28 +0,0 @@
-package cn.reghao.devops.common.agent.app.iface.impl;
-
-import cn.reghao.devops.common.agent.app.iface.AppDeploy;
-import cn.reghao.devops.common.msg.constant.PackType;
-import cn.reghao.devops.common.msg.event.EvtAppDeploy;
-import cn.reghao.devops.common.msg.event.EvtAppStatResult;
-
-/**
- * @author reghao
- * @date 2023-03-06 16:21:30
- */
-public class AppDeployService implements AppDeploy {
-    private final DockerApp dockerApp;
-
-    public AppDeployService(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 打包没有实现");
-        }
-    }
-}

+ 0 - 66
common/src/main/java/cn/reghao/devops/common/agent/app/iface/impl/AppStatService.java

@@ -1,66 +0,0 @@
-package cn.reghao.devops.common.agent.app.iface.impl;
-
-import cn.reghao.devops.common.agent.app.iface.AppStat;
-import cn.reghao.devops.common.msg.constant.PackType;
-import cn.reghao.devops.common.msg.event.EvtAppStat;
-import cn.reghao.devops.common.msg.event.EvtAppStatResult;
-
-/**
- * @author reghao
- * @date 2023-03-06 16:19:24
- */
-public class AppStatService implements AppStat {
-    private final DockerApp dockerApp;
-
-    public AppStatService(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 打包没有实现");
-        }
-    }
-}

+ 0 - 84
common/src/main/java/cn/reghao/devops/common/agent/app/iface/impl/DockerApp.java

@@ -1,84 +0,0 @@
-package cn.reghao.devops.common.agent.app.iface.impl;
-
-import cn.reghao.devops.common.docker.Docker;
-import cn.reghao.devops.common.docker.DockerImpl;
-import cn.reghao.devops.common.docker.po.Config;
-import cn.reghao.devops.common.docker.po.HostConfig;
-import cn.reghao.devops.common.machine.Machine;
-import cn.reghao.devops.common.msg.constant.NodeStatus;
-import cn.reghao.devops.common.msg.event.EvtAppDeploy;
-import cn.reghao.devops.common.msg.event.EvtAppStatResult;
-import cn.reghao.devops.common.util.NotAvailable;
-import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.jutil.jdk.serializer.JsonConverter;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-
-/**
- * @author reghao
- * @date 2023-03-06 15:26:22
- */
-public class DockerApp {
-    private final Docker docker = new DockerImpl();
-
-    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.pull(packagePath);
-        InspectContainerResponse containerInfo = docker.createAndRun(appId, containerConfig);
-        return getStat(appId, containerInfo);
-    }
-
-    public EvtAppStatResult start(String appId) throws Exception {
-        InspectContainerResponse containerInfo = docker.start(appId);
-        return getStat(appId, containerInfo);
-    }
-
-    public EvtAppStatResult stop(String appId) throws Exception {
-        InspectContainerResponse containerInfo = docker.stop(appId);
-        return getStat(appId, containerInfo);
-    }
-
-    public EvtAppStatResult restart(String appId) throws Exception {
-        InspectContainerResponse containerInfo = docker.restart(appId);
-        return getStat(appId, containerInfo);
-    }
-
-    public EvtAppStatResult stat(String appId) throws Exception {
-        InspectContainerResponse containerInfo = docker.inspectContainer(appId);
-        return getStat(appId, containerInfo);
-    }
-
-    private EvtAppStatResult getStat(String appId, InspectContainerResponse containerInfo) {
-        EvtAppStatResult appStatResult = new EvtAppStatResult(appId, Machine.ID);
-        String image = containerInfo.getConfig().getImage();
-        if (image != null) {
-            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.setStartTime(DateTimeConverter.localDateTime(startedAt));
-            appStatResult.setPid(state.getPidLong().intValue());
-        }
-
-        return appStatResult;
-    }
-}

+ 0 - 81
common/src/main/java/cn/reghao/devops/common/agent/machine/MachineEvent.java

@@ -1,81 +0,0 @@
-package cn.reghao.devops.common.agent.machine;
-
-import cn.reghao.devops.common.machine.Machine;
-import cn.reghao.devops.common.msg.MessageSender;
-import cn.reghao.devops.common.msg.MsgQueue;
-import cn.reghao.devops.common.msg.event.EvtAgentHeartbeat;
-import cn.reghao.devops.common.msg.event.EvtAgentStart;
-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.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 MessageSender messageSender;
-    private final int heartbeatInterval;
-    
-    public MachineEvent(MessageSender messageSender, Machine machine, int heartbeatInterval) {
-        this.scheduler = ThreadPoolWrapper.scheduledThreadPool("heartbeat", 1);
-        this.machine = machine;
-        this.messageSender = messageSender;
-        this.heartbeatInterval = heartbeatInterval;
-    }
-
-    public void agentStart() {
-        EvtAgentStart evtAgentStart = machine.detail();
-        EventMessage eventMessage = EventMessage.evt(evtAgentStart);
-        pub(eventMessage);
-
-        agentHeartbeat();
-    }
-
-    public void agentShutdown() {
-        ThreadPoolWrapper.shutdownScheduler(scheduler);
-        EvtAgentHeartbeat machineStat = machine.stat();
-        EventMessage eventMessage = EventMessage.evt(machineStat);
-        pub(eventMessage);
-    }
-
-    public void agentHeartbeat() {
-        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(MsgQueue.managerTopic(), 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);
-        }
-    }
-}

+ 0 - 30
common/src/main/java/cn/reghao/devops/common/docker/Docker.java

@@ -1,30 +0,0 @@
-package cn.reghao.devops.common.docker;
-
-import cn.reghao.devops.common.docker.po.Config;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.Container;
-import com.github.dockerjava.api.model.Image;
-
-import java.util.List;
-
-/**
- * Docker 客户端
- *
- * @author reghao
- * @date 2021-10-27 04:17:38
- */
-public interface Docker {
-    void build(String repoTag, String compileHome, String dockerfileContent) throws Exception;
-    void build(String repoTag, String compileHome) 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;
-    InspectContainerResponse start(String containerName);
-    InspectContainerResponse stop(String containerName);
-    InspectContainerResponse restart(String containerName);
-    InspectContainerResponse inspectContainer(String containerName);
-    List<Image> images();
-    List<Container> ps(boolean isAll);
-    InspectContainerResponse ps(String containerName);
-}

+ 0 - 279
common/src/main/java/cn/reghao/devops/common/docker/DockerImpl.java

@@ -1,279 +0,0 @@
-package cn.reghao.devops.common.docker;
-
-import cn.reghao.devops.common.docker.po.Config;
-import cn.reghao.jutil.jdk.exception.ExceptionUtil;
-import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.jutil.jdk.text.TextFile;
-import com.github.dockerjava.api.DockerClient;
-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.core.command.PushImageResultCallback;
-import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
-import com.github.dockerjava.transport.DockerHttpClient;
-
-import java.io.File;
-import java.time.Duration;
-import java.util.*;
-
-/**
- * Docker 客户端
- *
- * @author reghao
- * @date 2021-10-27 03:41:38
- */
-public class DockerImpl implements Docker {
-    private final DockerClient dockerClient;
-    private final TextFile textFile = new TextFile();
-
-    public DockerImpl() {
-        DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
-                .withDockerHost("unix:///var/run/docker.sock")
-                .withDockerTlsVerify(false)
-                .withDockerCertPath(String.format("%s/.docker", System.getProperty("user.home")))
-                //.withRegistryUsername("username")
-                //.withRegistryPassword("password")
-                //.withRegistryEmail(registryMail)
-                //.withRegistryUrl(registryUrl)
-                .build();
-
-        DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder()
-                .dockerHost(config.getDockerHost())
-                .sslConfig(config.getSSLConfig())
-                .maxConnections(100)
-                .connectionTimeout(Duration.ofSeconds(30))
-                .responseTimeout(Duration.ofSeconds(45))
-                .build();
-
-        this.dockerClient = DockerClientImpl.getInstance(config, httpClient);
-    }
-
-    @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();
-        } catch (Exception e) {
-            throw new Exception(ExceptionUtil.errorMsg(e));
-        }
-    }
-
-    @Override
-    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();
-    }
-
-    @Override
-    public void push(String image) throws Exception {
-        try {
-            dockerClient.pushImageCmd(image).exec(new PushImageResultCallback()).awaitCompletion();
-        } catch (InterruptedException e) {
-            throw new Exception(ExceptionUtil.errorMsg(e));
-        }
-        /*dockerClient.pushImageCmd(image).exec(new ResultCallback<PushResponseItem>() {
-            @Override
-            public void onStart(Closeable closeable) {
-
-            }
-
-            @Override
-            public void onNext(PushResponseItem object) {
-                System.out.println(object.getStatus());
-            }
-
-            @Override
-            public void onError(Throwable throwable) {
-
-            }
-
-            @Override
-            public void onComplete() {
-
-            }
-
-            @Override
-            public void close() throws IOException {
-
-            }
-        }).onComplete();*/
-    }
-
-    @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, 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);
-        }
-
-        HostConfig hostConfig = HostConfig.newHostConfig()
-                .withNetworkMode("host")
-                .withRestartPolicy(RestartPolicy.unlessStoppedRestart());
-        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);
-        }
-
-        createContainerCmd.withHostConfig(hostConfig);
-        CreateContainerResponse response = createContainerCmd.exec();
-        String containerId = response.getId();
-        dockerClient.startContainerCmd(containerId).exec();
-        return dockerClient.inspectContainerCmd(containerId).exec();
-    }
-
-    @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();
-
-        images.forEach(image -> {
-            long created = image.getCreated();
-            String[] repoTags = image.getRepoTags();
-            if (repoTags.length == 0) {
-                return;
-            }
-
-            String[] repoTag = repoTags[0].split(":");
-            String repo = repoTag[0];
-            String tag = repoTag[1];
-            System.out.printf("%s:%s -> %s\n", repo, tag, DateTimeConverter.format(created*1000));
-        });
-
-        return images;
-    }
-
-    @Override
-    public List<Container> ps(boolean isAll) {
-        return dockerClient.listContainersCmd()
-                .withShowAll(isAll)
-                .exec();
-    }
-
-    @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();
-    }
-}

+ 0 - 46
common/src/main/java/cn/reghao/devops/common/docker/po/Config.java

@@ -1,46 +0,0 @@
-package cn.reghao.devops.common.docker.po;
-
-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 {
-    @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(String image) {
-        this.image = image;
-        this.hostConfig = new HostConfig();
-    }
-}

+ 0 - 18
common/src/main/java/cn/reghao/devops/common/docker/po/Data.java

@@ -1,18 +0,0 @@
-package cn.reghao.devops.common.docker.po;
-
-import com.google.gson.annotations.SerializedName;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author reghao
- * @date 2020-05-19 20:50:24
- */
-@Getter
-@Setter
-public class Data {
-    @SerializedName("LowerDir") private String lowerDir;
-    @SerializedName("MergedDir") private String mergedDir;
-    @SerializedName("UpperDir") private String upperDir;
-    @SerializedName("WorkDir") private String workDir;
-}

+ 0 - 11
common/src/main/java/cn/reghao/devops/common/docker/po/ExposedPorts.java

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

+ 0 - 16
common/src/main/java/cn/reghao/devops/common/docker/po/GraphDriver.java

@@ -1,16 +0,0 @@
-package cn.reghao.devops.common.docker.po;
-
-import com.google.gson.annotations.SerializedName;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author reghao
- * @date 2020-05-19 20:51:13
- */
-@Getter
-@Setter
-public class GraphDriver {
-    @SerializedName("Data") private Data data;
-    @SerializedName("Name") private String name;
-}

+ 0 - 17
common/src/main/java/cn/reghao/devops/common/docker/po/Health.java

@@ -1,17 +0,0 @@
-package cn.reghao.devops.common.docker.po;
-
-import com.google.gson.annotations.SerializedName;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2021-02-25 10:16:50
- */
-@Data
-public class Health {
-    @SerializedName("Status") private String status;
-    @SerializedName("FailingStreak") private int failingStreak;
-    @SerializedName("Log") private List<Log> log;
-}

+ 0 - 15
common/src/main/java/cn/reghao/devops/common/docker/po/Healthcheck.java

@@ -1,15 +0,0 @@
-package cn.reghao.devops.common.docker.po;
-
-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;
-}

+ 0 - 23
common/src/main/java/cn/reghao/devops/common/docker/po/HostConfig.java

@@ -1,23 +0,0 @@
-package cn.reghao.devops.common.docker.po;
-
-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;
-
-    public HostConfig() {
-        this.networkMode = "host";
-        this.restartPolicy = new RestartPolicy();
-    }
-}

+ 0 - 14
common/src/main/java/cn/reghao/devops/common/docker/po/Labels.java

@@ -1,14 +0,0 @@
-package cn.reghao.devops.common.docker.po;
-
-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;
-}

+ 0 - 16
common/src/main/java/cn/reghao/devops/common/docker/po/Log.java

@@ -1,16 +0,0 @@
-package cn.reghao.devops.common.docker.po;
-
-import com.google.gson.annotations.SerializedName;
-import lombok.Data;
-
-/**
- * @author reghao
- * @date 2021-02-25 10:19:45
- */
-@Data
-public class Log {
-    @SerializedName("Start") private String start;
-    @SerializedName("End") private String end;
-    @SerializedName("ExitCode") private int exitCode;
-    @SerializedName("Output") private String output;
-}

+ 0 - 11
common/src/main/java/cn/reghao/devops/common/docker/po/NetworkingConfig.java

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

Некоторые файлы не были показаны из-за большого количества измененных файлов