Merge branch 'main' of https://gitea.functen.cn/shihao/WechatHookBot

bot.py

@@ -34,9 +34,8 @@ from WechatHook.callbacks import (
 from utils.hookbot import HookBot
 from utils.plugin_manager import PluginManager
 from utils.decorators import scheduler
+from utils.message_queue import PriorityMessageQueue, MessagePriority
 from utils.bot_utils import (
-    PriorityMessageQueue,
-    MessagePriority,
     PRIORITY_MESSAGE_TYPES,
     AdaptiveCircuitBreaker,
     ConfigWatcher,
@@ -269,10 +268,12 @@ class BotService:
         self.queue_config = config.get("Queue", {})
         self.concurrency_config = config.get("Concurrency", {})
 
-        # 创建优先级消息队列
-        queue_size = self.queue_config.get("max_size", 1000)
-        self.message_queue = PriorityMessageQueue(maxsize=queue_size)
-        logger.info(f"优先级消息队列已创建，容量: {queue_size}")
+        # 创建优先级消息队列（使用新的队列模块）
+        self.message_queue = PriorityMessageQueue.from_config(self.queue_config)
+        logger.info(
+            f"优先级消息队列已创建，容量: {self.message_queue.maxsize}, "
+            f"溢出策略: {self.message_queue.overflow_strategy.value}"
+        )
 
         # 创建并发控制信号量
         max_concurrency = self.concurrency_config.get("plugin_max_concurrency", 8)