From 2b3e3cc87124112bf4616fd79159a2b85423a0f2 Mon Sep 17 00:00:00 2001
From: BTMuli <BT-Muli@outlook.com>
Date: Mon, 10 Apr 2023 17:14:12 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20fix(login):=20=E5=88=9D=E6=AD=A5?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=20login=5Fticket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/src/main.rs | 4 ++--
 src/pages/Config.vue  | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index e058be65..a7b4de2b 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -50,14 +50,14 @@ async fn mys_login(handle: AppHandle) {
     let mys_window = WindowBuilder::new(
         &handle,
         "mys-login", /* the unique window label */
-        WindowUrl::External("https://bbs.mihoyo.com/ys/".parse().unwrap()),
+        WindowUrl::External("https://user.mihoyo.com".parse().unwrap()),
     )
     .build()
     .unwrap();
     // 执行 js 代码
     let js_code = "
         const cookie = document.cookie;
-        if(cookie == null || cookie == ''){
+        if(cookie === null || cookie.includes('login_ticket') === false) {
             alert('请在该网页登录后关闭窗口再试');
         } else {
             fetch('http://localhost:8000/login?cookie=' + cookie);
diff --git a/src/pages/Config.vue b/src/pages/Config.vue
index 0752d887..e6f008f0 100644
--- a/src/pages/Config.vue
+++ b/src/pages/Config.vue
@@ -106,7 +106,7 @@
           重新获取 Cookie
         </v-list-item-title>
         <template #append>
-          <v-btn class="card-btn" @click="readCookie()">
+          <v-btn class="card-btn" @click="showCookie()">
             <template #prepend>
               <img src="../assets/icons/circle-check.svg" alt="check">
               查看 Cookie
@@ -330,10 +330,14 @@ function submitHome () {
   snackbar.value = true;
 }
 
+async function showCookie () {
+  const cookie = hk4eStore.getCookie();
+  alert(`Cookie 获取成功！\n\n${cookie}`);
+}
+
 // 获取 Cookie
 async function readCookie () {
   const cookie = hk4eStore.getCookie();
-  // todo 验证 cookie 是否有效
   const tryReadCookie = await tauri.invoke("read_cookie") as string || cookie;
   if (cookie === null || tryReadCookie === "") {
     snackbarText.value = "Cookie 为空!";