From 0f721425aedf490312cff7df46a68b52c9c0e5dc Mon Sep 17 00:00:00 2001 From: xaoyaoo Date: Mon, 6 May 2024 17:56:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E5=B9=B6=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pywxdump/api/api.py | 2 +- pywxdump/wx_info/merge_db.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pywxdump/api/api.py b/pywxdump/api/api.py index eab64f0..c7a47cd 100644 --- a/pywxdump/api/api.py +++ b/pywxdump/api/api.py @@ -233,7 +233,7 @@ 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(wx_path, key, merge_path) + code, ret = all_merge_real_time_db(key=key, wx_path=wx_path, merge_path=merge_path) if code: return ReJson(0, ret) else: diff --git a/pywxdump/wx_info/merge_db.py b/pywxdump/wx_info/merge_db.py index a70a889..8f8e1ab 100644 --- a/pywxdump/wx_info/merge_db.py +++ b/pywxdump/wx_info/merge_db.py @@ -419,8 +419,8 @@ def all_merge_real_time_db(key, wx_path, merge_path): db_paths = get_core_db(wx_path, ["MediaMSG", "MSG", "MicroMsg"]) if not db_paths[0]: - # return ReJson(1001, body="media_paths or msg_paths is required") - return False, "media_paths or msg_paths is required" + print(wx_path) + return False, db_paths[1] db_paths = db_paths[1] for i in db_paths: merge_real_time_db(key=key, db_path=i, merge_path=merge_path)