Bläddra i källkod

style: 模板名改为静态变量

370774330@qq.com 5 år sedan
förälder
incheckning
b06f62c27d

+ 7 - 3
core/src/main/java/seecoder/devcloud/core/pipeline/template/PipelineTemplateTable.java

@@ -23,14 +23,18 @@ public class PipelineTemplateTable {
 
     private static final HashSet<String> templateNames;
 
+    //模板名
+    public static final String SPRINGBOOT_JAVA8 = "SPRINGBOOT_JAVA8";
+    public static final String NODE_10 = "NODE_10";
+
+
     /**
      * 需要添加模板类型在这里添加,然后根据需求添加对应的dockerfile、configjson等
-     * todo 静态字段
      */
     static {
         templateNames = new HashSet<String>();
-        templateNames.add("NODE-10");
-        templateNames.add("SPRINGBOOT-JAVA8");
+        templateNames.add(NODE_10);
+        templateNames.add(SPRINGBOOT_JAVA8);
 
     }
 

+ 3 - 2
core/src/test/java/seecoder/devcloud/core/CoreApplicationTests.java

@@ -20,6 +20,7 @@ import seecoder.devcloud.core.pipeline.Context;
 import seecoder.devcloud.core.pipeline.PipelineException;
 import seecoder.devcloud.core.pipeline.config.HandlerConfigTable;
 import seecoder.devcloud.core.pipeline.handler.*;
+import seecoder.devcloud.core.pipeline.template.PipelineTemplateTable;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -117,7 +118,7 @@ class CoreApplicationTests {
     @Test
     void k8sImageFrontendBuild() {
         context.setDeployName("pf");
-        context.setTemplateName("NODE-10");
+        context.setTemplateName("NODE-");
         NodeImageBuildHandler nodeImageBuildHandler = new NodeImageBuildHandler();
         nodeImageBuildHandler.setRepoUrl("http://gitlab.192.168.99.105.nip.io/root/frontendimage.git");
         nodeImageBuildHandler.setBranchName("master");
@@ -214,7 +215,7 @@ class CoreApplicationTests {
         this.context = Context.builder()
                 .namespace("g")
                 .deployName("p")
-                .templateName("SPRINGBOOT-JAVA8")
+                .templateName(PipelineTemplateTable.SPRINGBOOT_JAVA8)
                 .pipelineId(1)
                 .applicationProperties(properties)
                 .build();

+ 2 - 1
web/src/test/java/seecoder/devcloud/web/dao/pipeline/PipelineMapperTest.java

@@ -6,6 +6,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
+import seecoder.devcloud.core.pipeline.template.PipelineTemplateTable;
 import seecoder.devcloud.web.model.po.pipeline.PipelinePO;
 
 /**
@@ -33,7 +34,7 @@ class PipelineMapperTest {
                 .configJson("newt")
                 .name("newd")
                 .projectId(1)
-                .templateName("SPRINGBOOT-JAVA8")
+                .templateName(PipelineTemplateTable.SPRINGBOOT_JAVA8)
                 .build();
         pipelineMapper.insert(po, "id");
     }