From dc94c95d3a6608d325945b234f127bc744eec638 Mon Sep 17 00:00:00 2001 From: greysonfang Date: Fri, 1 Sep 2023 15:26:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0itsm?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8D=95=E6=8D=AE=E5=86=85=E5=AE=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20#64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdk/iam/dto/application/ApplicationDTO.java | 9 +++++++++ .../tencent/bk/sdk/iam/dto/itsm/ItsmColumn.java | 15 +++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/main/java/com/tencent/bk/sdk/iam/dto/application/ApplicationDTO.java b/src/main/java/com/tencent/bk/sdk/iam/dto/application/ApplicationDTO.java index 5b19919..8007588 100644 --- a/src/main/java/com/tencent/bk/sdk/iam/dto/application/ApplicationDTO.java +++ b/src/main/java/com/tencent/bk/sdk/iam/dto/application/ApplicationDTO.java @@ -12,9 +12,12 @@ package com.tencent.bk.sdk.iam.dto.application; import com.fasterxml.jackson.annotation.JsonProperty; +import com.tencent.bk.sdk.iam.dto.itsm.ItsmContentDTO; +import com.tencent.bk.sdk.iam.dto.itsm.ItsmValue; import lombok.Builder; import lombok.Data; +import java.util.HashMap; import java.util.List; @Data @@ -27,4 +30,10 @@ public class ApplicationDTO { /*申请人,即username*/ private String applicant; private String reason; + @JsonProperty("content_template") + private ItsmContentDTO contentTemplate; + @JsonProperty("group_content") + private HashMap groupContent; + @JsonProperty("title_prefix") + private String titlePrefix; } diff --git a/src/main/java/com/tencent/bk/sdk/iam/dto/itsm/ItsmColumn.java b/src/main/java/com/tencent/bk/sdk/iam/dto/itsm/ItsmColumn.java index 86d6941..0156ac4 100644 --- a/src/main/java/com/tencent/bk/sdk/iam/dto/itsm/ItsmColumn.java +++ b/src/main/java/com/tencent/bk/sdk/iam/dto/itsm/ItsmColumn.java @@ -1,13 +1,28 @@ package com.tencent.bk.sdk.iam.dto.itsm; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Builder; import lombok.Data; @Data @Builder public class ItsmColumn { + /** + * 列标识 + * */ private String key; + /** + * 列名称 + * */ private String name; + /** + * 列类型:text、url + * */ private String type; + /** + * 是否为抽屉模式 + * */ + @JsonProperty("is_iframe") + private Boolean iframe; private Integer width; } From 10298a8061d5846ead0384a5e1e80bf1e970933f Mon Sep 17 00:00:00 2001 From: greysonfang Date: Fri, 1 Sep 2023 15:28:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0itsm?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8D=95=E6=8D=AE=E5=86=85=E5=AE=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20#64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b4664f8..8d33932 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ ext { set("junitVersion", "5.4.2") if (System.getProperty("snapshot") == "true") { - set('iamVersion', "1.0.31-SNAPSHOT") + set('iamVersion', "1.0.32-SNAPSHOT") } else { set('iamVersion', "1.0.0") }