From 1932423965fddfe4c6d8b6ed00b85982d2c3acb3 Mon Sep 17 00:00:00 2001
From: woni <320753691@qq.com>
Date: Fri, 19 Jan 2024 01:02:47 +0800
Subject: [PATCH] add celery

---
 app/__init__.py | 14 +++++++++++++-
 app/task.py     | 13 +++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 35a6da7..b84647d 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -49,8 +49,20 @@ if not os.path.exists(cache_dir):
 
 def do_p2_im_message_receive_v1(data: P2ImMessageReceiveV1) -> None:
     # print(client, bitable_token, table_id, cache_dir, data)
+
+    message_type = data.event.message.message_type
+    content = json.loads(data.event.message.content)
+    sender_id = data.event.sender.sender_id.open_id
+    message_id = data.event.message.message_id
+
+    clear_data = {}
+    clear_data["message_type"] = message_type
+    clear_data["content"] = content
+    clear_data["sender_id"] = sender_id
+    clear_data["message_id"] = message_id
+
     process_message_callback.delay(
-        app_id, app_secret, bitable_token, table_id, cache_dir, data
+        app_id, app_secret, bitable_token, table_id, cache_dir, clear_data
     )
     print(lark.JSON.marshal(data))
 
diff --git a/app/task.py b/app/task.py
index af3d180..f4ffe6d 100644
--- a/app/task.py
+++ b/app/task.py
@@ -38,8 +38,15 @@ def process_message_callback(
     images = []
     images_token = []
     message_content = ""
-    message_type = data.event.message.message_type
-    content = json.loads(data.event.message.content)
+    # message_type = data.event.message.message_type
+    # content = json.loads(data.event.message.content)
+    # sender_id = data.event.sender.sender_id.open_id
+    # message_id = data.event.message.message_id
+
+    message_type = data.get("message_type")
+    content = data.get("content")
+    sender_id = data.get("sender_id")
+    message_id = data.get("message_id")
 
     if message_type == "post":
         content = content["content"]
@@ -53,10 +60,8 @@ def process_message_callback(
     if message_type == "text":
         message_content = content["text"].replace("@_user_1", "").strip()
 
-    sender_id = data.event.sender.sender_id.open_id
     record["问题概述"] = message_content
     record["创建人"] = sender_id
-    message_id = data.event.message.message_id
 
     # 对 image_key 处理并并上传至多维表格