修复显示bug

This commit is contained in:
yowiv
2025-03-16 00:35:57 +08:00
committed by GitHub
parent d055ae309f
commit 06efa8a14f

View File

@@ -51,7 +51,7 @@ def session_login():
print("获取验证码令牌失败,无法登录") print("获取验证码令牌失败,无法登录")
return None return None
#print(f"成功获取验证码令牌: {token[:30]}...{token[-10:]}") #print(f"成功获取验证码令牌: {token[:30]}...{token[-10:]}]")
#print(token) #print(token)
except TurnstileSolverError as e: except TurnstileSolverError as e:
@@ -121,102 +121,71 @@ def sign():
url = f"https://www.nodeseek.com/api/attendance?random={NS_RANDOM}" url = f"https://www.nodeseek.com/api/attendance?random={NS_RANDOM}"
headers = { headers = {
'User-Agent': "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36 Edg/125.0.0.0", 'User-Agent': "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36 Edg/125.0.0.0",
'sec-ch-ua': "\"Not A(Brand\";v=\"99\", \"Microsoft Edge\";v=\"121\", \"Chromium\";v=\"121\"",
'sec-ch-ua-mobile': "?0",
'sec-ch-ua-platform': "\"Windows\"",
'origin': "https://www.nodeseek.com", 'origin': "https://www.nodeseek.com",
'sec-fetch-site': "same-origin",
'sec-fetch-mode': "cors",
'sec-fetch-dest': "empty",
'referer': "https://www.nodeseek.com/board", 'referer': "https://www.nodeseek.com/board",
'accept-language': "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6",
'Cookie': NS_COOKIE 'Cookie': NS_COOKIE
} }
try: try:
response = requests.post(url, headers=headers, impersonate="chrome110") response = requests.post(url, headers=headers, impersonate="chrome110")
response_data = response.json() response_data = response.json()
#print(response_data) print(f"签到返回: {response_data}")
message = response_data.get('message', '') message = response_data.get('message', '')
success = response_data.get('success')
if success == "true": # 简化判断逻辑
if "鸡腿" in message or response_data.get('success') == True:
# 如果消息中包含"鸡腿"或success为True都视为签到成功
print(f"签到成功: {message}") print(f"签到成功: {message}")
return "success", message return "success", message
elif message and "已完成签到" in message: elif "已完成签到" in message:
print(f"已经签到过: {message}") print(f"已经签到过: {message}")
return "already_signed", message return "already_signed", message
elif message == "USER NOT FOUND" or (response_data.get('status') == 404): elif message == "USER NOT FOUND" or response_data.get('status') == 404:
print("Cookie已失效: USER NOT FOUND") print("Cookie已失效")
return "invalid_cookie", message return "invalid_cookie", message
else: else:
print(f"签到失败: {message}") print(f"签到失败: {message}")
return "fail", message return "fail", message
except Exception as e: except Exception as e:
print("发生异常:", e) print("发生异常:", e)
print("实际响应内容:", response.text if 'response' in locals() else "没有响应")
return "error", str(e) return "error", str(e)
if __name__ == "__main__": if __name__ == "__main__":
# 尝试使用现有Cookie签到
sign_result, sign_message = "no_cookie", ""
if NS_COOKIE: if NS_COOKIE:
sign_result, sign_message = sign() sign_result, sign_message = sign()
if sign_result in ["success", "already_signed"]: # 处理签到结果
if sign_result == "success": if sign_result in ["success", "already_signed"]:
print("签到成功") status = "签到成功" if sign_result == "success" else "今天已经签到过了"
if hadsend: print(status)
send("nodeseek签到", f"{sign_message}") if hadsend:
else: send("nodeseek签到", f"{sign_message}")
print("今天已经签到过了")
if hadsend:
send("nodeseek签到", f"{sign_message}")
elif sign_result in ["invalid_cookie", "error", "fail"]:
if USER and PASS:
print("Cookie失效或签到异常尝试重新登录...")
cookie = session_login()
if cookie:
print("登录成功使用新Cookie签到")
NS_COOKIE = cookie
sign_result, sign_message = sign()
if sign_result in ["success", "already_signed"]:
print("使用新Cookie签到成功")
if hadsend:
send("nodeseek签到", f"{sign_message}\nCookie: {cookie}")
else:
print("使用新Cookie签到失败")
if hadsend:
send("nodeseek签到", f"{sign_message}")
else:
print("重新登录失败")
if hadsend:
send("nodeseek登录", "登录失败")
else:
print("Cookie失效或签到异常但未设置用户名密码无法重新登录")
if hadsend:
send("nodeseek签到", "Cookie已失效未设置用户名密码无法重新登录")
else: else:
# 签到失败或没有Cookie尝试登录
if USER and PASS: if USER and PASS:
print("没有找到Cookie尝试登录获取...") print("尝试登录获取新Cookie...")
cookie = session_login() cookie = session_login()
if cookie: if cookie:
print("登录成功,使用获取的Cookie进行签到") print("登录成功,使用Cookie签到")
NS_COOKIE = cookie NS_COOKIE = cookie
sign_result, sign_message = sign() sign_result, sign_message = sign()
if sign_result in ["success", "already_signed"]: status = "签到成功" if sign_result in ["success", "already_signed"] else "签到失败"
print("首次登录签到成功") print(status)
if hadsend: if hadsend:
send("nodeseek签到", f"{sign_message}\nCookie: {cookie}") message = f"{sign_message}"
else: if sign_result in ["success", "already_signed"]:
print("首次登录签到失败") message += f"\nCookie: {cookie}"
if hadsend: send("nodeseek签到", message)
send("nodeseek签到", f"{sign_message}")
else: else:
print("登录失败") print("登录失败")
if hadsend: if hadsend:
send("nodeseek登录", "登录失败") send("nodeseek登录", "登录失败")
else: else:
print("没有Cookie且未设置用户名密码,无法执行任何操作") print("无法执行操作:没有有效Cookie且未设置用户名密码")
if hadsend: if hadsend:
send("nodeseek签到", "没有Cookie且未设置用户名密码,无法执行任何操作") send("nodeseek签到", "无法执行操作:没有有效Cookie且未设置用户名密码")