小更新

common/src/main/java/cn/reghao/autodop/common/dockerc/Docker.java

@@ -62,7 +62,7 @@ public class Docker implements ImageOps, ContainerOps, AutoCloseable {
 
             String[] lines = result.split(System.lineSeparator());
             for (String line : lines) {
-                if (line.contains("error")) {
+                if (line.contains("error") || line.contains("message")) {
                     throw new DockerException("Docker 请求错误 -> " + line);
                 }
             }

common/src/main/java/cn/reghao/autodop/common/utils/DateTimeConverter.java

@@ -158,4 +158,9 @@ public class DateTimeConverter {
         long second = Duration.between(now, future).getSeconds();
         return second * 1000;
     }
+
+    public static void main(String[] args) {
+        LocalDateTime localDateTime = DateTimeConverter.localDateTime(0);
+        System.out.println();
+    }
 }

dagent/src/main/java/cn/reghao/autodop/dagent/machine/timer/HeartbeatJob.java

@@ -28,6 +28,5 @@ public class HeartbeatJob implements Job {
         MqMessage mqMessage = MqMessage.mqMessage(MessageType.machineType.name(),
                 MachineOps.machineHeartbeatOps.name(), false, payload);
         rabbitProducer.send("amq.direct", "dmaster", mqMessage);
-        log.info("发送机器心跳...");
     }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/RemoteCallService.java

@@ -70,7 +70,7 @@ public class RemoteCallService {
         for (Map.Entry<String, Future<RpcResult>> entry : futureMap.entrySet()) {
             Future<RpcResult> future = entry.getValue();
             while (!future.isDone() && !future.isCancelled()) {
-                // 休眠等待异步任务结束
+                // TODO 休眠等待异步任务结束
                 try {
                     Thread.sleep(1_000);
                 } catch (InterruptedException e) {
@@ -78,6 +78,7 @@ public class RemoteCallService {
                 }
             }
 
+            log.info("RPC 调用返回...");
             String machineId = entry.getKey();
             try {
                 RpcResult rpcResult = future.get();

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/packer/DockerPack.java

@@ -27,7 +27,6 @@ public class DockerPack implements CodePacker {
             String image = repo + ":" + commitId;
 
             docker.build(image, appCompileHome, dockerfile);
-            log.info("{} 构建完成...", image);
             docker.push(image);
             log.info("{} 已 push 到仓库...", image);
             return image;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/deploy/AppDeployer.java

@@ -86,6 +86,7 @@ public class AppDeployer {
             if (rpcResult.getStatusCode() == 0) {
                 DeployedAppStatus deployedAppStatus =
                         (DeployedAppStatus) JsonConverter.jsonToObject(rpcResult.getResult(), DeployedAppStatus.class);
+                deployedAppStatus.setAppType(buildLog.getAppType());
                 deployedAppStatus.setEnv(buildLog.getEnv());
                 deployedAppStatus.setCommitId(buildLog.getCommitId());
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/deploy/DeployNotifyMsg.java

@@ -33,11 +33,13 @@ public class DeployNotifyMsg {
         StringBuilder sb = new StringBuilder();
         sb.append("应用更新").append(System.lineSeparator());
         sb.append("# 应用: ").append(buildLog.getAppId()).append(System.lineSeparator());
-        sb.append("# 版本: ").append(buildLog.getCommitId()).append(System.lineSeparator());
         sb.append("# 环境: ").append(buildLog.getEnv()).append(System.lineSeparator());
-        sb.append("# 更新时间: ").append(DateTimeConverter.format(deployLog.getDeployTime()))
+        sb.append("# 版本: ").append(buildLog.getCommitId()).append(System.lineSeparator());
+        sb.append("# 版本时间: ").append(DateTimeConverter.format(buildLog.getCommitTime()))
+                .append(System.lineSeparator());
+        sb.append("# 部署时间: ").append(DateTimeConverter.format(deployLog.getDeployTime()))
                 .append(System.lineSeparator());
-        sb.append("# 更新结果: ").append(System.lineSeparator());
+        sb.append("# 部署结果: ").append(System.lineSeparator());
         for (int i = 0; i < deployLogs.size(); i++) {
             sb.append(i+1).append(".").append(deployLogs.get(i).getMachineAddress()).append(" -> ")
                     .append(deployLogs.get(i).getResult()).append(System.lineSeparator());