diff --git a/src/api/user.js b/src/api/user.js index d6fae60..16da399 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -17,7 +17,7 @@ export const loginByUsername = (tenantCode, username, password, type) => request } }) -export const refeshToken = (refresh_token) => request({ +export const refreshToken = (refresh_token) => request({ url: '/api/blade-auth/oauth/token', method: 'post', params: { diff --git a/src/page/index/index.vue b/src/page/index/index.vue index 1d1614d..1705d3c 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -95,7 +95,7 @@ export default { if (date.seconds >= this.website.tokenTime && !this.refreshLock) { this.refreshLock = true; this.$store - .dispatch("RefeshToken") + .dispatch("refreshToken") .then(() => { this.refreshLock = false; }) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 22dc597..bd79d7a 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,10 +1,10 @@ -import { setToken, setRefreshToken, removeToken } from '@/util/auth' +import { setToken, setRefreshToken, removeToken, removeRefreshToken } from '@/util/auth' import { Message } from 'element-ui' import { setStore, getStore } from '@/util/store' import { isURL, validatenull } from '@/util/validate' import { deepClone } from '@/util/util' import webiste from '@/config/website' -import { loginByUsername, getUserInfo, getMenu, getTopMenu, logout, refeshToken, getButtons } from '@/api/user' +import { loginByUsername, getUserInfo, getMenu, getTopMenu, logout, refreshToken, getButtons } from '@/api/user' function addPath(ele, first) { @@ -95,10 +95,10 @@ const user = { }) }, //刷新token - RefeshToken({ state, commit }) { + refreshToken({ state, commit }) { console.log('handle refresh token') return new Promise((resolve, reject) => { - refeshToken(state.refreshToken).then(res => { + refreshToken(state.refreshToken).then(res => { const data = res.data; commit('SET_TOKEN', data.access_token); commit('SET_REFRESH_TOKEN', data.refresh_token); @@ -118,6 +118,7 @@ const user = { commit('DEL_ALL_TAG'); commit('CLEAR_LOCK'); removeToken() + removeRefreshToken() resolve() }).catch(error => { reject(error) @@ -133,6 +134,7 @@ const user = { commit('DEL_ALL_TAG'); commit('CLEAR_LOCK'); removeToken() + removeRefreshToken() resolve() }) }, diff --git a/src/util/auth.js b/src/util/auth.js index 0483053..23da168 100644 --- a/src/util/auth.js +++ b/src/util/auth.js @@ -20,3 +20,8 @@ export function setRefreshToken(token) { export function removeToken() { return Cookies.remove(TokenKey) } + +export function removeRefreshToken() { + return Cookies.remove(RefreshTokenKey) +} +