Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
InJoyU
vue-element-admin
提交
a0a011e9
V
vue-element-admin
项目概览
InJoyU
/
vue-element-admin
与 Fork 源项目一致
从无法访问的项目Fork
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vue-element-admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a0a011e9
编写于
7月 20, 2017
作者:
P
Pan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix cookie token bug
上级
c8856741
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
26 addition
and
10 deletion
+26
-10
src/main.js
src/main.js
+2
-1
src/store/modules/user.js
src/store/modules/user.js
+7
-7
src/utils/auth.js
src/utils/auth.js
+15
-0
src/utils/fetch.js
src/utils/fetch.js
+2
-2
未找到文件。
src/main.js
浏览文件 @
a0a011e9
...
@@ -19,6 +19,7 @@ import IconSvg from 'components/Icon-svg';// svg 组件
...
@@ -19,6 +19,7 @@ import IconSvg from 'components/Icon-svg';// svg 组件
import
vueWaves
from
'
./directive/waves
'
;
// 水波纹指令
import
vueWaves
from
'
./directive/waves
'
;
// 水波纹指令
import
errLog
from
'
store/errLog
'
;
// error log组件
import
errLog
from
'
store/errLog
'
;
// error log组件
import
'
./mock/index.js
'
;
// 该项目所有请求使用mockjs模拟
import
'
./mock/index.js
'
;
// 该项目所有请求使用mockjs模拟
import
{
getToken
}
from
'
utils/auth
'
;
// register globally
// register globally
Vue
.
component
(
'
multiselect
'
,
Multiselect
);
Vue
.
component
(
'
multiselect
'
,
Multiselect
);
...
@@ -43,7 +44,7 @@ function hasPermission(roles, permissionRoles) {
...
@@ -43,7 +44,7 @@ function hasPermission(roles, permissionRoles) {
const
whiteList
=
[
'
/login
'
,
'
/authredirect
'
,
'
/reset
'
,
'
/sendpwd
'
];
// 不重定向白名单
const
whiteList
=
[
'
/login
'
,
'
/authredirect
'
,
'
/reset
'
,
'
/sendpwd
'
];
// 不重定向白名单
router
.
beforeEach
((
to
,
from
,
next
)
=>
{
router
.
beforeEach
((
to
,
from
,
next
)
=>
{
NProgress
.
start
();
// 开启Progress
NProgress
.
start
();
// 开启Progress
if
(
store
.
getters
.
token
)
{
// 判断是否有token
if
(
getToken
()
)
{
// 判断是否有token
if
(
to
.
path
===
'
/login
'
)
{
if
(
to
.
path
===
'
/login
'
)
{
next
({
path
:
'
/
'
});
next
({
path
:
'
/
'
});
}
else
{
}
else
{
...
...
src/store/modules/user.js
浏览文件 @
a0a011e9
import
{
loginByEmail
,
logout
,
getInfo
}
from
'
api/login
'
;
import
{
loginByEmail
,
logout
,
getInfo
}
from
'
api/login
'
;
import
Cookies
from
'
js-cookie
'
;
import
{
getToken
,
setToken
,
removeToken
}
from
'
utils/auth
'
;
const
user
=
{
const
user
=
{
state
:
{
state
:
{
user
:
''
,
user
:
''
,
status
:
''
,
status
:
''
,
code
:
''
,
code
:
''
,
token
:
Cookies
.
get
(
'
Admin-Token
'
),
token
:
getToken
(
),
name
:
''
,
name
:
''
,
avatar
:
''
,
avatar
:
''
,
introduction
:
''
,
introduction
:
''
,
...
@@ -56,7 +56,7 @@ const user = {
...
@@ -56,7 +56,7 @@ const user = {
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
loginByEmail
(
email
,
userInfo
.
password
).
then
(
response
=>
{
loginByEmail
(
email
,
userInfo
.
password
).
then
(
response
=>
{
const
data
=
response
.
data
;
const
data
=
response
.
data
;
Cookies
.
set
(
'
Admin-Token
'
,
response
.
data
.
token
);
setToken
(
response
.
data
.
token
);
commit
(
'
SET_TOKEN
'
,
data
.
token
);
commit
(
'
SET_TOKEN
'
,
data
.
token
);
resolve
();
resolve
();
}).
catch
(
error
=>
{
}).
catch
(
error
=>
{
...
@@ -87,7 +87,7 @@ const user = {
...
@@ -87,7 +87,7 @@ const user = {
commit
(
'
SET_CODE
'
,
code
);
commit
(
'
SET_CODE
'
,
code
);
loginByThirdparty
(
state
.
status
,
state
.
email
,
state
.
code
).
then
(
response
=>
{
loginByThirdparty
(
state
.
status
,
state
.
email
,
state
.
code
).
then
(
response
=>
{
commit
(
'
SET_TOKEN
'
,
response
.
data
.
token
);
commit
(
'
SET_TOKEN
'
,
response
.
data
.
token
);
Cookies
.
set
(
'
Admin-Token
'
,
response
.
data
.
token
);
setToken
(
response
.
data
.
token
);
resolve
();
resolve
();
}).
catch
(
error
=>
{
}).
catch
(
error
=>
{
reject
(
error
);
reject
(
error
);
...
@@ -101,7 +101,7 @@ const user = {
...
@@ -101,7 +101,7 @@ const user = {
logout
(
state
.
token
).
then
(()
=>
{
logout
(
state
.
token
).
then
(()
=>
{
commit
(
'
SET_TOKEN
'
,
''
);
commit
(
'
SET_TOKEN
'
,
''
);
commit
(
'
SET_ROLES
'
,
[]);
commit
(
'
SET_ROLES
'
,
[]);
Cookies
.
remove
(
'
Admin-Token
'
);
removeToken
(
);
resolve
();
resolve
();
}).
catch
(
error
=>
{
}).
catch
(
error
=>
{
reject
(
error
);
reject
(
error
);
...
@@ -113,7 +113,7 @@ const user = {
...
@@ -113,7 +113,7 @@ const user = {
FedLogOut
({
commit
})
{
FedLogOut
({
commit
})
{
return
new
Promise
(
resolve
=>
{
return
new
Promise
(
resolve
=>
{
commit
(
'
SET_TOKEN
'
,
''
);
commit
(
'
SET_TOKEN
'
,
''
);
Cookies
.
remove
(
'
Admin-Token
'
);
removeToken
(
);
resolve
();
resolve
();
});
});
},
},
...
@@ -123,7 +123,7 @@ const user = {
...
@@ -123,7 +123,7 @@ const user = {
return
new
Promise
(
resolve
=>
{
return
new
Promise
(
resolve
=>
{
commit
(
'
SET_ROLES
'
,
[
role
]);
commit
(
'
SET_ROLES
'
,
[
role
]);
commit
(
'
SET_TOKEN
'
,
role
);
commit
(
'
SET_TOKEN
'
,
role
);
Cookies
.
set
(
'
Admin-Token
'
,
role
);
setToken
(
role
);
resolve
();
resolve
();
})
})
}
}
...
...
src/utils/auth.js
0 → 100644
浏览文件 @
a0a011e9
import
Cookies
from
'
js-cookie
'
const
TokenKey
=
'
Admin-Token
'
export
function
getToken
()
{
return
Cookies
.
get
(
TokenKey
)
}
export
function
setToken
(
token
)
{
return
Cookies
.
set
(
TokenKey
,
token
)
}
export
function
removeToken
()
{
return
Cookies
.
remove
(
TokenKey
)
}
src/utils/fetch.js
浏览文件 @
a0a011e9
import
axios
from
'
axios
'
;
import
axios
from
'
axios
'
;
import
{
Message
}
from
'
element-ui
'
;
import
{
Message
}
from
'
element-ui
'
;
import
store
from
'
../store
'
;
import
store
from
'
../store
'
;
// import router from '../router
';
import
{
getToken
}
from
'
utils/auth
'
;
// 创建axios实例
// 创建axios实例
const
service
=
axios
.
create
({
const
service
=
axios
.
create
({
...
@@ -13,7 +13,7 @@ const service = axios.create({
...
@@ -13,7 +13,7 @@ const service = axios.create({
service
.
interceptors
.
request
.
use
(
config
=>
{
service
.
interceptors
.
request
.
use
(
config
=>
{
// Do something before request is sent
// Do something before request is sent
if
(
store
.
getters
.
token
)
{
if
(
store
.
getters
.
token
)
{
config
.
headers
[
'
X-Token
'
]
=
store
.
getters
.
token
;
// 让每个请求携带token--['X-Token']为自定义key 请根据实际情况自行修改
config
.
headers
[
'
X-Token
'
]
=
getToken
()
;
// 让每个请求携带token--['X-Token']为自定义key 请根据实际情况自行修改
}
}
return
config
;
return
config
;
},
error
=>
{
},
error
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录