From 9531072e548b2dbe2e42782deff69b1386f0cf0b Mon Sep 17 00:00:00 2001 From: v_zkggzhou <2198773846@qq.com> Date: Thu, 10 Jul 2025 18:36:40 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=94=AF=E6=8C=81=20isSensitive=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=20#5534?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tencent/bk/devops/atom/pojo/DataField.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java b/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java index 5b1745c..79e4fea 100644 --- a/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java +++ b/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java @@ -17,8 +17,20 @@ public DataField(DataType type) { this.type = type; } + + public DataField(DataType type, boolean isSensitive) { + this.type = type; + this.isSensitive = isSensitive; + } + /** * 类型 */ private DataType type; + + + /** + * 是否属于敏感字段 + */ + private boolean isSensitive = false; } From 93090269c6c3bfc93b36408649c001156f7d407a Mon Sep 17 00:00:00 2001 From: v_zkggzhou <2198773846@qq.com> Date: Thu, 10 Jul 2025 19:40:43 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=94=AF=E6=8C=81=20isSensitive=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=20#5534?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1fd8f68..4a22f15 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.tencent.devops.ci-plugins java-plugin-sdk - 1.1.9 + 1.1.20-SNAPSHOT 2018-2118 bk-ci pipeline plugins sdk for java From 3ddc5a8a087ad9a56d029c9cb86a1ff28256a4ac Mon Sep 17 00:00:00 2001 From: v_zkggzhou <2198773846@qq.com> Date: Fri, 11 Jul 2025 10:17:44 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=94=AF=E6=8C=81=20isSensitive=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=20#5534?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/tencent/bk/devops/atom/pojo/DataField.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java b/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java index 79e4fea..96fb08d 100644 --- a/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java +++ b/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java @@ -17,12 +17,6 @@ public DataField(DataType type) { this.type = type; } - - public DataField(DataType type, boolean isSensitive) { - this.type = type; - this.isSensitive = isSensitive; - } - /** * 类型 */ From 30b3bc88c144ad8dc933c084a0fef07093f68720 Mon Sep 17 00:00:00 2001 From: v_zkggzhou <2198773846@qq.com> Date: Fri, 11 Jul 2025 14:29:39 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=94=AF=E6=8C=81=20isSensitive=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=20#5534?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a22f15..90e496e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.tencent.devops.ci-plugins java-plugin-sdk - 1.1.20-SNAPSHOT + 1.1.20 2018-2118 bk-ci pipeline plugins sdk for java From 365a9fe5175f127009b308c2f0547d06c0f07661 Mon Sep 17 00:00:00 2001 From: v_zkggzhou <2198773846@qq.com> Date: Fri, 11 Jul 2025 14:40:56 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=94=AF=E6=8C=81=20isSensitive=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=20#5534?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c3926c4..65a8104 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ | v1.1.7 | 新增kubernetes构建资源相关api | | v1.1.8 | 增加fileGateway | | v1.1.9 | 插件支持国际化，增加MessageUtil、I18nUtil工具类，AtomResult类增加setErrorInfo方法 | +| v1.2.0 | DataField类新增isSensitive属性，插件输出将支持屏蔽指定敏感字段 | [TOC] diff --git a/pom.xml b/pom.xml index 90e496e..447e212 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.tencent.devops.ci-plugins java-plugin-sdk - 1.1.20 + 1.2.0 2018-2118 bk-ci pipeline plugins sdk for java From 117889b9340e26a800871855bda66c55645636b6 Mon Sep 17 00:00:00 2001 From: v_zkggzhou <2198773846@qq.com> Date: Fri, 11 Jul 2025 15:01:40 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=94=AF=E6=8C=81=20isSensitive=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=20#5534?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/tencent/bk/devops/plugin/common/OS.kt | 2 +- .../kotlin/com/tencent/bk/devops/plugin/script/ScriptUtils.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/tencent/bk/devops/plugin/common/OS.kt b/src/main/kotlin/com/tencent/bk/devops/plugin/common/OS.kt index ba45f62..759f907 100644 --- a/src/main/kotlin/com/tencent/bk/devops/plugin/common/OS.kt +++ b/src/main/kotlin/com/tencent/bk/devops/plugin/common/OS.kt @@ -4,4 +4,4 @@ enum class OS { MACOS, WINDOWS, LINUX -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/tencent/bk/devops/plugin/script/ScriptUtils.kt b/src/main/kotlin/com/tencent/bk/devops/plugin/script/ScriptUtils.kt index d077d7b..728f0d7 100644 --- a/src/main/kotlin/com/tencent/bk/devops/plugin/script/ScriptUtils.kt +++ b/src/main/kotlin/com/tencent/bk/devops/plugin/script/ScriptUtils.kt @@ -26,4 +26,4 @@ object ScriptUtils { } } -} \ No newline at end of file +} From 5a2e199891216602064e55f3831ef03bc4a2a1e1 Mon Sep 17 00:00:00 2001 From: v_zkggzhou <2198773846@qq.com> Date: Fri, 11 Jul 2025 15:37:54 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=94=AF=E6=8C=81=20isSensitive=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=20#5534?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java b/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java index 96fb08d..fd94f89 100644 --- a/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java +++ b/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java @@ -1,5 +1,6 @@ package com.tencent.bk.devops.atom.pojo; +import com.fasterxml.jackson.annotation.JsonProperty; import com.tencent.bk.devops.atom.common.DataType; import lombok.Getter; import lombok.Setter; @@ -26,5 +27,6 @@ public DataField(DataType type) { /** * 是否属于敏感字段 */ + @JsonProperty("isSensitive") private boolean isSensitive = false; } From a67867a821f503a37784fe2b27e070f906565505 Mon Sep 17 00:00:00 2001 From: v_zkggzhou <2198773846@qq.com> Date: Fri, 11 Jul 2025 16:08:41 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=94=AF=E6=8C=81=20isSensitive=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=20#5534?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java b/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java index fd94f89..42c639f 100644 --- a/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java +++ b/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java @@ -27,6 +27,5 @@ public DataField(DataType type) { /** * 是否属于敏感字段 */ - @JsonProperty("isSensitive") - private boolean isSensitive = false; + private boolean sensitive = false; } From 1d0311640ae96831db26d185a3a73a21b91009c0 Mon Sep 17 00:00:00 2001 From: v_zkggzhou <2198773846@qq.com> Date: Fri, 11 Jul 2025 16:50:57 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=94=AF=E6=8C=81=20isSensitive=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=20#5534?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tencent/bk/devops/atom/pojo/DataField.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java b/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java index 42c639f..db31833 100644 --- a/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java +++ b/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.tencent.bk.devops.atom.common.DataType; +import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -23,9 +24,14 @@ public DataField(DataType type) { */ private DataType type; - /** * 是否属于敏感字段 */ - private boolean sensitive = false; + @JsonProperty("isSensitive") + @Getter(AccessLevel.NONE) + private boolean isSensitive = false; + + public boolean sensitive() { + return isSensitive; + } } From 202e066764e91212644837e53251a2231c261f4d Mon Sep 17 00:00:00 2001 From: v_zkggzhou <2198773846@qq.com> Date: Fri, 11 Jul 2025 17:07:53 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=94=AF=E6=8C=81=20isSensitive=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=20#5534?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tencent/bk/devops/atom/pojo/DataField.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java b/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java index db31833..05f6d35 100644 --- a/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java +++ b/src/main/java/com/tencent/bk/devops/atom/pojo/DataField.java @@ -1,9 +1,8 @@ package com.tencent.bk.devops.atom.pojo; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.tencent.bk.devops.atom.common.DataType; -import lombok.AccessLevel; -import lombok.Getter; import lombok.Setter; /** @@ -11,7 +10,6 @@ * @version 1.0 */ @Setter -@Getter @SuppressWarnings("all") public abstract class DataField { @@ -28,10 +26,14 @@ public DataField(DataType type) { * 是否属于敏感字段 */ @JsonProperty("isSensitive") - @Getter(AccessLevel.NONE) private boolean isSensitive = false; - public boolean sensitive() { + public DataType getType() { + return type; + } + + @JsonIgnore + public boolean isSensitive() { return isSensitive; } }