初始化

src/router/index.js

@@ -1,16 +1,16 @@
-import Vue from 'vue'
+import Vue from 'vue';
-import Router from 'vue-router'
+import Router from 'vue-router';
 
-Vue.use(Router)
+Vue.use(Router);
 
 /* Layout */
-import Layout from '@/layout'
+import Layout from '@/layout';
 
 /* Router Modules */
-import componentsRouter from './modules/components'
+import componentsRouter from './modules/components';
-import chartsRouter from './modules/charts'
+import chartsRouter from './modules/charts';
-import tableRouter from './modules/table'
+import tableRouter from './modules/table';
-import nestedRouter from './modules/nested'
+import nestedRouter from './modules/nested';
 
 /**
  * Note: sub-menu only appear when route children.length >= 1
@@ -55,11 +55,6 @@ export const constantRoutes = [
     component: () => import('@/views/login/index'),
     hidden: true
   },
-  {
-    path: '/auth-redirect',
-    component: () => import('@/views/login/auth-redirect'),
-    hidden: true
-  },
   {
     path: '/404',
     component: () => import('@/views/error-page/404'),
@@ -122,7 +117,7 @@ export const constantRoutes = [
       }
     ]
   }
-]
+];
 
 /**
  * asyncRoutes
@@ -385,20 +380,20 @@ export const asyncRoutes = [
 
   // 404 page must be placed at the end !!!
   { path: '*', redirect: '/404', hidden: true }
-]
+];
 
 const createRouter = () => new Router({
   // mode: 'history', // require service support
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes
-})
+});
 
-const router = createRouter()
+const router = createRouter();
 
 // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
 export function resetRouter() {
-  const newRouter = createRouter()
+  const newRouter = createRouter();
-  router.matcher = newRouter.matcher // reset router
+  router.matcher = newRouter.matcher; // reset router
 }
 
-export default router
+export default router;

src/utils/request.js

@@ -1,15 +1,14 @@
-import axios from 'axios'
+import axios from 'axios';
-import { MessageBox, Message } from 'element-ui'
+import { MessageBox, Message } from 'element-ui';
-import store from '@/store'
+import store from '@/store';
-import { getToken } from '@/utils/auth'
+import { getToken } from '@/utils/auth';
 
 // create an axios instance
 const service = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
+  baseURL: process.env.BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 5000 // request timeout
+  timeout: 50000 // request timeout
-})
+});
-
 // request interceptor
 service.interceptors.request.use(
   config => {
@@ -19,16 +18,16 @@ service.interceptors.request.use(
       // let each request carry token
       // ['X-Token'] is a custom headers key
       // please modify it according to the actual situation
-      config.headers['X-Token'] = getToken()
+      config.headers['Authorization'] = 'Bearer ' + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
     }
-    return config
+    return config;
   },
   error => {
     // do something with request error
-    console.log(error) // for debug
+    console.log(error); // for debug
-    return Promise.reject(error)
+    return Promise.reject(error);
   }
-)
+);
 
 // response interceptor
 service.interceptors.response.use(
@@ -43,15 +42,13 @@ service.interceptors.response.use(
    * You can also judge the status by HTTP Status Code
    */
   response => {
-    const res = response.data
+    const res = response.data;
-
+    if (res.code !== '000000') {
-    // if the custom code is not 20000, it is judged as an error.
-    if (res.code !== 20000) {
       Message({
         message: res.message || 'Error',
         type: 'error',
         duration: 5 * 1000
-      })
+      });
 
       // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
       if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
@@ -62,24 +59,24 @@ service.interceptors.response.use(
           type: 'warning'
         }).then(() => {
           store.dispatch('user/resetToken').then(() => {
-            location.reload()
+            location.reload();
-          })
+          });
-        })
+        });
       }
-      return Promise.reject(new Error(res.message || 'Error'))
+      return Promise.reject(new Error(res.message || 'Error'));
     } else {
-      return res
+      return res;
     }
   },
   error => {
-    console.log('err' + error) // for debug
+    console.log('err' + error); // for debug
     Message({
       message: error.message,
       type: 'error',
       duration: 5 * 1000
-    })
+    });
-    return Promise.reject(error)
+    return Promise.reject(error);
   }
-)
+);
 
-export default service
+export default service;