Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin

modified:   amazon/detail_spider.py
	modified:   amazon/main.py

app/amazon/detail_spider.py

@@ -111,8 +111,29 @@ class ChromeAmzone(ChromeAmzoneBase):
 
 
 
+<<<<<<< HEAD
 class SpiderTask(TaskBase):
     task_name = "亚马逊采集"
+=======
+class SpiderTask:
+    mark_name = "亚马逊采集"
+
+    def __init__(self, user_info: dict = None):
+        """初始化审批任务处理器
+
+        Args:
+            user_info: 用户信息字典，包含 company, username, password
+        """
+        self.user_info = user_info or {}
+        self.running = True
+        self.result_api_module = "appearance-patent"
+
+    def log(self, message: str, level: str = "INFO"):
+        timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        if level == "ERROR":
+            show_notification(message, "error")
+        print(f"[{timestamp}] [PriceTask] [{level}] {message}")
+>>>>>>> 6d398b66bc24634b13f1de162e8f68836e64441d
 
     @staticmethod
     def group_by_id_prefix(data):
@@ -166,9 +187,16 @@ class SpiderTask(TaskBase):
             task_data: 任务数据
         """
         try:
+<<<<<<< HEAD
             data = task_data.get("data", {})
             task_id = data.get("taskId")
             groups = self.normalize_groups(data)
+=======
+            data = task_data.get("data", {})
+            self.result_api_module = "similar-asin" if task_data.get("type") == "similar-asin-run" else "appearance-patent"
+            task_id = data.get("taskId")
+            groups = self.normalize_groups(data)
+>>>>>>> 6d398b66bc24634b13f1de162e8f68836e64441d
 
             # 用于测试
             limit = data.get("limit", None)
@@ -307,7 +335,7 @@ class SpiderTask(TaskBase):
         """回传处理结果到API
         """
 
-        url = f"{DELETE_BRAND_API_BASE}/api/appearance-patent/tasks/{task_id}/result"
+        url = f"{DELETE_BRAND_API_BASE}/api/{self.result_api_module}/tasks/{task_id}/result"
 
         payload ={
           "submissionId": f"{task_id}",