Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: xaoyaoo/PyWxDump
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.1.37
Choose a base ref
...
head repository: xaoyaoo/PyWxDump
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 15 commits
  • 6 files changed
  • 2 contributors

Commits on Oct 15, 2024

  1. UPDATE CHANGELOG.md

    xaoyaoo committed Oct 15, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    48bdf80 View commit details

Commits on Oct 19, 2024

  1. Copy the full SHA
    654ccdd View commit details
  2. fix

    xaoyaoo committed Oct 19, 2024
    Copy the full SHA
    6d8ff36 View commit details
  3. UPDATE CHANGELOG.md

    xaoyaoo committed Oct 19, 2024
    Copy the full SHA
    ee007f5 View commit details

Commits on Dec 28, 2024

  1. fix 修改flask启动方式

    xaoyaoo committed Dec 28, 2024
    Copy the full SHA
    6a3d079 View commit details
  2. fix 修改flask启动方式

    xaoyaoo committed Dec 28, 2024
    Copy the full SHA
    fcab5ad View commit details

Commits on Jan 10, 2025

  1. 新增消息分类 (#162)

    * 新增消息分类
    Signed-off-by: SasakiSaki <[email protected]>
    oovm authored Jan 10, 2025
    Copy the full SHA
    0ac4c9c View commit details

Commits on Jan 14, 2025

  1. add wx 3.9.12.31

    xaoyaoo committed Jan 14, 2025
    Copy the full SHA
    983610f View commit details
  2. add wx 3.9.12.31

    xaoyaoo committed Jan 14, 2025
    Copy the full SHA
    ef32e93 View commit details
  3. Copy the full SHA
    c03fd47 View commit details

Commits on Feb 3, 2025

  1. add wx 3.9.12.31

    xaoyaoo committed Feb 3, 2025
    Copy the full SHA
    e2f193c View commit details
  2. add wx 3.9.12.37

    xaoyaoo committed Feb 3, 2025
    Copy the full SHA
    36a9e4f View commit details
  3. add wx 3.9.12.37

    xaoyaoo committed Feb 3, 2025
    Copy the full SHA
    881b0e5 View commit details

Commits on Feb 21, 2025

  1. add 3.9.12.45

    xaoyaoo committed Feb 21, 2025
    Copy the full SHA
    42679aa View commit details
  2. add 3.9.12.45

    xaoyaoo committed Feb 21, 2025
    Copy the full SHA
    7a0c7f3 View commit details
Showing with 77 additions and 20 deletions.
  1. +19 −1 doc/CHANGELOG.md
  2. +12 −2 doc/wx数据库简述.md
  3. +21 −0 pywxdump/WX_OFFS.json
  4. +2 −3 pywxdump/__init__.py
  5. +23 −14 pywxdump/api/__init__.py
  6. BIN pywxdump/wx_core/tools/realTime.exe
20 changes: 19 additions & 1 deletion doc/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,25 @@
## v3.1.36.(待发布)
## v3.1.39.(待发布)

-

## v3.1.38

- fix
- 实时消息增加中文路径支持
- UPDATE CHANGELOG.md

## v3.1.37

- fix
- 完善收藏的类型转换体系
- fix tag查询结果去重
- modify log fmt

## v3.1.36

- fix #143
- UPDATE CHANGELOG.md

## v3.1.35

- fix
14 changes: 12 additions & 2 deletions doc/wx数据库简述.md
Original file line number Diff line number Diff line change
@@ -227,23 +227,33 @@ FTS 这一前缀了——这代表的是搜索时所需的索引。
| 1 | 0 | 文本 |
| 3 | 0 | 图片 |
| 34 | 0 | 语音 |
| 37 | 0 | 打招呼, 加好友的时候输入的 `我是某某某` 这一句话 |
| 42 | 0 | 向别人推荐自己的好友 |
| 43 | 0 | 视频 |
| 47 | 0 | 动画表情(第三方开发的表情包) |
| 49 | 1 | 类似文字消息而不一样的消息,目前只见到一个阿里云盘的邀请注册是这样的。估计和57子类的情况一样 |
| 48 | 0 | 地图定位 |
| 49 | 1 | 类似文字消息而不一样的消息,目前只见到一个阿里云盘的邀请注册是这样的,还有飞书日程。估计和57子类的情况一样 |
| 49 | 4 | 分享 Bilibili 视频 |
| 49 | 5 | 卡片式链接,CompressContent 中有标题、简介等,BytesExtra 中有本地缓存的封面路径 |
| 49 | 6 | 文件,CompressContent 中有文件名和下载链接(但不会读),BytesExtra 中有本地保存的路径 |
| 49 | 8 | 用户上传的 GIF 表情,CompressContent 中有CDN链接,不过似乎不能直接访问下载 |
| 49 | 19 | 合并转发的聊天记录,CompressContent 中有详细聊天记录,BytesExtra 中有图片视频等的缓存 |
| 49 | 33/36 | 分享的小程序,CompressContent 中有卡片信息,BytesExtra 中有封面缓存位置 |
| 49 | 50 | 微视频 |
| 49 | 51 | 分享朋友圈动态 |
| 49 | 53 | 接龙 |
| 49 | 57 | 带有引用的文本消息(这种类型下 StrContent 为空,发送和引用的内容均在 CompressContent 中) |
| 49 | 63 | 视频号直播或直播回放等 |
| 49 | 76 | 分享歌曲 |
| 49 | 87 | 群公告 |
| 49 | 88 | 视频号直播或直播回放等 |
| 49 | 2000 | 转账消息(包括发出、接收、主动退还) |
| 49 | 2003 | 赠送红包封面 |
| 50 | 0 | 语音通话 |
| 65 | 0 | 朋友推荐消息 |
| 10000 | 0 | 系统通知(居中出现的那种灰色文字) |
| 10000 | 4 | 拍一拍 |
| 10000 | 8000 | 系统通知(特别包含你邀请别人加入群聊) |

## 更多内容查看:
https://blog.csdn.net/weixin_44495599/article/details/130030359
https://blog.csdn.net/weixin_44495599/article/details/130030359
21 changes: 21 additions & 0 deletions pywxdump/WX_OFFS.json
Original file line number Diff line number Diff line change
@@ -425,5 +425,26 @@
93834792,
0,
93836256
],
"3.9.12.31": [
94516904,
94518240,
94516712,
0,
94518176
],
"3.9.12.37": [
94520808,
94522144,
94522146,
0,
94522080
],
"3.9.12.45": [
94503784,
94505120,
94503592,
0,
94505056
]
}
5 changes: 2 additions & 3 deletions pywxdump/__init__.py
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
# Author: xaoyaoo
# Date: 2023/10/14
# -------------------------------------------------------------------------------
__version__ = "3.1.37"
__version__ = "3.1.43"

