From f151cc66f9683af576296e37126f914014be79fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=86=9B?= <510423039@qq.com> Date: Mon, 14 Nov 2022 15:49:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9eslint=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vben28/.eslintignore | 1 + vben28/src/services/ServiceProxyBase.ts | 18 +++++++++--------- vben28/tsconfig.json | 8 +++++++- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/vben28/.eslintignore b/vben28/.eslintignore index 348631b2..70e7235e 100644 --- a/vben28/.eslintignore +++ b/vben28/.eslintignore @@ -13,3 +13,4 @@ dist .local /bin Dockerfile +/src/services/ServiceProxies.ts diff --git a/vben28/src/services/ServiceProxyBase.ts b/vben28/src/services/ServiceProxyBase.ts index 527997e8..1a763f69 100644 --- a/vben28/src/services/ServiceProxyBase.ts +++ b/vben28/src/services/ServiceProxyBase.ts @@ -15,15 +15,15 @@ export class ServiceProxyBase { if (!guard) { if (userStore.checkUserLoginExpire) { router.replace(PageEnum.BASE_LOGIN); - return; + } else { + // 添加header + options.headers = { + 'accept-language': language, + 'Content-Type': 'application/json', + Authorization: 'Bearer ' + token, + __tenant: userStore.tenantId, + }; } - // 添加header - options.headers = { - 'accept-language': language, - 'Content-Type': 'application/json', - Authorization: 'Bearer ' + token, - __tenant: userStore.tenantId, - }; } else { options.headers = { 'Content-Type': 'application/json', @@ -37,7 +37,7 @@ export class ServiceProxyBase { protected transformResult( _url: string, response: AxiosResponse, - processor: (response: AxiosResponse) => Promise + processor: (response: AxiosResponse) => Promise, ): Promise { const { t } = useI18n(); diff --git a/vben28/tsconfig.json b/vben28/tsconfig.json index 76e91f26..ac067bb5 100644 --- a/vben28/tsconfig.json +++ b/vben28/tsconfig.json @@ -40,5 +40,11 @@ "mock/**/*.ts", "vite.config.ts" ], - "exclude": ["node_modules", "tests/server/**/*.ts", "dist", "**/*.js"] + "exclude": [ + "node_modules", + "tests/server/**/*.ts", + "dist", + "**/*.js", + "src/services/ServiceProxies.ts" + ] }