From ccbcf5878cc120159059785f9af329f071ba7a88 Mon Sep 17 00:00:00 2001 From: xaoyaoo Date: Tue, 13 Aug 2024 17:47:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=95=B0=E6=8D=AE=E5=BA=93=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pywxdump/api/local_server.py | 5 ++++- pywxdump/wx_core/merge_db.py | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pywxdump/api/local_server.py b/pywxdump/api/local_server.py index d14a368..47a0b6f 100644 --- a/pywxdump/api/local_server.py +++ b/pywxdump/api/local_server.py @@ -207,7 +207,10 @@ def get_real_time_msg(): if not merge_path or not key or not wx_path or not wx_path: return ReJson(1002, body="msg_path or media_path or wx_path or key is required") - code, ret = all_merge_real_time_db(key=key, wx_path=wx_path, merge_path=merge_path) + real_time_exe_path = get_conf(g.caf, g.at, "real_time_exe_path") + + code, ret = all_merge_real_time_db(key=key, wx_path=wx_path, merge_path=merge_path, + real_time_exe_path=real_time_exe_path) if code: return ReJson(0, ret) else: diff --git a/pywxdump/wx_core/merge_db.py b/pywxdump/wx_core/merge_db.py index 99e697b..29e0464 100644 --- a/pywxdump/wx_core/merge_db.py +++ b/pywxdump/wx_core/merge_db.py @@ -393,7 +393,7 @@ def decrypt_merge(wx_path: str, key: str, outpath: str = "", @wx_core_error -def merge_real_time_db(key, merge_path: str, db_paths: [dict] or dict, real_time_exe_path=None): +def merge_real_time_db(key, merge_path: str, db_paths: [dict] or dict, real_time_exe_path: str = None): """ 合并实时数据库消息,暂时只支持64位系统 :param key: 解密密钥 @@ -451,13 +451,14 @@ def merge_real_time_db(key, merge_path: str, db_paths: [dict] or dict, real_time @wx_core_error -def all_merge_real_time_db(key, wx_path, merge_path: str, real_time_exe_path=None): +def all_merge_real_time_db(key, wx_path, merge_path: str, real_time_exe_path: str = None): """ 合并所有实时数据库 注：这是全量合并，会有可能产生重复数据，需要自行去重 :param key: 解密密钥 :param wx_path: 微信路径 :param merge_path: 合并后的数据库路径 eg: C:\\*******\\WeChat Files\\wxid_*********\\merge.db + :param real_time_exe_path: 实时数据库合并工具路径 :return: """ if not merge_path or not key or not wx_path or not wx_path: