Merge pull request TencentBlueKing#10905 from stubenhuang/issue-bk-72…

…-10558 feat: 蓝鲸7.2版本的改动 TencentBlueKing#10558
yongyiduan · Sep 3, 2024 · 3759f6e · 3759f6e
2 parents fb22f20 + 4566aee
commit 3759f6e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git 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]'

diff --git a/...uth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/EsbBaseReq.kt b/...uth/common-auth-api/src/main/kotlin/com/tencent/devops/common/auth/api/pojo/EsbBaseReq.kt
@@ -27,14 +27,21 @@
 
 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,
     open var bk_app_secret: String,
     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<String, String> {
+        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/...e/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt b/...e/notify/biz-notify/src/main/kotlin/com/tencent/devops/notify/blueking/sdk/pojo/ApiReq.kt
@@ -26,14 +26,21 @@
  */
 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?,
     open var bk_app_secret: String?,
     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<String, String> {
+        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(), "")
+        )
+    }
 }