From 08ba64c2b7729283034e541a23452faaae0ec32c Mon Sep 17 00:00:00 2001 From: kicer Date: Tue, 8 Sep 2026 09:47:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=97=B6=20/api/me=20=E5=8F=AA=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E4=B8=80=E6=AC=A1=EF=BC=88=E5=90=AF=E5=8A=A8=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E7=BB=93=E6=9E=9C=E5=A4=8D=E7=94=A8=E7=BB=99=E4=BE=A7?= =?UTF-8?q?=E8=BE=B9=E6=A0=8F=E7=94=A8=E6=88=B7=E5=8C=BA=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 启动校验 fetch /api/me 后结果顺带传给 loadDrawerUser 渲染,不再二次自拉; 拉取失败/未启用认证时仍回退到内部 req('/api/me') 兜底,行为不变。 --- app/server/public/index.html | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/app/server/public/index.html b/app/server/public/index.html index b6273fb..fb822d9 100644 --- a/app/server/public/index.html +++ b/app/server/public/index.html @@ -2912,18 +2912,22 @@ for (const ch of String(name || '')) h = (h * 31 + ch.codePointAt(0)) >>> 0; return AVATAR_COLORS[h % AVATAR_COLORS.length]; } - // 侧边栏底部用户区:拉取真实登录用户名,头像样式与设置页 user-card 一致(按用户名取色+首两字) - async function loadDrawerUser() { + // 侧边栏底部用户区:展示真实登录用户名,头像样式与设置页 user-card 一致(按用户名取色+首两字)。 + // 启动校验已经拉到登录用户时直接传入,避免同一次加载重复请求 /api/me;未传入时自拉兜底。 + async function loadDrawerUser(knownUser) { const av = $('drawer-avatar'), un = $('drawer-user-name'); if (!av || !un) return; - try { - const r = await req('GET', '/api/me'); - const name = r && r.user ? String(r.user) : ''; - if (!name) return; // 未登录态(理论上不会出现,401 已自动跳登录页) - av.textContent = userInitials(name); - av.style.background = avatarColor(name); - un.textContent = name; - } catch (_) { /* 未启用认证时无 /api/me,保留默认占位 */ } + let name = knownUser ? String(knownUser) : ''; + if (!name) { + try { + const r = await req('GET', '/api/me'); + name = r && r.user ? String(r.user) : ''; + } catch (_) { return; /* 未启用认证时无 /api/me,保留默认占位 */ } + } + if (!name) return; // 未登录态(理论上不会出现,401 已自动跳登录页) + av.textContent = userInitials(name); + av.style.background = avatarColor(name); + un.textContent = name; } function userCardHtml(me) { return '
' + @@ -3988,6 +3992,7 @@ drawerMQ.addEventListener('change', e => openDrawer(e.matches)); // 页面加载时校验 cookie 身份:防止 localStorage 旧 token 通过 autoRestore 恢复错误用户 (async () => { + let verifiedUser = null; // 校验结果顺带复用给侧边栏,避免同一次加载请求两次 /api/me try { const res = await fetch('/api/me', { credentials: 'include' }); if (res.ok) { @@ -3999,10 +4004,11 @@ location.href = '/logout'; return; } + verifiedUser = String(j.user); } } catch (_) { /* 网络错误放过,让后续请求正常走 */ } loadSessionList(); - loadDrawerUser(); // 侧边栏底部展示真实登录用户(未启用认证时静默回退默认占位) + loadDrawerUser(verifiedUser); // 侧边栏底部展示真实登录用户(未启用认证/拉取失败时静默回退默认占位) })();