From bec50fadaaa84f7b5abdedf0923595ecd11b5537 Mon Sep 17 00:00:00 2001
From: yanzili <978387851@qq.com>
Date: Mon, 28 Jun 2021 16:55:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=20token=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 report-ui/src/api/axios.js     |  7 ++----
 report-ui/src/router/index.js  |  2 +-
 report-ui/src/utils/request.js | 41 +++++++++++++++++-----------------
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/report-ui/src/api/axios.js b/report-ui/src/api/axios.js
index 46bae2f4..fd56f807 100644
--- a/report-ui/src/api/axios.js
+++ b/report-ui/src/api/axios.js
@@ -17,13 +17,10 @@ service.interceptors.request.use(
   config => {
     // 在发送请求之前做些什么
     var token = getItem('token');
-    // config = signUtil.sign(token, deepClone(config));
-    console.log(config, 'config')
     return config
   },
   error => {
-    // Do something with request error
-    console.log(error) // for debug
+    // Do something with request error 
     Promise.reject(error)
   }
 )
@@ -35,6 +32,7 @@ service.interceptors.response.use(
     if (res.code == 200) {
       return res
     }
+
     else if (res.code == '50014') {
       //登录超时或被登出，弹确认框，用户确认后，跳转到登录页面
       MessageBox({
@@ -45,7 +43,6 @@ service.interceptors.response.use(
         sessionStorage.clear();
         localStorage.clear();
         delItem('token')
-        // location.reload();
         window.location.href = "/";
       }).catch(err => {
       })
diff --git a/report-ui/src/router/index.js b/report-ui/src/router/index.js
index d2c62820..1e4977fc 100644
--- a/report-ui/src/router/index.js
+++ b/report-ui/src/router/index.js
@@ -98,7 +98,7 @@ export const constantRouterMap = [
   //   ]
   // },
   { path: '/404', component: () => import('@/views/404'), hidden: true },
-  { path: '*', redirect: '/index', hidden: true },
+  { path: '*', redirect: '/login', hidden: true },
 ]
 
 export default new Router({
diff --git a/report-ui/src/utils/request.js b/report-ui/src/utils/request.js
index 5c263a8b..81b3eae8 100644
--- a/report-ui/src/utils/request.js
+++ b/report-ui/src/utils/request.js
@@ -2,7 +2,6 @@ import axios from 'axios'
 import { Message, MessageBox } from 'element-ui'
 import store from '../store'
 import { getToken } from '@/utils/auth'
-
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
@@ -17,7 +16,6 @@ service.interceptors.request.use(
   },
   error => {
     // Do something with request error
-    console.log(error) // for debug
     Promise.reject(error)
   }
 )
@@ -29,36 +27,37 @@ service.interceptors.response.use(
      * code为非20000是抛错 可结合自己业务进行修改
      */
     const res = response.data
-    if (res.code !== '200') {
+    // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
+    if (res.code == '50008' || res.code == '50012' || res.code == '50014') {
+      MessageBox.confirm(
+        '你已被登出，可以取消继续留在该页面，或者重新登录',
+        '重新登录',
+        {
+          confirmButtonText: '重新登录',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        // store.dispatch('FedLogOut').then(() => {
+        //   // location.reload() // 为了重新实例化vue-router对象 避免bug
+        //   window.location.href = "/";
+        // })
+        location.reload();
+        window.location.href = "/";
+      })
+    }
+    else if (res.code !== '200') {
       Message({
         message: res.message,
         type: 'error',
         duration: 5 * 1000
       })
-
-      // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
-      if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
-        MessageBox.confirm(
-          '你已被登出，可以取消继续留在该页面，或者重新登录',
-          '确定登出',
-          {
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          store.dispatch('FedLogOut').then(() => {
-            location.reload() // 为了重新实例化vue-router对象 避免bug
-          })
-        })
-      }
       return Promise.reject('error')
     } else {
       return response.data
     }
   },
   error => {
-    console.log('err' + error) // for debug
     Message({
       message: error.message,
       type: 'error',