From 4efb98f2b554b76270b12837db7a7f724e2ede89 Mon Sep 17 00:00:00 2001
From: tomasysh <tomasysh@gmail.com>
Date: 星期四, 02 一月 2025 19:24:41 +0800
Subject: [PATCH] Merge branch 'element-ui-hack' into 202412_CR
---
PAMapp/shared/services/httpClient.ts | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/PAMapp/shared/services/httpClient.ts b/PAMapp/shared/services/httpClient.ts
index c0b08f2..8fe7bad 100644
--- a/PAMapp/shared/services/httpClient.ts
+++ b/PAMapp/shared/services/httpClient.ts
@@ -1,6 +1,4 @@
-import { AxiosRequestConfig, AxiosError, AxiosResponse} from 'axios';
-import axios from 'axios';
-import _ from 'lodash';
+import axios, { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
import messageBoxService from './message-box.service';
@@ -10,10 +8,23 @@
'/eService/authenticate',
'/login/validate/get_img_code',
'/login/validate/verify_img_code',
+ '/api/access_analysis/insert'
];
+function getBaseUrl(): string {
+ const baseUrl = process.env.BASE_URL;
+ if (!baseUrl) {
+ throw new Error('BASE_URL is not defined in process.env');
+ }
+ // const pattern = /^(https?:\/\/)[\w.-]+(:\d+)?/i; // �����RL撽��
+ // if (!pattern.test(baseUrl)) {
+ // throw new Error('Invalid BASE_URL');
+ // }
+ // 銝�閬���RL嚗�摰歇蝬蝯�RL
+ return baseUrl;
+}
export const http = axios.create({
- baseURL: process.env.BASE_URL,
+ baseURL: getBaseUrl(), // 雿輻�������aseURL
withCredentials: true
});
@@ -48,7 +59,8 @@
function addHttpHeader(config: AxiosRequestConfig): void {
config.headers = {
- Authorization: 'Bearer ' + localStorage.getItem('id_token')
+ Authorization: 'Bearer ' + localStorage.getItem('id_token'),
+ 'content-type': 'application/json'
}
}
@@ -72,11 +84,15 @@
messageBoxService.showErrorMessage('', error);
return
}
- if (!_.includes(notRequireInterceptorErrorUrl, error.config.url)) {
+ if (!notRequireInterceptorErrorUrl.includes(error.config.url)) {
switch (error.response.status) {
case 401:
Promise.all([messageBoxService.showErrorMessage('���暹��'), window.$nuxt.$store.dispatch('localStorage/actionStorageClear')]).then(() => {
- _.isEqual(window.$nuxt.$route.name, 'index') ? location.reload() : window.$nuxt.$router.push('/');
+ if (window.$nuxt.$route.name === 'index') {
+ location.reload();
+ } else {
+ window.$nuxt.$router.push('/');
+ }
});
break;
--
Gitblit v1.8.0