fix: #105

mikumifa · Jun 13, 2024 · 29381b0 · 29381b0
1 parent aa8e653
commit 29381b0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/tab/go.py b/tab/go.py
@@ -4,7 +4,7 @@
 from datetime import datetime
 from json import JSONDecodeError
 from urllib.parse import urlencode
-
+import uuid
 import gradio as gr
 import qrcode
 from loguru import logger
@@ -150,15 +150,6 @@ def start_go(tickets_info_str, time_start, interval, mode, total_attempts, api_k
                     gt = _data["data"]["geetest"]["gt"]
                     challenge = _data["data"]["geetest"]["challenge"]
                     token = _data["data"]["token"]
-                    yield [
-                        gr.update(value=withTimeString("进行验证码验证"), visible=True),
-                        gr.update(visible=True),
-                        gr.update(),
-                        gr.update(visible=True),
-                        gr.update(value=gt),
-                        gr.update(value=challenge),
-                        gr.update(value="hello"),
-                    ]
                     try:
                         if select_way != 2:
                             yield [
@@ -168,7 +159,7 @@ def start_go(tickets_info_str, time_start, interval, mode, total_attempts, api_k
                                 gr.update(visible=True),
                                 gr.update(value=gt),
                                 gr.update(value=challenge),
-                                gr.update(value="hello"),
+                                gr.update(value=uuid.uuid1()),
                             ]
                         if select_way != 0:
                             # https://passport.bilibili.com/x/passport-login/captcha?source=main_web
@@ -181,7 +172,15 @@ def run_validation():
 
                             threading.Thread(target=run_validation).start()
                     except NameError as err:
-                        pass
+                        yield [
+                            gr.update(value=withTimeString("进行验证码验证"), visible=True),
+                            gr.update(visible=True),
+                            gr.update(),
+                            gr.update(visible=True),
+                            gr.update(value=gt),
+                            gr.update(value=challenge),
+                            gr.update(value=uuid.uuid1()),
+                        ]
                     while geetest_validate == "" or geetest_seccode == "":
                         continue
                     logger.info(

diff --git a/tab/train.py b/tab/train.py
@@ -6,7 +6,7 @@
 from config import cookies_config_path
 from tab.go import ways_detail, ways
 from util.bili_request import BiliRequest
-
+import uuid
 
 def train_tab():
     gr.Markdown("""
@@ -99,7 +99,7 @@ def test_get_challenge(api_key):
                     gr.update(visible=True),  # test_gt_row
                     gr.update(value="重新生成"),  # test_get_challenge_btn
                     gr.update(),
-                    gr.update(value="hello")
+                    gr.update(value=uuid.uuid1())
                 ]
             if select_way != 0:
                 def run_validation():
@@ -110,7 +110,14 @@ def run_validation():
 
                 threading.Thread(target=run_validation).start()
         except NameError as err:
-            pass
+            yield [
+                gr.update(value=test_gt),  # test_gt_ui
+                gr.update(value=test_challenge),  # test_challenge_ui
+                gr.update(visible=True),  # test_gt_row
+                gr.update(value="重新生成"),  # test_get_challenge_btn
+                gr.update(),
+                gr.update(value=uuid.uuid1())
+            ]
         while test_geetest_validate == "" or test_geetest_seccode == "":
             continue
         _url = "https://api.bilibili.com/x/gaia-vgate/v1/validate"