From 3b794bcb47b0457d1245ce5b4cfec61b74524073 Mon Sep 17 00:00:00 2001 From: xaoyaoo Date: Thu, 7 Dec 2023 14:44:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B032wx=E8=8E=B7=E5=8F=96key?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pywxdump/wx_info/get_bias_addr.py | 1 - pywxdump/wx_info/get_wx_info.py | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pywxdump/wx_info/get_bias_addr.py b/pywxdump/wx_info/get_bias_addr.py index df6cbdd..d62beab 100644 --- a/pywxdump/wx_info/get_bias_addr.py +++ b/pywxdump/wx_info/get_bias_addr.py @@ -222,7 +222,6 @@ class BiasAddr: type1_addrs = pm.pattern_scan_module(phone_type1.encode(), module, return_multiple=True) type2_addrs = pm.pattern_scan_module(phone_type2.encode(), module, return_multiple=True) type3_addrs = pm.pattern_scan_module(phone_type3.encode(), module, return_multiple=True) - print(len(type1_addrs), len(type2_addrs), len(type3_addrs)) type_addrs = type1_addrs if len(type1_addrs) >= 2 else type2_addrs if len( type2_addrs) >= 2 else type3_addrs if len(type3_addrs) >= 2 else "None" if type_addrs == "None": diff --git a/pywxdump/wx_info/get_wx_info.py b/pywxdump/wx_info/get_wx_info.py index 18e323d..e79e0b0 100644 --- a/pywxdump/wx_info/get_wx_info.py +++ b/pywxdump/wx_info/get_wx_info.py @@ -183,8 +183,9 @@ def get_key(db_path, addr_len): type1_addrs = pm.pattern_scan_module(phone_type1.encode(), module_name, return_multiple=True) type2_addrs = pm.pattern_scan_module(phone_type2.encode(), module_name, return_multiple=True) type3_addrs = pm.pattern_scan_module(phone_type3.encode(), module_name, return_multiple=True) - type_addrs = type1_addrs if len(type1_addrs) == 2 else type2_addrs if len(type2_addrs) == 2 else type3_addrs if len( - type3_addrs) == 2 else "None" + type_addrs = type1_addrs if len(type1_addrs) >= 2 else type2_addrs if len(type2_addrs) >= 2 else type3_addrs if len( + type3_addrs) >= 2 else "None" + print(type_addrs) if type_addrs == "None": return "None" for i in type_addrs[::-1]: @@ -329,6 +330,5 @@ def get_wechat_db(require_list: Union[List[str], str] = "all", msg_dir: str = No if __name__ == '__main__': - with open("../version_list.json", "r", encoding="utf-8") as f: - version_list = json.load(f) - read_info(version_list, is_logging=True) + from pywxdump import VERSION_LIST + read_info(VERSION_LIST, is_logging=True)