微调

dmaster/src/main/java/cn/reghao/autodop/dmaster/common/exception/ExceptionUtil.java → common/src/main/java/cn/reghao/autodop/common/utils/ExceptionUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.common.exception;
+package cn.reghao.autodop.common.utils;
 
 /**
  * @author reghao

dagent/src/main/java/cn/reghao/autodop/dagent/app/App.java

@@ -6,6 +6,7 @@ import cn.reghao.autodop.common.dagent.app.api.data.deploy.AppDeployArgs;
 import cn.reghao.autodop.common.dagent.app.api.data.deploy.PackerType;
 import cn.reghao.autodop.common.dagent.app.api.data.log.AppLogArgs;
 import cn.reghao.autodop.common.dockerc.exception.DockerException;
+import cn.reghao.autodop.common.utils.ExceptionUtil;
 import cn.reghao.autodop.common.utils.serializer.JsonConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -31,10 +32,11 @@ public class App {
             case docker:
                 try {
                     dockerAppServiceImpl.deploy(appDeployArgs);
+                    return RpcResult.success("ok");
                 } catch (DockerException e) {
                     e.printStackTrace();
+                    return RpcResult.fail(ExceptionUtil.errorMsg(e));
                 }
-                break;
             case zip:
                 zipAppServiceImpl.deploy(appDeployArgs);
                 break;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/log/BuildDeployApp.java

@@ -28,6 +28,7 @@ public class BuildDeployApp extends BaseEntity {
     @Column(nullable = false)
     private boolean enable;
     private String commitId;
+    private String commitTime;
     private String bdType;
     private LocalDateTime bdTime;
     // 0 - 成功 1 - 失败 2 - 尚未构建

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/log/BuildLog.java

@@ -24,6 +24,7 @@ public class BuildLog extends BaseDocument {
     // 代码是否更新
     private boolean isUpdate;
     private String commitId;
+    private String commitTime;
     private String packagePath;
     private long updateTotalTime;
     private long compileTotalTime;

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

@@ -11,7 +11,7 @@ import cn.reghao.autodop.dmaster.app.service.deploy.AppDeployer;
 import cn.reghao.autodop.dmaster.app.entity.config.orchestration.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.service.log.BuildDeployLogService;
 import cn.reghao.autodop.dmaster.app.service.log.BuildDeployLogConsumer;
-import cn.reghao.autodop.dmaster.common.exception.ExceptionUtil;
+import cn.reghao.autodop.common.utils.ExceptionUtil;
 import cn.reghao.autodop.dmaster.common.thread.ThreadPoolWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -12,8 +12,9 @@ import cn.reghao.autodop.dmaster.app.entity.deploy.DeployConfig;
 import cn.reghao.autodop.dmaster.app.entity.log.BuildLog;
 import cn.reghao.autodop.dmaster.app.entity.log.DeployLog;
 import cn.reghao.autodop.dmaster.app.entity.log.DeployResult;
-import cn.reghao.autodop.dmaster.common.exception.ExceptionUtil;
+import cn.reghao.autodop.common.utils.ExceptionUtil;
 import cn.reghao.autodop.dmaster.common.thread.ThreadPoolWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -29,6 +30,7 @@ import java.util.concurrent.Future;
  * @author reghao
  * @date 2020-03-13 10:26:22
  */
+@Slf4j
 @Component
 public class AppDeployer {
     private final String routeKey = "dagent";
@@ -123,6 +125,8 @@ public class AppDeployer {
             mqMessage.setType(MessageType.appType.name());
             mqMessage.setOps(AppOps.appDeployOps.name());
             mqMessage.setPayload(JsonConverter.objectToJson(appDeployArgs));
+
+            log.info("RPC 调用部署应用...");
             return sender.callRemote(routeKey, mqMessage);
         }
     }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app3/scheduler/BackupScheduler.java

@@ -3,7 +3,7 @@ package cn.reghao.autodop.dmaster.app3.scheduler;
 import cn.reghao.autodop.common.shell.ShellExecutor;
 import cn.reghao.autodop.dmaster.app3.entity.App3Bak;
 import cn.reghao.autodop.dmaster.app3.entity.App3BakLog;
-import cn.reghao.autodop.dmaster.common.mongo.MongoCrud;
+import cn.reghao.autodop.dmaster.common.db.mongo.MongoCrud;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
 import org.quartz.impl.StdSchedulerFactory;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app3/scheduler/ScriptBakJob.java

@@ -4,7 +4,7 @@ import cn.reghao.autodop.common.shell.ShellExecutor;
 import cn.reghao.autodop.common.shell.ShellResult;
 import cn.reghao.autodop.common.utils.DatetimeConverter;
 import cn.reghao.autodop.dmaster.app3.entity.App3BakLog;
-import cn.reghao.autodop.dmaster.common.mongo.MongoCrud;
+import cn.reghao.autodop.dmaster.common.db.mongo.MongoCrud;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.*;
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/common/mongo/MongoCrud.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/common/db/mongo/MongoCrud.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.common.mongo;
+package cn.reghao.autodop.dmaster.common.db.mongo;
 
 import cn.reghao.autodop.dmaster.common.db.CrudOps;
 import cn.reghao.autodop.dmaster.common.db.PageList;

dmaster/src/main/java/cn/reghao/autodop/dmaster/common/exception/ControllerExceptionHandler.java

@@ -1,6 +1,7 @@
 package cn.reghao.autodop.dmaster.common.exception;
 
 import cn.reghao.autodop.common.result.WebResult;
+import cn.reghao.autodop.common.utils.ExceptionUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;

dmaster/src/main/java/cn/reghao/autodop/dmaster/cluster/amqp/MachineMessageDispatcher.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/utils/amqp/MachineMessageDispatcher.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.cluster.amqp;
+package cn.reghao.autodop.dmaster.utils.amqp;
 
 import cn.reghao.autodop.common.dagent.machine.api.MachineOps;
 import cn.reghao.autodop.common.utils.serializer.JsonConverter;

dmaster/src/main/java/cn/reghao/autodop/dmaster/cluster/amqp/MessageDispatcher.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/utils/amqp/MessageDispatcher.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.cluster.amqp;
+package cn.reghao.autodop.dmaster.utils.amqp;
 
 /**
  * @author reghao

dmaster/src/main/java/cn/reghao/autodop/dmaster/cluster/amqp/RabbitConsumer.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/utils/amqp/RabbitConsumer.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.cluster.amqp;
+package cn.reghao.autodop.dmaster.utils.amqp;
 
 import cn.reghao.autodop.common.amqp.MQMessage;
 import cn.reghao.autodop.common.amqp.MessageType;

dmaster/src/main/java/cn/reghao/autodop/dmaster/cluster/amqp/RabbitConsumerConfig.java → dmaster/src/main/java/cn/reghao/autodop/dmaster/utils/amqp/RabbitConsumerConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.autodop.dmaster.cluster.amqp;
+package cn.reghao.autodop.dmaster.utils.amqp;
 
 import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;