From 2abfcdc05039c656163f2bc159f05378499ed329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= <BT-Muli@outlook.com>
Date: Sat, 27 Jul 2024 19:55:48 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B5=8B=E8=AF=95=E6=88=90=E5=8A=9F=20#118?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/func/geetest.vue           | 27 ++++-------------------
 src/plugins/Mys/request/doCaptchaLogin.ts |  4 ----
 src/plugins/Mys/types/CaptchaLogin.d.ts   |  5 +++--
 3 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/src/components/func/geetest.vue b/src/components/func/geetest.vue
index 19bb8800..e8cad9ae 100644
--- a/src/components/func/geetest.vue
+++ b/src/components/func/geetest.vue
@@ -15,21 +15,7 @@
   </transition>
 </template>
 <script setup lang="ts">
-import { onMounted, ref, watch } from "vue";
-
-interface GeetestProps {
-  gt: string;
-  challenge: string;
-  new_captcha: number;
-  success: number;
-}
-
-const props = withDefaults(defineProps<GeetestProps>(), {
-  gt: "",
-  challenge: "",
-  new_captcha: 0,
-  success: 0,
-});
+import { ref, watch } from "vue";
 
 const show = ref<boolean>(false);
 const showOuter = ref<boolean>(false);
@@ -53,14 +39,9 @@ watch(show, () => {
   }
 });
 
-onMounted(async () => {
-  await displayBox(props);
-});
-
 async function displayBox(
   props: TGApp.Plugins.Mys.Geetest.reqResp,
 ): Promise<TGApp.Plugins.Mys.Geetest.validateResp | false> {
-  if (!props.gt || !props.challenge) return false;
   show.value = true;
   return await new Promise<TGApp.Plugins.Mys.Geetest.validateResp>((resolve) => {
     // eslint-disable-next-line no-undef
@@ -80,9 +61,9 @@ async function displayBox(
         captchaObj.onSuccess(async () => {
           const validate = captchaObj.getValidate();
           resolve(validate);
-          captchaObj.onClose(() => {
-            show.value = false;
-          });
+        });
+        captchaObj.onClose(() => {
+          show.value = false;
         });
       },
     );
diff --git a/src/plugins/Mys/request/doCaptchaLogin.ts b/src/plugins/Mys/request/doCaptchaLogin.ts
index 230381d1..d4ec7b99 100644
--- a/src/plugins/Mys/request/doCaptchaLogin.ts
+++ b/src/plugins/Mys/request/doCaptchaLogin.ts
@@ -68,8 +68,6 @@ export async function getCaptcha(
     referer: "https://user.miyoushe.com/",
     "x-rpc-game_biz": TGConstant.Utils.GAME_BIZ,
   };
-  console.log("getCaptcha header: ", header);
-  console.log("getCaptcha body: ", body);
   const resp = await TGHttp<
     TGApp.Plugins.Mys.CaptchaLogin.CaptchaResponse | TGApp.BBS.Response.Base
   >(
@@ -129,8 +127,6 @@ export async function doCaptchaLogin(
     "x-rpc-device_model": device_model,
     "user-agent": TGConstant.BBS.UA_MOBILE,
   };
-  console.log("doCaptchaLogin header: ", header);
-  console.log("doCaptchaLogin body: ", body);
   const resp = await TGHttp<TGApp.Plugins.Mys.CaptchaLogin.LoginResponse | TGApp.BBS.Response.Base>(
     url,
     {
diff --git a/src/plugins/Mys/types/CaptchaLogin.d.ts b/src/plugins/Mys/types/CaptchaLogin.d.ts
index 29486cf7..dc4bf46b 100644
--- a/src/plugins/Mys/types/CaptchaLogin.d.ts
+++ b/src/plugins/Mys/types/CaptchaLogin.d.ts
@@ -44,13 +44,14 @@ declare namespace TGApp.Plugins.Mys.CaptchaLogin {
    * @interface CaptchaAigis
    * @property {string} session_id 会话 id
    * @property {number} mmt_type mmt 类型
-   * @property {TGApp.Plugins.Mys.Geetest.getData} data 数据
+   * @see TGApp.Plugins.Mys.Geetest.validateResp
+   * @property {string} data 数据，为上面的序列化数据
    * @return CaptchaBody
    */
   interface CaptchaAigis {
     session_id: string;
     mmt_type: number;
-    data: TGApp.Plugins.Mys.Geetest.reqResp;
+    data: string;
   }
 
   /**