From 64a95dbae989001d188f4ca378ef76ad7b3cd4aa Mon Sep 17 00:00:00 2001
From: durant <826035498@qq.com>
Date: Sun, 10 Dec 2023 21:19:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E4=BF=AE=E5=A4=8DCSRF=20token?=
 =?UTF-8?q?=20=E5=8F=96=E5=80=BC=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20#2469?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbm-ui/backend/ticket/flow_manager/inner.py      | 2 +-
 dbm-ui/frontend/src/services/http/lib/request.ts | 6 +++---
 helm-charts/bk-dbm/Chart.yaml                    | 4 ++--
 helm-charts/bk-dbm/charts/db-dns-api/Chart.yaml  | 2 +-
 helm-charts/bk-dbm/charts/dbm/Chart.yaml         | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dbm-ui/backend/ticket/flow_manager/inner.py b/dbm-ui/backend/ticket/flow_manager/inner.py
index bc8a8d1dda..81a51c0638 100644
--- a/dbm-ui/backend/ticket/flow_manager/inner.py
+++ b/dbm-ui/backend/ticket/flow_manager/inner.py
@@ -96,7 +96,7 @@ def _status(self) -> str:
 
     @property
     def _url(self) -> str:
-        return f"/database/{self.ticket.bk_biz_id}/task-history/detail/{self.root_id}/"
+        return f"/{self.ticket.bk_biz_id}/task-history/detail/{self.root_id}"
 
     def check_exclusive_operations(self):
         """判断执行互斥"""
diff --git a/dbm-ui/frontend/src/services/http/lib/request.ts b/dbm-ui/frontend/src/services/http/lib/request.ts
index 78be88fa15..62e7cdd187 100644
--- a/dbm-ui/frontend/src/services/http/lib/request.ts
+++ b/dbm-ui/frontend/src/services/http/lib/request.ts
@@ -47,7 +47,7 @@ requestMiddleware(axios.interceptors.request);
 responseMiddleware(axios.interceptors.response);
 
 const { CancelToken } = axios;
-const CRRF_TOKEN_KEY = 'dbm_csrftoken';
+const CSRF_TOKEN_KEY = 'dbm_csrftoken';
 
 const csrfHashCode = (key: string) => {
   let hashCode = 5381;
@@ -56,7 +56,7 @@ const csrfHashCode = (key: string) => {
   }
   return hashCode & 0x7fffffff;
 };
-const CSRFToken = Cookie.get(CRRF_TOKEN_KEY);
+const CSRFToken = Cookie.get(CSRF_TOKEN_KEY);
 
 axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
 if (CSRFToken !== undefined) {
@@ -69,7 +69,7 @@ const defaultConfig = {
   headers: {},
   withCredentials: true,
   paramsSerializer,
-  xsrfCookieName: 'bk-audit_csrftoken',
+  xsrfCookieName: 'dbm_csrftoken',
   xsrfHeaderName: 'X-CSRFToken',
 };
 
diff --git a/helm-charts/bk-dbm/Chart.yaml b/helm-charts/bk-dbm/Chart.yaml
index 512d8fcb3f..ddc7cf7227 100644
--- a/helm-charts/bk-dbm/Chart.yaml
+++ b/helm-charts/bk-dbm/Chart.yaml
@@ -79,5 +79,5 @@ dependencies:
 description: A Helm chart for bkdbm
 name: bk-dbm
 type: application
-version: 1.3.0-alpha.17
-appVersion: 1.3.0-alpha.17
+version: 1.3.0-alpha.18
+appVersion: 1.3.0-alpha.18
diff --git a/helm-charts/bk-dbm/charts/db-dns-api/Chart.yaml b/helm-charts/bk-dbm/charts/db-dns-api/Chart.yaml
index 8c1577dc57..a4da4ec4eb 100644
--- a/helm-charts/bk-dbm/charts/db-dns-api/Chart.yaml
+++ b/helm-charts/bk-dbm/charts/db-dns-api/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 0.0.1-alpha.3
+appVersion: 0.0.1-alpha.9
 description: A Helm chart for Kubernetes
 name: db-dns-api
 version: 0.1.4
diff --git a/helm-charts/bk-dbm/charts/dbm/Chart.yaml b/helm-charts/bk-dbm/charts/dbm/Chart.yaml
index 6ba2543496..08f76881c2 100644
--- a/helm-charts/bk-dbm/charts/dbm/Chart.yaml
+++ b/helm-charts/bk-dbm/charts/dbm/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.3.0-alpha.110
+appVersion: 1.3.0-alpha.121
 description: A Helm chart for dbm
 name: dbm
 type: application