Showing
2 changed files
with
11 additions
and
6 deletions
| @@ -40,6 +40,9 @@ instance.interceptors.request.use( | @@ -40,6 +40,9 @@ instance.interceptors.request.use( | ||
| 40 | // 公共请求参数 | 40 | // 公共请求参数 |
| 41 | // config.params.key = key | 41 | // config.params.key = key |
| 42 | Logger.debug('HttpRequest', 'request: ' + config.url) | 42 | Logger.debug('HttpRequest', 'request: ' + config.url) |
| 43 | + // TODO 临时打印token,测试token失效。待删除 | ||
| 44 | + Logger.debug('HttpRequest', 'request token: ' + config?.headers?.get('RMRB-X-TOKEN')) | ||
| 45 | + Logger.debug('HttpRequest', 'request cookie: ' + config?.headers?.get('cookie')) | ||
| 43 | return config; | 46 | return config; |
| 44 | }, | 47 | }, |
| 45 | (error: AxiosError) => { | 48 | (error: AxiosError) => { |
| @@ -29,10 +29,11 @@ export class HttpBizUtil { | @@ -29,10 +29,11 @@ export class HttpBizUtil { | ||
| 29 | // 403:临时token;406:强制下线、封禁、清空登录信息还要跳转登录页面 | 29 | // 403:临时token;406:强制下线、封禁、清空登录信息还要跳转登录页面 |
| 30 | if (res.code == 403 || res.code == 406) { | 30 | if (res.code == 403 || res.code == 406) { |
| 31 | HttpBizUtil.refreshToken().then((token: string) => { | 31 | HttpBizUtil.refreshToken().then((token: string) => { |
| 32 | - if (headers) { | ||
| 33 | - headers.replace('RMRB-X-TOKEN', token) | ||
| 34 | - headers.replace('cookie', 'RMRB-X-TOKEN=' + token) | 32 | + if (!headers) { |
| 33 | + headers = new HashMap() | ||
| 35 | } | 34 | } |
| 35 | + headers?.replace('RMRB-X-TOKEN', token) | ||
| 36 | + headers?.replace('cookie', 'RMRB-X-TOKEN=' + token) | ||
| 36 | Logger.debug(TAG, 'get again send: ' + token) | 37 | Logger.debug(TAG, 'get again send: ' + token) |
| 37 | // refreshToken为空场景不处理,直接请求接口。 | 38 | // refreshToken为空场景不处理,直接请求接口。 |
| 38 | WDHttp.get<T>(url, headers).then((againResDTO: T) => { | 39 | WDHttp.get<T>(url, headers).then((againResDTO: T) => { |
| @@ -67,10 +68,11 @@ export class HttpBizUtil { | @@ -67,10 +68,11 @@ export class HttpBizUtil { | ||
| 67 | Logger.debug(TAG, 'post catch error: ' + JSON.stringify(res)) | 68 | Logger.debug(TAG, 'post catch error: ' + JSON.stringify(res)) |
| 68 | if (res.code == 403 || res.code == 406) { | 69 | if (res.code == 403 || res.code == 406) { |
| 69 | HttpBizUtil.refreshToken().then((token: string) => { | 70 | HttpBizUtil.refreshToken().then((token: string) => { |
| 70 | - if (headers) { | ||
| 71 | - headers.replace('RMRB-X-TOKEN', token) | ||
| 72 | - headers.replace('cookie', 'RMRB-X-TOKEN=' + token) | 71 | + if (!headers) { |
| 72 | + headers = new HashMap() | ||
| 73 | } | 73 | } |
| 74 | + headers?.replace('RMRB-X-TOKEN', token) | ||
| 75 | + headers?.replace('cookie', 'RMRB-X-TOKEN=' + token) | ||
| 74 | Logger.debug(TAG, 'post again send: ' + token) | 76 | Logger.debug(TAG, 'post again send: ' + token) |
| 75 | // refreshToken为空场景不处理,直接请求接口。 | 77 | // refreshToken为空场景不处理,直接请求接口。 |
| 76 | WDHttp.post<T>(url, data, headers).then((againResDTO: T) => { | 78 | WDHttp.post<T>(url, data, headers).then((againResDTO: T) => { |
-
Please register or login to post a comment