From b2d8e8b8395c2bf2198e99f3423c3391b1bb3725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Wed, 11 Sep 2024 06:08:39 +0800
Subject: [PATCH] =?UTF-8?q?optimize:=20=E9=85=8D=E7=BD=AE=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E4=BC=98=E5=8C=96=EF=BC=8C=E7=94=A8=E6=88=B7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20>=20=E4=B8=AA=E4=BA=BA=E8=BF=9C=E7=A8=8B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20>=20=E5=85=B1=E4=BA=AB=E8=BF=9C=E7=A8=8B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20>=20=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/src/config.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/config.js b/packages/core/src/config.js
index edbde97b..41b105ba 100644
--- a/packages/core/src/config.js
+++ b/packages/core/src/config.js
@@ -245,14 +245,27 @@ const configApi = {
     // 以用户配置作为基准配置，是为了保证用户配置的顺序在前
     const merged = newConfig != null ? lodash.cloneDeep(newConfig) : {}
 
-    mergeApi.doMerge(merged, defConfig) // 合并默认配置
     if (get().app.remoteConfig.enabled === true) {
+      let personalRemoteConfig = null
+      let shareRemoteConfig = null
+
+      if (get().app.remoteConfig.personalUrl) {
+        personalRemoteConfig = configApi.readRemoteConfig('_personal')
+        mergeApi.doMerge(merged, personalRemoteConfig) // 先合并一次个人远程配置，使配置顺序在前
+      }
       if (get().app.remoteConfig.url) {
-        mergeApi.doMerge(merged, configApi.readRemoteConfig()) // 合并共享远程配置
+        shareRemoteConfig = configApi.readRemoteConfig()
+        mergeApi.doMerge(merged, shareRemoteConfig) // 先合并一次共享远程配置，使配置顺序在前
+      }
+      mergeApi.doMerge(merged, defConfig) // 合并默认配置，顺序排在最后
+      if (get().app.remoteConfig.url) {
+        mergeApi.doMerge(merged, shareRemoteConfig) // 再合并一次共享远程配置，使配置生效
       }
       if (get().app.remoteConfig.personalUrl) {
-        mergeApi.doMerge(merged, configApi.readRemoteConfig('_personal')) // 合并个人远程配置
+        mergeApi.doMerge(merged, personalRemoteConfig) // 再合并一次个人远程配置，使配置生效
       }
+    } else {
+      mergeApi.doMerge(merged, defConfig) // 合并默认配置
     }
     if (newConfig != null) {
       mergeApi.doMerge(merged, newConfig) // 再合并一次用户配置，使用户配置重新生效