From 8f2fbe5f4b8c65b0376a77b397ead1d18f356c97 Mon Sep 17 00:00:00 2001 From: liuwei Date: Tue, 22 Apr 2025 12:08:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- message_util.py | 4 ++-- robot.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/message_util.py b/message_util.py index 0b54765..f2f59c6 100644 --- a/message_util.py +++ b/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: diff --git a/robot.py b/robot.py index fce551e..7482c0c 100644 --- a/robot.py +++ b/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}")