Pārlūkot izejas kodu

CompilerConfig 添加 compileCmd 和 versionCmd 两个字段, 分别表示编译命令和编译器的版本命令

reghao 1 gadu atpakaļ
vecāks
revīzija
f9e879a1a2

+ 5 - 2
web/src/main/java/cn/reghao/devops/web/mgr/builds/model/po/CompilerConfig.java

@@ -34,13 +34,16 @@ public class CompilerConfig extends BaseEntity {
     @Length(max = 255, message = "编译名字的最大长度不能超过 255 个字符")
     @Column(nullable = false, unique = true)
     private String name;
-    @NotBlank(groups = { ShellCompiler.class, MavenCompiler.class }, message = "编译器主目录不能为空")
-    @Length(max = 255, message = "编译器主目录的最大长度不能超过 255 个字符")
     private String homePath;
     @NotBlank(groups = { ShellCompiler.class}, message = "编译脚本不能为空")
     @Length(max = 10_000, message = "编译脚本的最大长度不能超过 10_000 个字符")
     @Column(columnDefinition="text")
+    @Deprecated
     private String compileScript;
+    @Length(max = 1000, message = "编译命令长度不能超过 1000 个字符")
+    private String compileCmd;
+    @Length(max = 1000, message = "版本命令长度不能超过 1000 个字符")
+    private String versionCmd;
 
     public interface NoneCompiler {
     }

+ 12 - 0
web/src/main/resources/templates/devops/build/compiler/add.html

@@ -32,6 +32,18 @@
                 <textarea class="layui-textarea" name="compileScript" placeholder="请输入编译脚本"></textarea>
             </div>
         </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">编译命令</label>
+            <div class="layui-input-inline">
+                <textarea class="layui-textarea" name="compileCmd" placeholder="请输入编译命令"></textarea>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">版本命令</label>
+            <div class="layui-input-inline">
+                <textarea class="layui-textarea" name="versionCmd" placeholder="请输入编译器版本命令"></textarea>
+            </div>
+        </div>
         <div class="layui-form-item timo-finally">
             <button class="layui-btn ajax-submit"><i class="fa fa-check-circle"></i> 保存</button>
             <button class="layui-btn btn-secondary close-popup"><i class="fa fa-times-circle"></i> 关闭</button>