-1

src/utils/auth.js

@@ -3,29 +3,33 @@ import Cookies from 'js-cookie'
 const TokenKey = 'GCLS_Token'
 
 export function getToken() {
-    return Cookies.get(TokenKey)
+  return Cookies.get(TokenKey) ? Cookies.get(TokenKey) : sessionStorage.getItem(TokenKey);
 }
 
-export function setToken(token) {
-    return Cookies.set(TokenKey, token)
+export function setToken (token) {
+  sessionStorage.setItem(TokenKey, JSON.stringify(token));
+  return Cookies.set(TokenKey, token);
 }
 
-export function removeToken() {
-    return Cookies.remove(TokenKey)
+export function removeToken () {
+  sessionStorage.removeItem(TokenKey)
+  return Cookies.remove(TokenKey);
 }
 
 const ConfigKey = 'GCLS_Config'
 
-export function getConfig() {
-    return Cookies.get(ConfigKey)
+export function getConfig () {
+  return Cookies.get(ConfigKey) ? Cookies.get(ConfigKey) : sessionStorage.getItem(ConfigKey);
 }
 
 export function setConfig(val) {
-    return Cookies.set(ConfigKey, val)
+  sessionStorage.setItem(ConfigKey, JSON.stringify(val));
+  return Cookies.set(ConfigKey, val);
 }
 
-export function removeConfig() {
-    return Cookies.remove(ConfigKey)
+export function removeConfig () {
+  sessionStorage.removeItem(ConfigKey);
+  return Cookies.remove(ConfigKey);
 }
 export function CopyToClipboard(element, root) {
     var doc = document,

src/utils/request.js

@@ -63,23 +63,23 @@ service.interceptors.response.use(
             return Promise.reject(new Error(res.message || res.error || 'Error'))
         } else if (res.status === -1) {
             // 登录失效
-            // Cookies.remove('session_id')
-            // Cookies.remove('user_code')
-            // Cookies.remove('user_real_name')
-            // Cookies.remove('user_type')
-            // removeToken();
-            // msg = Message({
-            //     message: '登录会话失效，请重新登录',
-            //     type: 'error',
-            //     showClose: true,
-            //     duration: 0
-            // })
-            // if (process.env.NODE_ENV === 'development') {
-                // router.push(`/login`)
-            // } else {
-                // window.location.href = '/';
-            // }
-            // return false
+            Cookies.remove('session_id')
+            Cookies.remove('user_code')
+            Cookies.remove('user_real_name')
+            Cookies.remove('user_type')
+            removeToken();
+            msg = Message({
+                message: '登录会话失效，请重新登录',
+                type: 'error',
+                showClose: true,
+                duration: 0
+            })
+            if (process.env.NODE_ENV === 'development') {
+                router.push(`/login`)
+            } else {
+                window.location.href = '/';
+            }
+            return false
         } else {
             Message.closeAll()
             return res