From f8b69df9555005dd035529d95fb1673427852ca4 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 12 Feb 2025 21:09:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=81=B6=E7=8E=B0?=
 =?UTF-8?q?=E7=9A=84=E6=98=AF=E5=AD=90=E7=AA=97=E5=8F=A3=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E4=B8=A2=E5=A4=B1=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/store/actions.js | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 39d983b3b..2cae109a6 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -75,14 +75,28 @@ export default {
                 userid: '__system:userId__',
                 token: '__system:userToken__'
             };
+            const paramUser = {
+                userid: 0,
+                token: null
+            }
             Object.entries(paramMap).forEach(([param, key]) => {
-                urlParams[param] && window.localStorage.setItem(key, urlParams[param]);
+                if (urlParams[param]) {
+                    window.localStorage.setItem(key, urlParams[param]);
+                    param === 'userid' && (paramUser.userid = $A.runNum(urlParams[param]))
+                    param === 'token' && (paramUser.token = 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);
             }
 
+            // 处理用户身份信息
+            if (paramUser.userid > 0 && paramUser.token) {
+                const userInfo = await $A.IDBJson('userInfo')
+                await $A.IDBSet("userInfo", Object.assign(userInfo, paramUser));
+            }
+
             // 清理缓存、读取缓存
             let action = null
             const clearCache = await $A.IDBString("clearCache")
@@ -995,14 +1009,6 @@ export default {
                 state.userIsAdmin = $A.inArray("admin", state.userInfo.identity);
             }
 
-            // 处理本地存储的用户信息
-            const localId = $A.runNum(window.localStorage.getItem("__system:userId__"));
-            const localToken = window.localStorage.getItem("__system:userToken__") || "";
-            if (state.userId === 0 && localId && localToken) {
-                state.userId = localId;
-                state.userToken = localToken;
-            }
-
             // 处理ServerUrl
             if (state.cacheServerUrl) {
                 window.systemInfo.apiUrl = state.cacheServerUrl