Support selecting account for join key

MliKiowa · MliKiowa · commit 938074c65475 · 2026-03-04T21:28:38.000+08:00
Add account selection to About page so users can generate the group-join password for different QQ accounts. about.tsx: fetch quick-login list (QQManager.getQQQuickLoginListNew), track selectedUin with useState/useEffect, build account list (including current login as fallback), compute password per selected account (SHA512(hash + uin).substring(0,7)), and render a Select control and updated Snippet/Tooltip UI; also add a binding notice. README and translated docs: add note that the join key is only valid for the latest 100 versions and prompt users to update if it fails.
diff --git a/README.md b/README.md
@@ -20,10 +20,12 @@ NapCat is currently looking for a new primary maintainer. Please email nanaeonn@
 
 You can get the join password directly from the **About** page of the WebUI.
 
-- [[NapCat Family] Happy Family] 1090875633: https://qm.qq.com/q/VwpnklcXqo
-- [[NapCat Family] Royal Relatives] 1059714215: https://qm.qq.com/q/gq18RH7o7S
-- [[NapCat Family] Loving Family] 1085662710: https://qm.qq.com/q/XyiyGPqa42
-- [[NapCat Family] Joyful Family] 1085359803: https://qm.qq.com/q/E4nfkGD6oK
+- [NapCat Family Group 1](https://qm.qq.com/q/VwpnklcXqo) Group ID(1090875633)
+- [NapCat Family Group 2](https://qm.qq.com/q/gq18RH7o7S) Group ID(1059714215)
+- [NapCat Family Group 3](https://qm.qq.com/q/XyiyGPqa42) Group ID(1085662710)
+- [NapCat Family Group 4](https://qm.qq.com/q/E4nfkGD6oK) Group ID(1085359803)
+
+> Note: The join key is only valid for the latest 100 versions, and requires NapCat version >= 4.17.31. If it fails, please update.
 
 ## Welcome
 
diff --git a/docs/README_ja.md b/docs/README_ja.md
@@ -20,10 +20,12 @@ NapCat は現在、新しいメインメンテナーを募集しています。n
 
 **WebUI の「について」ページ** から参加パスワードを直接取得できます：
 
-- [NapCat Family] Happy Family 1090875633：https://qm.qq.com/q/VwpnklcXqo
-- [NapCat Family] Royal Relatives 1059714215：https://qm.qq.com/q/gq18RH7o7S
-- [NapCat Family] Loving Family 1085662710：https://qm.qq.com/q/XyiyGPqa42
-- [NapCat Family] Joyful Family 1085359803：https://qm.qq.com/q/E4nfkGD6oK
+- [NapCat Family Group 1](https://qm.qq.com/q/VwpnklcXqo) Group ID(1090875633)
+- [NapCat Family Group 2](https://qm.qq.com/q/gq18RH7o7S) Group ID(1059714215)
+- [NapCat Family Group 3](https://qm.qq.com/q/XyiyGPqa42) Group ID(1085662710)
+- [NapCat Family Group 4](https://qm.qq.com/q/E4nfkGD6oK) Group ID(1085359803)
+
+> 注意：入会キーは最新の100バージョンにのみ有効で、NapCatバージョン >= 4.17.31 が必要です。エラーが発生した場合は更新してください。
 
 ## ようこそ
 
diff --git a/docs/README_ko.md b/docs/README_ko.md
@@ -19,10 +19,12 @@ NapCat은 현재 새로운 주요 메인테이너를 찾고 있습니다. nanaeo
 
 **WebUI 의 「정보」페이지** 에서 입장 비밀번호를 바로 확인할 수 있습니다：
 
-- [NapCat Family] Happy Family 1090875633：https://qm.qq.com/q/VwpnklcXqo
-- [NapCat Family] Royal Relatives 1059714215：https://qm.qq.com/q/gq18RH7o7S
-- [NapCat Family] Loving Family 1085662710：https://qm.qq.com/q/XyiyGPqa42
-- [NapCat Family] Joyful Family 1085359803：https://qm.qq.com/q/E4nfkGD6oK
+- [NapCat Family Group 1](https://qm.qq.com/q/VwpnklcXqo) Group ID(1090875633)
+- [NapCat Family Group 2](https://qm.qq.com/q/gq18RH7o7S) Group ID(1059714215)
+- [NapCat Family Group 3](https://qm.qq.com/q/XyiyGPqa42) Group ID(1085662710)
+- [NapCat Family Group 4](https://qm.qq.com/q/E4nfkGD6oK) Group ID(1085359803)
+
+> 참고: 가입 키는 최신 100개 버전에서만 유효하며, NapCat 버전 >= 4.17.31이 필요합니다. 오류가 발생하면 업데이트하세요.
 ## 환영합니다
 
 - NapCatQQ는 NTQQ를 기반으로 한 최신 Bot 프로토콜 구현체입니다
diff --git a/docs/README_ru.md b/docs/README_ru.md
@@ -20,10 +20,12 @@ NapCat в настоящее время ищет нового основного
 
 Пароль для вступления можно получить прямо на **странице «О программе» в WebUI**：
 
-- [NapCat Family] Happy Family 1090875633：https://qm.qq.com/q/VwpnklcXqo
-- [NapCat Family] Royal Relatives 1059714215：https://qm.qq.com/q/gq18RH7o7S
-- [NapCat Family] Loving Family 1085662710：https://qm.qq.com/q/XyiyGPqa42
-- [NapCat Family] Joyful Family 1085359803：https://qm.qq.com/q/E4nfkGD6oK
+- [NapCat Family Group 1](https://qm.qq.com/q/VwpnklcXqo) Group ID(1090875633)
+- [NapCat Family Group 2](https://qm.qq.com/q/gq18RH7o7S) Group ID(1059714215)
+- [NapCat Family Group 3](https://qm.qq.com/q/XyiyGPqa42) Group ID(1085662710)
+- [NapCat Family Group 4](https://qm.qq.com/q/E4nfkGD6oK) Group ID(1085359803)
+
+> Примечание: Ключ для входа действителен только для последних 100 версий и требует версию NapCat >= 4.17.31. Если возникает ошибка, пожалуйста, обновитесь.
 
 ## Добро пожаловать
 
diff --git a/docs/README_zh-CN.md b/docs/README_zh-CN.md
@@ -20,10 +20,12 @@ NapCat 当前正在寻找新的主要维护者，欢迎email到 nanaeonn@outlook
 
 可直接在 **WebUI 关于页面** 获取入群密码：
 
-- 点击链接加入群聊【[NapCat家族群] 欢乐一家亲】1090875633：https://qm.qq.com/q/VwpnklcXqo
-- 点击链接加入群聊【[NapCat家族群] 皇亲国戚】1059714215：https://qm.qq.com/q/gq18RH7o7S
-- 点击链接加入群聊【[NapCat家族群] 相亲相爱一家人】1085662710：https://qm.qq.com/q/XyiyGPqa42
-- 点击链接加入群聊【[NapCat家族群] 开心家族】1085359803 ：https://qm.qq.com/q/E4nfkGD6oK
+- [NapCat家族一群](https://qm.qq.com/q/VwpnklcXqo) 群号(1090875633)
+- [NapCat家族二群](https://qm.qq.com/q/gq18RH7o7S) 群号(1059714215)
+- [NapCat家族三群](https://qm.qq.com/q/XyiyGPqa42) 群号(1085662710)
+- [NapCat家族四群](https://qm.qq.com/q/E4nfkGD6oK) 群号(1085359803)
+
+> 注意：入群密钥只适合最新的100个版本，且 NapCat 版本需 >= 4.17.31，如果不符合请更新。
 
 ## 欢迎
 
diff --git a/docs/README_zh-TW.md b/docs/README_zh-TW.md
@@ -20,10 +20,12 @@ NapCat 目前正在尋找新的主要維護者，歡迎透過 email 聯繫 nanae
 
 可直接在 **WebUI 關於頁面** 取得入群密碼：
 
-- 點擊連結加入群聊【[NapCat家族群] 歡樂一家親】1090875633：https://qm.qq.com/q/VwpnklcXqo
-- 點擊連結加入群聊【[NapCat家族群] 皇親國戚】1059714215：https://qm.qq.com/q/gq18RH7o7S
-- 點擊連結加入群聊【[NapCat家族群] 相親相愛一家人】1085662710：https://qm.qq.com/q/XyiyGPqa42
-- 點擊連結加入群聊【[NapCat家族群] 開心家族】1085359803：https://qm.qq.com/q/E4nfkGD6oK
+- [NapCat家族一群](https://qm.qq.com/q/VwpnklcXqo) 群號(1090875633)
+- [NapCat家族二群](https://qm.qq.com/q/gq18RH7o7S) 群號(1059714215)
+- [NapCat家族三群](https://qm.qq.com/q/XyiyGPqa42) 群號(1085662710)
+- [NapCat家族四群](https://qm.qq.com/q/E4nfkGD6oK) 群號(1085359803)
+
+> 注意：入群密鑰只適用於最新的100個版本，且 NapCat 版本需 >= 4.17.31，如果錯誤請更新。
 
 ## 歡迎
 
diff --git a/packages/napcat-webui-frontend/src/pages/dashboard/about.tsx b/packages/napcat-webui-frontend/src/pages/dashboard/about.tsx
@@ -3,10 +3,12 @@ import { Chip } from '@heroui/chip';
 import { Divider } from '@heroui/divider';
 import { Image } from '@heroui/image';
 import { Link } from '@heroui/link';
+import { Select, SelectItem } from '@heroui/select';
 import { Snippet } from '@heroui/snippet';
 import { Spinner } from '@heroui/spinner';
 import { Tooltip } from '@heroui/tooltip';
 import { useRequest } from 'ahooks';
+import { useEffect, useState } from 'react';
 import {
   BsCodeSlash,
   BsCpu,
@@ -45,13 +47,57 @@ function VersionInfo () {
 
 function NapCatFileHash () {
   const { data: hashData, loading: hashLoading, error: hashError } = useRequest(WebUIManager.GetNapCatFileHash);
+  const { data: loginList, loading: listLoading, error: listError } = useRequest(QQManager.getQQQuickLoginListNew);
   const { data: loginData, loading: loginLoading, error: loginError } = useRequest(QQManager.getQQLoginInfo);
 
-  const loading = hashLoading || loginLoading;
-  const error = hashError || loginError;
+  const [selectedUin, setSelectedUin] = useState<string | null>(null);
 
-  const password = hashData && loginData?.uin
-    ? CryptoJS.SHA512(hashData.hash + loginData.uin).toString()
+  const loading = hashLoading || listLoading || loginLoading;
+  const error = hashError || listError || loginError;
+
+  // 优先使用 getLoginList 返回的账号列表，回退到当前登录账号
+  const accounts: { uin: string; label: string; }[] = [];
+
+  // 添加 LoginList 账号
+  if (loginList && loginList.length > 0) {
+    loginList.forEach(item => {
+      accounts.push({
+        uin: item.uin,
+        label: item.nickName ? `${item.nickName}（${item.uin}）` : item.uin,
+      });
+    });
+  }
+
+  // 确保当前登录账号也在列表中
+  // 注意：API 返回的 uin 类型可能不一致（string/number），做一次转换比较
+  if (loginData?.uin) {
+    const isLoginAccountInList = accounts.some(acc => String(acc.uin) === String(loginData.uin));
+    if (!isLoginAccountInList) {
+      accounts.push({
+        uin: String(loginData.uin),
+        label: loginData.nick ? `${loginData.nick}（${loginData.uin}）` : String(loginData.uin)
+      });
+    }
+  }
+
+  // 自动选择第一个账号
+  useEffect(() => {
+    if (accounts.length > 0) {
+      const isSelectedValid = selectedUin && accounts.some(acc => acc.uin === selectedUin);
+
+      if (!isSelectedValid) {
+        if (loginData?.uin && accounts.some((acc) => acc.uin == loginData.uin)) {
+          setSelectedUin(loginData.uin);
+        } else {
+          setSelectedUin(accounts[0].uin);
+        }
+      }
+    }
+  }, [accounts, selectedUin, loginData]);
+
+  const currentAccount = accounts.find((acc) => acc.uin === selectedUin) || accounts[0];
+  const password = (hashData && currentAccount)
+    ? CryptoJS.SHA512(hashData.hash + currentAccount.uin).toString().substring(0, 7)
     : null;
 
   return (
@@ -62,17 +108,45 @@ function NapCatFileHash () {
       </div>
       {error ? (
         <Chip color="warning" variant="flat" size="sm">无法计算：{(error as Error).message}</Chip>
-      ) : loading ? null : password ? (
-        <Tooltip content="复制此值作为入群密码" placement="top">
-          <Snippet
-            size="sm"
-            variant="flat"
-            className="w-full text-xs"
-            symbol=""
-          >
-            {password}
-          </Snippet>
-        </Tooltip>
+      ) : loading ? null : accounts.length > 0 ? (
+        <div className="space-y-3">
+          {accounts.length > 1 && (
+            <Select
+              label="选择账号"
+              size="sm"
+              selectedKeys={selectedUin ? [selectedUin] : []}
+              onChange={(e) => setSelectedUin(e.target.value)}
+              className="max-w-full"
+            >
+              {accounts.map((acc) => (
+                <SelectItem key={acc.uin} textValue={acc.label}>
+                  {acc.label}
+                </SelectItem>
+              ))}
+            </Select>
+          )}
+
+          {password && (
+            <div className="space-y-1">
+              {accounts.length === 1 && <p className="text-xs text-default-500">{currentAccount.label}</p>}
+              <Tooltip content={`使用 ${currentAccount.label} 申请入群，以此值作为入群密码`} placement="top">
+                <Snippet
+                  size="sm"
+                  variant="flat"
+                  symbol=""
+                  codeString={password}
+                  className="w-full"
+                  classNames={{
+                    pre: 'text-xs break-all whitespace-pre-wrap font-mono',
+                  }}
+                >
+                  {password}
+                </Snippet>
+              </Tooltip>
+            </div>
+          )}
+          <p className="text-xs text-warning-500">入群密钥绑定QQ，使用对应QQ申请入群即可。</p>
+        </div>
       ) : null}
     </div>
   );
@@ -183,9 +257,6 @@ export default function AboutPage () {
             </CardHeader>
             <CardBody className="py-4 space-y-4">
               <NapCatFileHash />
-              <p className="text-xs text-default-400 px-1">
-                复制上方密码，作为加入 QQ 群的入群密码。
-              </p>
               <div className="flex flex-col gap-2">
                 {links.map((link, idx) => (
                   <Link
