optimize: 优化、统一用户退出操作 (close TencentBlueKing#220)

CohleRustW · Oct 19, 2021 · 26dc66b · 26dc66b
1 parent 2fa5dbc
commit 26dc66b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/dev_log/2.1.354/daoqgong_202110181000.yaml b/dev_log/2.1.354/daoqgong_202110181000.yaml
@@ -0,0 +1,3 @@
+---
+optimization:
+  - "优化、统一用户退出操作  (closed #220)"
diff --git a/frontend/index.html b/frontend/index.html
@@ -36,6 +36,7 @@
               const BK_DOCS_CENTER_URL = '{{ BK_DOCS_CENTER_URL }}'
               const BKAPP_RUN_ENV = '{{ BKAPP_RUN_ENV }}'
               const TAM_ID = '{{ TAM_ID }}'
+              const LOGIN_URL = '{{ LOGIN_URL }}'
 
               return {
                   SITE_URL: SITE_URL,
@@ -62,7 +63,8 @@
                   USE_TJJ,
                   BK_DOCS_CENTER_URL,
                   BKAPP_RUN_ENV,
-                  TAM_ID
+                  TAM_ID,
+                  LOGIN_URL,
               }
           })()
         </script>

diff --git a/frontend/src/components/common/navigation.vue b/frontend/src/components/common/navigation.vue
@@ -280,7 +280,8 @@ export default class NodemanNavigation extends Mixins(routerBackMixin) {
       if (NODE_ENV === 'development') {
         window.location.href = LOGIN_DEV_URL + window.location.href;
       } else {
-        window.location.href = `${window.PROJECT_CONFIG.BK_PAAS_HOST}/console/accounts/logout/`;
+        // window.location.href = `${window.PROJECT_CONFIG.BK_PAAS_HOST}/console/accounts/logout/`;
+        window.location.href = `${window.PROJECT_CONFIG.LOGIN_URL}?&c_url=${window.location}`;
       }
     }
   }