优化方法名

pull/59/head
smallchill 7 years ago
parent d77b189cb7
commit 5c58761d67
  1. 2
      src/api/user.js
  2. 2
      src/page/index/index.vue
  3. 10
      src/store/modules/user.js
  4. 5
      src/util/auth.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', url: '/api/blade-auth/oauth/token',
method: 'post', method: 'post',
params: { params: {

@ -95,7 +95,7 @@ export default {
if (date.seconds >= this.website.tokenTime && !this.refreshLock) { if (date.seconds >= this.website.tokenTime && !this.refreshLock) {
this.refreshLock = true; this.refreshLock = true;
this.$store this.$store
.dispatch("RefeshToken") .dispatch("refreshToken")
.then(() => { .then(() => {
this.refreshLock = false; this.refreshLock = false;
}) })

@ -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 { Message } from 'element-ui'
import { setStore, getStore } from '@/util/store' import { setStore, getStore } from '@/util/store'
import { isURL, validatenull } from '@/util/validate' import { isURL, validatenull } from '@/util/validate'
import { deepClone } from '@/util/util' import { deepClone } from '@/util/util'
import webiste from '@/config/website' 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) { function addPath(ele, first) {
@ -95,10 +95,10 @@ const user = {
}) })
}, },
//刷新token //刷新token
RefeshToken({ state, commit }) { refreshToken({ state, commit }) {
console.log('handle refresh token') console.log('handle refresh token')
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
refeshToken(state.refreshToken).then(res => { refreshToken(state.refreshToken).then(res => {
const data = res.data; const data = res.data;
commit('SET_TOKEN', data.access_token); commit('SET_TOKEN', data.access_token);
commit('SET_REFRESH_TOKEN', data.refresh_token); commit('SET_REFRESH_TOKEN', data.refresh_token);
@ -118,6 +118,7 @@ const user = {
commit('DEL_ALL_TAG'); commit('DEL_ALL_TAG');
commit('CLEAR_LOCK'); commit('CLEAR_LOCK');
removeToken() removeToken()
removeRefreshToken()
resolve() resolve()
}).catch(error => { }).catch(error => {
reject(error) reject(error)
@ -133,6 +134,7 @@ const user = {
commit('DEL_ALL_TAG'); commit('DEL_ALL_TAG');
commit('CLEAR_LOCK'); commit('CLEAR_LOCK');
removeToken() removeToken()
removeRefreshToken()
resolve() resolve()
}) })
}, },

@ -20,3 +20,8 @@ export function setRefreshToken(token) {
export function removeToken() { export function removeToken() {
return Cookies.remove(TokenKey) return Cookies.remove(TokenKey)
} }
export function removeRefreshToken() {
return Cookies.remove(RefreshTokenKey)
}

Loading…
Cancel
Save