From 785a57e89f99ec350f029f9a85a450839324babf Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期五, 21 七月 2023 09:38:42 +0800
Subject: [PATCH] Merge branch '2023_CR' into 2023_CR2
---
PAMapp/shared/services/httpClient.ts | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/PAMapp/shared/services/httpClient.ts b/PAMapp/shared/services/httpClient.ts
index e524ddf..001821f 100644
--- a/PAMapp/shared/services/httpClient.ts
+++ b/PAMapp/shared/services/httpClient.ts
@@ -6,18 +6,23 @@
const notRequireInterceptorErrorUrl = [
'/otp/verify',
+ // '/otp/sendOtp',
'/eService/authenticate',
'/login/validate/get_img_code',
'/login/validate/verify_img_code',
+ '/api/access_analysis/insert'
];
export const http = axios.create({
baseURL: process.env.BASE_URL,
- withCredentials: true
+ withCredentials: true,
});
+
+let apiNumber = 0;
http.interceptors.request.use(
(config: AxiosRequestConfig) => {
+ apiNumber += 1;
loadingStart();
addHttpHeader(config);
return config;
@@ -26,11 +31,17 @@
http.interceptors.response.use(
(response: AxiosResponse) => {
- loadingFinish();
+ apiNumber -= 1;
+ if (apiNumber === 0) {
+ loadingFinish();
+ }
return response;
},
(error: AxiosError) => {
- loadingFinish();
+ apiNumber -= 1;
+ if (apiNumber === 0) {
+ loadingFinish();
+ }
showErrorMessageBox(error)
return Promise.reject(error);
}
@@ -38,7 +49,8 @@
function addHttpHeader(config: AxiosRequestConfig): void {
config.headers = {
- Authorization: 'Bearer ' + localStorage.getItem('id_token')
+ Authorization: 'Bearer ' + localStorage.getItem('id_token'),
+ 'content-type': 'application/json'
}
}
@@ -55,8 +67,13 @@
};
function showErrorMessageBox(error: any): void {
- // console.log('error', error, error.response);
setTimeout(() => {
+ // NOTE: 甇斤 HOT FIX 憿批��憭望������暹��� dialog [Tomas, 2022/7/20 14:21]
+ if(error.config.url.includes('/eService/authenticate')) return;
+ if (error.config.url.includes('/otp/sendOtp')) {
+ messageBoxService.showErrorMessage('', error);
+ return
+ }
if (!_.includes(notRequireInterceptorErrorUrl, error.config.url)) {
switch (error.response.status) {
case 401:
--
Gitblit v1.8.0