合并依赖

src/tasks/base.py

@@ -15,6 +15,8 @@ from src.browser.manager import BrowserManager
 from src.notifications.service import NotificationService
 from src.utils.video_recorder import TaskVideoRecorder
 
+from surugaya_common import redis_keys
+
 
 class BasePurchaseTask(ABC):
     """
@@ -173,7 +175,7 @@ class BasePurchaseTask(ABC):
         """
         import json
         import httpx
-        from src.utils.http_utils import generate_signed_headers
+        from surugaya_common.http_utils import generate_signed_headers
 
         # 1. 准备基础数据
         app_id = self.settings.appid or ""
@@ -315,7 +317,7 @@ class BasePurchaseTask(ABC):
         """
         生成Redis Hash表的key，包含节点ID和交易单号。
         """
-        return "jp_surugaya_trade"
+        return redis_keys.TRADE_HASH
 
     def get_delay_interval_seconds(self) -> int:
         """

src/tasks/surugaya.py

@@ -15,13 +15,14 @@ from playwright.async_api import Page
 from playwright.async_api import TimeoutError as PlaywrightTimeoutError
 
 from notifications import NotificationEvent
-from parsers.surugaya import SurugayaOrderDetail
 from src.tasks.base import BasePurchaseTask
 from src.config.accounts import get_account_config
-from src.utils.page_utils import format_japanese_price, human_scroll
-from src.parsers.surugaya.order_detail import SurugayaOrderDetailParser
+from src.utils.page_utils import format_japanese_price
 from task_queue.redis_manager import get_redis_client
-from utils.app_utils import is_valid_str
+from surugaya_common.models import SurugayaOrderDetail
+from surugaya_common.parsers.surugaya.order_detail import SurugayaOrderDetailParser
+from surugaya_common.browser_utils import human_scroll
+from surugaya_common.app_utils import is_valid_str
 
 
 class TemplateMatchResult(TypedDict):

src/tasks/surugaya_trade_monitor.py

@@ -4,7 +4,7 @@ from typing import Any
 
 from loguru import logger
 
-from parsers.surugaya import SurugayaOrderDetailParser
+from surugaya_common.parsers.surugaya import SurugayaOrderDetailParser
 from src.tasks.base import BasePurchaseTask
 from task_queue.redis_manager import get_redis_client