reghao 5 anos atrás
pai
commit
d602587caa

+ 1 - 1
dmaster/src/main/java/cn/reghao/autodop/dmaster/app/constant/AppType.java

@@ -7,5 +7,5 @@ package cn.reghao.autodop.dmaster.app.constant;
  * @date 2019-10-18 14:31:29
  */
 public enum AppType {
-    maven, dotnetCore, npm
+    shell, dotnetCore, maven, npm, cmake, python, android
 }

+ 1 - 1
dmaster/src/main/java/cn/reghao/autodop/dmaster/app/constant/build/CompilerType.java

@@ -7,5 +7,5 @@ package cn.reghao.autodop.dmaster.app.constant.build;
  * @date 2019-10-18 14:31:29
  */
 public enum CompilerType {
-    none, shell, dotnet, maven, npm, cmake, python
+    none, shell, dotnetCore, maven, npm, cmake, python, android
 }

+ 2 - 1
dmaster/src/main/java/cn/reghao/autodop/dmaster/app/entity/log/BuildDeployApp.java

@@ -22,6 +22,7 @@ import java.util.stream.Collectors;
 public class BuildDeployApp extends BaseEntity {
     @Column(nullable = false, unique = true)
     private String appId;
+    private String appType;
     @Column(nullable = false)
     private String env;
     @Column(nullable = false)
@@ -29,7 +30,7 @@ public class BuildDeployApp extends BaseEntity {
     private String commitId;
     private String bdType;
     private LocalDateTime bdTime;
-    // 0 - 成功 1 - 失败
+    // 0 - 成功 1 - 失败 2 - 尚未构建
     private int statusCode;
     private String result;
 

+ 1 - 1
dmaster/src/main/java/cn/reghao/autodop/dmaster/app/vo/orchestration/ProjVO.java

@@ -63,7 +63,7 @@ public class ProjVO {
 
         CompilerConfig compilerConfig = new CompilerConfig();
         compilerConfig.setName("dotnet5-dev");
-        compilerConfig.setType(CompilerType.dotnet.name());
+        compilerConfig.setType(CompilerType.dotnetCore.name());
         compilerConfig.setHomePath("/home/reghao/dev/env/dotnet/dotnet-sdk-5.0.100-linux-x64");
         compilerConfig.setBinPath("/home/reghao/dev/env/dotnet/dotnet-sdk-5.0.100-linux-x64/dotnet");
         compilerConfig.setEnv("dev");