Merge remote-tracking branch 'xaoyaoo/master'

doc/CHANGELOG.md

@@ -1,3 +1,25 @@
+## v2.4.31.(待发布)
+
+- UPDATE CHANGELOG.md
+
+## v2.4.30
+
+- 格式化代码
+- 删除test下不必要文件
+- 增加打包为exe时，添加版本信息
+- UPDATE CHANGELOG.md
+
+## v2.4.29
+
+- 代码格式化
+- 重命名conf.json
+- session保存更加合理化
+- 增加视频文件等内容显示 #71
+- 文件和视频的支持api (#71)
+- UPDATE CHANGELOG.md
+- 添加微信数据文件路径通过读取内存方式获取
+- Merge branch 'master' of https://github.com/xaoyaoo/PyWxDump
+
 ## v2.4.28
 
 - 更新FAQ

pywxdump/__init__.py

@@ -23,4 +23,4 @@ except:
     VERSION_LIST = {}
     VERSION_LIST_PATH = None
 
-__version__ = "2.4.28"
+__version__ = "2.4.30"

pywxdump/analyzer/db_parsing.py

@@ -255,5 +255,4 @@ def read_BytesExtra(BytesExtra):
         deserialize_data, message_type = blackboxprotobuf.decode_message(BytesExtra)
         return deserialize_data
     except Exception as e:
-        return None
+        return None
-

pywxdump/server.py

@@ -32,7 +32,7 @@ def start_falsk(merge_path="", msg_path="", micro_path="", media_path="", wx_pat
         os.makedirs(tmp_path)
         print(f"[+] 创建临时文件夹：{tmp_path}")
 
-    session_file = os.path.join(tmp_path, "session.conf")  # 用于存放各种基础信息
+    session_file = os.path.join(tmp_path, "conf.json")  # 用于存放各种基础信息
 
     from flask import Flask, g
     from flask_cors import CORS

tests/__init__.py

@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-#
-# -------------------------------------------------------------------------------
-# Name:         __init__.py.py
-# Description:  
-# Author:       xaoyaoo
-# Date:         2023/10/15
-# -------------------------------------------------------------------------------
-
-
-if __name__ == '__main__':
-    pass

tests/flassk_demo.py

@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-#
-# -------------------------------------------------------------------------------
-# Name:         flassk_demo.py
-# Description:  
-# Author:       xaoyaoo
-# Date:         2023/12/11
-# -------------------------------------------------------------------------------
-from flask import Flask, jsonify
-
-app = Flask(__name__)
-
-
-@app.route('/api/demo', methods=["get",'POST'])
-def demo():
-    # 模拟不同的API情况
-    # 0: 请求成功
-    r_data = {
-        'code': 0,
-        'body': {
-            'message': 'Success!',
-            'data': {
-                'key': 'value'
-            }
-        },
-        'msg': 'success',
-        'extra': {}
-    }
-    return jsonify(r_data)
-
-if __name__ == '__main__':
-    app.run(debug=True)