milestone-test

common/src/main/java/cn/reghao/autodop/common/deploy/AppStatus.java

@@ -2,8 +2,6 @@ package cn.reghao.autodop.common.deploy;
 
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @author reghao
  * @date 2020-05-19 20:32:35
@@ -11,8 +9,8 @@ import java.util.Date;
 @Data
 public class AppStatus {
     private String appId;
-    private String host;
     private String commitId;
+    private String host;
     private String status;
     private String startedTime;
 }

common/src/main/java/cn/reghao/autodop/common/dockerc/pojo/ContainerInspect.java

@@ -3,8 +3,6 @@ package cn.reghao.autodop.common.dockerc.pojo;
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * docker inspect 的返回值（部分）
  *
@@ -14,7 +12,7 @@ import java.util.Date;
 @Data
 public class ContainerInspect {
     @SerializedName("Id") private String id;
-    @SerializedName("Created") private Date created;
+    @SerializedName("Created") private String created;
     @SerializedName("Path") private String path;
     @SerializedName("State") private State state;
     @SerializedName("Image") private String image;

common/src/main/java/cn/reghao/autodop/common/dockerc/pojo/State.java

@@ -3,8 +3,6 @@ package cn.reghao.autodop.common.dockerc.pojo;
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @author reghao
  * @date 2020-05-19 21:04:06
@@ -20,6 +18,6 @@ public class State {
     @SerializedName("Pid") private int pid;
     @SerializedName("ExitCode") private int exitCode;
     @SerializedName("Error") private String error;
-    @SerializedName("StartedAt") private Date startedAt;
-    @SerializedName("FinishedAt") private Date finishedAt;
+    @SerializedName("StartedAt") private String startedAt;
+    @SerializedName("FinishedAt") private String finishedAt;
 }

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

@@ -1,9 +1,6 @@
 package cn.reghao.autodop.common.utils;
 
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.*;
 import java.time.format.DateTimeFormatter;
 
 /**
@@ -24,6 +21,19 @@ public class DateTimeUtil {
         return dtf.format(localDateTime);
     }
 
+    /**
+     * 将 0 时区时间日期字符串转换为东 8 区时间日期字符串
+     *
+     * @param
+     * @return
+     * @date 2020-06-03 上午10:39
+     */
+    public static String convert(String dateTime) {
+        ZoneId zoneId = ZoneId.of("UTC+8");
+        ZonedDateTime zonedDateTime = Instant.parse(dateTime).atZone(zoneId);
+        return format(zonedDateTime.toLocalDateTime());
+    }
+
     /**
      * 毫秒时间戳转换为日期时间
      *

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

@@ -6,12 +6,10 @@ import cn.reghao.autodop.common.dockerc.exception.DockerException;
 import cn.reghao.autodop.common.dockerc.pojo.ContainerInspect;
 import cn.reghao.autodop.common.dockerc.pojo.State;
 import cn.reghao.autodop.common.grpc.facade.app.AppStatusService;
+import cn.reghao.autodop.common.utils.DateTimeUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 /**
  * @author reghao
  * @date 2020-01-19 21:51:37
@@ -55,7 +53,7 @@ public class DockerAppStatusServiceImpl implements AppStatusService {
             ContainerInspect container = docker.inspectContainer(containerId);
             State state = container.getState();
             String status = state.getStatus();
-            Date date = state.getStartedAt();
+            String startedAt = state.getStartedAt();
             String[] str = container.getConfig().getImage().split(appId + ":");
             String commitId = null;
             if (str.length == 2) {
@@ -67,9 +65,7 @@ public class DockerAppStatusServiceImpl implements AppStatusService {
             appStatus.setCommitId(commitId);
             appStatus.setStatus(status);
             if ("running".equals(status)) {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                String datetime = sdf.format(date);
-                appStatus.setStartedTime(datetime);
+                appStatus.setStartedTime(DateTimeUtil.convert(startedAt));
             }
 
             return appStatus;

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/AppBuildController.java

@@ -1,27 +1,20 @@
 package cn.reghao.autodop.dmaster.app.controller;
 
 import cn.reghao.autodop.dmaster.app.entity.log.BuildDeployLog;
-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.orchestration.AppOrchestration;
 import cn.reghao.autodop.dmaster.app.service.AppBuildService;
-import cn.reghao.autodop.dmaster.app.service.tools.updater.CommitLog;
 import cn.reghao.autodop.dmaster.app.vo.AppToBuild;
 import cn.reghao.autodop.dmaster.app.vo.PageList;
 import cn.reghao.autodop.dmaster.app.vo.log.BuildLogVO;
 import cn.reghao.autodop.dmaster.app.vo.log.CommitLogVO;
 import cn.reghao.autodop.dmaster.app.vo.log.DeployLogVO;
-import cn.reghao.autodop.dmaster.app.vo.result.BuildResult;
 import cn.reghao.autodop.dmaster.app.service.OssService;
 import cn.reghao.autodop.dmaster.app.service.build.BuildDispatcher;
-import cn.reghao.autodop.dmaster.app.vo.result.DeployResult;
 import cn.reghao.autodop.dmaster.common.webresult.WebResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.tmatesoft.svn.core.SVNException;
@@ -65,11 +58,11 @@ public class AppBuildController {
             return WebResult.success("ok");
         } else {
             buildDeployLogs = buildDispatcher.dispatch(apps, true);
-            List<DeployResult> deployResults = buildDeployLogs.stream()
-                    .map(BuildDeployLog::deployResult)
+            List<DeployLogVO> deployResultVOS = buildDeployLogs.stream()
+                    .map(BuildDeployLog::deployLog)
                     .collect(Collectors.toList());
 
-            return WebResult.success(deployResults);
+            return WebResult.success(deployResultVOS);
         }
     }
 
@@ -86,8 +79,8 @@ public class AppBuildController {
             return WebResult.success("ok");
         } else {
             buildDeployLogs = buildDispatcher.dispatch(apps, false);
-            List<BuildResult> buildResults = buildDeployLogs.stream()
-                    .map(BuildDeployLog::buildResult)
+            List<BuildLogVO> buildResults = buildDeployLogs.stream()
+                    .map(BuildDeployLog::buildLog)
                     .collect(Collectors.toList());
 
             return WebResult.success(buildResults);
@@ -128,7 +121,7 @@ public class AppBuildController {
         return new HashSet<>(Arrays.asList(array));
     }
 
-    @ApiOperation(value = "待构建的应用列表")
+    @ApiOperation(value = "需要构建部署的应用")
     @GetMapping("/list")
     public ResponseEntity<String> buildList(/*@RequestParam("env") String env
             @RequestParam("page") int page, @RequestParam("size") int size*/) {
@@ -142,7 +135,7 @@ public class AppBuildController {
         return ResponseEntity.ok().body(WebResult.success(pageList));
     }
 
-    @ApiOperation(value = "")
+    @ApiOperation(value = "代码提交日志")
     @GetMapping("/logs/commit")
     public ResponseEntity<String> commitLog() {
         List<CommitLogVO> res = buildService.commitLogs();
@@ -153,7 +146,7 @@ public class AppBuildController {
         return ResponseEntity.ok().body(WebResult.success(logs));
     }
 
-    @ApiOperation(value = "")
+    @ApiOperation(value = "构建日志")
     @GetMapping("/logs/build")
     public ResponseEntity<String> buildLog() {
         List<BuildLogVO> res = buildService.buildLogs();
@@ -164,7 +157,7 @@ public class AppBuildController {
         return ResponseEntity.ok().body(WebResult.success(logs));
     }
 
-    @ApiOperation(value = "")
+    @ApiOperation(value = "部署日志")
     @GetMapping("/logs/deploy")
     public ResponseEntity<String> deployLog() {
         List<DeployLogVO> res = buildService.deployLogs();

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/IndexController.java

@@ -1,10 +1,17 @@
 package cn.reghao.autodop.dmaster.app.controller;
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author reghao
  * @date 2020-02-28 11:33:23
@@ -13,8 +20,27 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "测试接口")
 @RestController
 public class IndexController {
-    @GetMapping("/test")
+    @ApiOperation(value = "获取用户信息")
+    @ApiImplicitParams(
+            @ApiImplicitParam(name="appId", value="应用 ID", paramType="path", dataType = "String")
+    )
+    @GetMapping("/admin/getInfo")
     public ResponseEntity<String> adminInfo() {
-        return ResponseEntity.ok().body("ok");
+        String result = "{\"code\":0,\"data\":{\"name\":\"admin\",\"roles\":[\"Home\",\"Dashbord\",\"Driver\",\"Driver-index\",\"Permission\",\"PageUser\",\"PageAdmin\",\"Roles\",\"Table\",\"BaseTable\",\"ComplexTable\",\"Icons\",\"Icons-index\",\"Components\",\"Sldie-yz\",\"Upload\",\"Carousel\",\"Echarts\",\"Sldie-chart\",\"Dynamic-chart\",\"Map-chart\",\"Excel\",\"Excel-out\",\"Excel-in\",\"Mutiheader-out\",\"Error\",\"Page404\",\"Github\",\"NavTest\",\"Nav1\",\"Nav2\",\"Nav2-1\",\"Nav2-2\",\"Nav2-2-1\",\"Nav2-2-2\",\"*404\"],\"introduce\":\"哈哈哈\"},\"_res\":{\"status\":200}}";
+        return ResponseEntity.ok().body(result);
+    }
+
+    @Data
+    static class Result {
+        private int code;
+        private Map<String, Integer> _res;
+        private String data;
+    }
+
+    @Data
+    static class AdminInfo {
+        private String name;
+        private String introduce;
+        private List<String> roles;
     }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/BaseEntity.java

@@ -6,7 +6,7 @@ import org.hibernate.annotations.CreationTimestamp;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
  * 继承策略为每个实体类一张表
@@ -27,7 +27,7 @@ public class BaseEntity implements Serializable {
 
     @CreationTimestamp
     @Column(updatable = false)
-    protected Date createTime;
+    protected LocalDateTime createTime;
     @CreationTimestamp
-    protected Date updateTime;
+    protected LocalDateTime updateTime;
 }

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

@@ -1,15 +1,9 @@
 package cn.reghao.autodop.dmaster.app.entity.log;
 
-import cn.reghao.autodop.dmaster.app.service.tools.updater.CommitLog;
-import cn.reghao.autodop.dmaster.app.vo.result.BuildResult;
-import cn.reghao.autodop.dmaster.app.vo.result.DeployResult;
-import cn.reghao.autodop.dmaster.app.vo.result.DeployStatus;
+import cn.reghao.autodop.dmaster.app.vo.log.BuildLogVO;
+import cn.reghao.autodop.dmaster.app.vo.log.DeployLogVO;
 import lombok.Data;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 /**
  * 应用构建部署日志
  *
@@ -27,61 +21,11 @@ public class BuildDeployLog {
         this.deployLog = deployLog;
     }
 
-    /**
-     * 构建结果
-     *
-     * @param
-     * @return
-     * @date 2020-05-20 下午9:56
-     */
-    public BuildResult buildResult() {
-        BuildResult buildResult = new BuildResult();
-        buildResult.setStage(buildLog.getStage());
-        buildResult.setCode(buildLog.getCode());
-        buildResult.setMsg(buildLog.getMsg());
-
-        buildResult.setAppId(buildLog.getApp().getAppId());
-        buildResult.setDescription(buildLog.getApp().getDescription());
-        buildResult.setEnv(buildLog.getApp().getEnv());
-        CommitLog commitLog = buildLog.getCommitLog();
-        if (commitLog != null) {
-            buildResult.setCommitId(commitLog.getCommitId());
-        }
-        buildResult.setAppPath(buildLog.getAppPath());
-
-        return buildResult;
+    public BuildLogVO buildLog() {
+        return BuildLogVO.of(buildLog);
     }
 
-    /**
-     * 部署结果
-     *
-     * @param
-     * @return
-     * @date 2020-05-20 下午9:56
-     */
-    public DeployResult deployResult() {
-        DeployResult deployResult = new DeployResult();
-        deployResult.setAppId(this.buildLog.getApp().getAppId());
-        deployResult.setDescription(this.buildLog.getApp().getDescription());
-        deployResult.setEnv(this.buildLog.getApp().getEnv());
-        CommitLog commitLog = this.buildLog.getCommitLog();
-        if (commitLog != null) {
-            deployResult.setCommitId(commitLog.getCommitId());
-        }
-
-        List<DeployStatus> list = new ArrayList<>();
-        /*this.deployLogs.forEach((host, deployLog) -> {
-            DeployStatus deployStatus = new DeployStatus();
-            deployStatus.setHost(deployLog.getHost());
-            deployStatus.setDeployTime(deployLog.getDeployTime());
-            if (deployLog.getCode() == 0) {
-                deployStatus.setMsg("部署成功");
-            } else {
-                deployStatus.setMsg("部署失败");
-            }
-            list.add(deployStatus);
-        });*/
-        deployResult.setDeployStatus(list);
-        return deployResult;
+    public DeployLogVO deployLog() {
+        return DeployLogVO.of(deployLog);
     }
 }

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

@@ -8,9 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * 应用构建日志

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/repository/log/LogRepository.java

@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.*;
 
 /**
@@ -43,7 +44,7 @@ public class LogRepository {
         if (entity != null) {
             buildLog.setId(entity.getId());
             buildLog.setCreateTime(entity.getCreateTime());
-            buildLog.setUpdateTime(new Date());
+            buildLog.setUpdateTime(LocalDateTime.now());
             saveOrUpdateBuildLog(buildLog);
         } else {
             saveOrUpdateBuildLog(buildLog);
@@ -78,7 +79,7 @@ public class LogRepository {
             saveOrUpdateDeployedApp(buildLog);
         } else {
             deployLogEntity.setDeployResults(deployLog.getDeployResults());
-            deployLogEntity.setUpdateTime(new Date());
+            deployLogEntity.setUpdateTime(LocalDateTime.now());
             deployLogRepository.save(deployLogEntity);
         }
     }
@@ -92,7 +93,7 @@ public class LogRepository {
             deployedAppRepository.save(entity);
         } else {
             entity.setCommitId(buildLog.getCommitLog().getCommitId());
-            entity.setUpdateTime(new Date());
+            entity.setUpdateTime(LocalDateTime.now());
             deployedAppRepository.save(entity);
         }
     }

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

@@ -19,6 +19,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.*;
 
 /**
@@ -216,7 +217,7 @@ public class AppOrchestrateService {
 
                     proj.setId(projEntity.getId());
                     proj.setCreateTime(projEntity.getCreateTime());
-                    proj.setUpdateTime(new Date());
+                    proj.setUpdateTime(LocalDateTime.now());
                     projRepository.save(proj);
                     return true;
                 }
@@ -228,7 +229,7 @@ public class AppOrchestrateService {
                 if (appEntity != null) {
                     app.setId(appEntity.getId());
                     app.setCreateTime(appEntity.getCreateTime());
-                    app.setUpdateTime(new Date());
+                    app.setUpdateTime(LocalDateTime.now());
                     saveApp(app);
                     return true;
                 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/AppIntegrate.java

@@ -25,8 +25,6 @@ import cn.reghao.autodop.dmaster.common.config.SysConfig;
 import lombok.extern.slf4j.Slf4j;
 
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.Map;
 
 /**
  * 应用构建部署，根据 AppOrchestration 的值完成应用构建和部署的配置

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

@@ -1,15 +1,19 @@
 package cn.reghao.autodop.dmaster.app.vo.log;
 
+import cn.reghao.autodop.dmaster.app.entity.log.DeployLog;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @author reghao
  * @date 2020-06-02 14:40:17
  */
 @AllArgsConstructor
+@NoArgsConstructor
 @Data
 public class DeployLogVO {
     private String appId;
@@ -18,4 +22,18 @@ public class DeployLogVO {
     private String branch;
     private String commitId;
     private Set<DeployResultVO> deployResults;
+
+    public static DeployLogVO of(DeployLog deployLog) {
+        DeployLogVO deployLogVO = new DeployLogVO();
+        deployLogVO.appId = deployLog.getBuildLog().getApp().getAppId();
+        deployLogVO.env = deployLog.getBuildLog().getApp().getEnv();
+        deployLogVO.remoteRepoUrl = deployLog.getBuildLog().getCommitLog().getRemoteRepoUrl();
+        deployLogVO.branch = deployLog.getBuildLog().getCommitLog().getBranch();
+        deployLogVO.commitId = deployLog.getBuildLog().getCommitLog().getCommitId();
+        deployLogVO.deployResults = deployLog.getDeployResults().stream()
+                .map(DeployResultVO::of)
+                .collect(Collectors.toSet());
+
+        return deployLogVO;
+    }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/vo/result/BuildResult.java

@@ -1,27 +0,0 @@
-package cn.reghao.autodop.dmaster.app.vo.result;
-
-import cn.reghao.autodop.dmaster.app.service.tools.updater.CommitLog;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 应用构建结果
- *
- * @author reghao
- * @date 2020-03-10 11:22:05
- */
-@NoArgsConstructor
-@Data
-public class BuildResult {
-    private String stage;
-    private int code;
-    private String msg;
-
-    private String appId;
-    private String description;
-    private String env;
-    private String commitId;
-
-    private CommitLog commitLog;
-    private String appPath;
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/vo/result/DeployResult.java

@@ -1,20 +0,0 @@
-package cn.reghao.autodop.dmaster.app.vo.result;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 应用部署结果
- *
- * @author reghao
- * @date 2020-03-10 11:22:05
- */
-@Data
-public class DeployResult {
-    private String appId;
-    private String description;
-    private String env;
-    private String commitId;
-    private List<DeployStatus> deployStatus;
-}

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/vo/result/DeployStatus.java

@@ -1,18 +0,0 @@
-package cn.reghao.autodop.dmaster.app.vo.result;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 应用部署到远程主机的状态
- *
- * @author reghao
- * @date 2020-05-20 17:08:44
- */
-@Data
-public class DeployStatus {
-    private String host;
-    private String msg;
-    private Date deployTime;
-}

scripts/build-and-deploy.sh

@@ -3,8 +3,8 @@
 ###
 #!/bin/sh
 
-#sh build.sh test dmaster
-#sh deploy.sh autodop-dmaster 192.168.0.50 gjs &
+sh build.sh test dmaster
+sh deploy.sh autodop-dmaster 192.168.0.50 gjs &
 
 sh build.sh test dagent
 sh deploy.sh autodop-dagent 192.168.0.171 gjs &