Commit e05c7098 authored by 刘帅阳's avatar 刘帅阳

token问题

parent 6cd3e77d
...@@ -36,7 +36,12 @@ export function getInfo() { ...@@ -36,7 +36,12 @@ export function getInfo() {
method: 'get' method: 'get'
}) })
} }
export function handleLogout() {
return request({
url: '/auth/logout',
method: 'get'
})
}
// 退出方法 // 退出方法
export function logout() { export function logout() {
return request({ return request({
......
...@@ -51,9 +51,9 @@ ...@@ -51,9 +51,9 @@
修改密码 修改密码
</router-link> </router-link>
</el-dropdown-item> </el-dropdown-item>
<!-- <el-dropdown-item @click.native="setting = true">--> <!-- <el-dropdown-item @click.native="setting = true">-->
<!-- <span>布局设置</span>--> <!-- <span>布局设置</span>-->
<!-- </el-dropdown-item>--> <!-- </el-dropdown-item>-->
<el-dropdown-item divided @click.native="logout"> <el-dropdown-item divided @click.native="logout">
<span style="display:block;">退出</span> <span style="display:block;">退出</span>
</el-dropdown-item> </el-dropdown-item>
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import Hamburger from '@/components/Hamburger' import Hamburger from '@/components/Hamburger'
import { handleLogout } from '@/api/login'
export default { export default {
components: { components: {
Hamburger Hamburger
...@@ -117,8 +118,14 @@ export default { ...@@ -117,8 +118,14 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$store.dispatch('FedLogOut').then(() => { console.log('handleLogouthandleLogouthandleLogouthandleLogouthandleLogouthandleLogout')
location.reload() handleLogout().then(res => {
if (res.code === 200) {
this.$message.success('退出成功!')
this.$store.dispatch('FedLogOut').then(() => {
location.reload()
})
}
}) })
}) })
// await this.$store.dispatch('user/logout') // await this.$store.dispatch('user/logout')
......
...@@ -2,7 +2,7 @@ import axios from 'axios' ...@@ -2,7 +2,7 @@ import axios from 'axios'
import { Notification, MessageBox, Message, Loading } from 'element-ui' import { Notification, MessageBox, Message, Loading } from 'element-ui'
import store from '@/store' import store from '@/store'
import Qs from 'qs' import Qs from 'qs'
import { getToken, setToken } from '@/utils/auth' import { getToken, setToken,removeToken } from '@/utils/auth'
import SM4 from './gmUtil' import SM4 from './gmUtil'
import errorCode from '@/utils/errorCode' import errorCode from '@/utils/errorCode'
import { refreshToken } from '@/api/login.js' import { refreshToken } from '@/api/login.js'
...@@ -85,9 +85,12 @@ service.interceptors.response.use(res => { ...@@ -85,9 +85,12 @@ service.interceptors.response.use(res => {
} }
if (code === 401) { if (code === 401) {
Message({ Message({
message: '用户不存在或密码错误', message: '当前登录无权限,请重新登录',
type: 'error' type: 'error'
}) })
store.dispatch('FedLogOut').then(() => {
location.reload()
})
// MessageBox.confirm( // MessageBox.confirm(
// '登录状态已过期,您可以继续留在该页面,或者重新登录', // '登录状态已过期,您可以继续留在该页面,或者重新登录',
// '系统提示', // '系统提示',
...@@ -109,6 +112,7 @@ service.interceptors.response.use(res => { ...@@ -109,6 +112,7 @@ service.interceptors.response.use(res => {
}) })
return Promise.reject(new Error(message)) return Promise.reject(new Error(message))
} else if (code !== 200 && code !== 'E004') { } else if (code !== 200 && code !== 'E004') {
console.log('!!!!!!!!!!!!!!!!!!!!!')
Message({ Message({
message: message, message: message,
type: 'error', type: 'error',
......
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