From 1acfd7ee34529f8e388311828fa262a677a085dd Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 20 Dec 2024 09:22:14 +0800
Subject: [PATCH] no message

---
 resources/assets/js/app.js           | 21 ---------------------
 resources/assets/js/store/actions.js | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index 1629769b8..04a16beae 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -2,27 +2,6 @@ const isElectron = !!(window && window.process && window.process.type);
 const isEEUiApp = window && window.navigator && /eeui/i.test(window.navigator.userAgent);
 const isSoftware = isElectron || isEEUiApp;
 
-const urlParams = $A.urlParameterAll()
-if (urlParams.language
-    || urlParams.theme
-    || urlParams.userid
-    || urlParams.token) {
-    if (urlParams.language) {
-        window.localStorage.setItem("__system:languageName__", urlParams.language)
-    }
-    if (urlParams.theme) {
-        window.localStorage.setItem("__system:themeConf__", urlParams.language)
-    }
-    if (urlParams.userid) {
-        window.localStorage.setItem("__system:userId__", urlParams.userid)
-    }
-    if (urlParams.token) {
-        window.localStorage.setItem("__system:userToken__", urlParams.token)
-    }
-    const newUrl = $A.removeURLParameter(window.location.href, ['theme', 'language', 'userid', 'token'])
-    window.history.replaceState(null, '', newUrl)
-}
-
 import microappInit from "./microapp"
 import {languageName, switchLanguage as $L} from "./language";
 
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 99176571c..2996d2d81 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -67,9 +67,24 @@ export default {
      */
     init({state, dispatch}) {
         return new Promise(async resolve => {
-            let action = null
+            // 语言、主题、用户信息
+            const urlParams = $A.urlParameterAll()
+            const paramMap = {
+                language: '__system:languageName__',
+                theme: '__system:themeConf__',
+                userid: '__system:userId__',
+                token: '__system:userToken__'
+            };
+            Object.entries(paramMap).forEach(([param, key]) => {
+                urlParams[param] && window.localStorage.setItem(key, urlParams[param]);
+            });
+            if (Object.keys(paramMap).some(param => urlParams[param])) {
+                const newUrl = $A.removeURLParameter(window.location.href, Object.keys(paramMap));
+                window.history.replaceState(null, '', newUrl);
+            }
 
             // 清理缓存、读取缓存
+            let action = null
             const clearCache = await $A.IDBString("clearCache")
             if (clearCache) {
                 if (clearCache === "handle") {