diff --git a/Utils/Pdd/PddUtils.py b/Utils/Pdd/PddUtils.py index 81d0105..aedbc73 100644 --- a/Utils/Pdd/PddUtils.py +++ b/Utils/Pdd/PddUtils.py @@ -40,7 +40,7 @@ from Utils.message_models import PlatformMessage class Track: """滑块轨迹生成类""" - + @staticmethod def get_track(distance): distance = int(distance) + random.randint(7, 11) + 0.8 @@ -853,7 +853,7 @@ class Track: class ImgDistance: """滑块图像识别距离计算类""" - + def __init__(self, bg, tp): self.bg = bg self.tp = tp @@ -999,7 +999,8 @@ class ImgDistance: save_path=save_path ) - # AutiContent类已移除 - 后端会提供所有必要的anti_content + +# AutiContent类已移除 - 后端会提供所有必要的anti_content def gzip_compress(self, data): """压缩数据""" @@ -1010,7 +1011,7 @@ class ImgDistance: return result except Exception as e: logger.error(f"调用gzipCompress函数失败: {e}") - + # fallback处理：简单返回原数据 logger.warning("使用fallback处理，返回原数据") return data @@ -1018,7 +1019,7 @@ class ImgDistance: class EncryptTool: """加密工具类""" - + @staticmethod def aes_encrypt(text, key, iv): cipher = AES.new(key.encode('utf-8'), AES.MODE_CBC, iv.encode('utf-8')) @@ -1058,7 +1059,7 @@ class EncryptTool: class PddLogin: """拼多多登录核心类""" - + def __init__(self, log_callback=None): super().__init__() self.login_api = "https://mms.pinduoduo.com/janus/api/auth" @@ -1604,14 +1605,14 @@ class PddLogin: return result # 发送验证码通知给后端，并获取验证码 - def request_verification_code(self, username, store_id, backend_anti_content, phone_number=None): + def request_verification_code(self, username, store_id, backend_anti_content): """向后端请求获取手机验证码""" - self._log(f"开始请求验证码，用户名: {username}, 店铺ID: {store_id}, 手机号: {phone_number}", "INFO") - + self._log(f"开始请求验证码，用户名: {username}, 店铺ID: {store_id}", "INFO") + # 使用后端下发的anti_content anti_content = backend_anti_content self._log(f"使用后端下发的anti_content", "DEBUG") - + self.headers["anti-content"] = anti_content url = "https://mms.pinduoduo.com/janus/api/user/getLoginVerificationCode" payload = { @@ -1620,34 +1621,33 @@ class PddLogin: } response = requests.post(url, headers=self.headers, json=payload, cookies=self.cookies) self._log(f"发送验证码请求结果: {response.text}") - - # 发送消息给后端，告知需要验证码（包含手机号） + + # 发送消息给后端，告知需要验证码 self._log("准备向后端发送验证码需求通知", "INFO") - self._send_verification_needed_message(store_id, phone_number) # 🔥 传递手机号 - + self._send_verification_needed_message(store_id) + # 这里需要等待后端重新下发包含验证码的登录参数 # 实际实现中这个方法会在接收到新的登录参数后被重新调用 return None - def _send_verification_needed_message(self, store_id, phone_number=None): + def _send_verification_needed_message(self, store_id): """向后端发送需要验证码的通知""" try: - self._log(f"开始发送验证码需求通知，店铺ID: {store_id}, 手机号: {phone_number}", "INFO") + self._log(f"开始发送验证码需求通知，店铺ID: {store_id}", "INFO") from WebSocket.backend_singleton import get_backend_client backend = get_backend_client() self._log(f"获取到后端客户端: {backend is not None}", "DEBUG") - + if backend: message = { "type": "connect_message", "store_id": store_id, "status": False, - "content": "需要验证码", - "phone_number": phone_number # 🔥 新增手机号字段 + "content": "需要验证码" } self._log(f"准备发送验证码通知消息: {message}", "DEBUG") backend.send_message(message) - self._log("✅ 成功向后端发送验证码需求通知（含手机号）", "SUCCESS") + self._log("✅ 成功向后端发送验证码需求通知", "SUCCESS") else: self._log("❌ 后端客户端为空，无法发送验证码需求通知", "ERROR") except Exception as e: @@ -1661,7 +1661,7 @@ class PddLogin: self._log(f"开始发送验证码错误通知，店铺ID: {store_id}, 错误: {error_msg}", "INFO") from WebSocket.backend_singleton import get_backend_client backend = get_backend_client() - + if backend: message = { "type": "connect_message", @@ -1685,7 +1685,7 @@ class PddLogin: self._log(f"开始发送登录成功通知，店铺ID: {store_id}", "INFO") from WebSocket.backend_singleton import get_backend_client backend = get_backend_client() - + if backend: message = { "type": "connect_message", @@ -1708,7 +1708,7 @@ class PddLogin: self._log(f"开始发送登录失败通知，店铺ID: {store_id}, 错误: {error_msg}", "INFO") from WebSocket.backend_singleton import get_backend_client backend = get_backend_client() - + if backend: message = { "type": "connect_message", @@ -1731,12 +1731,10 @@ class PddLogin: self._log("🚀 [PddLogin] 开始使用参数登录", "INFO") # 检查验证码字段（兼容 code 和 verification_code） verification_code = login_params.get("verification_code") or login_params.get("code", "") - self._log( - f"📋 [PddLogin] 登录参数: username={login_params.get('username', 'N/A')}, 包含验证码={bool(verification_code)}", - "DEBUG") - + self._log(f"📋 [PddLogin] 登录参数: username={login_params.get('username', 'N/A')}, 包含验证码={bool(verification_code)}", "DEBUG") + self.headers["anti-content"] = login_params.get("anti_content", "") - + # 直接使用后端提供的参数构建登录请求 ts = login_params.get("timestamp", int(round(time.time() * 1000))) payload = { @@ -1802,36 +1800,12 @@ class PddLogin: self._log(f"🔍 [Debug] 登录请求URL: {self.login_api}", "DEBUG") self._log(f"🔍 [Debug] 登录请求payload: {payload}", "DEBUG") self._log(f"🔍 [Debug] 登录请求headers: {dict(self.headers)}", "DEBUG") - + response = requests.post(self.login_api, headers=self.headers, json=payload, cookies=self.cookies) self.cookies.update(response.cookies.get_dict()) - - # 🔥 增强日志输出 - 打印完整响应信息 self._log(f"登录响应状态码: {response.status_code}") - self._log(f"登录响应Headers: {dict(response.headers)}") - self._log(f"登录完整响应内容: {response.text}") - - # 🔥 尝试解析JSON响应获取更多信息 - response_json = None # 🔥 在外部定义变量 - try: - response_json = response.json() - self._log(f"登录响应JSON结构: {json.dumps(response_json, ensure_ascii=False, indent=2)}") - - # 特别关注result字段中可能包含的手机号信息 - if "result" in response_json: - result_data = response_json["result"] - self._log(f"响应result字段详情: {json.dumps(result_data, ensure_ascii=False, indent=2)}") - - # 查找可能的手机号字段 - possible_phone_fields = ["phone", "mobile", "phoneNumber", "mobileNumber", "telephone", "tel", - "cellphone", "handphone"] - for field in possible_phone_fields: - if field in result_data: - self._log(f"🔍 发现可能的手机号字段 {field}: {result_data[field]}") - - except Exception as e: - self._log(f"解析响应JSON失败: {e}", "DEBUG") - + self._log(f"登录响应内容: {response.text}") + # 检查响应内容 if "需要手机验证" in response.text: self._log("✅ 检测到需要手机验证的响应", "INFO") @@ -1845,8 +1819,7 @@ class PddLogin: salt = self.vc_pre_ck_b() # 获取生成aes key和iv 的密文值 pictures = self.obtain_captcha() # 获取验证码图片 - distance = round((ImgDistance(bg=pictures[0], tp=pictures[1]).main() * (272 / 320)) + (48.75 / 2), - 2) # 计算距离 + distance = round((ImgDistance(bg=pictures[0], tp=pictures[1]).main() * (272 / 320)) + (48.75 / 2), 2) # 计算距离 track_list = Track.get_track(distance=distance) # 生成轨迹 captcha_collect = self.captcha_collect(salt=salt, track_list=track_list) # 生成captcha_collect参数 @@ -1860,8 +1833,7 @@ class PddLogin: success_count += 1 # 如果滑块成功 success_count 计数一次 成功8次还是显示验证码则失败 返回False if success_count < 8: - return self.login_with_params(login_params=login_params, store_id=store_id, - success_count=success_count) + return self.login_with_params(login_params=login_params, store_id=store_id, success_count=success_count) else: return False else: @@ -1881,7 +1853,7 @@ class PddLogin: response_data = response.json() error_msg = response_data.get('errorMsg', '验证码验证失败') self._log(f"服务器返回错误: {error_msg}", "WARNING") - + # 不要重新发送验证码请求，直接报告验证失败 self._send_verification_error_message(store_id, error_msg) # 直接使用官方错误信息 return "verification_code_error" # 返回特殊状态，避免重复发送消息 @@ -1891,27 +1863,9 @@ class PddLogin: username = login_params.get("username") backend_anti_content = login_params.get("anti_content") self._log(f"为用户 {username} 发送验证码，使用后端anti_content", "INFO") - - # 🔥 从响应中提取手机号 - phone_number = None - try: - if response_json and isinstance(response_json, dict): - phone_number = response_json.get("result") # 手机号在result字段中 - if phone_number and isinstance(phone_number, str): - self._log(f"🔍 从登录响应中提取到手机号: {phone_number}", "SUCCESS") - else: - self._log("⚠️ 响应中的result字段不包含有效手机号", "WARNING") - self._log(f"🔍 DEBUG: response_json = {response_json}", "DEBUG") - else: - self._log("⚠️ response_json 为空或格式不正确", "WARNING") - self._log(f"🔍 DEBUG: response_json = {response_json}", "DEBUG") - except Exception as e: - self._log(f"❌ 提取手机号时出错: {e}", "DEBUG") - import traceback - self._log(f"🔍 DEBUG: 错误详情: {traceback.format_exc()}", "DEBUG") - - # 传递后端下发的anti_content和手机号 - self.request_verification_code(username, store_id, backend_anti_content, phone_number) # 🔥 传递手机号 + + # 传递后端下发的anti_content + self.request_verification_code(username, store_id, backend_anti_content) return "need_verification_code" else: @@ -1929,7 +1883,6 @@ class PddLogin: self._send_login_failure_message(store_id, error_msg) return "login_failure" # 返回特殊状态，避免重复发送消息 - # ===== 登录相关类集成结束 ===== @@ -2017,13 +1970,13 @@ class ChatPdd: raise FileNotFoundError(f"找不到必需的JS文件: {file_path}") return True - + @staticmethod def _get_resource_path(relative_path): """获取资源文件的绝对路径（兼容PyInstaller打包环境）""" try: print(f"[DEBUG] 正在解析资源路径: {relative_path}") - + # PyInstaller环境下的基础路径 if hasattr(sys, '_MEIPASS'): # PyInstaller 临时目录 @@ -2039,10 +1992,10 @@ class ChatPdd: # 向上两级目录到项目根目录 base_path = os.path.dirname(os.path.dirname(base_path)) print(f"[DEBUG] 开发环境，计算的项目根目录: {base_path}") - + resource_path = os.path.join(base_path, relative_path) print(f"[DEBUG] 拼接后的完整资源路径: {resource_path}") - + # 检查路径是否存在 if os.path.exists(resource_path): print(f"[DEBUG] ✅ 资源路径存在: {resource_path}") @@ -2059,7 +2012,7 @@ class ChatPdd: print(f"[DEBUG] 📄 {item}") except Exception as e: print(f"[DEBUG] 无法列出目录内容: {e}") - + return resource_path except Exception as e: print(f"[ERROR] 获取资源路径失败: {e}") @@ -2936,11 +2889,11 @@ class PddListenerForGUI: self._log("🔄 [PDD] 开始创建PddLogin实例", "DEBUG") pdd_login = PddLogin(log_callback=self.log_callback) self._log("✅ [PDD] PddLogin实例创建成功", "DEBUG") - + self._log("🔄 [PDD] 开始执行登录", "DEBUG") login_result = pdd_login.login_with_params(params_dict, store_id) self._log(f"📊 [PDD] 登录结果: {login_result}", "DEBUG") - + if login_result == "need_verification_code": self._log("⚠️ [PDD] 需要手机验证码，已通知后端，等待重新下发包含验证码的登录参数", "WARNING") return "need_verification_code" # 返回特殊标识，避免被覆盖 @@ -2956,7 +2909,7 @@ class PddListenerForGUI: elif isinstance(login_result, dict): # 登录成功，获取到cookies self._log("✅ [PDD] 登录成功，使用获取的cookies连接平台", "SUCCESS") - + # 将cookies字典转换为字符串格式，与原有逻辑兼容 import json cookies_str = json.dumps(login_result) @@ -3102,6 +3055,8 @@ class PddListenerForGUI: self._log(f"❌ [PDD] 解析登录参数失败: {e}", "ERROR") return {} + + def get_status(self) -> Dict[str, Any]: return { "running": self.running,