Skip to content
This repository has been archived by the owner on Jan 21, 2024. It is now read-only.

Fix/token expire #129

Merged
merged 39 commits into from
Apr 18, 2020
Merged
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
d35e50d
1.3.0-beta.2
ruibaby Mar 2, 2020
6388bed
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 4, 2020
1852499
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 4, 2020
f452e9c
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 4, 2020
9042784
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 6, 2020
debfdbc
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 6, 2020
8b2f358
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 6, 2020
0680e6c
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 6, 2020
92f950e
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 7, 2020
11834b9
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 7, 2020
38105a6
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 8, 2020
057dd6a
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 9, 2020
bfcbc7d
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 9, 2020
0741456
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 11, 2020
a583f08
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 12, 2020
75f3107
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 13, 2020
10baba6
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 15, 2020
c5bb81d
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 16, 2020
0fed992
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 17, 2020
5a8fea4
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 17, 2020
00c1abb
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 17, 2020
5b750df
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 18, 2020
06cd6bc
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 18, 2020
3cb34c4
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 19, 2020
abe55e9
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 20, 2020
ee630b0
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 20, 2020
826f850
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 20, 2020
25f4bdf
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 21, 2020
eac1338
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 22, 2020
bbfc3c6
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 27, 2020
437a028
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 28, 2020
0f84209
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Mar 29, 2020
5033d25
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Apr 2, 2020
c5e8627
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Apr 4, 2020
c1674a0
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Apr 5, 2020
1a6ebb2
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Apr 10, 2020
e54da10
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Apr 12, 2020
78a0977
Merge branch 'master' of https://github.com/halo-dev/halo-admin
ruibaby Apr 17, 2020
166d1e1
fix: token expire.
ruibaby Apr 17, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/store/modules/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const user = {
},
mutations: {
SET_TOKEN: (state, token) => {
Vue.ls.set(ACCESS_TOKEN, token)
Vue.ls.set(ACCESS_TOKEN, token, token ? token.expired_in * 1000 : null)
state.token = token
},
CLEAR_TOKEN: state => {
Expand Down