From b466113c5dc44541b1092ca99db2cf7f87c5787c Mon Sep 17 00:00:00 2001
From: AiRanthem <airanthem666@gmail.com>
Date: Sat, 26 Mar 2022 15:23:22 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=9B=B4=E6=96=B0selenium=20API=202.=20?=
 =?UTF-8?q?=E5=B0=81=E8=A3=85=E7=82=B9=E5=87=BB=E3=80=81=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AD=89=E9=80=BB=E8=BE=91=EF=BC=8C=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=9B=B4?=
 =?UTF-8?q?=E5=8A=A0=E6=96=B9=E4=BE=BF=E5=9C=B0=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 XMUAutoCheckIn.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/XMUAutoCheckIn.py b/XMUAutoCheckIn.py
index 53a7d0d..87d3e04 100644
--- a/XMUAutoCheckIn.py
+++ b/XMUAutoCheckIn.py
@@ -73,7 +73,7 @@ def get_text(driver: WebDriver, xpath: str, comment: str) -> str:
     return must_operate_element_by_xpath(driver, xpath, lambda x: x.text, f"获取 {comment} 文本")
 
 
-def select_dropdown(driver: WebDriver, dropdown_xpath: str, target_xpath: str, comment: str) -> bool:
+def select_dropdown(driver: WebDriver, dropdown_xpath: str, target_xpath: str, comment: str):
     click_given_xpath(driver, dropdown_xpath, f"{comment} 下拉框")
     time.sleep(1)
     click_given_xpath(driver, target_xpath, f"{comment} 选项")
@@ -90,8 +90,8 @@ def checkin(username, passwd, passwd_vpn, email, use_vpn=True) -> None:
     logger.info("准备工作完成")
 
     # 进入登录页面
+    logger.info("正在请求登录页面")
     driver.get(login_url)
-    logger.info("请求页面")
 
     if use_vpn:
         # 首先登陆WebVPN，根据上面url在WebVPN登陆成功后会自动跳转打卡登录界面
@@ -223,17 +223,17 @@ def main():
                     config["username"],
                     config["password"],
                     config["password_vpn"],
-                    config['email']
+                    config['email'], False
                 )
                 return
             except RuntimeError:
-                logger.info("VPN打卡失败，尝试直连")
+                logger.info("直连打卡失败，尝试VPN")
                 try:
                     checkin(
                         config["username"],
                         config["password"],
                         config["password_vpn"],
-                        config['email']
+                        config['email'], True
                     )
                     return
                 except Exception as e: