修改token保存方式

This commit is contained in:
2021-10-06 13:11:11 +08:00
parent d21f63d8f3
commit 28110bd884
5 changed files with 12 additions and 12 deletions
+2 -2
View File
@@ -15,7 +15,7 @@ import { ElMessage, ElLoading } from 'element-plus'
// 添加请求拦截器
service.interceptors.request.use(config => {
// 在发送请求之前添加token到请求头
const token = localStorage.getItem('login_token')
const token = app.$store.state.loginInfo.token
if (token !== null && config.headers) {
config.headers.token = token
}
@@ -48,7 +48,7 @@ service.interceptors.response.use(res=> {
// 全局路由导航前置守卫
router.beforeEach(function (to, from, next) {
app.$store.commit('setBreadcrumb', routePathes[to.path] || [])
if(filterExclude.indexOf(to.path) !== -1 || localStorage.getItem('login_token')) {
if(filterExclude.indexOf(to.path) !== -1 || app.$store.state.loginInfo.token) {
next()
} else {
next('/login')
+5 -5
View File
@@ -33,7 +33,7 @@ export default abstract class BaseList<T extends Page> extends Vue {
/**
* 重置搜索项
*/
reset() {
reset(): void {
this.search.reset()
this.loadData()
}
@@ -41,7 +41,7 @@ export default abstract class BaseList<T extends Page> extends Vue {
* 页码变更
* @param pageNum 页码
*/
pageChange(pageNum: number) {
pageChange(pageNum: number): void {
this.search.pageNum = pageNum
this.loadData()
}
@@ -50,7 +50,7 @@ export default abstract class BaseList<T extends Page> extends Vue {
* 每页数据条数变更
* @param pageSize 每页数据条数
*/
pageSizeChange(pageSize: number) {
pageSizeChange(pageSize: number): void {
this.search.limit = pageSize
this.loadData()
}
@@ -59,7 +59,7 @@ export default abstract class BaseList<T extends Page> extends Vue {
* 日期时间格式化
* @param dateStr 日期时间
*/
datetimeFormat(dateStr: string) {
return moment(dateStr).format('YYYY-MM-DD HH:mm:ss')
datetimeFormat(dateStr: string): string | null {
return dateStr ? moment(dateStr).format('YYYY-MM-DD HH:mm:ss') : null
}
}
+1 -1
View File
@@ -8,7 +8,7 @@ class Store {
state: StateType = {
loginInfo: {
userInfo: null,
token: null
token: localStorage.getItem('login_token')
},
breadcrumb: [],
pageSizeOpts: [10, 20, 50, 100],
+3 -3
View File
@@ -75,14 +75,14 @@ export default class Home extends Vue{
this.openMenuNames.push(result[1])
}
}
if(!localStorage.getItem('login_token')) {
if(!this.$store.state.loginInfo.token) {
this.$router.push('/login')
return
}
const data = await this.$http.post<{token: null | string}, any>('/api/common/verifyToken', {token: localStorage.getItem('login_token')})
const data = await this.$http.post<{token: string}, any>('/api/common/verifyToken', {token: this.$store.state.loginInfo.token})
if(data.status) {
// 如果是已过期的token 服务端会签发新的token
this.$store.commit('login', {token: data.newToken || localStorage.getItem('login_token'), userInfo: data.userInfo})
this.$store.commit('login', {token: data.newToken || this.$store.state.loginInfo.token, userInfo: data.userInfo})
} else {
this.$router.push('/login')
}
+1 -1
View File
@@ -143,7 +143,7 @@ export default class SystemConfig extends Vue {
* @param dateStr 日期时间
*/
datetimeFormat(dateStr: string) {
return moment(dateStr).format('YYYY-MM-DD HH:mm:ss')
return dateStr ? moment(dateStr).format('YYYY-MM-DD HH:mm:ss') : null
}
}
</script>