From 56725b461db4d317fd38c2ec8040b5a507171fc7 Mon Sep 17 00:00:00 2001 From: stubenhuang Date: Tue, 12 Dec 2023 19:54:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?pref:=20=E4=BC=98=E5=8C=96rbac=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=BA=8C=E8=BF=9B=E5=88=B6=E9=83=A8=E7=BD=B2=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=20#9769?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ms-init/auth/iam-callback-resource-registere.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support-files/ms-init/auth/iam-callback-resource-registere.conf b/support-files/ms-init/auth/iam-callback-resource-registere.conf index 7b0a7678af2..41e96c1cb68 100644 --- a/support-files/ms-init/auth/iam-callback-resource-registere.conf +++ b/support-files/ms-init/auth/iam-callback-resource-registere.conf @@ -58,7 +58,7 @@ "group":{ "gateway":"http://bk-ci.service.consul", "resource": "group", - "path":"/ms/quliaty/api/open/quality/callback/group", + "path":"/ms/quality/api/open/quality/callback/group", "system":"ci", "related_resource":["project"], "related_flag": true @@ -66,7 +66,7 @@ "rule":{ "gateway":"http://bk-ci.service.consul", "resource": "rule", - "path":"/ms/quliaty/api/open/quality/callback/rule", + "path":"/ms/quality/api/open/quality/callback/rule", "system":"ci", "related_resource":["project"], "related_flag": true From 4af273cae5a4d0b1ee00c3637eb2a9957b45e9d9 Mon Sep 17 00:00:00 2001 From: stubenhuang Date: Tue, 12 Dec 2023 19:57:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?doc:=20=E6=96=87=E6=A1=A3=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20issue=20#9766?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/common-lib/docs.ts | 2 +- src/frontend/locale/index.js | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/frontend/common-lib/docs.ts b/src/frontend/common-lib/docs.ts index 106938b4e13..abb631c353e 100644 --- a/src/frontend/common-lib/docs.ts +++ b/src/frontend/common-lib/docs.ts @@ -1,5 +1,5 @@ // const commonPrefix = `${DOCS_URL_PREFIX}/docs/markdown/持续集成平台/产品白皮书` -const commonPrefix = `${DOCS_URL_PREFIX}/bk--docs--center/markdown/Devops/UserGuide` +const commonPrefix = `${DOCS_URL_PREFIX}/markdown/Devops/UserGuide` export const BkciDocs = { BKCI_DOC: `${commonPrefix}/intro/README.md`, // 首页跳转文档 GATE_DOC: `${commonPrefix}/Services/Quailty-gate/quailty-gate.md`, // 质量红线文档 diff --git a/src/frontend/locale/index.js b/src/frontend/locale/index.js index f8bdf54055f..4274a8d3c77 100644 --- a/src/frontend/locale/index.js +++ b/src/frontend/locale/index.js @@ -134,12 +134,16 @@ export default (r, initSetLocale = false) => { async function syncLocaleBackend (localeLang) { try { - console.log('sync backendLocalEnum', backendLocalEnum[localeLang], localeLang) + const bkLocalEnum = { + 'zh-CN': 'zh-cn', // 简体中文 + 'en-US': 'en' // 英文 + } + console.log('sync backendLocalEnum', backendLocalEnum[localeLang], localeLang, bkLocalEnum[localeLang]) await Promise.all([ axios.put('/ms/project/api/user/locales/update', { language: backendLocalEnum[localeLang] }), - jsonpLocale(backendLocalEnum[localeLang]) + jsonpLocale(bkLocalEnum[localeLang]) ]) } catch (error) { console.error('sync locale to backend error', error)