import os, json

@@ -31,5 +31,4 @@
__all__ = ["BiasAddr", "get_wx_info", "get_wx_db", "batch_decrypt", "decrypt", "get_core_db",
"merge_db", "decrypt_merge", "merge_real_time_db", "all_merge_real_time_db",
"DBHandler", "MsgHandler", "MicroHandler", "MediaHandler", "OpenIMContactHandler", "FavoriteHandler",
"PublicMsgHandler",
"start_server", "WX_OFFS", "WX_OFFS_PATH", "__version__"]
"PublicMsgHandler", "start_server", "WX_OFFS", "WX_OFFS_PATH", "__version__"]
37 changes: 23 additions & 14 deletions pywxdump/api/__init__.py
Original file line number Diff line number Diff line change
@@ -29,23 +29,23 @@
from pywxdump import __version__


def gen_fastapi_app(handler):
def gen_fastapi_app(handler, origins=None):
app = FastAPI(title="wxdump", description="微信工具", version=__version__,
terms_of_service="https://github.com/xaoyaoo/pywxdump",
contact={"name": "xaoyaoo", "url": "https://github.com/xaoyaoo/pywxdump"},
license_info={"name": "MIT License",
"url": "https://github.com/xaoyaoo/PyWxDump/blob/master/LICENSE"})

web_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), "ui", "web") # web文件夹路径

# 跨域
origins = [
"http://localhost:5000",
"http://127.0.0.1:5000",
"http://localhost:8080", # 开发环境的客户端地址"
# "http://0.0.0.0:5000",
# "*"
]
if not origins:
origins = [
"http://localhost:5000",
"http://127.0.0.1:5000",
"http://localhost:8080", # 开发环境的客户端地址"
# "http://0.0.0.0:5000",
# "*"
]
app.add_middleware(
CORSMiddleware,
allow_origins=origins, # 允许所有源
@@ -191,16 +191,25 @@ def start_server(port=5000, online=False, debug=False, isopenBrowser=True,

time.sleep(1)
server_loger.info(f"启动flask服务,host:port:{host}:{port}")
print("[+] 请使用浏览器访问 http://127.0.0.1:5000/ 查看聊天记录")
print(f"[+] 请使用浏览器访问 http://127.0.0.1:{port}/ 查看聊天记录")
global app
print("[+] 如需查看api文档,请访问 http://127.0.0.1:5000/docs ")
app = gen_fastapi_app(file_handler)
print(f"[+] 如需查看api文档,请访问 http://127.0.0.1:{port}/docs ")
origins = [
f"http://localhost:{port}",
f"http://{host}:{port}",
f"http://localhost:8080", # 开发环境的客户端地址"
# f"http://0.0.0.0:{port}",
# "*"
]
app = gen_fastapi_app(file_handler, origins)

LOGGING_CONFIG["formatters"]["default"]["fmt"] = "[%(asctime)s] %(levelprefix)s %(message)s"
LOGGING_CONFIG["formatters"]["access"][
"fmt"] = '[%(asctime)s] %(levelprefix)s %(client_addr)s - "%(request_line)s" %(status_code)s'

uvicorn.run(app=app, host=host, port=port, reload=debug, log_level="info", workers=1, env_file=env_file)
config = uvicorn.Config(app=app, host=host, port=port, reload=debug, log_level="info", workers=1, env_file=env_file)
server = uvicorn.Server(config)
server.run()
# uvicorn.run(app=app, host=host, port=port, reload=debug, log_level="info", workers=1, env_file=env_file)


app = None
Binary file modified pywxdump/wx_core/tools/realTime.exe
Binary file not shown.