agent/src/main/java/cn/reghao/devops/agent/service/DeployJob.java

@@ -57,7 +57,20 @@ public class DeployJob  {
 
             log.info(">>> [Step 4] 正在轮询健康检查...");
             int maxRetries = 5; // 假设尝试 5 次，每次 2s
-            for (int i = 0; i < maxRetries; i++) {
+            runStep(ctx, DeployStepName.HEALTH_CHECK.name(), () -> {
+                for (int i = 0; i < maxRetries; i++) {
+                    try (Socket socket = new Socket()) {
+                        // 仅检测 TCP 端口是否开放，无需 curl
+                        String host = "localhost";
+                        socket.connect(new InetSocketAddress(host, appPort), 2000);
+                        //healthCheck = true;
+                    } catch (IOException e) {
+                        //throw new RuntimeException(e);
+                    }
+                    try { Thread.sleep(2000); } catch (InterruptedException e) { Thread.currentThread().interrupt(); }
+                }
+            });
+            /*for (int i = 0; i < maxRetries; i++) {
                 runStep(ctx, DeployStepName.HEALTH_CHECK.name(), () -> {
                     try (Socket socket = new Socket()) {
                         // 仅检测 TCP 端口是否开放，无需 curl
@@ -69,8 +82,7 @@ public class DeployJob  {
                     }
                 });
                 try { Thread.sleep(2000); } catch (InterruptedException e) { Thread.currentThread().interrupt(); }
-            }
-
+            }*/
             runStep(ctx, DeployStepName.DEPLOY_DONE.name(), () -> {
                 log.info(">>> [Step 5] 上报部署状态...");
                 InspectContainerResponse inspectContainerResponse = DockerManager.getDocker().inspectContainer(appId);

agent/src/main/java/cn/reghao/devops/agent/ws/WebSocketClient.java

@@ -118,53 +118,57 @@ public class WebSocketClient {
 
         @Override
         public CompletionStage<?> onText(WebSocket webSocket, CharSequence data, boolean last) {
-            String message = data.toString();
-            JsonNode root = JsonUtils.readTree(message);
-            // 1. 直接解析为枚举对象
-            AgentCommand cmd = AgentCommand.fromString(root.path("type").asText());
-            String taskId = root.path("taskId").asText();
-            if (cmd == AgentCommand.REGISTER_ACK) {
-                log.info("注册确认收到，开启定时心跳任务...");
-                // 只有收到 ACK，才启动心跳定时器
-                startHeartbeatScheduler();
-            } else if (cmd == AgentCommand.HEARTBEAT_ACK) {
-                // 更新最后成功交互时间
-                lastAckTime.set(System.currentTimeMillis());
-            } else {
-                // 使用虚拟线程或线程池处理任务，避免阻塞 WebSocket 读取线程
-                taskExecutor.execute(() -> {
-                    try {
-                        switch (cmd) {
-                            case DEPLOY_TASK -> {
-                                EvtAppDeploy evtAppDeploy = JsonUtils.convert(root.get("data"), EvtAppDeploy.class);
-                                deployJob.handleDeploy(webSocket, evtAppDeploy);
-                            }
-                            case APP_TASK -> {
-                                EvtAppStat evtAppStat = JsonUtils.convert(root.get("data"), EvtAppStat.class);
-                                appJob.handleApp(webSocket, evtAppStat);
+            try {
+                String message = data.toString();
+                JsonNode root = JsonUtils.readTree(message);
+                // 1. 直接解析为枚举对象
+                AgentCommand cmd = AgentCommand.fromString(root.path("type").asText());
+                String taskId = root.path("taskId").asText();
+                if (cmd == AgentCommand.REGISTER_ACK) {
+                    log.info("注册确认收到，开启定时心跳任务...");
+                    // 只有收到 ACK，才启动心跳定时器
+                    startHeartbeatScheduler();
+                } else if (cmd == AgentCommand.HEARTBEAT_ACK) {
+                    // 更新最后成功交互时间
+                    lastAckTime.set(System.currentTimeMillis());
+                } else {
+                    // 使用虚拟线程或线程池处理任务，避免阻塞 WebSocket 读取线程
+                    taskExecutor.execute(() -> {
+                        try {
+                            switch (cmd) {
+                                case DEPLOY_TASK -> {
+                                    EvtAppDeploy evtAppDeploy = JsonUtils.convert(root.get("data"), EvtAppDeploy.class);
+                                    deployJob.handleDeploy(webSocket, evtAppDeploy);
+                                }
+                                case APP_TASK -> {
+                                    EvtAppStat evtAppStat = JsonUtils.convert(root.get("data"), EvtAppStat.class);
+                                    appJob.handleApp(webSocket, evtAppStat);
+                                }
+                                case UNKNOWN -> {
+                                    log.error("收到未知指令类型: {}", message);
+                                }
                             }
-                            case UNKNOWN -> {
-                                log.error("收到未知指令类型: {}", message);
+                        } catch (Exception e) {
+                            String errorMsg = e.getMessage();
+                            AgentResponse<Object> resp = new AgentResponse<>();
+                            resp.setAgentId(Machine.ID);
+                            resp.setTaskId(taskId);
+                            resp.setType(AgentResponseType.TASK_ERROR);
+                            resp.setData(errorMsg);
+                            String json = JsonUtils.toJson(resp);
+                            if (webSocket != null && !webSocket.isOutputClosed()) {
+                                webSocket.sendText(json, true).whenComplete((ws, ex) -> {
+                                    if (ex != null) {
+                                        log.error("发送失败，这可能导致输出流被标记为关闭!", ex);
+                                        // 这里可以触发重连
+                                    }
+                                });
                             }
                         }
-                    } catch (Exception e) {
-                        String errorMsg = e.getMessage();
-                        AgentResponse<Object> resp = new AgentResponse<>();
-                        resp.setAgentId(Machine.ID);
-                        resp.setTaskId(taskId);
-                        resp.setType(AgentResponseType.TASK_ERROR);
-                        resp.setData(errorMsg);
-                        String json = JsonUtils.toJson(resp);
-                        if (webSocket != null && !webSocket.isOutputClosed()) {
-                            webSocket.sendText(json, true).whenComplete((ws, ex) -> {
-                                if (ex != null) {
-                                    log.error("发送失败，这可能导致输出流被标记为关闭!", ex);
-                                    // 这里可以触发重连
-                                }
-                            });
-                        }
-                    }
-                });
+                    });
+                }
+            } catch (Exception e) {
+                log.error("处理消息时发生异常: ", e);
             }
 
             // 立即返回，继续监听下一条消息

common/src/main/java/cn/reghao/devops/common/docker/Docker.java

@@ -2,6 +2,7 @@ package cn.reghao.devops.common.docker;
 
 import cn.reghao.devops.common.docker.model.DockerAuth;
 import cn.reghao.devops.common.docker.model.DockerContainerConfig;
+import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Image;
 import com.github.dockerjava.api.model.Version;
@@ -16,7 +17,8 @@ import java.util.List;
  * @date 2021-10-27 04:17:38
  */
 public interface Docker {
-    void auth();
+    DockerClient getDockerClient();
+    void auth(DockerAuth dockerAuth);
     Version version();
     void ping();
     void build(String repoTag, String compileHome, String dockerfileContent) throws Exception;

common/src/main/java/cn/reghao/devops/common/docker/DockerImpl.java

@@ -36,6 +36,7 @@ public class DockerImpl implements Docker {
     private final String unixSock = "/var/run/docker.sock";
 
     public DockerImpl() {
+        // 1. 配置：默认读取环境变量（如 DOCKER_HOST）
         DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
                 .withDockerHost("unix://" + unixSock)
                 .withDockerTlsVerify(false)
@@ -48,19 +49,6 @@ public class DockerImpl implements Docker {
         init(config);
     }
 
-    public DockerImpl(DockerAuth dockerAuth) {
-        DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
-                .withDockerHost("unix://" + unixSock)
-                .withDockerTlsVerify(false)
-                //.withDockerCertPath(String.format("%s/.docker", System.getProperty("user.home")))
-                .withRegistryUrl(dockerAuth.getRegistryUrl())
-                .withRegistryUsername(dockerAuth.getUsername())
-                .withRegistryPassword(dockerAuth.getPassword())
-                //.withRegistryEmail(registryMail)
-                .build();
-        init(config);
-    }
-
     private void init(DockerClientConfig config) {
         DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder()
                 .dockerHost(config.getDockerHost())
@@ -73,8 +61,14 @@ public class DockerImpl implements Docker {
     }
 
     @Override
-    public void auth() {
-        dockerClient.authCmd().exec();
+    public DockerClient getDockerClient() {
+        return dockerClient;
+    }
+
+    @Override
+    public void auth(DockerAuth dockerAuth) {
+        AuthConfig authConfig = getAuthConfig(dockerAuth);
+        dockerClient.authCmd().withAuthConfig(authConfig).exec();
     }
 
     @Override

mgr/src/main/java/cn/reghao/devops/mgr/admin/service/UserContext.java

@@ -3,6 +3,7 @@ package cn.reghao.devops.mgr.admin.service;
 import cn.reghao.devops.mgr.admin.model.constant.RoleType;
 import cn.reghao.devops.mgr.admin.security.form.AccountAuthToken;
 import cn.reghao.devops.mgr.admin.model.po.User;
+import cn.reghao.jutil.jdk.web.result.NotAvailable;
 import cn.reghao.jutil.web.ServletUtil;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
@@ -36,24 +37,13 @@ public class UserContext {
         return user != null ? user.getId() : -1;
     }
 
-    public static String getUserRole() {
+    public static String getUsername() {
         User user = getUser();
-        return user != null ? user.getRole().iterator().next() : RoleType.ROLE_ANONYMOUS.name();
+        return user != null ? user.getUsername() : NotAvailable.na.getDesc();
     }
 
-    /**
-     * 设置通过 oss-sdk 登入的用户
-     *
-     * @param
-     * @return
-     * @date 2025-06-03 11:39:45
-     */
-    public static void setOssUser(User user) {
-        String sessionId = ServletUtil.getSessionId();
-        AccountAuthToken authToken = new AccountAuthToken(sessionId, false, user.getId(), "");
-        authToken.setAuthenticated(true);
-        Authentication auth = new AccountAuthToken(authToken, user);
-        SecurityContext securityContext = SecurityContextHolder.getContext();
-        securityContext.setAuthentication(auth);
+    public static String getUserRole() {
+        User user = getUser();
+        return user != null ? user.getRole().iterator().next() : RoleType.ROLE_ANONYMOUS.name();
     }
 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/db/query/AppBuildQuery.java

@@ -3,9 +3,9 @@ package cn.reghao.devops.mgr.ops.app.db.query;
 import cn.reghao.devops.mgr.ops.builder.model.po.AppBuilding;
 import cn.reghao.devops.mgr.ops.app.model.po.AppConfig;
 import cn.reghao.devops.mgr.ops.builder.model.po.BuildLog;
-import cn.reghao.devops.mgr.ops.app.model.vo.AppBuildingVO;
+import cn.reghao.devops.mgr.ops.builder.model.vo.AppBuildingVO;
 import cn.reghao.devops.mgr.ops.app.model.vo.AppConfigVO;
-import cn.reghao.devops.mgr.ops.app.model.vo.BuildLogVO;
+import cn.reghao.devops.mgr.ops.builder.model.vo.BuildLogVO;
 import cn.reghao.devops.mgr.ops.build.model.po.CompilerConfig;
 import cn.reghao.devops.mgr.ops.build.model.po.PackerConfig;
 import cn.reghao.devops.mgr.ops.build.model.po.RepoAuthConfig;

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/db/query/AppDeployQuery.java

@@ -1,9 +1,9 @@
 package cn.reghao.devops.mgr.ops.app.db.query;
 
 import cn.reghao.devops.mgr.ops.app.model.po.AppDeployConfig;
-import cn.reghao.devops.mgr.ops.app.model.vo.AppDeployingVO;
-import cn.reghao.devops.mgr.ops.app.model.vo.AppRunning;
-import cn.reghao.devops.mgr.ops.app.model.vo.AppRunningNode;
+import cn.reghao.devops.mgr.ops.builder.model.vo.AppDeployingVO;
+import cn.reghao.devops.mgr.ops.builder.model.vo.AppRunning;
+import cn.reghao.devops.mgr.ops.builder.model.vo.AppRunningNode;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/db/query/impl/AppBuildQueryImpl.java

@@ -10,9 +10,9 @@ import cn.reghao.devops.mgr.ops.builder.model.po.AppBuilding;
 import cn.reghao.devops.mgr.ops.builder.model.po.AppDeploying;
 import cn.reghao.devops.mgr.ops.app.model.po.AppConfig;
 import cn.reghao.devops.mgr.ops.builder.model.po.BuildLog;
-import cn.reghao.devops.mgr.ops.app.model.vo.AppBuildingVO;
+import cn.reghao.devops.mgr.ops.builder.model.vo.AppBuildingVO;
 import cn.reghao.devops.mgr.ops.app.model.vo.AppConfigVO;
-import cn.reghao.devops.mgr.ops.app.model.vo.BuildLogVO;
+import cn.reghao.devops.mgr.ops.builder.model.vo.BuildLogVO;
 import cn.reghao.devops.mgr.ops.build.model.po.CompilerConfig;
 import cn.reghao.devops.mgr.ops.build.model.po.PackerConfig;
 import cn.reghao.devops.mgr.ops.build.model.po.RepoAuthConfig;
@@ -41,7 +41,7 @@ public class AppBuildQueryImpl implements AppBuildQuery {
     private final BuildLogRepository buildLogRepository;
     private final AppDeployConfigRepository deployConfigRepository;
     private final AppDeployingRepository appDeployingRepository;
-    private TextFile textFile = new TextFile();
+    private final TextFile textFile = new TextFile();
 
     public AppBuildQueryImpl(AppConfigRepository appConfigRepository, AppBuildingRepository buildingRepository,
                              BuildLogRepository buildLogRepository, AppDeployConfigRepository deployConfigRepository,
@@ -188,7 +188,7 @@ public class AppBuildQueryImpl implements AppBuildQuery {
         String html = "";
         BuildLog buildLog = buildLogRepository.findByBuildLogId(buildLogId);
         if (buildLog != null) {
-            html = StringUtil.txtToHtml(buildLog.getLogSummary());
+            html = StringUtil.txtToHtml(buildLog.getErrorMsg());
         }
         return html;
     }

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/db/query/impl/AppDeployQueryImpl.java

@@ -12,10 +12,10 @@ import cn.reghao.devops.mgr.ops.app.model.po.AppConfig;
 import cn.reghao.devops.mgr.ops.app.model.po.AppDeployConfig;
 import cn.reghao.devops.mgr.ops.builder.model.po.BuildLog;
 import cn.reghao.devops.mgr.ops.builder.model.po.DeployLog;
-import cn.reghao.devops.mgr.ops.app.model.vo.AppDeployingVO;
+import cn.reghao.devops.mgr.ops.builder.model.vo.AppDeployingVO;
 import cn.reghao.devops.mgr.ops.app.model.vo.AppNodeCount;
-import cn.reghao.devops.mgr.ops.app.model.vo.AppRunning;
-import cn.reghao.devops.mgr.ops.app.model.vo.AppRunningNode;
+import cn.reghao.devops.mgr.ops.builder.model.vo.AppRunning;
+import cn.reghao.devops.mgr.ops.builder.model.vo.AppRunningNode;
 import cn.reghao.devops.mgr.ops.machine.model.po.MachineInfo;
 import cn.reghao.devops.mgr.ops.machine.service.MachineQuery;
 import org.springframework.data.domain.Page;
@@ -74,7 +74,7 @@ public class AppDeployQueryImpl implements AppDeployQuery {
                     MachineInfo machineInfo = appDeploying.getAppDeployConfig().getMachineInfo();
                     String machineStatus = machineQuery.isAgentOnline(machineInfo.getMachineId())
                             ? NodeStatus.Online.name() : NodeStatus.Offline.name();
-                    return new AppDeployingVO(appDeploying, null, machineStatus);
+                    return new AppDeployingVO(appDeploying, machineStatus);
                 })
                 .sorted(Comparator.comparing(AppDeployingVO::getDeployTime).reversed())
                 .collect(Collectors.toList());

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/model/constant/DeployStatus.java

@@ -1,30 +0,0 @@
-package cn.reghao.devops.mgr.ops.app.model.constant;
-
-/**
- * 部署状态
- *
- * @author reghao
- * @date 2021-11-08 16:35:42
- */
-public enum DeployStatus {
-    neverDeploy(1, "尚未部署"),
-    onDeploying(2, "正在部署"),
-    deploySuccess(3, "部署成功"),
-    deployFail(4, "部署失败");
-
-    private final Integer code;
-    private final String desc;
-
-    DeployStatus(Integer code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-}

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/model/vo/msg/BuildNotifyMsg.java

@@ -1,7 +1,7 @@
 package cn.reghao.devops.mgr.ops.app.model.vo.msg;
 
 import cn.reghao.devops.mgr.admin.service.notifier.ding.DingMsg;
-import cn.reghao.devops.mgr.ops.app.model.constant.BuildStatus;
+import cn.reghao.devops.mgr.ops.builder.model.constant.BuildStatus;
 import cn.reghao.devops.mgr.ops.builder.model.po.AppBuilding;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import lombok.Data;
@@ -31,7 +31,7 @@ public class BuildNotifyMsg {
         this.repoBranch = appBuilding.getAppConfig().getRepoBranch();
         this.commitId = appBuilding.getCommitId();
         this.commitTime = DateTimeConverter.format(appBuilding.getCommitTime());
-        this.buildResult = BuildStatus.getByCode(appBuilding.getBuildStatus()).getDesc();
+        this.buildResult = BuildStatus.valueOf(appBuilding.getBuildStatus()).getDesc();
         this.buildTime = DateTimeConverter.format(appBuilding.getBuildTime());
         this.opsBy = appBuilding.getOpsBy();
     }

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/model/vo/msg/DeployNotifyMsg.java

@@ -33,13 +33,8 @@ public class DeployNotifyMsg {
         this.commitId = buildLog.getCommitId();
         this.commitTime = DateTimeConverter.format(buildLog.getCommitTime());
         this.machineIpv4 = deployLog.getAppDeployConfig().getMachineInfo().getMachineIpv4();
-        /*int code = deployLog.getCode();
-        if (code == ResultStatus.SUCCESS.getCode()) {
-            this.deployResult = ResultStatus.SUCCESS.getMsg();
-        } else {
-            this.deployResult = deployLog.getMsg();
-        }*/
-        this.deployTime = DateTimeConverter.format(deployLog.getDeployTime());
+        this.deployResult = deployLog.getStatus();
+        this.deployTime = DateTimeConverter.format(deployLog.getEndTime());
         this.opsBy = deployLog.getOpsBy();
     }
 

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/model/vo/msg/DingTestMsg.java

@@ -16,7 +16,7 @@ public class DingTestMsg {
 
     public DingTestMsg() {
         this.sendTime = DateTimeConverter.format(System.currentTimeMillis());
-        this.sendBy = UserContext.getUser().getUsername();
+        this.sendBy = UserContext.getUsername();
     }
 
     public DingMsg dingMsg() {

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/service/AppDeployService.java

@@ -20,6 +20,6 @@ public interface AppDeployService {
     void deleteAppDeploying(String appId, String machineId);
     void deleteDeployLog(String buildLogId);
 
-    void updateBeforeDeploy(AppBuilding appBuilding, String machineId, String opsBy);
+    void updateBeforeDeploy(AppBuilding appBuilding, String machineId);
     void updateAfterDeploy(EvtAppStatResult statResult);
 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/service/PermissionCheck.java

@@ -5,7 +5,7 @@ import cn.reghao.devops.mgr.admin.model.po.Role;
 import cn.reghao.devops.mgr.admin.model.po.User;
 import cn.reghao.devops.mgr.admin.service.RoleService;
 import cn.reghao.devops.mgr.admin.service.UserContext;
-import cn.reghao.devops.mgr.ops.builder.model.constant.EnvType;
+import cn.reghao.devops.mgr.ops.build.model.constant.EnvType;
 import org.springframework.stereotype.Service;
 
 import java.util.Set;

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/service/impl/AppBuildServiceImpl.java

@@ -13,7 +13,7 @@ import cn.reghao.devops.mgr.ops.app.service.AppDeployService;
 import cn.reghao.devops.mgr.ops.build.model.vo.BuildConfig;
 import cn.reghao.devops.mgr.ops.build.service.BuildConfigChecker;
 import cn.reghao.devops.mgr.ops.builder.model.LocalBuildDir;
-import cn.reghao.devops.mgr.ops.builder.model.constant.RepoType;
+import cn.reghao.devops.mgr.ops.build.model.constant.RepoType;
 import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import lombok.extern.slf4j.Slf4j;

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/service/impl/AppDeployServiceImpl.java

@@ -5,13 +5,14 @@ import cn.reghao.devops.common.docker.model.DockerContainerConfig;
 import cn.reghao.devops.common.msg.constant.PackType;
 import cn.reghao.devops.common.msg.constant.StepStatus;
 import cn.reghao.devops.common.msg.event.EvtAppStatResult;
+import cn.reghao.devops.mgr.admin.service.UserContext;
 import cn.reghao.devops.mgr.ops.aliyun.service.AliyunCdn;
 import cn.reghao.devops.mgr.ops.app.db.query.AppBuildQuery;
 import cn.reghao.devops.mgr.ops.app.db.query.AppDeployQuery;
+import cn.reghao.devops.mgr.ops.builder.model.constant.BuildStatus;
 import cn.reghao.devops.mgr.ops.builder.db.repository.AppDeployingRepository;
 import cn.reghao.devops.mgr.ops.app.db.repository.AppDeployConfigRepository;
 import cn.reghao.devops.mgr.ops.builder.db.repository.DeployLogRepository;
-import cn.reghao.devops.mgr.ops.app.model.constant.DeployStatus;
 import cn.reghao.devops.mgr.ops.app.model.dto.DeployConfigDto;
 import cn.reghao.devops.mgr.ops.app.model.dto.DeployConfigUpdateDto;
 import cn.reghao.devops.mgr.ops.builder.model.po.AppBuilding;
@@ -26,8 +27,8 @@ import cn.reghao.devops.mgr.ops.builder.task.RereshCheckTask;
 import cn.reghao.devops.mgr.ops.machine.model.po.MachineInfo;
 import cn.reghao.devops.mgr.ops.machine.service.MachineQuery;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
+import cn.reghao.jutil.jdk.web.result.NotAvailable;
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
 import lombok.extern.slf4j.Slf4j;
@@ -37,7 +38,6 @@ import org.springframework.util.StringUtils;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -82,14 +82,14 @@ public class AppDeployServiceImpl implements AppDeployService {
         AppConfig appConfig = appBuildQuery.getAppConfig(appId);
         if (appConfig == null) {
             String msg = String.format("%s 不存在", appId);
-            return Result.result(ResultStatus.ERROR, msg);
+            return Result.result(cn.reghao.jutil.jdk.web.result.ResultStatus.ERROR, msg);
         }
 
         String machineId = deployConfigDto.getMachineId();
         MachineInfo machineInfo = machineQuery.getMachineInfo(machineId);
         if (machineInfo == null) {
             String msg = String.format("%s 不存在", machineId);
-            return Result.result(ResultStatus.ERROR, msg);
+            return Result.result(cn.reghao.jutil.jdk.web.result.ResultStatus.ERROR, msg);
         }
 
         String startScript = deployConfigDto.getStartScript();
@@ -105,13 +105,8 @@ public class AppDeployServiceImpl implements AppDeployService {
         deployConfigRepository.save(appDeployConfig);
 
         AppDeploying appDeploying = new AppDeploying(appDeployConfig);
-        // 定义流水线环节：检出 -> 编译 -> 打包 -> (部署)
-        List<String> stepNames = Arrays.stream(DeployStepName.values())
-                .map(Enum::name)
-                .collect(Collectors.toList());
-        appDeploying.initSteps(stepNames, "");
         appDeployingRepository.save(appDeploying);
-        return Result.result(ResultStatus.SUCCESS);
+        return Result.result(cn.reghao.jutil.jdk.web.result.ResultStatus.SUCCESS);
     }
 
     @Override
@@ -121,7 +116,7 @@ public class AppDeployServiceImpl implements AppDeployService {
         AppDeployConfig appDeployConfig = appDeployQuery.getByAppIdAndMachineId(appId, machineId);
         if (appDeployConfig == null) {
             String msg = String.format("%s 在 %s 上的部署配置不存在", appId, machineId);
-            return Result.result(ResultStatus.ERROR, msg);
+            return Result.result(cn.reghao.jutil.jdk.web.result.ResultStatus.ERROR, msg);
         }
 
         String startScript = deployConfigUpdateDto.getStartScript();
@@ -135,7 +130,7 @@ public class AppDeployServiceImpl implements AppDeployService {
 
         appDeployConfig.setStartScript(startScript);
         deployConfigRepository.save(appDeployConfig);
-        return Result.result(ResultStatus.SUCCESS);
+        return Result.result(cn.reghao.jutil.jdk.web.result.ResultStatus.SUCCESS);
     }
 
     @Override
@@ -148,7 +143,7 @@ public class AppDeployServiceImpl implements AppDeployService {
     public Result deleteDeployConfig(int appDeployConfigId) {
         AppDeployConfig appDeployConfig = deployConfigRepository.findById(appDeployConfigId).orElse(null);
         if (appDeployConfig == null) {
-            return Result.result(ResultStatus.FAIL, "AppDeployConfig not exists");
+            return Result.result(cn.reghao.jutil.jdk.web.result.ResultStatus.FAIL, "AppDeployConfig not exists");
         }
 
         return deleteAppDeployConfig(appDeployConfig);
@@ -161,10 +156,10 @@ public class AppDeployServiceImpl implements AppDeployService {
             appDeployingRepository.delete(appDeploying);
             deployLogRepository.deleteByAppDeployConfig_MachineInfo_MachineId(machineId);
             deployConfigRepository.delete(appDeployConfig);
-            return Result.result(ResultStatus.SUCCESS);
+            return Result.result(cn.reghao.jutil.jdk.web.result.ResultStatus.SUCCESS);
         }
 
-        return Result.result(ResultStatus.FAIL, "app is running");
+        return Result.result(cn.reghao.jutil.jdk.web.result.ResultStatus.FAIL, "app is running");
     }
 
     @Override
@@ -172,12 +167,12 @@ public class AppDeployServiceImpl implements AppDeployService {
         List<AppDeployConfig> list = deployConfigRepository.findByAppConfig_AppId(appId);
         for (AppDeployConfig appDeployConfig : list) {
             Result result = deleteAppDeployConfig(appDeployConfig);
-            if (result.getCode() != ResultStatus.SUCCESS.getCode()) {
+            if (result.getCode() != cn.reghao.jutil.jdk.web.result.ResultStatus.SUCCESS.getCode()) {
                 return result;
             }
         }
 
-        return Result.result(ResultStatus.SUCCESS);
+        return Result.result(cn.reghao.jutil.jdk.web.result.ResultStatus.SUCCESS);
     }
 
     @Override
@@ -211,18 +206,23 @@ public class AppDeployServiceImpl implements AppDeployService {
     }
 
     @Override
-    public void updateBeforeDeploy(AppBuilding appBuilding, String machineId, String opsBy) {
+    public void updateBeforeDeploy(AppBuilding appBuilding, String machineId) {
         String appId = appBuilding.getAppConfig().getAppId();
         AppDeploying appDeploying = appDeployingRepository.findByAppDeployConfig_AppConfig_AppIdAndAppDeployConfig_MachineInfo_MachineId(appId, machineId);
-        String machineId1 = appDeploying.getAppDeployConfig().getMachineInfo().getMachineId();
-        if (machineId1.equals(machineId)) {
-            appDeploying.setDeployResult(DeployStatus.onDeploying.getDesc());
+        if (appDeploying != null) {
+            String opsBy = UserContext.getUsername();
+            if (opsBy.equals(NotAvailable.na.getDesc())) {
+                opsBy = appBuilding.getOpsBy();
+            }
+
+            appDeploying.setDeployTime(LocalDateTime.now());
+            appDeploying.setDeployStatus(BuildStatus.OpsRunning.name());
             appDeploying.setOpsBy(opsBy);
+            appDeploying.updateBeforeDeploy();
+            appDeployingRepository.save(appDeploying);
+        } else {
+            log.error("AppDeploying with appId {} not exist", appId);
         }
-
-        BuildLog buildLog = appBuilding.getBuildLog();
-        //DeployLog deployLog = new DeployLog(buildLog);
-        appDeployingRepository.save(appDeploying);
     }
 
     @Override
@@ -235,34 +235,18 @@ public class AppDeployServiceImpl implements AppDeployService {
 
         AppDeployConfig deployConfig = deployConfigRepository.findByAppConfig_AppIdAndMachineInfo_MachineId(appId, machineId);
         if (deployConfig == null) {
+            log.error("AppDeployConfig with appId {} not exist", appId);
             return;
         }
 
         AppDeploying appDeploying = appDeployingRepository.findByAppDeployConfigId(deployConfig.getId());
         if (appDeploying == null) {
+            log.error("AppDeploying with appId {} not exist", appId);
             return;
         }
 
         String stepStatus = deployResult.getDeployStepStatus();
-        appDeploying.getSteps().stream()
-                .filter(s -> s.getStepName().equals(stepName))
-                .findFirst()
-                .ifPresent(step -> {
-                    step.setStatus(stepStatus);
-                    step.setErrorMsg(errorMsg);
-                    // 记录时间
-                    if (StepStatus.RUNNING.name().equals(stepStatus)) {
-                        step.setStartTime(LocalDateTime.now());
-                    } else if (StepStatus.SUCCESS.name().equals(stepStatus)
-                            || StepStatus.FAILURE.name().equals(stepStatus)) {
-                        LocalDateTime endTime = LocalDateTime.now();
-                        // 计算总耗时
-                        long seconds = Duration.between(step.getStartTime(), endTime).getSeconds();
-                        step.setEndTime(endTime);
-                        step.setDuration(seconds);
-                    }
-                });
-
+        appDeploying.updateStep(stepName, stepStatus, errorMsg);
         if (stepName.equals(DeployStepName.HEALTH_CHECK.name())) {
             appDeployingRepository.save(appDeploying);
             return;
@@ -273,9 +257,9 @@ public class AppDeployServiceImpl implements AppDeployService {
                 String machineIpv4 = deployConfig.getMachineInfo().getMachineIpv4();
                 log.info("部署在 {} 的应用 {} 已完成", machineIpv4, appId);
                 if (stepStatus.equals(StepStatus.FAILURE.name())) {
-                    appDeploying.setDeployResult(DeployStatus.deployFail.getDesc());
+                    appDeploying.setDeployStatus(BuildStatus.OpsFail.name());
                 } else {
-                    appDeploying.setDeployResult(DeployStatus.deploySuccess.getDesc());
+                    appDeploying.setDeployStatus(BuildStatus.OpsSuccess.name());
                     appDeploying.setRunning(deployResult.getRunning());
                     appDeploying.setStartTime(DateTimeConverter.localDateTime(deployResult.getStartTime()));
                     appDeploying.setPid(deployResult.getPid());
@@ -285,11 +269,9 @@ public class AppDeployServiceImpl implements AppDeployService {
                 AppDeployConfig appDeployConfig = appDeploying.getAppDeployConfig();
                 BuildLog buildLog = appBuildQuery.getAppBuilding(appId).getBuildLog();
 
-                String stepJson = JsonConverter.objectToJson(appDeploying.getSteps());
-                String configSnapshot = JsonConverter.objectToJson(appDeployConfig);
-                DeployLog deployLog = new DeployLog(buildLog, appDeployConfig);
-                //deployLogRepository.save(deployLog);
-                //buildDeployNotify.deployNotify(deployLog);
+                DeployLog deployLog = getDeployLog(appDeploying, appDeployConfig, deployResult, buildLog);
+                deployLogRepository.save(deployLog);
+                buildDeployNotify.deployNotify(deployLog);
 
                 log.info("{} 的通知已发送", deployResult.getAppId());
                 AppConfig appConfig = deployConfig.getAppConfig();
@@ -302,6 +284,27 @@ public class AppDeployServiceImpl implements AppDeployService {
         appDeployingRepository.save(appDeploying);
     }
 
+    private DeployLog getDeployLog(AppDeploying appDeploying, AppDeployConfig appDeployConfig,
+                                   EvtAppStatResult deployResult,BuildLog buildLog) {
+        String stepJson = JsonConverter.objectToJson(appDeploying.getSteps());
+        String configSnapshot = JsonConverter.objectToJson(appDeployConfig);
+
+        String opsBy = appDeploying.getOpsBy();
+        LocalDateTime startTime = appDeploying.getDeployTime();
+        LocalDateTime endTime = LocalDateTime.now();
+        long seconds = Duration.between(startTime, endTime).getSeconds();
+
+        DeployLog deployLog = new DeployLog(buildLog, appDeployConfig, opsBy);
+        deployLog.setStartTime(startTime);
+        deployLog.setEndTime(endTime);
+        deployLog.setDuration(seconds);
+        deployLog.setStatus(appDeploying.getDeployStatus());
+        deployLog.setErrorMsg(deployResult.getErrorMsg());
+        deployLog.setStepJson(stepJson);
+        deployLog.setConfigSnapshot(configSnapshot);
+        return deployLog;
+    }
+
     private void refreshCdn(AppConfig appConfig, BuildLog buildLog) {
         String buildId = buildLog.getBuildLogId();
         String appId = appConfig.getAppId();

mgr/src/main/java/cn/reghao/devops/mgr/ops/build/controller/CompilerController.java

@@ -4,7 +4,7 @@ import cn.reghao.devops.mgr.ops.build.db.repository.CompilerConfigRepository;
 import cn.reghao.devops.mgr.ops.build.model.dto.CompilerBindDto;
 import cn.reghao.devops.mgr.ops.build.model.po.CompilerConfig;
 import cn.reghao.devops.mgr.ops.build.service.CompilerConfigService;
-import cn.reghao.devops.mgr.ops.builder.model.constant.CompileType;
+import cn.reghao.devops.mgr.ops.build.model.constant.CompileType;
 import cn.reghao.devops.mgr.util.SelectOption;
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.web.result.Result;
@@ -84,7 +84,7 @@ public class CompilerController {
     @GetMapping(value = "/bind/list", produces = MediaType.APPLICATION_JSON_VALUE)
     public String compilerBindPage(@RequestParam("id") int id) {
         CompilerConfig compilerConfig = compilerConfigRepository.findById(id).orElse(null);
-        if (compilerConfig != null && compilerConfig.getType().equals(CompileType.docker.getName())) {
+        if (compilerConfig != null && compilerConfig.getType().equals(CompileType.dockerRun.getName())) {
             return WebResult.success(compilerConfig.getCompilerBinds());
         }
 

mgr/src/main/java/cn/reghao/devops/mgr/ops/build/controller/RepoAuthController.java

@@ -3,8 +3,8 @@ package cn.reghao.devops.mgr.ops.build.controller;
 import cn.reghao.devops.mgr.ops.build.db.repository.RepoAuthConfigRepository;
 import cn.reghao.devops.mgr.ops.build.model.po.RepoAuthConfig;
 import cn.reghao.devops.mgr.ops.build.service.RepoAuthConfigService;
-import cn.reghao.devops.mgr.ops.builder.model.constant.RepoAuthType;
-import cn.reghao.devops.mgr.ops.builder.model.constant.RepoType;
+import cn.reghao.devops.mgr.ops.build.model.constant.RepoAuthType;
+import cn.reghao.devops.mgr.ops.build.model.constant.RepoType;
 import cn.reghao.devops.mgr.util.SelectOption;
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.web.result.Result;

mgr/src/main/java/cn/reghao/devops/mgr/ops/build/model/constant/CompileType.java

@@ -7,7 +7,7 @@ package cn.reghao.devops.mgr.ops.build.model.constant;
  * @date 2019-10-18 14:31:29
  */
 public enum CompileType {
-    none, shell, maven;
+    none, shell, maven, dockerRun, dockerBuild;
 
     public String getName() {
         return this.name();

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/constant/EnvType.java → mgr/src/main/java/cn/reghao/devops/mgr/ops/build/model/constant/EnvType.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.mgr.ops.builder.model.constant;
+package cn.reghao.devops.mgr.ops.build.model.constant;
 
 /**
  * @author reghao

mgr/src/main/java/cn/reghao/devops/mgr/ops/build/model/po/CompilerConfig.java

@@ -2,7 +2,7 @@ package cn.reghao.devops.mgr.ops.build.model.po;
 
 import cn.reghao.devops.mgr.ops.build.model.provider.CompilerConfigGroupSequenceProvider;
 import cn.reghao.devops.mgr.ops.builder.model.dto.CompilerDto;
-import cn.reghao.devops.mgr.ops.builder.model.constant.CompileType;
+import cn.reghao.devops.mgr.ops.build.model.constant.CompileType;
 import cn.reghao.devops.mgr.util.BaseEntity;
 import cn.reghao.jutil.jdk.web.validator.ValidEnum;
 import lombok.Getter;

mgr/src/main/java/cn/reghao/devops/mgr/ops/build/model/po/RepoAuthConfig.java

@@ -2,8 +2,8 @@ package cn.reghao.devops.mgr.ops.build.model.po;
 
 import cn.reghao.devops.mgr.ops.build.model.provider.RepoAuthGroupSequenceProvider;
 import cn.reghao.devops.mgr.ops.builder.model.dto.RepoAuth;
-import cn.reghao.devops.mgr.ops.builder.model.constant.RepoAuthType;
-import cn.reghao.devops.mgr.ops.builder.model.constant.RepoType;
+import cn.reghao.devops.mgr.ops.build.model.constant.RepoAuthType;
+import cn.reghao.devops.mgr.ops.build.model.constant.RepoType;
 import cn.reghao.devops.mgr.util.BaseEntity;
 import cn.reghao.jutil.jdk.web.validator.ValidEnum;
 import lombok.Getter;

mgr/src/main/java/cn/reghao/devops/mgr/ops/build/model/provider/CompilerConfigGroupSequenceProvider.java

@@ -1,7 +1,7 @@
 package cn.reghao.devops.mgr.ops.build.model.provider;
 
 import cn.reghao.devops.mgr.ops.build.model.po.CompilerConfig;
-import cn.reghao.devops.mgr.ops.builder.model.constant.CompileType;
+import cn.reghao.devops.mgr.ops.build.model.constant.CompileType;
 import org.hibernate.validator.spi.group.DefaultGroupSequenceProvider;
 
 import java.util.ArrayList;

mgr/src/main/java/cn/reghao/devops/mgr/ops/build/model/provider/RepoAuthGroupSequenceProvider.java

@@ -1,7 +1,7 @@
 package cn.reghao.devops.mgr.ops.build.model.provider;
 
 import cn.reghao.devops.mgr.ops.build.model.po.RepoAuthConfig;
-import cn.reghao.devops.mgr.ops.builder.model.constant.RepoAuthType;
+import cn.reghao.devops.mgr.ops.build.model.constant.RepoAuthType;
 import org.hibernate.validator.spi.group.DefaultGroupSequenceProvider;
 
 import java.util.ArrayList;

mgr/src/main/java/cn/reghao/devops/mgr/ops/build/service/impl/CompilerConfigServiceImpl.java

@@ -7,7 +7,7 @@ import cn.reghao.devops.mgr.ops.build.model.dto.CompilerBindDto;
 import cn.reghao.devops.mgr.ops.build.model.po.CompilerBind;
 import cn.reghao.devops.mgr.ops.build.model.po.CompilerConfig;
 import cn.reghao.devops.mgr.ops.build.service.CompilerConfigService;
-import cn.reghao.devops.mgr.ops.builder.model.constant.CompileType;
+import cn.reghao.devops.mgr.ops.build.model.constant.CompileType;
 import cn.reghao.devops.mgr.util.StringUtil;
 import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.jdk.web.result.ResultStatus;
@@ -43,7 +43,7 @@ public class CompilerConfigServiceImpl implements CompilerConfigService {
         CompilerConfig entity = compilerConfigRepository.findByName(name);
         if (entity == null) {
             String type = compilerConfig.getType();
-            if (type.equals(CompileType.docker.getName())) {
+            if (type.equals(CompileType.dockerRun.getName())) {
                 // TODO pull 编译器镜像, 验证是否可用
                 String compilerImage = compilerConfig.getCompilerImage();
             }

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/controller/AppStatController.java

@@ -3,8 +3,8 @@ package cn.reghao.devops.mgr.ops.builder.controller;
 import cn.reghao.devops.common.msg.constant.AppStatOps;
 import cn.reghao.devops.mgr.ops.app.model.dto.AppNode;
 import cn.reghao.devops.mgr.ops.app.db.query.AppDeployQuery;
-import cn.reghao.devops.mgr.ops.app.model.vo.AppRunning;
-import cn.reghao.devops.mgr.ops.app.model.vo.AppRunningNode;
+import cn.reghao.devops.mgr.ops.builder.model.vo.AppRunning;
+import cn.reghao.devops.mgr.ops.builder.model.vo.AppRunningNode;
 import cn.reghao.devops.mgr.ops.app.service.AppRunService;
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.web.result.Result;

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/controller/BuildDeployController.java

@@ -1,10 +1,10 @@
 package cn.reghao.devops.mgr.ops.builder.controller;
 
 import cn.reghao.devops.mgr.ops.builder.model.po.PipelineStep;
-import cn.reghao.devops.mgr.ops.app.model.vo.AppBuildingVO;
-import cn.reghao.devops.mgr.ops.app.model.vo.AppDeployingVO;
-import cn.reghao.devops.mgr.ops.app.model.vo.BuildLogVO;
-import cn.reghao.devops.mgr.ops.app.model.vo.BuildTask;
+import cn.reghao.devops.mgr.ops.builder.model.vo.AppBuildingVO;
+import cn.reghao.devops.mgr.ops.builder.model.vo.AppDeployingVO;
+import cn.reghao.devops.mgr.ops.builder.model.vo.BuildLogVO;
+import cn.reghao.devops.mgr.ops.builder.model.vo.BuildTask;
 import cn.reghao.devops.mgr.ops.app.service.BuildTimeMetrics;
 import cn.reghao.devops.mgr.ops.builder.service.BuildService;
 import cn.reghao.devops.mgr.util.JsonUtils;
@@ -16,7 +16,7 @@ import cn.reghao.devops.mgr.ops.builder.service.GetApp;
 import cn.reghao.devops.mgr.ops.builder.service.webhook.WebhookService;
 import cn.reghao.devops.mgr.ops.app.db.query.AppBuildQuery;
 import cn.reghao.devops.mgr.ops.app.db.query.AppDeployQuery;
-import cn.reghao.devops.mgr.ops.app.model.vo.BuildConfigSnapshot;
+import cn.reghao.devops.mgr.ops.builder.model.vo.BuildConfigSnapshot;
 import cn.reghao.devops.mgr.ops.builder.model.po.BuildLog;
 import cn.reghao.devops.mgr.ops.builder.service.BuildApp;
 import cn.reghao.jutil.web.WebResult;

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/model/constant/BuildStatus.java → mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/constant/BuildStatus.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.mgr.ops.app.model.constant;
+package cn.reghao.devops.mgr.ops.builder.model.constant;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
@@ -7,7 +7,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * 构建状态
+ * 构建/部署结果状态
  *
  * @author reghao
  * @date 2021-11-08 16:35:42
@@ -15,10 +15,10 @@ import java.util.Map;
 @JsonFormat(shape = JsonFormat.Shape.OBJECT)
 @Getter
 public enum BuildStatus {
-    neverBuild(1, "尚未构建", "#909399", "info"),
-    onBuilding(2, "正在构建", "#409EFF", "primary"),
-    buildSuccess(3, "构建成功", "#67C23A", "success"),
-    buildFail(4, "构建失败", "#F56C6C", "danger");
+    OpsPending(1, "尚未开始", "#909399", "info"),
+    OpsRunning(2, "正在进行", "#409EFF", "primary"),
+    OpsSuccess(3, "操作成功", "#67C23A", "success"),
+    OpsFail(4, "操作失败", "#F56C6C", "danger");
 
     private final Integer code;
     private final String desc;
@@ -40,6 +40,6 @@ public enum BuildStatus {
     }
 
     public static BuildStatus getByCode(Integer code) {
-        return CACHE.getOrDefault(code, neverBuild);
+        return CACHE.getOrDefault(code, OpsPending);
     }
 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/model/constant/BuildStepName.java → mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/constant/BuildStepName.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.mgr.ops.app.model.constant;
+package cn.reghao.devops.mgr.ops.builder.model.constant;
 
 /**
  * 流水线阶段枚举
@@ -8,9 +8,10 @@ package cn.reghao.devops.mgr.ops.app.model.constant;
  */
 public enum BuildStepName {
     CHECKOUT("源码检出"),
+    SCAN("扫描源码"),
     COMPILE("项目编译"),
     PACK("镜像打包"),
-    DEPLOY("应用部署");
+    PUSH("推送镜像");
 
     private final String desc;
     BuildStepName(String desc) { this.desc = desc; }

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/constant/CompileType.java

@@ -1,19 +0,0 @@
-package cn.reghao.devops.mgr.ops.builder.model.constant;
-
-/**
- * 编译方式类型
- *
- * @author reghao
- * @date 2019-10-18 14:31:29
- */
-public enum CompileType {
-    none, shell, maven, docker;
-
-    public String getName() {
-        return this.name();
-    }
-
-    public String getValue() {
-        return this.name();
-    }
-}

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/constant/RepoAuthType.java

@@ -1,17 +0,0 @@
-package cn.reghao.devops.mgr.ops.builder.model.constant;
-
-/**
- * @author reghao
- * @date 2021-02-05 18:50:01
- */
-public enum RepoAuthType {
-    http, ssh, none;
-
-    public String getName() {
-        return this.name();
-    }
-
-    public String getValue() {
-        return this.name();
-    }
-}

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/constant/RepoType.java

@@ -1,17 +0,0 @@
-package cn.reghao.devops.mgr.ops.builder.model.constant;
-
-/**
- * @author reghao
- * @date 2021-02-05 22:50:41
- */
-public enum RepoType {
-    git;
-
-    public String getName() {
-        return this.name();
-    }
-
-    public String getValue() {
-        return this.name();
-    }
-}

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/model/constant/RunStatus.java → mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/constant/RunStatus.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.mgr.ops.app.model.constant;
+package cn.reghao.devops.mgr.ops.builder.model.constant;
 
 /**
  * 运行状态

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/po/AppBuilding.java

@@ -1,7 +1,8 @@
 package cn.reghao.devops.mgr.ops.builder.model.po;
 
-import cn.reghao.devops.mgr.ops.app.model.constant.BuildStatus;
-import cn.reghao.devops.mgr.ops.app.model.constant.BuildStepName;
+import cn.reghao.devops.mgr.admin.service.UserContext;
+import cn.reghao.devops.mgr.ops.builder.model.constant.BuildStatus;
+import cn.reghao.devops.mgr.ops.builder.model.constant.BuildStepName;
 import cn.reghao.devops.mgr.ops.app.model.po.AppConfig;
 import cn.reghao.devops.common.msg.constant.StepStatus;
 import cn.reghao.devops.mgr.util.BaseEntity;
@@ -40,7 +41,7 @@ public class AppBuilding extends BaseEntity {
     private LocalDateTime commitTime;
     private LocalDateTime buildTime;
     // BuildStatus
-    private int buildStatus;
+    private String buildStatus;
     private String packagePath;
     private String opsBy;
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true)
@@ -53,32 +54,34 @@ public class AppBuilding extends BaseEntity {
         this.commitId = NotAvailable.na.getDesc();
         this.commitTime = LocalDate.EPOCH.atStartOfDay();
         this.buildTime = LocalDate.EPOCH.atStartOfDay();
-        this.buildStatus = BuildStatus.neverBuild.getCode();
+        this.buildStatus = BuildStatus.OpsPending.name();
         this.packagePath = NotAvailable.na.getDesc();
         this.opsBy = NotAvailable.na.getDesc();
     }
 
-    public void updateBeforeBuild(String opsBy, String buildId) {
+    public void updateBeforeBuild() {
+        this.commitId = NotAvailable.na.getDesc();
+        this.commitTime = LocalDate.EPOCH.atStartOfDay();
         this.buildTime = LocalDateTime.now();
-        this.buildStatus = BuildStatus.onBuilding.getCode();
-        this.opsBy = opsBy;
+        this.buildStatus = BuildStatus.OpsRunning.name();
+        this.packagePath = NotAvailable.na.getDesc();
+        this.opsBy = UserContext.getUsername();
 
         // 定义流水线环节：检出 -> 编译 -> 打包 -> (部署)
         List<String> stepNames = Arrays.stream(BuildStepName.values()).map(Enum::name).collect(Collectors.toList());
-        initSteps(stepNames, buildId);
+        initSteps(stepNames);
     }
 
     // 初始化步骤的方法
-    private void initSteps(List<String> stepNames, String buildId) {
+    private void initSteps(List<String> stepNames) {
         if (this.steps.isEmpty()) {
             // 情况 A：如果 List 为空，说明是第一次构建，执行新建
             for (String name : stepNames) {
-                this.steps.add(new PipelineStep(buildId, name));
+                this.steps.add(new PipelineStep(name));
             }
         } else {
             // 情况 B：如果已经存在，则“洗牌”重置
             for (PipelineStep step : this.steps) {
-                //step.setBuildId(buildId);       // 更新为本次构建的 ID
                 step.setStatus("PENDING");     // 重置为待执行
                 step.setStartTime(null);       // 抹除时间
                 step.setEndTime(null);
@@ -87,11 +90,11 @@ public class AppBuilding extends BaseEntity {
             }
 
             // 如果新旧流程步骤数量不一致（比如配置改了），可以做增删逻辑
-            adjustStepsIfNecessary(stepNames, buildId);
+            adjustStepsIfNecessary(stepNames);
         }
     }
 
-    private void adjustStepsIfNecessary(List<String> stepNames, String buildId) {
+    private void adjustStepsIfNecessary(List<String> stepNames) {
         // 1. 删除多余的步骤
         this.steps.removeIf(step -> !stepNames.contains(step.getStepName()));
 
@@ -99,7 +102,7 @@ public class AppBuilding extends BaseEntity {
         for (String name : stepNames) {
             boolean exists = this.steps.stream().anyMatch(s -> s.getStepName().equals(name));
             if (!exists) {
-                this.steps.add(new PipelineStep(buildId, name));
+                this.steps.add(new PipelineStep(name));
             }
         }
     }
@@ -128,11 +131,7 @@ public class AppBuilding extends BaseEntity {
         this.buildLog = buildLog;
         this.commitId = buildLog.getCommitId();
         this.commitTime = buildLog.getCommitTime();
-        if (!StepStatus.SUCCESS.name().equals(buildLog.getStatus())) {
-            this.buildStatus = BuildStatus.buildFail.getCode();
-        } else {
-            this.buildStatus = BuildStatus.buildSuccess.getCode();
-        }
+        this.buildStatus = buildLog.getStatus();
         this.packagePath = buildLog.getPackagePath();
         this.opsBy = buildLog.getOpsBy();
     }

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/po/AppDeploying.java

@@ -1,10 +1,10 @@
 package cn.reghao.devops.mgr.ops.builder.model.po;
 
+import cn.reghao.devops.common.msg.DeployStepName;
 import cn.reghao.devops.common.msg.constant.StepStatus;
-import cn.reghao.devops.mgr.ops.app.model.constant.DeployStatus;
+import cn.reghao.devops.mgr.ops.builder.model.constant.BuildStatus;
 import cn.reghao.devops.mgr.ops.app.model.po.AppDeployConfig;
 import cn.reghao.devops.mgr.util.BaseEntity;
-import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.web.result.NotAvailable;
 import jakarta.persistence.*;
 import lombok.Data;
@@ -14,7 +14,9 @@ import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author reghao
@@ -30,8 +32,9 @@ public class AppDeploying extends BaseEntity {
     @ManyToOne(cascade = CascadeType.REFRESH)
     @JoinColumn(name = "app_building_id")
     private AppBuilding appBuilding;
+
     private LocalDateTime deployTime;
-    private String deployResult;
+    private String deployStatus;
     private String opsBy;
 
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true)
@@ -47,24 +50,31 @@ public class AppDeploying extends BaseEntity {
 
     public AppDeploying(AppDeployConfig appDeployConfig) {
         this.appDeployConfig = appDeployConfig;
-        this.deployResult = DeployStatus.neverDeploy.getDesc();
         this.deployTime = LocalDate.EPOCH.atStartOfDay();
+        this.deployStatus = BuildStatus.OpsPending.name();
         this.opsBy = NotAvailable.na.getDesc();
         this.running = false;
         this.pid = 0;
     }
 
+    public void updateBeforeDeploy() {
+        // 定义流水线环节：检出 -> 编译 -> 打包 -> (部署)
+        List<String> stepNames = Arrays.stream(DeployStepName.values())
+                .map(Enum::name)
+                .collect(Collectors.toList());
+        initSteps(stepNames, "");
+    }
+
     // 初始化步骤的方法
-    public void initSteps(List<String> stepNames, String buildId) {
+    private void initSteps(List<String> stepNames, String buildId) {
         if (this.steps.isEmpty()) {
             // 情况 A：如果 List 为空，说明是第一次构建，执行新建
             for (String name : stepNames) {
-                this.steps.add(new PipelineStep(buildId, name));
+                this.steps.add(new PipelineStep(name));
             }
         } else {
             // 情况 B：如果已经存在，则“洗牌”重置
             for (PipelineStep step : this.steps) {
-                //step.setBuildId(buildId);       // 更新为本次构建的 ID
                 step.setStatus("PENDING");     // 重置为待执行
                 step.setStartTime(null);       // 抹除时间
                 step.setEndTime(null);
@@ -85,7 +95,7 @@ public class AppDeploying extends BaseEntity {
         for (String name : stepNames) {
             boolean exists = this.steps.stream().anyMatch(s -> s.getStepName().equals(name));
             if (!exists) {
-                this.steps.add(new PipelineStep(buildId, name));
+                this.steps.add(new PipelineStep(name));
             }
         }
     }

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/po/BuildLog.java

@@ -38,7 +38,7 @@ public class BuildLog extends BaseEntity {
     private Long duration;
     private String status;
     @Column(columnDefinition = "TEXT")
-    private String logSummary;   // 关键错误摘要
+    private String errorMsg;   // 关键错误摘要
     private String logPath;
     @Column(columnDefinition = "json")
     private String stepJson; // 存储历史步骤快照

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/po/DeployLog.java

@@ -2,7 +2,6 @@ package cn.reghao.devops.mgr.ops.builder.model.po;
 
 import cn.reghao.devops.mgr.ops.app.model.po.AppDeployConfig;
 import cn.reghao.devops.mgr.util.BaseEntity;
-import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -30,20 +29,20 @@ public class DeployLog extends BaseEntity {
     private AppDeployConfig appDeployConfig;
 
     private String opsBy;
-    private LocalDateTime deployTime;
+    private LocalDateTime startTime;
+    private LocalDateTime endTime;
     private Long duration;
     private String status;
     @Column(columnDefinition = "TEXT")
-    private String logSummary;   // 关键错误摘要
+    private String errorMsg;
     @Column(columnDefinition = "json")
-    private String stepJson; // 存储历史步骤快照
+    private String stepJson;
     @Column(columnDefinition = "json")
     private String configSnapshot;
 
-    public DeployLog(BuildLog buildLog, AppDeployConfig appDeployConfig) {
+    public DeployLog(BuildLog buildLog, AppDeployConfig appDeployConfig, String opsBy) {
         this.buildLog = buildLog;
         this.appDeployConfig = appDeployConfig;
-        this.opsBy = buildLog.getOpsBy();
-        this.deployTime = DateTimeConverter.localDateTime(System.currentTimeMillis());
+        this.opsBy = opsBy;
     }
 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/po/PipelineStep.java

@@ -44,7 +44,7 @@ public class PipelineStep {
     private Long duration;
     private String errorMsg;
 
-    public PipelineStep(String buildId, String stepName) {
+    public PipelineStep(String stepName) {
         this.stepName = stepName;
     }
 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/model/vo/AppBuildingVO.java → mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/vo/AppBuildingVO.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.mgr.ops.app.model.vo;
+package cn.reghao.devops.mgr.ops.builder.model.vo;
 
-import cn.reghao.devops.mgr.ops.app.model.constant.BuildStatus;
+import cn.reghao.devops.mgr.ops.builder.model.constant.BuildStatus;
 import cn.reghao.devops.mgr.ops.builder.model.po.PipelineStep;
 import cn.reghao.devops.mgr.ops.app.model.po.AppConfig;
 import cn.reghao.jutil.jdk.web.result.NotAvailable;
@@ -52,7 +52,7 @@ public class AppBuildingVO {
         this.buildBy = appBuilding.getOpsBy();
         this.totalNode = totalNode;
         this.totalRunning = totalRunning;
-        this.buildResult = new BuildResult(BuildStatus.getByCode(appBuilding.getBuildStatus()));
+        this.buildResult = new BuildResult(BuildStatus.valueOf(appBuilding.getBuildStatus()));
         this.steps = appBuilding.getSteps();
     }
 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/model/vo/AppDeployingVO.java → mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/vo/AppDeployingVO.java

@@ -1,6 +1,7 @@
-package cn.reghao.devops.mgr.ops.app.model.vo;
+package cn.reghao.devops.mgr.ops.builder.model.vo;
 
-import cn.reghao.devops.mgr.ops.builder.model.po.BuildLog;
+import cn.reghao.devops.mgr.ops.builder.model.constant.BuildStatus;
+import cn.reghao.devops.mgr.ops.builder.model.po.PipelineStep;
 import cn.reghao.devops.mgr.ops.machine.model.po.MachineInfo;
 import cn.reghao.jutil.jdk.web.result.NotAvailable;
 import cn.reghao.devops.mgr.ops.builder.model.po.AppDeploying;
@@ -8,6 +9,7 @@ import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * @author reghao
@@ -22,24 +24,19 @@ public class AppDeployingVO {
     private String packagePath;
     private String deployBy;
     private String deployTime;
-    private String deployResult;
+    private BuildResult deployResult;
+    private List<PipelineStep> steps;
 
-    public AppDeployingVO(AppDeploying appDeploying, BuildLog buildLog, String machineStatus) {
+    public AppDeployingVO(AppDeploying appDeploying, String machineStatus) {
         MachineInfo machineInfo = appDeploying.getAppDeployConfig().getMachineInfo();
         this.machineId = machineInfo.getMachineId();
         this.machineIpv4 = machineInfo.getMachineIpv4();
         this.machineStatus = machineStatus;
-
-        if (buildLog != null) {
-            this.commitId = buildLog.getCommitId() != null ? buildLog.getCommitId() : NotAvailable.na.getDesc();
-            this.packagePath = buildLog.getPackagePath() != null ? buildLog.getPackagePath() : NotAvailable.na.getDesc();
-        } else {
-            this.commitId = NotAvailable.na.getDesc();
-            this.packagePath = NotAvailable.na.getDesc();
-        }
-
+        this.commitId = appDeploying.getAppBuilding().getCommitId();
+        this.packagePath = appDeploying.getAppBuilding().getPackagePath();
         this.deployBy = appDeploying.getOpsBy() != null ? appDeploying.getOpsBy() : NotAvailable.na.getDesc();
         this.deployTime = appDeploying.getDeployTime().equals(LocalDate.EPOCH.atStartOfDay()) ? NotAvailable.na.getDesc() : DateTimeConverter.format(appDeploying.getDeployTime());
-        this.deployResult = appDeploying.getDeployResult();
+        this.deployResult = new BuildResult(BuildStatus.valueOf(appDeploying.getDeployStatus()));
+        this.steps = appDeploying.getSteps();
     }
 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/model/vo/AppRunning.java → mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/vo/AppRunning.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.mgr.ops.app.model.vo;
+package cn.reghao.devops.mgr.ops.builder.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/model/vo/AppRunningNode.java → mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/vo/AppRunningNode.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.mgr.ops.app.model.vo;
+package cn.reghao.devops.mgr.ops.builder.model.vo;
 
-import cn.reghao.devops.mgr.ops.app.model.constant.RunStatus;
+import cn.reghao.devops.mgr.ops.builder.model.constant.RunStatus;
 import cn.reghao.devops.mgr.ops.app.model.po.AppConfig;
 import cn.reghao.devops.mgr.ops.builder.model.po.BuildLog;
 import cn.reghao.devops.mgr.ops.machine.model.po.MachineInfo;

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/model/vo/BuildConfigSnapshot.java → mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/vo/BuildConfigSnapshot.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.mgr.ops.app.model.vo;
+package cn.reghao.devops.mgr.ops.builder.model.vo;
 
 import cn.reghao.devops.mgr.ops.app.model.po.AppConfig;
 import lombok.AllArgsConstructor;

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/model/vo/BuildLogVO.java → mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/vo/BuildLogVO.java

@@ -1,5 +1,6 @@
-package cn.reghao.devops.mgr.ops.app.model.vo;
+package cn.reghao.devops.mgr.ops.builder.model.vo;
 
+import cn.reghao.devops.mgr.ops.builder.model.constant.BuildStatus;
 import cn.reghao.devops.mgr.ops.builder.model.po.BuildLog;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import lombok.Data;
@@ -19,6 +20,7 @@ public class BuildLogVO {
     private String buildTime;
     private String packagePath;
     private String buildBy;
+    private BuildResult buildResult;
 
     public BuildLogVO(BuildLog buildLog) {
         this.buildLogId = buildLog.getBuildLogId();
@@ -30,5 +32,6 @@ public class BuildLogVO {
         this.buildTime = DateTimeConverter.format(buildLog.getStartTime());
         this.packagePath = buildLog.getPackagePath();
         this.buildBy = buildLog.getOpsBy();
+        this.buildResult = new BuildResult(BuildStatus.valueOf(buildLog.getStatus()));
     }
 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/model/vo/BuildResult.java → mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/vo/BuildResult.java

@@ -1,6 +1,6 @@
-package cn.reghao.devops.mgr.ops.app.model.vo;
+package cn.reghao.devops.mgr.ops.builder.model.vo;
 
-import cn.reghao.devops.mgr.ops.app.model.constant.BuildStatus;
+import cn.reghao.devops.mgr.ops.builder.model.constant.BuildStatus;
 import lombok.Getter;
 
 /**

mgr/src/main/java/cn/reghao/devops/mgr/ops/app/model/vo/BuildTask.java → mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/vo/BuildTask.java

@@ -1,4 +1,4 @@
-package cn.reghao.devops.mgr.ops.app.model.vo;
+package cn.reghao.devops.mgr.ops.builder.model.vo;
 
 import cn.reghao.devops.mgr.ops.builder.model.dto.AppDto;
 import lombok.Getter;

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/model/vo/KeyValue.java

@@ -0,0 +1,15 @@
+package cn.reghao.devops.mgr.ops.builder.model.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author reghao
+ * @date 2026-03-19 10:46:15
+ */
+@AllArgsConstructor
+@Getter
+public class KeyValue {
+    private String key;
+    private String value;
+}

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/service/BuildApp.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.mgr.ops.builder.service;
 
-import cn.reghao.devops.mgr.ops.app.model.vo.BuildTask;
+import cn.reghao.devops.mgr.ops.builder.model.vo.BuildTask;
 import cn.reghao.jutil.jdk.web.result.Result;
 
 import java.util.List;

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/service/BuildLogService.java

@@ -1,12 +1,11 @@
 package cn.reghao.devops.mgr.ops.builder.service;
 
-import cn.reghao.devops.mgr.ops.app.model.constant.BuildStatus;
-import cn.reghao.devops.mgr.ops.app.model.constant.DeployStatus;
+import cn.reghao.devops.mgr.ops.builder.model.constant.BuildStatus;
 import cn.reghao.devops.mgr.ops.builder.db.query.BuildRepository;
 import cn.reghao.devops.mgr.ops.builder.model.po.AppBuilding;
 import cn.reghao.devops.mgr.ops.app.model.po.AppConfig;
 import cn.reghao.devops.common.msg.constant.StepStatus;
-import cn.reghao.devops.mgr.ops.app.model.vo.BuildConfigSnapshot;
+import cn.reghao.devops.mgr.ops.builder.model.vo.BuildConfigSnapshot;
 import cn.reghao.devops.mgr.ops.builder.model.po.AppDeploying;
 import cn.reghao.devops.mgr.ops.builder.model.po.BuildLog;
 import cn.reghao.devops.mgr.ops.builder.tool.repo.CommitInfo;
@@ -31,13 +30,10 @@ public class BuildLogService {
         this.buildRepository = buildRepository;
     }
 
-    public String initAppBuilding(AppConfig appConfig, String opsBy) {
+    public String initAppBuilding(AppConfig appConfig) {
         String buildId = UUID.randomUUID().toString().replace("-", "");
         AppBuilding appBuilding = buildRepository.getAppBuilding(appConfig.getAppId());
-        appBuilding.updateBeforeBuild(opsBy, buildId);
-        // 定义流水线环节：检出 -> 编译 -> 打包 -> (部署)
-        //List<String> stepNames = Arrays.stream(BuildStepName.values()).map(Enum::name).collect(Collectors.toList());
-        //appBuilding.initSteps(stepNames, buildId);
+        appBuilding.updateBeforeBuild();
         buildRepository.saveAppBuilding(appBuilding);
         return buildId;
     }
@@ -54,11 +50,11 @@ public class BuildLogService {
         BuildLog buildLog = getBuildLog(appBuilding, ctx, status);
         appBuilding.updateAfterBuild(buildLog);
 
-        if (appBuilding.getBuildStatus() == BuildStatus.buildSuccess.getCode()) {
+        if (appBuilding.getBuildStatus().equals(BuildStatus.OpsSuccess.name())) {
             List<AppDeploying> appDeployingList = buildRepository.getAppDeployingList(appId);
             appDeployingList.forEach(appDeploying -> {
                 appDeploying.setAppBuilding(appBuilding);
-                appDeploying.setDeployResult(DeployStatus.neverDeploy.getDesc());
+                appDeploying.setDeployStatus(BuildStatus.OpsPending.name());
             });
             buildRepository.save(appBuilding, buildLog, appDeployingList);
         } else {
@@ -72,8 +68,7 @@ public class BuildLogService {
     private BuildLog getBuildLog(AppBuilding appBuilding, PipelineContext ctx, String status) {
         String buildId = ctx.getBuildId();
         LocalDateTime startTime = appBuilding.getBuildTime();
-        LocalDateTime endTime = appBuilding.getBuildTime();
-        // 计算总耗时
+        LocalDateTime endTime = LocalDateTime.now();
         long seconds = Duration.between(startTime, endTime).getSeconds();
 
         AppConfig appConfig = ctx.getAppConfig();
@@ -92,13 +87,13 @@ public class BuildLogService {
         buildLog.setEndTime(endTime);
         buildLog.setDuration(seconds);
 
-        buildLog.setStatus(status);
         // 如果失败，存入最后几行日志作为摘要，方便在列表页直接查看原因
-        String logSummary = StepStatus.SUCCESS.name();
         if (!StepStatus.SUCCESS.name().equals(status)) {
-            logSummary = ctx.getLogSummary();
+            buildLog.setStatus(BuildStatus.OpsFail.name());
+            buildLog.setErrorMsg(ctx.getLogSummary());
+        } else {
+            buildLog.setStatus(BuildStatus.OpsSuccess.name());
         }
-        buildLog.setLogSummary(logSummary);
         buildLog.setLogPath(ctx.getLogFile().getAbsolutePath());
 
         String stepsJson = JsonConverter.objectToJson(appBuilding.getSteps());

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/service/BuildService.java

@@ -1,21 +1,19 @@
 package cn.reghao.devops.mgr.ops.builder.service;
 
-import cn.reghao.devops.mgr.admin.service.UserContext;
 import cn.reghao.devops.mgr.ops.app.db.repository.AppConfigRepository;
 import cn.reghao.devops.mgr.ops.app.model.po.AppConfig;
-import cn.reghao.devops.mgr.ops.app.model.constant.BuildStepName;
+import cn.reghao.devops.mgr.ops.build.model.constant.CompileType;
+import cn.reghao.devops.mgr.ops.builder.model.constant.BuildStepName;
 import cn.reghao.devops.common.msg.constant.StepStatus;
-import cn.reghao.devops.mgr.ops.builder.model.constant.CompileType;
 import cn.reghao.devops.mgr.ops.builder.tool.ToolProvider;
 import cn.reghao.devops.mgr.ops.builder.tool.compiler.CodeCompiler;
 import cn.reghao.devops.mgr.ops.builder.tool.packer.CodePacker;
 import cn.reghao.devops.mgr.ops.builder.tool.repo.CodeUpdater;
 import cn.reghao.devops.mgr.ops.builder.tool.repo.CommitInfo;
+import cn.reghao.jutil.jdk.exception.ExceptionUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.Objects;
-
 /**
  * @author reghao
  * @date 2026-02-26 13:20:54
@@ -47,9 +45,8 @@ public class BuildService {
             log.error("appId {} 不存在", appId);
             return;
         }
-        String opsBy = Objects.requireNonNull(UserContext.getUser()).getUsername();
 
-        String buildId = buildLogService.initAppBuilding(appConfig, opsBy);
+        String buildId = buildLogService.initAppBuilding(appConfig);
         jobScheduler.submitJob(appId, () -> {
             // 2. 初始化上下文（此时应开始记录日志，并标记数据库状态为 RUNNING）
             try {
@@ -64,18 +61,22 @@ public class BuildService {
                         ctx.setCommitInfo(commitInfo);
                     });
 
+                    runStep(ctx, BuildStepName.SCAN.name(), () -> {
+                        ctx.log(">>> [Step 2] 正在扫描代码...");
+                    });
+
                     // --- 阶段 2: 编译 ---
                     runStep(ctx, BuildStepName.COMPILE.name(), () -> {
-                        ctx.log(">>> [Step 2] 正在执行编译: " + appId);
+                        ctx.log(">>> [Step 3] 正在执行编译: " + appId);
                         CodeCompiler compiler = provider.getCompiler(appConfig.getCompilerConfig().getType());
                         compiler.compile(ctx, appConfig.getCompilerConfig());
                     });
 
                     // --- 阶段 3: 打包 (含 Dockerfile 落地) ---
                     runStep(ctx, BuildStepName.PACK.name(), () -> {
-                        ctx.log(">>> [Step 3] 正在打包产物...");
+                        ctx.log(">>> [Step 4] 正在打包产物...");
                         String compileType = appConfig.getCompilerConfig().getType();
-                        if (compileType.equals(CompileType.docker.getName())) {
+                        if (compileType.equals(CompileType.dockerBuild.getName())) {
                             ctx.log(">>> 采用 Docker 镜像编译的项目会自动打包产物...");
                         } else {
                             CodePacker codePacker = provider.getPacker(appConfig.getPackerConfig().getType());
@@ -83,21 +84,30 @@ public class BuildService {
                         }
                     });
 
+                    runStep(ctx, BuildStepName.PUSH.name(), () -> {
+                        ctx.log(">>> [Step 5] 正在推送镜像...");
+                        String compileType = appConfig.getCompilerConfig().getType();
+                        /*if (compileType.equals(CompileType.docker.getName())) {
+                            ctx.log(">>> 采用 Docker 镜像编译的项目会自动打包产物...");
+                        } else */{
+                            CodePacker codePacker = provider.getPacker(appConfig.getPackerConfig().getType());
+                            codePacker.push(ctx, appConfig.getPackerConfig());
+                        }
+                    });
+
+                    buildLogService.updateMainStatus(ctx, StepStatus.SUCCESS.name());
+                    ctx.log(">>> [Pipeline] 构建流水线执行成功。");
+
                     // --- 阶段 4: 部署 ---
                     if (deploy) {
-                        runStep(ctx, BuildStepName.DEPLOY.name(), () -> {
-                            ctx.log(">>> [Step 4] 检测到部署指令，开始发布...");
-                            deployApp.deploy(buildId);
-                            ctx.log(">>> [Step 4] 部署任务完成。");
-                        });
-                    } else {
-                        ctx.log(">>> [Step 4] 跳过部署阶段（参数 deploy=false）。");
+                        deployApp.deploy(buildId);
+                        ctx.log(">>> [Step 6] 部署请求已提交。");
                     }
-                    ctx.log(">>> [Pipeline] 恭喜！流水线执行成功。");
-                    buildLogService.updateMainStatus(ctx, StepStatus.SUCCESS.name());
                 } catch (Exception e) {
                     // 核心设计：一旦任何一步抛出异常，立即进入这里
-                    ctx.log("!!! [Pipeline] 任务失败，原因: " + e.getMessage());
+                    String errorMsg = ExceptionUtil.errorMsg(e);
+                    String stackTrace = ExceptionUtil.stackTrace(e);
+                    ctx.log("!!! [Pipeline] 任务失败，原因: " + errorMsg + System.lineSeparator() + stackTrace);
                     // 这里更新数据库状态为 FAILURE
                     buildLogService.updateMainStatus(ctx, StepStatus.FAILURE.name());
                 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/service/impl/BuildAppImpl.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.mgr.ops.builder.service.impl;
 
-import cn.reghao.devops.mgr.ops.app.model.vo.BuildTask;
+import cn.reghao.devops.mgr.ops.builder.model.vo.BuildTask;
 import cn.reghao.devops.mgr.ops.builder.service.BuildApp;
 import cn.reghao.jutil.jdk.web.result.Result;
 import lombok.extern.slf4j.Slf4j;

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/service/impl/DeployAppImpl.java

@@ -78,9 +78,7 @@ public class DeployAppImpl implements DeployApp {
     }
 
     private void deploy(AppBuilding appBuilding, AppDeployConfig appDeployConfig) {
-        String opsBy = appBuilding.getOpsBy();
         String packagePath = appBuilding.getPackagePath();
-
         String appId = appDeployConfig.getAppConfig().getAppId();
         String packType = appDeployConfig.getAppConfig().getPackerConfig().getType();
 
@@ -125,7 +123,7 @@ public class DeployAppImpl implements DeployApp {
             return;
         }
 
-        appDeployService.updateBeforeDeploy(appBuilding, machineId, opsBy);
+        appDeployService.updateBeforeDeploy(appBuilding, machineId);
         try {
             AgentMessage<EvtAppDeploy> message = new AgentMessage<>();
             message.setType(AgentCommand.DEPLOY_TASK);

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/tool/DockerBuild.java

@@ -1,18 +1,19 @@
 package cn.reghao.devops.mgr.ops.builder.tool;
 
+import cn.reghao.devops.common.docker.DockerManager;
 import cn.reghao.devops.mgr.ops.build.model.po.CompilerBind;
+import cn.reghao.devops.mgr.ops.builder.model.vo.KeyValue;
 import cn.reghao.devops.mgr.ops.builder.service.PipelineContext;
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.WaitContainerResultCallback;
 import com.github.dockerjava.api.model.*;
-import com.github.dockerjava.core.DefaultDockerClientConfig;
-import com.github.dockerjava.core.DockerClientImpl;
-import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
-import com.github.dockerjava.transport.DockerHttpClient;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -24,29 +25,87 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * @date 2026-02-26 13:21:42
  */
 public class DockerBuild {
-    private DockerClient dockerClient;
+    private final DockerClient dockerClient;
 
     public DockerBuild() {
-        initDockerClient();
+        this.dockerClient = DockerManager.getDocker().getDockerClient();
     }
 
-    private void initDockerClient() {
-        // 1. 配置：默认读取环境变量（如 DOCKER_HOST）
-        DefaultDockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
+    public void build(PipelineContext ctx, String repoTag, String sourceCodeDir, List<String> buildArgs) {
+        // 使用一个原子布尔值或自定义标记来记录回调中的失败
+        AtomicBoolean isFailed = new AtomicBoolean(false);
+        StringBuilder errorMsg = new StringBuilder();
 
-        // 2. 传输层：使用 HttpClient5
-        DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder()
-                .dockerHost(config.getDockerHost())
-                .sslConfig(config.getSSLConfig())
-                .maxConnections(100)
-                .build();
+        // 使用自定义的 Callback 来处理 Docker 的流式返回
+        ResultCallback.Adapter<BuildResponseItem> callback = new ResultCallback.Adapter<>() {
+            @Override
+            public void onNext(BuildResponseItem item) {
+                if (item.isErrorIndicated()) {
+                    isFailed.set(true);
+                    errorMsg.append(item.getErrorDetail().getMessage());
+                    ctx.log("[Docker-Error] " + item.getErrorDetail().getMessage());
+                } else if (item.getStream() != null) {
+                    ctx.log("[Docker-Build] " + item.getStream().trim());
+                }
+                super.onNext(item);
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                isFailed.set(true);
+                ctx.log("[Docker-Critical] 连接异常: " + throwable.getMessage());
+                super.onError(throwable);
+            }
+        };
+
+        List<KeyValue> keyValueList = buildArgs.stream()
+                .map(arg -> {
+                    String[] kv = arg.split("=");
+                    return new KeyValue(kv[0], kv[1]);
+                })
+                .toList();
+
+        try {
+            BuildImageCmd buildImageCmd = dockerClient.buildImageCmd()
+                    .withCpushares("512")
+                    .withMemory(1024 * 1024 * 1024L)
+                    .withBaseDirectory(new File(sourceCodeDir)) // 上下文路径
+                    .withDockerfile(new File(sourceCodeDir, "Dockerfile"))
+                    .withPull(true)
+                    .withTags(Collections.singleton(repoTag));
 
-        // 3. 实例化客户端
-        this.dockerClient = DockerClientImpl.getInstance(config, httpClient);
+            for (KeyValue keyValue : keyValueList) {
+                buildImageCmd.withBuildArg(keyValue.getKey(), keyValue.getValue());
+            }
+
+            buildImageCmd.exec(callback).awaitCompletion();
+            /*dockerClient.buildImageCmd()
+                    .withCpushares("512")
+                    .withMemory(1024 * 1024 * 1024L)
+                    .withBaseDirectory(new File(sourceCodeDir)) // 上下文路径
+                    .withDockerfile(new File(sourceCodeDir, "Dockerfile"))
+                    .withBuildArg("APP_ENV", env)
+                    .withPull(true)
+                    .withTags(Collections.singleton(repoTag))
+                    .exec(callback)
+                    .awaitCompletion();*/
+
+            // 2. 检查回调中是否标记了业务逻辑失败
+            if (isFailed.get()) {
+                String errMsg = "[Docker] 构建终止：检测到内部错误。";
+                ctx.log(">>> " +  errMsg);
+                errorMsg.append(errMsg);
+                throw new RuntimeException(errorMsg.toString());
+            }
+        } catch (Exception e) {
+            ctx.log(">>> [Docker] 构建由于异常中断: " + e.getMessage());
+            throw new RuntimeException(e);
+        }
     }
 
     public void build(PipelineContext ctx, String repoTag, String sourceCodeDir,
                       String image, String compileCmd, List<CompilerBind> compilerBinds, List<String> envs) {
+        // 这里的 workDir 会在 docker build 使用的 Dockerfile 中被引用
         String workDir = "/app";
         List<Bind> bindList = new ArrayList<>();
         bindList.add(new Bind(sourceCodeDir, new Volume(workDir)));
@@ -54,19 +113,22 @@ public class DockerBuild {
             bindList.add(new Bind(compilerBind.getHostPath(), new Volume(compilerBind.getContainerPath())));
         });
 
+        String user = getCurrentUserMapping();
         CreateContainerResponse container = dockerClient.createContainerCmd(image)
+                .withUser(user)
                 .withEnv(envs.toArray(new String[0]))
                 .withHostConfig(HostConfig.newHostConfig()
                         .withCpuQuota(100000L)
                         .withCpuPeriod(100000L)
                         .withMemory(2 * 1024 * 1024 * 1024L)
+                        .withAutoRemove(true) // --rm (容器停止后自动删除)
                         .withBinds(bindList)) // 关键：缓存挂载
                 .withWorkingDir(workDir)
                 .withEntrypoint("") // 确保覆盖默认入口
                 .withCmd("sh", "-c", compileCmd)
                 .exec();
         runContainer(ctx, container);
-        pack(ctx, sourceCodeDir, repoTag);
+        //pack(ctx, sourceCodeDir, repoTag);
     }
 
     private void runContainer(PipelineContext ctx, CreateContainerResponse container) {
@@ -89,14 +151,16 @@ public class DockerBuild {
         WaitContainerResultCallback waitCallback = new WaitContainerResultCallback();
         dockerClient.waitContainerCmd(container.getId()).exec(waitCallback);
         Integer exitCode = waitCallback.awaitStatusCode();
-        ctx.log("编译结束，退出码: " + exitCode);
+        if (exitCode != 0) {
+            String errorMsg = "source code compile failed...";
+            throw new RuntimeException(errorMsg);
+        }
     }
 
     public void pack(PipelineContext ctx, String sourceCodeDir, String repoTag) {
         // 使用一个原子布尔值或自定义标记来记录回调中的失败
         AtomicBoolean isFailed = new AtomicBoolean(false);
         StringBuilder errorMsg = new StringBuilder();
-
         // 使用自定义的 Callback 来处理 Docker 的流式返回
         ResultCallback.Adapter<BuildResponseItem> callback = new ResultCallback.Adapter<>() {
             @Override
@@ -121,6 +185,8 @@ public class DockerBuild {
 
         try {
             dockerClient.buildImageCmd()
+                    .withCpushares("512")
+                    .withMemory(1024 * 1024 * 1024L)
                     .withBaseDirectory(new File(sourceCodeDir)) // 上下文路径
                     .withDockerfile(new File(sourceCodeDir, "Dockerfile"))
                     .withTags(Collections.singleton(repoTag))
@@ -129,19 +195,24 @@ public class DockerBuild {
 
             // 2. 检查回调中是否标记了业务逻辑失败
             if (isFailed.get()) {
-                ctx.log(">>> [Docker] 构建终止：检测到内部错误。");
-                //return false;
+                String errMsg = "[Docker] 构建终止：检测到内部错误。";
+                ctx.log(">>> " +  errMsg);
+                errorMsg.append(errMsg);
+                throw new RuntimeException(errorMsg.toString());
             }
         } catch (Exception e) {
             ctx.log(">>> [Docker] 构建由于异常中断: " + e.getMessage());
-            //return false;
+            throw new RuntimeException(e);
         }
 
         // 2. 执行推送并捕获日志
-        push(ctx, repoTag);
+        //push(ctx, repoTag);
     }
 
-    private void push(PipelineContext ctx, String repoTag) {
+    public void push(PipelineContext ctx, String repoTag) {
+        // 使用一个原子布尔值或自定义标记来记录回调中的失败
+        AtomicBoolean isFailed = new AtomicBoolean(false);
+        StringBuilder errorMsg = new StringBuilder();
         // 2. 执行推送并捕获日志
         // 使用推荐的 ResultCallback.Adapter
         ResultCallback.Adapter<PushResponseItem> pushCallback = new ResultCallback.Adapter<>() {
@@ -157,6 +228,7 @@ public class DockerBuild {
 
             @Override
             public void onError(Throwable throwable) {
+                isFailed.set(true);
                 ctx.log("[Docker-Push-Error] 推送过程中发生异常: " + throwable.getMessage());
                 super.onError(throwable);
             }
@@ -174,11 +246,30 @@ public class DockerBuild {
                     //.withAuthConfig(authConfig)
                     .exec(pushCallback)
                     .awaitCompletion();// 阻塞直至 Adapter 收到 onComplete 或 onError
-            ctx.log(">>> [Docker] 镜像推送成功！");
-            //return true;
+
+            if (isFailed.get()) {
+                String errMsg = "[Docker] 推送终止：检测到内部错误。";
+                ctx.log(">>> " +  errMsg);
+                errorMsg.append(errMsg);
+                throw new RuntimeException(errorMsg.toString());
+            }
+            ctx.log(">>> [Docker] 推送成功！");
         } catch (Exception e) {
             ctx.log(">>> [Docker] 推送最终失败: " + e.getMessage());
-            //return false;
+            throw new RuntimeException(e);
+        }
+    }
+
+    public String getCurrentUserMapping() {
+        try {
+            // 使用 sh -c 可以确保在一行内获取
+            Process process = new ProcessBuilder("sh", "-c", "echo $(id -u):$(id -g)").start();
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+                return reader.readLine().trim();
+            }
+        } catch (Exception e) {
+            // 备选方案：如果执行失败，返回 root (不推荐，但可作为保底)
+            return "0:0";
         }
     }
 
@@ -313,7 +404,8 @@ public class DockerBuild {
     public static void main(String[] args) {
         DockerBuild dockerBuild = new DockerBuild();
         //dockerBuild.executeDockerBuildFlow("");
-        dockerBuild.build1();
+        //dockerBuild.build1();
         //dockerBuild.build2();
+        System.out.println();
     }
 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/tool/compiler/CodeCompiler.java

@@ -10,15 +10,6 @@ import cn.reghao.devops.mgr.ops.builder.service.PipelineContext;
  * @date 2020-01-21 16:17:22
  */
 public interface CodeCompiler {
-    /**
-     * @param appId 应用标识
-     * @param appCompileHome 编译应用代码所处的目录
-     * @date 2020-01-21 下午4:20
-     */
-    void compile(String appId, String appCompileHome) throws Exception;
-    default void compile(String appId, String appCompileHome, String env, String appRootPath) throws Exception {
-    }
-
     /**
      * 执行编译核心逻辑
      * @param ctx 运行时上下文（包含 buildId, log 方法, 工作目录等）

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/tool/compiler/DockerBuildCompiler.java

@@ -0,0 +1,61 @@
+package cn.reghao.devops.mgr.ops.builder.tool.compiler;
+
+import cn.reghao.devops.mgr.ops.build.model.constant.CompileType;
+import cn.reghao.devops.mgr.ops.build.model.po.CompilerBind;
+import cn.reghao.devops.mgr.ops.build.model.po.CompilerConfig;
+import cn.reghao.devops.mgr.ops.build.model.po.CompilerEnv;
+import cn.reghao.devops.mgr.ops.builder.service.PipelineContext;
+import cn.reghao.devops.mgr.ops.builder.tool.DockerBuild;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author reghao
+ * @date 2026-03-18 18:19:20
+ */
+@Component
+public class DockerBuildCompiler implements CodeCompiler {
+    private final DockerBuild dockerBuild;
+
+    public DockerBuildCompiler() {
+        this.dockerBuild = new DockerBuild();
+    }
+
+    @Override
+    public void compile(PipelineContext ctx, CompilerConfig compilerConfig) throws Exception {
+        String registryUrl = ctx.getDockerRegistry().getRegistryUrl();
+        String repoTag = String.format("%s/%s:%s", registryUrl, ctx.getAppId(), ctx.getCommitInfo().getCommitId());
+        String sourceCodeDir = ctx.getCompileDir();
+
+        String dockerfileContent = ctx.getDockerfile();
+        if (StringUtils.isBlank(dockerfileContent)) {
+            throw new Exception("未在配置中找到 Dockerfile 内容");
+        }
+
+        // 1. 将数据库中的内容写入到编译目录下的临时文件
+        File dockerFile = new File(sourceCodeDir, "Dockerfile");
+        try (FileWriter writer = new FileWriter(dockerFile)) {
+            writer.write(dockerfileContent);
+        }
+
+        String image = compilerConfig.getCompilerImage();
+        String compileCmd = compilerConfig.getCompileCmd();
+        List<CompilerBind> compilerBinds = compilerConfig.getCompilerBinds();
+        List<String> buildArgs = compilerConfig.getCompilerEnvs().stream()
+                .map(CompilerEnv::getEnv)
+                .collect(Collectors.toList());
+
+        dockerBuild.build(ctx, repoTag, sourceCodeDir, buildArgs);
+        ctx.setBuildTargetPath(repoTag);
+    }
+
+    @Override
+    public String supportType() {
+        return CompileType.dockerBuild.getName();
+    }
+}

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/tool/compiler/DockerCompiler.java → mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/tool/compiler/DockerRunCompiler.java

@@ -5,7 +5,7 @@ import cn.reghao.devops.mgr.ops.build.model.po.CompilerConfig;
 import cn.reghao.devops.mgr.ops.build.model.po.CompilerEnv;
 import cn.reghao.devops.mgr.ops.builder.tool.DockerBuild;
 import cn.reghao.devops.mgr.ops.builder.service.PipelineContext;
-import cn.reghao.devops.mgr.ops.builder.model.constant.CompileType;
+import cn.reghao.devops.mgr.ops.build.model.constant.CompileType;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -19,24 +19,13 @@ import java.util.stream.Collectors;
  * @date 2024-08-09 09:49:11
  */
 @Component
-public class DockerCompiler implements CodeCompiler {
+public class DockerRunCompiler implements CodeCompiler {
     private final DockerBuild dockerBuild;
 
-    public DockerCompiler() {
+    public DockerRunCompiler() {
         this.dockerBuild = new DockerBuild();
     }
 
-    @Override
-    public void compile(String appId, String appCompileHome) throws Exception {
-        /*DockerContainerConfig config1;
-        synchronized(this) {
-            config.getVolumes().getMap().put("/app", appCompileHome);
-            config1 = (DockerContainerConfig) config.clone();
-        }
-
-        docker.runAndRm(config1);*/
-    }
-
     @Override
     public void compile(PipelineContext ctx, CompilerConfig compilerConfig) throws Exception {
         String registryUrl = ctx.getDockerRegistry().getRegistryUrl();
@@ -60,12 +49,13 @@ public class DockerCompiler implements CodeCompiler {
         List<String> envs = compilerConfig.getCompilerEnvs().stream()
                 .map(CompilerEnv::getEnv)
                 .collect(Collectors.toList());
+
         dockerBuild.build(ctx, repoTag, sourceCodeDir, image, compileCmd, compilerBinds, envs);
         ctx.setBuildTargetPath(repoTag);
     }
 
     @Override
     public String supportType() {
-        return CompileType.docker.getName();
+        return CompileType.dockerRun.getName();
     }
 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/tool/compiler/EmptyCompiler.java

@@ -2,7 +2,7 @@ package cn.reghao.devops.mgr.ops.builder.tool.compiler;
 
 import cn.reghao.devops.mgr.ops.build.model.po.CompilerConfig;
 import cn.reghao.devops.mgr.ops.builder.service.PipelineContext;
-import cn.reghao.devops.mgr.ops.builder.model.constant.CompileType;
+import cn.reghao.devops.mgr.ops.build.model.constant.CompileType;
 import org.springframework.stereotype.Component;
 
 /**
@@ -13,10 +13,6 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class EmptyCompiler implements CodeCompiler {
-    @Override
-    public void compile(String appId, String appCompileHome) throws Exception {
-    }
-
     @Override
     public void compile(PipelineContext ctx, CompilerConfig compilerConfig) {
     }

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/tool/compiler/MavenCompiler.java

@@ -2,7 +2,7 @@ package cn.reghao.devops.mgr.ops.builder.tool.compiler;
 
 import cn.reghao.devops.mgr.ops.build.model.po.CompilerConfig;
 import cn.reghao.devops.mgr.ops.builder.service.PipelineContext;
-import cn.reghao.devops.mgr.ops.builder.model.constant.CompileType;
+import cn.reghao.devops.mgr.ops.build.model.constant.CompileType;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
@@ -33,12 +33,10 @@ public class MavenCompiler implements CodeCompiler {
         this.standaloneArgs = new String[]{"clean", "package", "-Dmaven.test.skip=true"};
     }
 
-    @Override
     public void compile(String appId, String appCompileHome) throws Exception {
         throw new Exception("未实现此方法");
     }
 
-    @Override
     public void compile(String appId, String appCompileHome, String env, String appRootPath) throws Exception {
         String pomPath = appCompileHome + "/pom.xml";
         boolean multiModule = isMultiModule(pomPath);

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/tool/compiler/ShellCompiler.java

@@ -2,7 +2,7 @@ package cn.reghao.devops.mgr.ops.builder.tool.compiler;
 
 import cn.reghao.devops.mgr.ops.build.model.po.CompilerConfig;
 import cn.reghao.devops.mgr.ops.builder.service.PipelineContext;
-import cn.reghao.devops.mgr.ops.builder.model.constant.CompileType;
+import cn.reghao.devops.mgr.ops.build.model.constant.CompileType;
 import cn.reghao.jutil.jdk.shell.ShellExecutor;
 import cn.reghao.jutil.jdk.shell.ShellResult;
 import org.springframework.stereotype.Component;
@@ -23,18 +23,6 @@ public class ShellCompiler implements CodeCompiler {
         this.shell = new ShellExecutor();
     }
 
-    @Override
-    public void compile(String appId, String appCompileHome) throws Exception {
-        ShellResult result;
-        for (String compileScript : compileCmds) {
-            result = shell.execWithDir(appCompileHome, compileScript.split("\\s+"));
-            if (!result.isSuccess()) {
-                throw new Exception(result.getResult());
-                //throw new Exception(JsonConverter.objectToJson(result.getResult()));
-            }
-        }
-    }
-
     @Override
     public void compile(PipelineContext ctx, CompilerConfig compilerConfig) throws Exception {
         String sourceCodeDir = ctx.getCompileDir();
@@ -44,7 +32,6 @@ public class ShellCompiler implements CodeCompiler {
             result = shell.execWithDir(sourceCodeDir, compileScript.split("\\s+"));
             if (!result.isSuccess()) {
                 throw new Exception(result.getResult());
-                //throw new Exception(JsonConverter.objectToJson(result.getResult()));
             }
         }
     }

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/tool/packer/CodePacker.java

@@ -11,5 +11,6 @@ import cn.reghao.devops.mgr.ops.builder.service.PipelineContext;
  */
 public interface CodePacker {
     void pack(PipelineContext ctx, PackerConfig packerConfig);
+    default void push(PipelineContext ctx, PackerConfig packerConfig) {}
     String supportType();
 }

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/tool/packer/DockerPack.java

@@ -1,6 +1,5 @@
 package cn.reghao.devops.mgr.ops.builder.tool.packer;
 
-import cn.reghao.devops.common.docker.Docker;
 import cn.reghao.devops.common.msg.constant.PackType;
 import cn.reghao.devops.mgr.ops.build.model.po.PackerConfig;
 import cn.reghao.devops.mgr.ops.builder.tool.DockerBuild;
@@ -8,8 +7,6 @@ import cn.reghao.devops.mgr.ops.builder.service.PipelineContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-import java.io.File;
-
 /**
  * 打包为 docker 应用
  *
@@ -19,41 +16,10 @@ import java.io.File;
 @Slf4j
 @Component
 public class DockerPack implements CodePacker {
-    private String targetPath;
-    private Docker docker;
-    private DockerBuild dockerBuild;
-
-    /*public DockerPack(String targetPath, DockerAuth dockerAuth) {
-        this.targetPath = targetPath;
-        this.docker = new DockerImpl(dockerAuth);
-    }
-
-    public DockerPack(String targetPath) {
-        this.targetPath = targetPath;
-        this.docker = new DockerImpl();
-    }*/
-
-    //@Override
-    public String pack(String appId, String commitId, String appRootPath, String dockerfile) throws Exception {
-        int idx = targetPath.lastIndexOf("/");
-        String appId1 = targetPath.substring(idx+1);
-        String repo;
-        if (appId1.equals(appId)) {
-            repo = targetPath;
-        } else {
-            repo = targetPath + File.separator + appId;
-        }
-
-        //String repo = targetPath + File.separator + appId;
-        String image = repo + ":" + commitId;
-        docker.build(image, appRootPath, dockerfile);
-        return image;
-    }
+    private final DockerBuild dockerBuild;
 
-    //@Override
-    public String push(String localPath) throws Exception {
-        docker.push(localPath);
-        return localPath;
+    public DockerPack() {
+        this.dockerBuild = new DockerBuild();
     }
 
     @Override
@@ -64,6 +30,15 @@ public class DockerPack implements CodePacker {
 
             String sourceCodeDir = ctx.getCompileDir();
             dockerBuild.pack(ctx, sourceCodeDir, repoTag);
+            ctx.setBuildTargetPath(repoTag);
+        }
+    }
+
+    public void push(PipelineContext ctx, PackerConfig packerConfig) {
+        if (packerConfig.getType().equals(PackType.docker.getName())) {
+            String registryUrl = ctx.getDockerRegistry().getRegistryUrl();
+            String repoTag = String.format("%s/%s:%s", registryUrl, ctx.getAppId(), ctx.getCommitInfo().getCommitId());
+            dockerBuild.push(ctx, repoTag);
         }
     }
 

mgr/src/main/java/cn/reghao/devops/mgr/ops/builder/tool/repo/GitImpl.java

@@ -2,8 +2,8 @@ package cn.reghao.devops.mgr.ops.builder.tool.repo;
 
 import cn.reghao.devops.mgr.ops.build.model.po.RepoAuthConfig;
 import cn.reghao.devops.mgr.ops.builder.service.PipelineContext;
-import cn.reghao.devops.mgr.ops.builder.model.constant.RepoAuthType;
-import cn.reghao.devops.mgr.ops.builder.model.constant.RepoType;
+import cn.reghao.devops.mgr.ops.build.model.constant.RepoAuthType;
+import cn.reghao.devops.mgr.ops.build.model.constant.RepoType;
 import cn.reghao.devops.mgr.ops.builder.tool.BuilderUtil;
 import org.eclipse.jgit.api.*;
 import org.eclipse.jgit.diff.DiffEntry;

mgr/src/main/java/cn/reghao/devops/mgr/ops/docker/service/DockerImageService.java

@@ -3,7 +3,7 @@ package cn.reghao.devops.mgr.ops.docker.service;
 import cn.reghao.devops.common.msg.constant.PackType;
 import cn.reghao.devops.mgr.ops.app.db.repository.AppConfigRepository;
 import cn.reghao.devops.mgr.ops.build.db.repository.CompilerConfigRepository;
-import cn.reghao.devops.mgr.ops.builder.model.constant.CompileType;
+import cn.reghao.devops.mgr.ops.build.model.constant.CompileType;
 import cn.reghao.devops.mgr.ops.docker.model.vo.DockerImage;
 import org.springframework.stereotype.Service;
 
@@ -28,7 +28,7 @@ public class DockerImageService {
         List<DockerImage> list = new ArrayList<>();
 
         compilerConfigRepository.findAll().stream()
-                .filter(compilerConfig -> compilerConfig.getType().equals(CompileType.docker.name()))
+                .filter(compilerConfig -> compilerConfig.getType().equals(CompileType.dockerRun.name()))
                 .forEach(compilerConfig -> {
                     String compileName = compilerConfig.getName();
                     String compilerImage = compilerConfig.getCompilerImage();

mgr/src/main/java/cn/reghao/devops/mgr/ops/docker/service/DockerRegistryService.java

@@ -21,8 +21,8 @@ public class DockerRegistryService {
     }
 
     public void addOrUpdate(DockerAuth dockerAuth) {
-        DockerImpl docker = new DockerImpl(dockerAuth);
-        docker.auth();
+        DockerImpl docker = new DockerImpl();
+        docker.auth(dockerAuth);
 
         String registryUrl = dockerAuth.getRegistryUrl();
         DockerRegistry dockerRegistry = dockerAuthRepository.findByRegistryUrl(registryUrl);

mgr/src/main/java/cn/reghao/devops/mgr/ops/machine/service/impl/MachineServiceImpl.java

@@ -3,7 +3,7 @@ package cn.reghao.devops.mgr.ops.machine.service.impl;
 import cn.reghao.devops.common.util.Machine;
 import cn.reghao.devops.common.msg.constant.NodeStatus;
 import cn.reghao.devops.common.msg.event.EvtAgentStart;
-import cn.reghao.devops.mgr.ops.builder.model.constant.EnvType;
+import cn.reghao.devops.mgr.ops.build.model.constant.EnvType;
 import cn.reghao.devops.mgr.ops.util.DefaultSetting;
 import cn.reghao.devops.mgr.ops.machine.db.repository.MachineInfoRepository;
 import cn.reghao.devops.mgr.ops.machine.model.po.MachineInfo;

mgr/src/main/java/cn/reghao/devops/mgr/ops/util/BuilderInit.java

@@ -5,7 +5,7 @@ import cn.reghao.devops.mgr.config.AppProperties;
 import cn.reghao.devops.mgr.ops.build.db.repository.CompilerConfigRepository;
 import cn.reghao.devops.mgr.ops.build.model.po.CompilerConfig;
 import cn.reghao.devops.mgr.ops.build.service.BuildDirService;
-import cn.reghao.devops.mgr.ops.builder.model.constant.CompileType;
+import cn.reghao.devops.mgr.ops.build.model.constant.CompileType;
 import cn.reghao.jutil.jdk.shell.ShellExecutor;
 import cn.reghao.jutil.jdk.shell.ShellResult;
 import lombok.extern.slf4j.Slf4j;

mgr/src/main/java/cn/reghao/devops/mgr/ops/util/DefaultSetting.java

@@ -4,7 +4,7 @@ import cn.reghao.devops.mgr.admin.db.repository.SiteOptionRepository;
 import cn.reghao.devops.mgr.admin.model.po.SiteOption;
 import cn.reghao.devops.mgr.admin.service.UserContext;
 import cn.reghao.devops.mgr.ops.app.model.constant.AppType;
-import cn.reghao.devops.mgr.ops.builder.model.constant.EnvType;
+import cn.reghao.devops.mgr.ops.build.model.constant.EnvType;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;

mgr/src/test/java/devops/AppConfigTest.java

@@ -34,11 +34,6 @@ public class AppConfigTest {
         List<AppDeploying> list = deployConfigRepository.findAll().stream()
                 .map(appDeployConfig -> {
                     AppDeploying appDeploying = new AppDeploying(appDeployConfig);
-                    // 定义流水线环节：检出 -> 编译 -> 打包 -> (部署)
-                    List<String> stepNames = Arrays.stream(DeployStepName.values())
-                            .map(Enum::name)
-                            .collect(Collectors.toList());
-                    appDeploying.initSteps(stepNames, "");
                     return appDeploying;
                 })
                 .collect(Collectors.toList());
@@ -56,7 +51,14 @@ public class AppConfigTest {
                     return new AppBuilding(appConfig);
                 })
                 .collect(Collectors.toList());
-
         buildingRepository.saveAll(appBuildingList);
+
+        List<AppDeploying> list = deployConfigRepository.findAll().stream()
+                .map(appDeployConfig -> {
+                    AppDeploying appDeploying = new AppDeploying(appDeployConfig);
+                    return appDeploying;
+                })
+                .collect(Collectors.toList());
+        appDeployingRepository.saveAll(list);
     }
 }

mgr/src/test/java/devops/GitTest.java

@@ -1,7 +1,7 @@
 package devops;
 
 import cn.reghao.devops.mgr.ops.build.model.po.RepoAuthConfig;
-import cn.reghao.devops.mgr.ops.builder.model.constant.RepoAuthType;
+import cn.reghao.devops.mgr.ops.build.model.constant.RepoAuthType;
 import cn.reghao.devops.mgr.ops.builder.tool.repo.GitImpl;
 import cn.reghao.devops.mgr.ops.deployer.model.constant.SshAuthType;
 import cn.reghao.devops.mgr.ops.deployer.model.po.RemoteHost;