Explorar o código

fix: context初始化添加pipelineId字段

zhaoxingrui %!s(int64=4) %!d(string=hai) anos
pai
achega
e26490264e

+ 2 - 1
web/src/main/java/cn/seecoder/web/core/pipeline/PipelineFactory.java

@@ -27,9 +27,10 @@ public class PipelineFactory {
      * @param deployName   流水线部署k8s的应用名称,devcloud后端采用Pipeline中的name作为project name
      * @return
      */
-    public static Pipeline init(String configJson, String namespace, String deployName) throws PipelineException {
+    public static Pipeline init(Integer pipelineId, String configJson, String namespace, String deployName) throws PipelineException {
         //初始化context
         Context context = Context.builder()
+                .pipelineId(pipelineId)
                 .deployName(deployName)
                 .namespace(namespace)
                 .build();

+ 2 - 2
web/src/main/java/cn/seecoder/web/core/pipeline/handler/NodeImageBuildHandler.java

@@ -55,9 +55,9 @@ public class NodeImageBuildHandler extends AbstractHandler{
     @Override
     public void process(Context context) throws PipelineException {
         //0. 变量准备
-        String templateName = PipelineTemplateTable.NODE_14;
+//        String templateName = PipelineTemplateTable.NODE_14;
         System.out.println(context.getPipelineId());
-//        String templateName = pipelineService.getTemplateNameById(context.getPipelineId());
+        String templateName = pipelineService.getTemplateNameById(context.getPipelineId());
         String imageName = context.getNamespace() + "-" + context.getDeployName();
 
         // 1. 有git从git拿到地址仓库

+ 1 - 1
web/src/main/java/cn/seecoder/web/service/impl/pipeline/DeploymentServiceImpl.java

@@ -144,7 +144,7 @@ public class DeploymentServiceImpl implements DeploymentService {
 
         Pipeline pipeline = null;
         try {
-            pipeline = PipelineFactory.init(pipelinePO.getConfigJson(), projectPO.getUniqueK8sNamespace(), pipelinePO.getName());
+            pipeline = PipelineFactory.init(pipelinePO.getPipelineId(), pipelinePO.getConfigJson(), projectPO.getUniqueK8sNamespace(), pipelinePO.getName());
             pipeline.addConfig("pipelineRecordId", record.getId().toString());
             pipeline.start();
             record.setResult(PipelineRecordPO.DEPLOY_SUCCESS);