调整内容

message_util.py

@@ -16,10 +16,10 @@ class MessageUtil:
     """
 
     # 修改 MessageUtil 类的初始化方法，接受联系人管理器而不是联系人字典
-    def __init__(self, app_id: str, base_url: str, client: GewechatClient, contact_manager: ContactManager):
+    def __init__(self, app_id: str, client: GewechatClient):
         self.app_id = app_id
         self.client = client
-        self.contact_manager = contact_manager
+        self.contact_manager = ContactManager.get_instance()
         self.LOG = logging.getLogger("MessageUtil")
 
     def send_text(self, msg: str, receiver: str, at_list: str = "") -> None:

robot.py

@@ -69,7 +69,7 @@ class Robot(Job):
         self.redis_pool = self.db_manager.redis_pool
 
         # 初始化消息工具类 - 使用联系人管理器
-        self.message_util = MessageUtil(app_id, client, self.contact_manager)
+        self.message_util = MessageUtil(app_id, client)
         self.groups = {}  # 存储按group_id分组的消息列表，每个group_id最多保留10条消息
         GroupBotManager.load_local_cache()
 
@@ -321,7 +321,7 @@ class Robot(Job):
         try:
             news = News().get_baidu_news()
             if news and isinstance(news, str):
-                self.send_text_msg(news, sender)
+                self.message_util.send_text(news, sender)
             else:
                 self.LOG.error("获取百度新闻返回值异常")
         except Exception as e:
@@ -331,7 +331,7 @@ class Robot(Job):
     def news_en_report(self, website, sender: str = None) -> None:
         try:
             news = News().get_eng_news(website)
-            self.send_text_msg(news, sender)
+            self.message_util.send_text(news, sender)
         except Exception as e:
             self.LOG.error(f"newsEnReport error：{e}")
 
@@ -368,7 +368,7 @@ class Robot(Job):
             for r in receivers:
                 if self.gbm.get_group_permission(r, Feature.DAILY_SUMMARY) == PermissionStatus.ENABLED:
                     output = self.message_storage.generate_and_send_ranking(r, self.allContacts)
-                    self.send_text_msg(output, r)
+                    self.message_util.send_text(output, r)
         except Exception as e:
             self.LOG.error(f"SendRanking error：{e}")