Commit c671e47e authored by GuanHua's avatar GuanHua

fix: 修改token获取方式

parent 0193fc94
......@@ -47,6 +47,19 @@ export const setLocalAuth = (info: AuthInfo) => {
window.localStorage.setItem(AUTH_KEY, JSON.stringify(info))
}
export const getCookieAuth = (): AuthInfo => {
try {
const cookieAuth: AuthInfo = getCookie(AUTH_KEY) as unknown as AuthInfo
// return (localAuth || {}) as AuthInfo
if (cookieAuth) {
return cookieAuth
}
return null
} catch (error) {
return null as AuthInfo
}
}
export const getAuth = (): AuthInfo => {
try {
const cookieAuth: AuthInfo = getCookie(AUTH_KEY) as unknown as AuthInfo
......
......@@ -3,7 +3,7 @@ import responseCode from '@/constants/responseCode'
import { IRequestError, IRequestSuccess } from '..';
import { history } from 'umi'
import { message } from 'antd'
import { getAuth, removeAuth } from './auth';
import { getCookieAuth, removeAuth } from './auth';
import { GlobalConfig } from '@/global/config';
import qs from 'qs'
......@@ -80,7 +80,7 @@ const cache = {}
// 请求拦截器
baseRequest.interceptors.request.use((url: string, options: RequestOptionsInit): { url: string, options: RequestOptionsInit } => {
// 判断是否有权限
const { userId, memberId, token } = getAuth() || {}
const { userId, memberId, token } = getCookieAuth() || {}
const headers: any = {
...options.headers
}
......@@ -121,8 +121,8 @@ class ApiRequest {
baseRequest<IRequestSuccess<T>>(url, options).then(res => {
// 登录验证
if (res.code === 1101) {
removeAuth()
window.location.replace(`/user/login?redirect=${btoa(encodeURIComponent(String(window.location)))}`)
// removeAuth()
// window.location.replace(`/user/login?redirect=${btoa(encodeURIComponent(String(window.location)))}`)
message.destroy()
message.error(res.message)
reject(res)
......
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