From 7d90a1160e6e7c48d971d3a617beb0544efafdb0 Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Sun, 19 Jun 2022 14:31:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E6=97=B6=E5=BA=8F=E6=80=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

确保在请求前端配置之后(即尝试通过配置文件修改地址之后)再发起请求
---
 web/src/init.tsx | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/web/src/init.tsx b/web/src/init.tsx
index 33b6bd99..415089cc 100644
--- a/web/src/init.tsx
+++ b/web/src/init.tsx
@@ -104,12 +104,14 @@ request
       setServiceUrl(() => _get(config, 'serviceUrl'));
     }
   })
-  .catch(() => {});
-
-/**
- * 初始化时加载全局配置
- */
-fetchGlobalConfig().catch((e) => {
-  showErrorToasts(t('全局配置加载失败'));
-  console.error('全局配置加载失败', e);
-});
+  .catch(() => {})
+  .finally(() => {
+    /**
+     * 初始化时加载全局配置
+     * 确保在请求前端配置之后(即尝试通过配置文件修改地址之后)再发起请求
+     */
+    fetchGlobalConfig().catch((e) => {
+      showErrorToasts(t('全局配置加载失败'));
+      console.error('全局配置加载失败', e);
+    });
+  });