Commit 7e2db21b authored by 智勇's avatar 智勇

删除前端token

parent 499dffb7
...@@ -3,43 +3,37 @@ import store from './store' ...@@ -3,43 +3,37 @@ import store from './store'
import NProgress from 'nprogress' // progress bar import NProgress from 'nprogress' // progress bar
import 'nprogress/nprogress.css' // progress bar style import 'nprogress/nprogress.css' // progress bar style
import { Message } from 'element-ui' import { Message } from 'element-ui'
import { getToken } from '@/utils/auth' // getToken from cookie
NProgress.configure({ showSpinner: false })// NProgress configuration NProgress.configure({ showSpinner: false })// NProgress configuration
const whiteList = ['/login'] // 不重定向白名单 const whiteList = ['/login'] // 不重定向白名单
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
NProgress.start() NProgress.start()
if (whiteList.indexOf(to.path) !== -1) {
if (getToken()) { next()
if (to.path === '/login') { } else {
next({ path: '/' }) if (sessionStorage.getItem('qahome_env')) {
NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
} else {
if (store.getters.roles.length === 0) { if (store.getters.roles.length === 0) {
store.dispatch('GetInfo').then(res => { // 拉取用户信息 store.dispatch('GetInfo').then(res => {
next() next()
}).catch(() => { }).catch((err) => {
store.dispatch('FedLogOut').then(() => { store.dispatch('FedLogOut').then(() => {
// Message.error(err || 'Verification failed, please login again') Message.warning(err || '请登录...')
next({ path: '/' }) next(`/login?redirect=${to.path}`)
NProgress.done()
}) })
}) })
} else { } else {
next() next()
} }
}
} else {
if (whiteList.indexOf(to.path) !== -1) {
next()
} else { } else {
Message.warning('请登录...') next(`/login?redirect=${to.path}`)
next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
NProgress.done() NProgress.done()
} }
} }
}) })
router.afterEach(() => { router.afterEach(() => {
NProgress.done() // 结束Progress NProgress.done()
}) })
import { login, logout, getInfo } from '@/api/login' import { login, logout, getInfo } from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth'
const user = { const user = {
state: { state: {
token: getToken(),
name: '', name: '',
avatar: '', avatar: '',
roles: [] roles: []
...@@ -26,10 +24,7 @@ const user = { ...@@ -26,10 +24,7 @@ const user = {
Login({ commit }, userInfo) { Login({ commit }, userInfo) {
const username = userInfo.username.trim() const username = userInfo.username.trim()
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
login(username, userInfo.password).then(response => { login(username, userInfo.password).then(() => {
const data = response.data
setToken(data)
commit('SET_TOKEN', data)
resolve() resolve()
}).catch(error => { }).catch(error => {
reject(error) reject(error)
...@@ -43,7 +38,7 @@ const user = { ...@@ -43,7 +38,7 @@ const user = {
getInfo().then(response => { getInfo().then(response => {
const data = response.data const data = response.data
data.roles = data.rank.indexOf('CHANNEL') !== -1 ? ['channel'] : ['admin'] data.roles = data.rank.indexOf('CHANNEL') !== -1 ? ['channel'] : ['admin']
if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组 if (data.roles && data.roles.length > 0) {
commit('SET_ROLES', data.roles) commit('SET_ROLES', data.roles)
} else { } else {
reject('getInfo: roles must be a non-null array !') reject('getInfo: roles must be a non-null array !')
...@@ -62,7 +57,6 @@ const user = { ...@@ -62,7 +57,6 @@ const user = {
logout(state.token).then(() => { logout(state.token).then(() => {
commit('SET_TOKEN', '') commit('SET_TOKEN', '')
commit('SET_ROLES', []) commit('SET_ROLES', [])
removeToken()
resolve() resolve()
}).catch(error => { }).catch(error => {
reject(error) reject(error)
...@@ -74,7 +68,6 @@ const user = { ...@@ -74,7 +68,6 @@ const user = {
FedLogOut({ commit }) { FedLogOut({ commit }) {
return new Promise(resolve => { return new Promise(resolve => {
commit('SET_TOKEN', '') commit('SET_TOKEN', '')
removeToken()
resolve() resolve()
}) })
} }
......
...@@ -7,7 +7,7 @@ export function getToken() { ...@@ -7,7 +7,7 @@ export function getToken() {
} }
export function setToken(token) { export function setToken(token) {
return Cookies.set(TokenKey, token) return Cookies.set(TokenKey, token, { expires: 7, path: '' })
} }
export function removeToken() { export function removeToken() {
......
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 { getToken } from '@/utils/auth'
import { MessageBox } from 'element-ui' import { MessageBox } from 'element-ui'
// 创建axios实例 // 创建axios实例
...@@ -13,12 +12,7 @@ const service = axios.create({ ...@@ -13,12 +12,7 @@ const service = axios.create({
// request拦截器 // request拦截器
service.interceptors.request.use( service.interceptors.request.use(
config => { config => {
if (store.getters.token) {
config.headers['SESSION'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
}
const url = store.getters.env === 'qaapi' ? process.env.qaapi : process.env.BASE_API.replace('namespace', store.getters.env) const url = store.getters.env === 'qaapi' ? process.env.qaapi : process.env.BASE_API.replace('namespace', store.getters.env)
// if (config.url.indexOf('yapi') === -1) {
// }
config.url = url + config.url config.url = url + config.url
config.headers['cluster'] = 'qa' config.headers['cluster'] = 'qa'
return config return config
...@@ -41,7 +35,7 @@ service.interceptors.response.use( ...@@ -41,7 +35,7 @@ service.interceptors.response.use(
if ((typeof res.code === 'number' && res.code !== 200000) || (typeof res.code === 'string' && res.code !== '0000')) { if ((typeof res.code === 'number' && res.code !== 200000) || (typeof res.code === 'string' && res.code !== '0000')) {
// 500003:Token 过期了; // 500003:Token 过期了;
if (res.code === 500003 || res.code === 500006) { if (res.code === 500003 || res.code === 500007) {
MessageBox.confirm('你已被登出,可以取消继续留在该页面,或者重新登录', '确定登出', { MessageBox.confirm('你已被登出,可以取消继续留在该页面,或者重新登录', '确定登出', {
confirmButtonText: '重新登录', confirmButtonText: '重新登录',
cancelButtonText: '取消', cancelButtonText: '取消',
...@@ -56,7 +50,7 @@ service.interceptors.response.use( ...@@ -56,7 +50,7 @@ service.interceptors.response.use(
Message({ Message({
message: res.message, message: res.message,
type: 'error', type: 'error',
duration: 5 * 1000 duration: 3 * 1000
}) })
} }
return Promise.reject(res.message || 'responseInterceptorsError') return Promise.reject(res.message || 'responseInterceptorsError')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment