|
@@ -3,8 +3,8 @@ import Snackbar from '@/plugins/snackbar'
|
|
|
import Confirm from '@/plugins/confirm'
|
|
|
import qs from 'qs'
|
|
|
import { config } from '@/config/axios/config'
|
|
|
-import { getAccessToken, getRefreshToken, getTenantId, setToken } from '@/utils/auth'
|
|
|
-// import { getAccessToken, getRefreshToken, getTenantId, removeToken, setToken } from '@/utils/auth'
|
|
|
+import { getToken, getRefreshToken, getTenantId, setToken } from '@/utils/auth'
|
|
|
+// import { getToken, getRefreshToken, getTenantId, removeToken, setToken } from '@/utils/auth'
|
|
|
import errorCode from './errorCode'
|
|
|
|
|
|
// import { resetRouter } from '@/router'
|
|
@@ -51,8 +51,8 @@ service.interceptors.request.use(
|
|
|
return (isToken = false)
|
|
|
}
|
|
|
})
|
|
|
- if (getAccessToken() && !isToken) {
|
|
|
- ;(config).headers.Authorization = 'Bearer ' + getAccessToken() // 让每个请求携带自定义token
|
|
|
+ if (getToken() && !isToken) {
|
|
|
+ ;(config).headers.Authorization = 'Bearer ' + getToken() // 让每个请求携带自定义token
|
|
|
}
|
|
|
// 设置租户
|
|
|
if (tenantEnable && tenantEnable === 'true') {
|
|
@@ -125,7 +125,7 @@ service.interceptors.response.use(
|
|
|
const refreshTokenRes = await refreshToken()
|
|
|
// 2.1 刷新成功,则回放队列的请求 + 当前请求
|
|
|
setToken((await refreshTokenRes).data.data)
|
|
|
- config.headers.Authorization = 'Bearer ' + getAccessToken()
|
|
|
+ config.headers.Authorization = 'Bearer ' + getToken()
|
|
|
requestList.forEach((cb) => {
|
|
|
cb()
|
|
|
})
|
|
@@ -147,7 +147,7 @@ service.interceptors.response.use(
|
|
|
// 添加到队列,等待刷新获取到新的令牌
|
|
|
return new Promise((resolve) => {
|
|
|
requestList.push(() => {
|
|
|
- config.headers.Authorization = 'Bearer ' + getAccessToken() // 让每个请求携带自定义token 请根据实际情况自行修改
|
|
|
+ config.headers.Authorization = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
|
|
|
resolve(service(config))
|
|
|
})
|
|
|
})
|