From 7c1dc851fa5355d08614d05dbc2777cf64f1023e Mon Sep 17 00:00:00 2001 From: asp_ly Date: Wed, 25 Dec 2024 22:06:44 +0800 Subject: [PATCH] 1 --- .../deploy/backend/deploy/dto/EnvironmentDTO.java | 9 +++++++++ .../deploy/backend/deploy/entity/Environment.java | 14 ++++++++++++++ .../resources/db/migration/V1.0.0__init_schema.sql | 2 ++ 3 files changed, 25 insertions(+) diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/EnvironmentDTO.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/EnvironmentDTO.java index 104aa9b3..90bd8d6d 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/EnvironmentDTO.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/EnvironmentDTO.java @@ -1,5 +1,6 @@ package com.qqchen.deploy.backend.deploy.dto; +import com.fasterxml.jackson.databind.JsonNode; import com.qqchen.deploy.backend.deploy.enums.BuildTypeEnum; import com.qqchen.deploy.backend.deploy.enums.DeployTypeEnum; import com.qqchen.deploy.backend.framework.dto.BaseDTO; @@ -31,6 +32,14 @@ public class EnvironmentDTO extends BaseDTO { @Schema(description = "环境描述") private String envDesc; + @Schema(description = "构建方式：JENKINS-Jenkins构建, GITLAB_RUNNER-GitLab Runner构建, GITHUB_ACTION-GitHub Action构建") + private BuildTypeEnum buildType; + + @Schema(description = "部署方式：K8S-Kubernetes集群部署, DOCKER-Docker容器部署, VM-虚拟机部署") + private DeployTypeEnum deployType; + + private JsonNode config; + @Schema(description = "排序号") @NotNull(message = "排序号不能为空") private Integer sort; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Environment.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Environment.java index 0a53ba41..d331c035 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Environment.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Environment.java @@ -43,6 +43,20 @@ public class Environment extends Entity { @Column(name = "env_desc") private String envDesc; + /** + * 构建方式 + */ + @Enumerated(EnumType.STRING) + @Column(name = "build_type") + private BuildTypeEnum buildType; + + /** + * 部署方式 + */ + @Enumerated(EnumType.STRING) + @Column(name = "deploy_type") + private DeployTypeEnum deployType; + /** * 排序号 */ diff --git a/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql b/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql index f7a836a4..18cb0ade 100644 --- a/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql +++ b/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql @@ -615,6 +615,8 @@ CREATE TABLE deploy_environment 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-虚拟机部署', sort INT NOT NULL DEFAULT 0 COMMENT '排序号',