From 7618bb3ef6c2b41a9f404cd08055b3f01725a6ec Mon Sep 17 00:00:00 2001 From: dengqichen Date: Fri, 3 Jan 2025 18:16:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=A3=B0=E9=81=93=E6=92=92=E6=97=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../build/JenkinsBaseBuildVariables.java | 30 +++++++++++++++++++ .../DeployNodeLocalVariables.java | 3 ++ 2 files changed, 33 insertions(+) diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/variables/build/JenkinsBaseBuildVariables.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/variables/build/JenkinsBaseBuildVariables.java index 7e0b6ddf..65a0b770 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/variables/build/JenkinsBaseBuildVariables.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/variables/build/JenkinsBaseBuildVariables.java @@ -1,5 +1,6 @@ package com.qqchen.deploy.backend.deploy.dto.variables.build; +import com.qqchen.deploy.backend.workflow.annotation.CodeEditorConfig; import com.qqchen.deploy.backend.workflow.annotation.SchemaProperty; import com.qqchen.deploy.backend.workflow.annotation.SchemaPropertyDataSource; import com.qqchen.deploy.backend.workflow.annotation.SchemaPropertyDataSourceParam; @@ -64,4 +65,33 @@ public class JenkinsBaseBuildVariables { ) private String jobId; + @SchemaProperty( + title = "构建产物路径", + description = "构建产物路径", + order = 5 + ) + private String artifactPath; + + + @SchemaProperty( + title = "Pipeline script", + description = "流水线脚本", + required = true, + format = "monaco-editor", // 使用 Monaco Editor + defaultValue = "#!/bin/bash\n\necho \"Hello World\"", + codeEditor = @CodeEditorConfig( + language = "shell", + theme = "vs-dark", + minimap = false, + lineNumbers = true, + wordWrap = true, + fontSize = 14, + tabSize = 2, + autoComplete = true, + folding = true + ), + order = 6 + ) + private String script; + } \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/DeployNodeLocalVariables.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/DeployNodeLocalVariables.java index 9fd7bdb9..2c556ee9 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/DeployNodeLocalVariables.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/DeployNodeLocalVariables.java @@ -1,11 +1,13 @@ package com.qqchen.deploy.backend.workflow.dto.definition.node.localVariables; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.qqchen.deploy.backend.workflow.annotation.SchemaProperty; import lombok.Data; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class DeployNodeLocalVariables extends BaseNodeLocalVariables { @@ -34,4 +36,5 @@ public class DeployNodeLocalVariables extends BaseNodeLocalVariables { ) private Long jobId; + }