fix(front): 注销功能404 (close TencentBlueKing#78)

GONGONGONG · Oct 18, 2021 · b7679dc · b7679dc
1 parent 879d019
commit b7679dc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/dev_log/1.0.6/daqgong_202110141800.yaml b/dev_log/1.0.6/daqgong_202110141800.yaml
@@ -0,0 +1,2 @@
+bugfix:
+  - "注销功能404 (closed #78)"
diff --git a/web/index-dev.html b/web/index-dev.html
@@ -17,6 +17,7 @@
                 const AJAX_URL_PREFIX = 'http://paas.ee225.bktencent.com/t/bk_gsekit/'
                 const LOGIN_SERVICE_URL = 'http://paas.ee225.bktencent.com/login/'
                 const CMDB_URL = 'https://magicbox.bk.tencent.com/static_api/v3/main/index.html'
+                const LOGIN_URL = ''
 
                 // BK_STATIC_URL 不能以 / 结尾
                 if (BK_STATIC_URL.endsWith('/')) {
@@ -35,7 +36,8 @@
                     BK_STATIC_URL: BK_STATIC_URL,
                     AJAX_URL_PREFIX: AJAX_URL_PREFIX,
                     LOGIN_SERVICE_URL: LOGIN_SERVICE_URL,
-                    CMDB_URL: CMDB_URL
+                    CMDB_URL: CMDB_URL,
+                    LOGIN_URL: LOGIN_URL
                 }
             })()
         </script>

diff --git a/web/index.html b/web/index.html
@@ -19,6 +19,7 @@
                 const TAM_AEGIS_KEY = '{{TAM_AEGIS_KEY}}' // TAM监控key
                 const TAM_AEGIS_URL = '{{TAM_AEGIS_URL}}' // TAM监控接入链接
                 const CMDB_URL = '{{CMDB_URL}}' // 配置平台路径
+                const LOGIN_URL = '{{LOGIN_URL}}'
 
                 // BK_STATIC_URL 不能以 / 结尾
                 if (BK_STATIC_URL.endsWith('/')) {
@@ -39,7 +40,8 @@
                     LOGIN_SERVICE_URL: LOGIN_SERVICE_URL,
                     TAM_AEGIS_KEY: TAM_AEGIS_KEY,
                     TAM_AEGIS_URL: TAM_AEGIS_URL,
-                    CMDB_URL: CMDB_URL
+                    CMDB_URL: CMDB_URL,
+                    LOGIN_URL: LOGIN_URL
                 }
             })()
         </script>

diff --git a/web/src/components/Header.vue b/web/src/components/Header.vue
@@ -138,7 +138,8 @@ export default {
       this.$router.push('/process-manage/status');
     },
     handleLogout() {
-      location.assign('/console/accounts/logout/');
+      // location.assign('/console/accounts/logout/');
+      location.href = `${window.PROJECT_CONFIG.LOGIN_URL}?&c_url=${window.location}`;
     },
     async resetAuthInfo() {
       const currentBiz = this.bizList.find(item => item.bk_biz_id === this.bizId);