File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ let requestList: any[] = []
31
31
// 是否正在刷新中
32
32
let isRefreshToken = false
33
33
// 请求白名单,无须token的接口
34
- const whiteList : string [ ] = [ '/login' , '/refresh-token' ]
34
+ const whiteList : string [ ] = [ '/login' , '/refresh-token' , '/system/tenant/get-id-by-name' ]
35
35
36
36
// 创建axios实例
37
37
const service : AxiosInstance = axios . create ( {
@@ -47,8 +47,7 @@ service.interceptors.request.use(
47
47
let isToken = ( config ! . headers || { } ) . isToken === false
48
48
whiteList . some ( ( v ) => {
49
49
if ( config . url ) {
50
- config . url . indexOf ( v ) > - 1
51
- return ( isToken = false )
50
+ return ( isToken = config . url . indexOf ( v ) > - 1 )
52
51
}
53
52
} )
54
53
if ( getAccessToken ( ) && ! isToken ) {
Original file line number Diff line number Diff line change @@ -148,6 +148,8 @@ import { ElLoading } from 'element-plus'
148
148
import LoginFormTitle from ' ./LoginFormTitle.vue'
149
149
import type { RouteLocationNormalizedLoaded } from ' vue-router'
150
150
151
+ import { CACHE_KEY , useCache } from ' @/hooks/web/useCache'
152
+ const { wsCache } = useCache ()
151
153
import { useIcon } from ' @/hooks/web/useIcon'
152
154
153
155
import * as authUtil from ' @/utils/auth'
@@ -244,6 +246,7 @@ const handleLogin = async (params) => {
244
246
if (! res ) {
245
247
return
246
248
}
249
+ wsCache .delete (CACHE_KEY .USER ) // 清除上次登录用户信息
247
250
ElLoading .service ({
248
251
lock: true ,
249
252
text: ' 正在加载系统中...' ,
You can’t perform that action at this time.
0 commit comments