From 951aacd10e070d3c9867dbb19404bc470f2e3aad Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 29 Nov 2023 10:20:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/demo' into demo

---
 src/api/http/request.ts |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/api/http/request.ts b/src/api/http/request.ts
index 2c57cc5..b66b2a9 100644
--- a/src/api/http/request.ts
+++ b/src/api/http/request.ts
@@ -7,6 +7,8 @@
 import { ELocalStorageKey, ERouterName, EUserType } from '/@/types/enums'
 export * from './type'
 
+const { baseUrl: { apiBaseUrl } } = window.globalApiConfig
+
 const REQUEST_ID = 'X-Request-Id'
 function getAuthToken () {
   return localStorage.getItem(ELocalStorageKey.Token)
@@ -16,7 +18,7 @@
   headers: {
     'Content-Type': 'application/json',
   },
-  baseURL: import.meta.env.VITE_BASE_API,
+  baseURL: apiBaseUrl || import.meta.env.VITE_BASE_API,
   // timeout: 12000,
 })
 

--
Gitblit v1.9.3