新增相同图片 oss_key合并

app/domains/monitor_tasks/auto_reply_cards_monitor/_utils.py

@@ -260,6 +260,6 @@ class AutoReplyCardsMonitorUtils:
             img2 = ImagePath(path=exist_oss)
             cover_id = exist_cover["cover_id"]
             if self.image_tool.is_same_image(img1, img2):
-                return cover_id
+                return cover_id, exist_oss
 
-        return False
+        return False, None

app/domains/monitor_tasks/auto_reply_cards_monitor/entrance.py

@@ -43,7 +43,7 @@ class AutoReplyCardsMonitor(AutoReplyCardsMonitorConst):
             return
         exist_covers = await self.mapper.fetch_exist_covers(root_source_id)
         if exist_covers:
-            exist_cover_id = self.tool.check_cover(save_path, exist_covers)
+            exist_cover_id, oss_key = self.tool.check_cover(save_path, exist_covers)
             if exist_cover_id is not False:
                 cover_id = exist_cover_id
                 self.tool.remove_local_cover(save_path)
@@ -73,11 +73,11 @@ class AutoReplyCardsMonitor(AutoReplyCardsMonitorConst):
         query = """
             INSERT INTO cooperate_auto_reply_detail
             (
-                task_id, position, msg_type, card_title, card_cover_id, 
+                task_id, position, msg_type, card_title, card_cover_id, card_cover, 
                 video_id, root_source_id, mini_program_name, task_result
             ) VALUES 
             (
-                %s, %s, %s, %s, %s, 
+                %s, %s, %s, %s, %s, %s,
                 %s, %s, %s, %s
             );
         """
@@ -87,6 +87,7 @@ class AutoReplyCardsMonitor(AutoReplyCardsMonitorConst):
             msg_type,
             xml_obj["title"],
             cover_id,
+            oss_key,
             video_id,
             root_source_id,
             xml_obj["mini_program"],