From b40b28adddaf32538f6550cbcea1ac24f0c0ac0d Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Sat, 18 Jun 2022 17:20:11 +0800
Subject: [PATCH] =?UTF-8?q?TODO=E9=83=A8=E7=BD=B2=E7=BA=BF=E4=B8=8A?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/tools/UserMenu.vue |  5 ++++-
 jero-web/src/permission.js                 | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue
index 21152b55b..a52b3a8c9 100644
--- a/jero-web/src/components/tools/UserMenu.vue
+++ b/jero-web/src/components/tools/UserMenu.vue
@@ -222,12 +222,15 @@
           onOk() {
             return that.Logout({}).then(() => {
               // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面
+              //  TODO  在部署线上时注掉以下代码
               that.$router.push({ path: '/user/login' })
+
               // window.location.href = 'https://signin-test.nio.com/logout?client_id=100679&redirect_uri=' +
               // encodeURIComponent('http://localhost:3000/dashboard/analysis') + '&response_type=code' //本地
-
+              //  TODO  在部署线上时解开以下代码
               // window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' +
               // encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上
+
               localStorage.removeItem('language')
               // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面
               //window.location.reload()
diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js
index 4ac026048..653f3352a 100644
--- a/jero-web/src/permission.js
+++ b/jero-web/src/permission.js
@@ -11,9 +11,15 @@ import { getAction } from '@/api/manage'
 import { welcome } from '@/utils/util'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
+// TODO   线上部署在conmponetns/tools/UserMenu.vue的退出登录时需解开代码以及注释代码
 
+//  TODO  在部署线上时注掉以下代码
 const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration']
+
+//  TODO  在部署线上时解开一下代码
 // const whiteList = []
+
+
 // no redirect whitelist
 
 router.beforeEach((to, from, next) => {
@@ -89,7 +95,9 @@ router.beforeEach((to, from, next) => {
              })*/
             // query: { redirect: to.fullPath }
             store.dispatch('Logout').then(() => {
+              //  TODO  在部署线上时注掉此代码
               next({ path: '/user/login', query: { redirect: to.fullPath } })
+
               let fullPath = ''
               if (to.fullPath == '/') {
                 fullPath = INDEX_MAIN_PAGE_PATH
@@ -100,6 +108,7 @@ router.beforeEach((to, from, next) => {
               // window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
               //   + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地
 
+              //  TODO  在部署线上时解开此代码
               // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
               //   + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上
             })
@@ -113,6 +122,7 @@ router.beforeEach((to, from, next) => {
       // 在免登录白名单，直接进入
       next()
     } else {
+      //  TODO  在部署线上时注掉此代码
       next({ path: '/user/login', query: { redirect: to.fullPath } })
 
       let fullPath = ''
@@ -124,9 +134,10 @@ router.beforeEach((to, from, next) => {
       // http://grp.nioint.com
       // window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
       //   + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地
-
+      //  TODO  在部署线上时解开此代码
       // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
       //   + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上
+
       NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
     }
   }