修修补补

common/src/main/java/cn/reghao/autodop/common/amqp/RabbitProducer.java

@@ -40,7 +40,7 @@ public class RabbitProducer {
      * @date 2021-02-23 下午3:57
      */
     public RpcResult callRemote(String exchange, String routeKey, MqMessage mqMessage) {
-        rabbitTemplate.setReplyTimeout(30_000);
+        rabbitTemplate.setReplyTimeout(90_000);
         String msg = JsonConverter.objectToJson(mqMessage);
         String result = (String) rabbitTemplate.convertSendAndReceive(exchange, routeKey, msg);
         if (result == null) {

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

@@ -1,5 +1,6 @@
 package cn.reghao.autodop.dmaster.app.entity.log;
 
+import cn.reghao.autodop.common.utils.DatetimeConverter;
 import cn.reghao.autodop.dmaster.common.db.orm.BaseEntity;
 import cn.reghao.autodop.dmaster.app.entity.config.orchestration.AppOrchestration;
 import lombok.Data;
@@ -28,7 +29,7 @@ public class BuildDeployApp extends BaseEntity {
     @Column(nullable = false)
     private boolean enable;
     private String commitId;
-    private String commitTime;
+    private long commitTime;
     private String bdType;
     private LocalDateTime bdTime;
     // 0 - 成功 1 - 失败 2 - 尚未构建
@@ -49,13 +50,14 @@ public class BuildDeployApp extends BaseEntity {
         buildDeployApp.setEnv(buildLog.getEnv());
         buildDeployApp.setEnable(true);
         buildDeployApp.setCommitId(buildLog.getCommitId());
+        buildDeployApp.setCommitTime(buildLog.getCommitTime());
         buildDeployApp.setBdType("构建");
         buildDeployApp.setBdTime(buildLog.getBuildTime());
         buildDeployApp.setStatusCode(buildLog.getStatusCode());
         if (buildLog.getStatusCode() != 0) {
             String errDetail = buildLog.getErrDetail();
-            if (errDetail.length() > 1000) {
-                buildDeployApp.setResult(errDetail.substring(0, 1000));
+            if (errDetail.length() > 100) {
+                buildDeployApp.setResult(errDetail.substring(0, 100));
             } else {
                 buildDeployApp.setResult(errDetail);
             }

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

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

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

@@ -106,6 +106,7 @@ public class BuildDeployDispatcher {
             CommitLog commitLog = appIntegrate.update();
             buildLog.setUpdate(commitLog.isUpdate());
             buildLog.setCommitId(commitLog.getCommitId());
+            buildLog.setCommitTime(commitLog.getCommitTime());
             buildLog.setUpdateTotalTime(System.currentTimeMillis()-start);
             buildDeployLogConsumer.addCommitLog(commitLog);
         } catch (Exception e) {

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/tools/compiler/MavenCompiler.java

@@ -46,7 +46,7 @@ public class MavenCompiler implements CodeCompiler {
     }
 
     /**
-     * mvn clean package -am -Pdev -pl ${app}
+     * mvn clean package -am -Pdev -pl ${app} -Dmaven.test.skip=true
      * // TODO 注意线程安全，也可每个线程创建一个对象
      *
      * @param
@@ -57,8 +57,8 @@ public class MavenCompiler implements CodeCompiler {
         // 清空前一次构建的日志
         compileLog.clear();
         request.setPomFile(new File(pomPath));
-        // mvn clean package
-        request.setGoals(Arrays.asList("clean", "package"));
+        // mvn clean package -Dmaven.test.skip=true
+        request.setGoals(Arrays.asList("clean", "package", "-Dmaven.test.skip=true"));
         // -am
         request.setAlsoMake(true);
         // -Penv

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/vo/log/BuildDeployAppVO.java

@@ -13,6 +13,7 @@ public class BuildDeployAppVO {
     private String appId;
     private String env;
     private String commitId;
+    private String commitTime;
     private String bdType;
     private String bdTime;
     // 0 - 成功 1 - 失败
@@ -24,6 +25,7 @@ public class BuildDeployAppVO {
         vo.setAppId(buildDeployApp.getAppId());
         vo.setEnv(buildDeployApp.getEnv());
         vo.setCommitId(buildDeployApp.getCommitId());
+        vo.setCommitTime(DatetimeConverter.msTimestampFormat(buildDeployApp.getCommitTime()));
         vo.setBdType(buildDeployApp.getBdType());
         if (buildDeployApp.getBdTime() != null) {
             vo.setBdTime(DatetimeConverter.format(buildDeployApp.getBdTime()));