实现pdd抖音平台cookie登录
This commit is contained in:
@@ -142,7 +142,47 @@ class DyLogin:
|
||||
response = requests.post(url, headers=self.headers, cookies=self.cookies, params=params, data=data)
|
||||
self.cookies.update(response.cookies.get_dict())
|
||||
self._log(f"验证码验证响应: {response.text}", "DEBUG")
|
||||
ticket = re.findall('ticket=(.*?)",', response.text)[0]
|
||||
|
||||
# 🔥 修复：增加错误处理，检查响应是否包含错误信息
|
||||
ticket = None
|
||||
try:
|
||||
# 尝试解析JSON响应
|
||||
response_data = response.json()
|
||||
if "error_code" in response_data:
|
||||
error_code = response_data.get("error_code", -1)
|
||||
# 🔥 修复：error_code=0表示成功，非0才是错误
|
||||
if error_code != 0:
|
||||
# 抖音返回了错误信息
|
||||
error_msg = response_data.get("description", "验证码验证失败")
|
||||
self._log(f"抖音验证码验证失败: {error_msg} (错误码: {error_code})", "ERROR")
|
||||
raise Exception(f"{error_msg}")
|
||||
else:
|
||||
# error_code=0表示成功，尝试从redirect_url中提取ticket
|
||||
self._log(f"✅ 抖音验证码验证成功 (错误码: {error_code})", "SUCCESS")
|
||||
redirect_url = response_data.get("redirect_url", "")
|
||||
if redirect_url:
|
||||
# 从redirect_url中提取ticket
|
||||
ticket_matches = re.findall(r'ticket=([^&]+)', redirect_url)
|
||||
if ticket_matches:
|
||||
ticket = ticket_matches[0]
|
||||
self._log(f"✅ 从redirect_url中提取到ticket: {ticket[:20]}...", "SUCCESS")
|
||||
except json.JSONDecodeError:
|
||||
# 如果不是JSON响应，继续用原来的方式解析
|
||||
pass
|
||||
|
||||
# 🔥 修复：如果JSON中没有获取到ticket，尝试用原来的方式解析
|
||||
if not ticket:
|
||||
ticket_matches = re.findall('ticket=(.*?)",', response.text)
|
||||
if ticket_matches:
|
||||
ticket = ticket_matches[0]
|
||||
self._log(f"✅ 从响应文本中提取到ticket: {ticket[:20]}...", "SUCCESS")
|
||||
|
||||
# 最终检查是否获取到ticket
|
||||
if not ticket:
|
||||
# 没有找到ticket，说明验证失败
|
||||
self._log("抖音验证码验证失败：响应中未找到ticket信息", "ERROR")
|
||||
raise Exception("验证码验证失败：服务器未返回有效的ticket")
|
||||
|
||||
return ticket
|
||||
|
||||
def callback(self, ticket):
|
||||
@@ -351,7 +391,8 @@ class DyLogin:
|
||||
message = {
|
||||
"type": "connect_message",
|
||||
"store_id": store_id,
|
||||
"status": True # 登录成功
|
||||
"status": True, # 登录成功
|
||||
"cookies": self.cookies # 🔥 新增：添加登录生成的cookie信息
|
||||
}
|
||||
self._log(f"准备发送登录成功消息: {message}", "DEBUG")
|
||||
backend.send_message(message)
|
||||
@@ -449,7 +490,8 @@ class DyLogin:
|
||||
# 将配置信息添加到cookies中
|
||||
self.cookies.update(shop_config)
|
||||
self._log("🎉 登录成功！配置信息已获取", "SUCCESS")
|
||||
# 🔥 不在这里发送成功通知，让backend_singleton统一处理
|
||||
# 🔥 发送登录成功通知给后端（与拼多多保持一致）
|
||||
self._send_login_success_message(store_id)
|
||||
return self.cookies
|
||||
else:
|
||||
error_msg = "获取抖音平台配置信息失败"
|
||||
@@ -2354,6 +2396,25 @@ class DouYinListenerForGUI:
|
||||
# 在后台启动监听任务
|
||||
asyncio.create_task(keep_running())
|
||||
|
||||
# 🔥 新增：Cookie登录成功后发送登录成功报告（与登录参数模式保持一致）
|
||||
try:
|
||||
from WebSocket.backend_singleton import get_backend_client
|
||||
backend = get_backend_client()
|
||||
|
||||
if backend:
|
||||
message = {
|
||||
"type": "connect_message",
|
||||
"store_id": store_id,
|
||||
"status": True, # 登录成功
|
||||
"cookies": cookie_dict # 添加cookie信息
|
||||
}
|
||||
backend.send_message(message)
|
||||
self._log("✅ [DY] 已向后端发送Cookie登录成功报告", "SUCCESS")
|
||||
else:
|
||||
self._log("⚠️ [DY] 无法获取后端客户端，跳过状态报告", "WARNING")
|
||||
except Exception as e:
|
||||
self._log(f"⚠️ [DY] 发送登录成功报告失败: {e}", "WARNING")
|
||||
|
||||
self._log("✅ [DY] 抖音平台连接成功，开始监听消息", "SUCCESS")
|
||||
return True
|
||||
else:
|
||||
|
||||
@@ -1691,7 +1691,8 @@ class PddLogin:
|
||||
message = {
|
||||
"type": "connect_message",
|
||||
"store_id": store_id,
|
||||
"status": True # 登录成功
|
||||
"status": True, # 登录成功
|
||||
"cookies": self.cookies # 🔥 新增：添加登录生成的cookie信息
|
||||
}
|
||||
self._log(f"准备发送登录成功消息: {message}", "DEBUG")
|
||||
backend.send_message(message)
|
||||
@@ -2801,6 +2802,28 @@ class ChatPdd:
|
||||
except Exception as e:
|
||||
self._log(f"❌ 获取或发送客服列表失败: {e}", "ERROR")
|
||||
|
||||
# 🔥 新增：Cookie登录成功后发送登录成功报告（与登录参数模式保持一致）
|
||||
try:
|
||||
if self.backend_service and hasattr(self, 'store_id') and self.store_id:
|
||||
# 构建cookie字典（从cookies_str解析）
|
||||
cookie_dict = {}
|
||||
if hasattr(self, 'cookie') and self.cookie:
|
||||
cookie_dict = self.cookie
|
||||
|
||||
message = {
|
||||
"type": "connect_message",
|
||||
"store_id": self.store_id,
|
||||
"status": True, # 登录成功
|
||||
"cookies": cookie_dict # 添加cookie信息
|
||||
}
|
||||
# 🔥 修复：使用正确的方法名 send_message_to_backend
|
||||
await self.backend_service.send_message_to_backend(message)
|
||||
self._log("✅ [PDD] 已向后端发送Cookie登录成功报告", "SUCCESS")
|
||||
else:
|
||||
self._log("⚠️ [PDD] 无法发送登录成功报告：backend_service或store_id缺失", "WARNING")
|
||||
except Exception as e:
|
||||
self._log(f"⚠️ [PDD] 发送登录成功报告失败: {e}", "WARNING")
|
||||
|
||||
# 启动消息监听和心跳
|
||||
await asyncio.gather(
|
||||
self.heartbeat(websocket),
|
||||
@@ -3080,6 +3103,7 @@ class PddListenerForGUI:
|
||||
cookies_str=cookies,
|
||||
store=store
|
||||
)
|
||||
|
||||
self._log("✅ [PDD] 拼多多平台连接成功，开始监听消息", "SUCCESS")
|
||||
return True
|
||||
except Exception as e:
|
||||
|
||||
Reference in New Issue
Block a user