From 54e0b9707bb34259dfccbe0c792b50e12b267e13 Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期二, 08 八月 2023 17:23:15 +0800
Subject: [PATCH] Merge branch '滲透' of ssh://dev.pollex.com.tw:29418/pcalife/PAM into 滲透

---
 PAMapp/shared/services/httpClient.ts |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/PAMapp/shared/services/httpClient.ts b/PAMapp/shared/services/httpClient.ts
index 7441584..a015cd1 100644
--- a/PAMapp/shared/services/httpClient.ts
+++ b/PAMapp/shared/services/httpClient.ts
@@ -6,15 +6,18 @@
 
 const notRequireInterceptorErrorUrl = [
   '/otp/verify',
-  '/otp/sendOtp',
+  // '/otp/sendOtp',
   '/eService/authenticate',
   '/login/validate/get_img_code',
   '/login/validate/verify_img_code',
+  '/api/access_analysis/insert'
 ];
 
+const BASE_URL = process.env.BASE_URL;
+
 export const http = axios.create({
-  baseURL: process.env.BASE_URL,
-  withCredentials: true
+  baseURL: BASE_URL,
+  withCredentials: true,
 });
 
 let apiNumber = 0;
@@ -48,7 +51,8 @@
 
 function addHttpHeader(config: AxiosRequestConfig): void {
   config.headers = {
-    Authorization: 'Bearer ' + localStorage.getItem('id_token')
+    Authorization: 'Bearer ' + localStorage.getItem('id_token'),
+    'content-type': 'application/json'
   }
 }
 
@@ -67,7 +71,11 @@
 function showErrorMessageBox(error: any): void {
   setTimeout(() => {
     // NOTE: 甇斤 HOT FIX 憿批��憭望������暹��� dialog [Tomas, 2022/7/20 14:21]
-    if(error.config.url.include('api/eService/authenticate')) return;
+    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