大声道撒旦

backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/DeployAppConfigDTO.java

@@ -19,11 +19,11 @@ import lombok.EqualsAndHashCode;
 public class DeployAppConfigDTO extends BaseDTO {
 
     @Schema(description = "环境ID")
-    @NotBlank(message = "环境ID不能为空")
+    @NotNull(message = "环境ID不能为空")
     private Long environmentId;
 
     @Schema(description = "应用ID")
-    @NotBlank(message = "应用ID不能为空")
+    @NotNull(message = "应用ID不能为空")
     private Long applicationId;
 
     @Schema(description = "构建类型")
@@ -34,6 +34,10 @@ public class DeployAppConfigDTO extends BaseDTO {
     private DevelopmentLanguageTypeEnum languageType;
 
     @Schema(description = "构建配置")
-    @NotBlank(message = "构建配置不能为空")
+    @NotNull(message = "构建配置不能为空")
     private JsonNode buildVariables;
+
+    @NotNull(message = "启用字段不能为空")
+    private Boolean enabled = true;
+
 } 

backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/EnvironmentDTO.java

@@ -38,6 +38,9 @@ public class EnvironmentDTO extends BaseDTO {
     @Schema(description = "部署方式：K8S-Kubernetes集群部署, DOCKER-Docker容器部署, VM-虚拟机部署")
     private DeployTypeEnum deployType;
 
+    @NotNull(message = "启用字段不能为空")
+    private Boolean enabled;
+
     @Schema(description = "排序号")
     @NotNull(message = "排序号不能为空")
     private Integer sort;

backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/variables/JenkinsJavaBuildVariables.java

@@ -4,7 +4,6 @@ import com.qqchen.deploy.backend.workflow.annotation.CodeEditorConfig;
 import com.qqchen.deploy.backend.workflow.annotation.SchemaProperty;
 import lombok.Data;
 
-import java.util.List;
 
 /**
  * Jenkins构建变量

backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/DeployAppConfig.java

@@ -38,4 +38,7 @@ public class DeployAppConfig extends Entity<Long> {
     @Type(JsonType.class)
     @Column(name = "build_variables", columnDefinition = "text", nullable = false)
     private JsonNode buildVariables;
+
+    @Column(name = "enabled", nullable = false)
+    private Boolean enabled;
 }

backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Environment.java

@@ -57,6 +57,9 @@ public class Environment extends Entity<Long> {
     @Column(name = "deploy_type")
     private DeployTypeEnum deployType;
 
+    @Column(name = "enabled")
+    private Boolean enabled;
+
     /**
      * 排序号
      */

backend/src/main/resources/db/migration/V1.0.0__init_schema.sql

@@ -606,19 +606,18 @@ CREATE TABLE deploy_application
 -- 环境表
 CREATE TABLE deploy_environment
 (
+	id          BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
     -- 业务字段
     tenant_code VARCHAR(50)           DEFAULT NULL COMMENT '租户编码',
-	-- build_type  VARCHAR(50)  NULL COMMENT '构建方式：JENKINS-Jenkins构建,GITLAB_RUNNER-GitLab Runner构建,GITHUB_ACTION-GitHub Action构建',
     env_code    VARCHAR(50)  NOT NULL COMMENT '环境编码',
     env_name    VARCHAR(100) NOT NULL COMMENT '环境名称',
     env_desc    VARCHAR(255) NULL COMMENT '环境描述',
 	build_type  VARCHAR(100) NULL COMMENT '构建类型：JENKINS-Jenkins构建,GITLAB_RUNNER-GitLab Runner构建,GITHUB_ACTION-GitHub Action构建',
 	deploy_type VARCHAR(100) NULL COMMENT '部署方式：K8S-Kubernetes集群部署, DOCKER-Docker容器部署, VM-虚拟机部署',
-
+	enabled          BIT          NOT NULL DEFAULT 1 COMMENT '是否启用（0：禁用，1：启用）',
     sort        INT          NOT NULL DEFAULT 0 COMMENT '排序号',
 
     -- 基础字段
-    id          BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
     create_by   VARCHAR(100) NULL COMMENT '创建人',
     create_time DATETIME(6)  NULL COMMENT '创建时间',
     update_by   VARCHAR(100) NULL COMMENT '更新人',