Skip to content

Commit a0a011e

Browse files
committed
fix cookie token bug
1 parent c885674 commit a0a011e

File tree

4 files changed

+26
-10
lines changed

4 files changed

+26
-10
lines changed

src/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import IconSvg from 'components/Icon-svg';// svg 组件
1919
import vueWaves from './directive/waves';// 水波纹指令
2020
import errLog from 'store/errLog';// error log组件
2121
import './mock/index.js'; // 该项目所有请求使用mockjs模拟
22+
import { getToken } from 'utils/auth';
2223

2324
// register globally
2425
Vue.component('multiselect', Multiselect);
@@ -43,7 +44,7 @@ function hasPermission(roles, permissionRoles) {
4344
const whiteList = ['/login', '/authredirect', '/reset', '/sendpwd'];// 不重定向白名单
4445
router.beforeEach((to, from, next) => {
4546
NProgress.start(); // 开启Progress
46-
if (store.getters.token) { // 判断是否有token
47+
if (getToken()) { // 判断是否有token
4748
if (to.path === '/login') {
4849
next({ path: '/' });
4950
} else {

src/store/modules/user.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { loginByEmail, logout, getInfo } from 'api/login';
2-
import Cookies from 'js-cookie';
2+
import { getToken, setToken, removeToken } from 'utils/auth';
33

44
const user = {
55
state: {
66
user: '',
77
status: '',
88
code: '',
9-
token: Cookies.get('Admin-Token'),
9+
token: getToken(),
1010
name: '',
1111
avatar: '',
1212
introduction: '',
@@ -56,7 +56,7 @@ const user = {
5656
return new Promise((resolve, reject) => {
5757
loginByEmail(email, userInfo.password).then(response => {
5858
const data = response.data;
59-
Cookies.set('Admin-Token', response.data.token);
59+
setToken(response.data.token);
6060
commit('SET_TOKEN', data.token);
6161
resolve();
6262
}).catch(error => {
@@ -87,7 +87,7 @@ const user = {
8787
commit('SET_CODE', code);
8888
loginByThirdparty(state.status, state.email, state.code).then(response => {
8989
commit('SET_TOKEN', response.data.token);
90-
Cookies.set('Admin-Token', response.data.token);
90+
setToken(response.data.token);
9191
resolve();
9292
}).catch(error => {
9393
reject(error);
@@ -101,7 +101,7 @@ const user = {
101101
logout(state.token).then(() => {
102102
commit('SET_TOKEN', '');
103103
commit('SET_ROLES', []);
104-
Cookies.remove('Admin-Token');
104+
removeToken();
105105
resolve();
106106
}).catch(error => {
107107
reject(error);
@@ -113,7 +113,7 @@ const user = {
113113
FedLogOut({ commit }) {
114114
return new Promise(resolve => {
115115
commit('SET_TOKEN', '');
116-
Cookies.remove('Admin-Token');
116+
removeToken();
117117
resolve();
118118
});
119119
},
@@ -123,7 +123,7 @@ const user = {
123123
return new Promise(resolve => {
124124
commit('SET_ROLES', [role]);
125125
commit('SET_TOKEN', role);
126-
Cookies.set('Admin-Token', role);
126+
setToken(role);
127127
resolve();
128128
})
129129
}

src/utils/auth.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import Cookies from 'js-cookie'
2+
3+
const TokenKey = 'Admin-Token'
4+
5+
export function getToken() {
6+
return Cookies.get(TokenKey)
7+
}
8+
9+
export function setToken(token) {
10+
return Cookies.set(TokenKey, token)
11+
}
12+
13+
export function removeToken() {
14+
return Cookies.remove(TokenKey)
15+
}

src/utils/fetch.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import axios from 'axios';
22
import { Message } from 'element-ui';
33
import store from '../store';
4-
// import router from '../router';
4+
import { getToken } from 'utils/auth';
55

66
// 创建axios实例
77
const service = axios.create({
@@ -13,7 +13,7 @@ const service = axios.create({
1313
service.interceptors.request.use(config => {
1414
// Do something before request is sent
1515
if (store.getters.token) {
16-
config.headers['X-Token'] = store.getters.token; // 让每个请求携带token--['X-Token']为自定义key 请根据实际情况自行修改
16+
config.headers['X-Token'] = getToken(); // 让每个请求携带token--['X-Token']为自定义key 请根据实际情况自行修改
1717
}
1818
return config;
1919
}, error => {

0 commit comments

Comments
 (0)