From f28ac0166536a2a4b68cac685a41ea667f60f7e9 Mon Sep 17 00:00:00 2001
From: yj <2077506045@qq.com>
Date: 星期三, 03 九月 2025 14:43:03 +0800
Subject: [PATCH] 兼容企业微信
---
app/api/callback.py | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/app/api/callback.py b/app/api/callback.py
index 3975cc3..2be5e12 100644
--- a/app/api/callback.py
+++ b/app/api/callback.py
@@ -48,16 +48,24 @@
f"鏀跺埌鍥炶皟娑堟伅: messageType={callback_data.messageType}, wcId={callback_data.wcId}"
)
- # 灏哖ydantic妯″瀷杞崲涓哄瓧鍏�
- callback_dict = callback_data.model_dump()
+ # 灏哖ydantic妯″瀷杞崲涓哄瓧鍏革紙鍏煎v1鍜寁2锛�
+ if hasattr(callback_data, 'model_dump'):
+ # Pydantic v2
+ callback_dict = callback_data.model_dump()
+ else:
+ # Pydantic v1
+ callback_dict = callback_data.dict()
# 灏嗘秷鎭姞鍏ラ槦鍒�
success = message_processor.enqueue_callback_message(callback_dict)
+
+ logger.info(f"娑堟伅鍏ラ槦缁撴灉: success={success}")
if success:
# 鑾峰彇鍙戦�佺敤鎴稩D
from_user = callback_dict.get("data", {}).get("fromUser")
if from_user:
+ logger.info(f"鍚姩鐢ㄦ埛闃熷垪澶勭悊: from_user={from_user}")
# 鍚姩鐢ㄦ埛闃熷垪澶勭悊
message_worker.process_user_queue(from_user)
@@ -65,6 +73,7 @@
success=True, message="娑堟伅宸叉垚鍔熷姞鍏ュ鐞嗛槦鍒�", code=200
)
else:
+ logger.warning("娑堟伅澶勭悊澶辫触锛屾湭鑳藉姞鍏ラ槦鍒�")
return CallbackResponse(success=False, message="娑堟伅澶勭悊澶辫触", code=400)
except Exception as e:
--
Gitblit v1.9.1