From a1f30f8fac981edff71b57a207b456916cb7f0fb Mon Sep 17 00:00:00 2001 From: stubenhuang Date: Tue, 3 Sep 2024 15:39:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E8=93=9D=E9=B2=B87.2=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=9A=84=E6=94=B9=E5=8A=A8=20#10558?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- helm-charts/core/ci/templates/bklog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/core/ci/templates/bklog.yaml b/helm-charts/core/ci/templates/bklog.yaml index 1754ea65616..e26e31b1e44 100644 --- a/helm-charts/core/ci/templates/bklog.yaml +++ b/helm-charts/core/ci/templates/bklog.yaml @@ -17,7 +17,7 @@ spec: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: Helm path: - - /data/logs/*-.log + - /data/workspace/*/logs/service.log encoding: 'utf-8' multiline: pattern: '^[0-2][0-9][0-9][0-9].[0-1][0-9].[0-3][0-9]' From 0a5939db444f58b9cbdd41910c552c030d7c449b Mon Sep 17 00:00:00 2001 From: stubenhuang Date: Tue, 3 Sep 2024 20:13:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E8=93=9D=E9=B2=B87.2=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=9A=84=E6=94=B9=E5=8A=A8=20#10558?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tencent/devops/common/auth/api/pojo/EsbBaseReq.kt | 11 ++++++++++- .../tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/EsbBaseReq.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/EsbBaseReq.kt index 3431e484bf3..33ffe5d43a2 100644 --- a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/EsbBaseReq.kt +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/EsbBaseReq.kt @@ -36,5 +36,14 @@ abstract class EsbBaseReq( open var bk_username: String, open val bk_token: String = "" ) { - fun toMap() = mapOf("X-Bkapi-Authorization" to JsonUtil.toJson(this).replace("\\s".toRegex(), "")) + fun toMap(): Map { + return mapOf( + "X-Bkapi-Authorization" to """{ + "bk_app_code":"$bk_app_code", + "bk_app_secret":"$bk_app_secret", + "bk_username":"$bk_username", + "bk_token":"$bk_token" + }""".trimIndent().replace("\\s".toRegex(), "") + ) + } } diff --git a/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt b/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt index 318bca17fb0..97d4e40bb94 100644 --- a/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt +++ b/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt @@ -35,5 +35,14 @@ abstract class ApiReq( open var bk_token: String?, open val bk_username: String? ) { - fun toMap() = mapOf("X-Bkapi-Authorization" to JsonUtil.toJson(this).replace("\\s".toRegex(), "")) + fun toMap(): Map { + return mapOf( + "X-Bkapi-Authorization" to """{ + "bk_app_code":"$bk_app_code", + "bk_app_secret":"$bk_app_secret", + "bk_username":"$bk_username", + "bk_token":"$bk_token" + }""".trimIndent().replace("\\s".toRegex(), "") + ) + } } From 4566aee3dbef79fdedf0d3b1538fab96b59b93c3 Mon Sep 17 00:00:00 2001 From: stubenhuang Date: Tue, 3 Sep 2024 20:15:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E8=93=9D=E9=B2=B87.2=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=9A=84=E6=94=B9=E5=8A=A8=20#10558?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tencent/devops/common/auth/api/pojo/EsbBaseReq.kt | 2 -- .../com/tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/EsbBaseReq.kt b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/EsbBaseReq.kt index 33ffe5d43a2..8b92069eaa8 100644 --- a/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/EsbBaseReq.kt +++ b/src/backend/ci/core/common/common-auth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/EsbBaseReq.kt @@ -27,8 +27,6 @@ package com.tencent.devops.common.auth.api.pojo -import com.tencent.devops.common.api.util.JsonUtil - @Suppress("ALL") abstract class EsbBaseReq( open var bk_app_code: String, diff --git a/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt b/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt index 97d4e40bb94..6d7ebd9398e 100644 --- a/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt +++ b/src/backend/ci/core/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt @@ -26,8 +26,6 @@ */ package com.tencent.devops.notify.blueking.sdk.pojo -import com.tencent.devops.common.api.util.JsonUtil - @Suppress("ALL") abstract class ApiReq( open var bk_app_code: String?,