From da965e7b39e9d6626749952b88225a6125be03d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Mon, 25 Nov 2024 13:01:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20qrcode=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 napcat.webui/src/backend/shell.ts       | 20 ++++++++++++
 napcat.webui/src/components/QQLogin.vue | 43 +++++++++++--------------
 src/webui/src/api/QQLogin.ts            |  1 +
 3 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/napcat.webui/src/backend/shell.ts b/napcat.webui/src/backend/shell.ts
index efc7f013..0819e0b8 100644
--- a/napcat.webui/src/backend/shell.ts
+++ b/napcat.webui/src/backend/shell.ts
@@ -74,6 +74,26 @@ export class QQLoginManager {
         }
         return false;
     }
+    public async checkQQLoginStatusWithQrcode(): Promise<{ qrcodeurl: string, isLogin: string } | undefined> {
+        try {
+            const QQLoginResponse = await fetch(`${this.apiPrefix}/QQLogin/CheckLoginStatus`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+            });
+            if (QQLoginResponse.status == 200) {
+                const QQLoginResponseJson = await QQLoginResponse.json();
+                if (QQLoginResponseJson.code == 0) {
+                    return QQLoginResponseJson.data;
+                }
+            }
+        } catch (error) {
+            console.error('Error checking QQ login status:', error);
+        }
+        return undefined;
+    }
 
     public async checkWebUiLogined(): Promise<boolean> {
         try {
diff --git a/napcat.webui/src/components/QQLogin.vue b/napcat.webui/src/components/QQLogin.vue
index 13d4b674..bd46608a 100644
--- a/napcat.webui/src/components/QQLogin.vue
+++ b/napcat.webui/src/components/QQLogin.vue
@@ -2,28 +2,14 @@
     <div class="login-container">
         <h2 class="sotheby-font">QQ Login</h2>
         <div class="login-methods">
-            <t-button
-                id="quick-login"
-                class="login-method"
-                :class="{ active: loginMethod === 'quick' }"
-                @click="loginMethod = 'quick'"
-                >Quick Login</t-button
-            >
-            <t-button
-                id="qrcode-login"
-                class="login-method"
-                :class="{ active: loginMethod === 'qrcode' }"
-                @click="loginMethod = 'qrcode'"
-                >QR Code</t-button
-            >
+            <t-button id="quick-login" class="login-method" :class="{ active: loginMethod === 'quick' }"
+                @click="loginMethod = 'quick'">Quick Login</t-button>
+            <t-button id="qrcode-login" class="login-method" :class="{ active: loginMethod === 'qrcode' }"
+                @click="loginMethod = 'qrcode'">QR Code</t-button>
         </div>
         <div v-show="loginMethod === 'quick'" id="quick-login-dropdown" class="login-form">
-            <t-select
-                id="quick-login-select"
-                v-model="selectedAccount"
-                placeholder="Select Account"
-                @change="selectAccount"
-            >
+            <t-select id="quick-login-select" v-model="selectedAccount" placeholder="Select Account"
+                @change="selectAccount">
                 <t-option v-for="account in quickLoginList" :key="account" :value="account">{{ account }}</t-option>
             </t-select>
         </div>
@@ -47,7 +33,7 @@ const selectedAccount = ref<string>('');
 const qrcodeCanvas = ref<HTMLCanvasElement | null>(null);
 const qqLoginManager = new QQLoginManager(localStorage.getItem('auth') || '');
 let heartBeatTimer: number | null = null;
-
+let qrcodeUrl: string = '';
 const selectAccount = async (accountName: string): Promise<void> => {
     const { result, errMsg } = await qqLoginManager.setQuickLogin(accountName);
     if (result) {
@@ -73,19 +59,26 @@ const generateQrCode = (data: string, canvas: HTMLCanvasElement | null): void =>
 };
 
 const HeartBeat = async (): Promise<void> => {
-    const isLogined = await qqLoginManager.checkQQLoginStatus();
-    if (isLogined) {
+    const isLogined = await qqLoginManager.checkQQLoginStatusWithQrcode();
+    if (isLogined?.isLogin) {
         if (heartBeatTimer) {
             clearInterval(heartBeatTimer);
         }
+        //判断是否已经调转
+        if (router.currentRoute.value.path !== '/dashboard/basic-info') {
+            return;
+        }
         await router.push({ path: '/dashboard/basic-info' });
+    } else if (isLogined?.qrcodeurl && qrcodeUrl !== isLogined.qrcodeurl) {
+        qrcodeUrl = isLogined.qrcodeurl;
+        generateQrCode(qrcodeUrl, qrcodeCanvas.value);
     }
 };
 
 const InitPages = async (): Promise<void> => {
     quickLoginList.value = await qqLoginManager.getQQQuickLoginList();
-    const qrcodeData = await qqLoginManager.getQQLoginQrcode();
-    generateQrCode(qrcodeData, qrcodeCanvas.value);
+    qrcodeUrl = await qqLoginManager.getQQLoginQrcode();
+    generateQrCode(qrcodeUrl, qrcodeCanvas.value);
     heartBeatTimer = window.setInterval(HeartBeat, 3000);
 };
 
diff --git a/src/webui/src/api/QQLogin.ts b/src/webui/src/api/QQLogin.ts
index b2d17f00..ba78451f 100644
--- a/src/webui/src/api/QQLogin.ts
+++ b/src/webui/src/api/QQLogin.ts
@@ -33,6 +33,7 @@ export const QQCheckLoginStatusHandler: RequestHandler = async (req, res) => {
         message: 'success',
         data: {
             isLogin: await WebUiDataRuntime.getQQLoginStatus(),
+            qrcodeurl: await WebUiDataRuntime.getQQLoginQrcodeURL()
         },
     });
 };