Merge branch 'master' of github.com:lich0821/WeChatFerry

This commit is contained in:
Changhua 2024-11-21 13:46:43 +08:00
commit c2a3443f7d
3 changed files with 23 additions and 7 deletions

View File

@ -27,6 +27,7 @@
<details><summary>点击查看功能清单</summary> <details><summary>点击查看功能清单</summary>
* 获取登录二维码
* 查询登录状态 * 查询登录状态
* 获取登录账号信息 * 获取登录账号信息
* 获取消息类型 * 获取消息类型
@ -80,6 +81,7 @@ pip install --upgrade wcferry
### HTTP ### HTTP
* [wcfrust](https://github.com/lich0821/wcf-client-rust)(基于 Rust * [wcfrust](https://github.com/lich0821/wcf-client-rust)(基于 Rust
* [go_wcf_http](clients/go_wcf_http/README.MD)(基于 Go * [go_wcf_http](clients/go_wcf_http/README.MD)(基于 Go
* [wcf-http](https://github.com/yuxiaoli/wcf-http)(基于 Python
### Java ### Java
* [java](clients/java/wcferry/README.MD) * [java](clients/java/wcferry/README.MD)
@ -209,9 +211,9 @@ WeChatFerry
## 版本更新 ## 版本更新
### v39.3.3 ### v39.3.4
* 修复发送文件 / 图片中文路径问题 * 实现获取登录二维码
<details><summary>点击查看更多</summary> <details><summary>点击查看更多</summary>
@ -223,6 +225,10 @@ WeChatFerry
* `y` 是 `WeChatFerry` 的版本,从 0 开始 * `y` 是 `WeChatFerry` 的版本,从 0 开始
* `z` 是各客户端的版本,从 0 开始 * `z` 是各客户端的版本,从 0 开始
### v39.3.3
* 修复发送文件 / 图片中文路径问题
### v39.3.2 ### v39.3.2
* 修复接收消息问题 * 修复接收消息问题

View File

@ -26,7 +26,7 @@ extern QWORD g_WeChatWinDllAddr;
#define OS_LOGIN_STATUS 0x595C9E8 #define OS_LOGIN_STATUS 0x595C9E8
#define OS_GET_SNS_DATA_MGR 0x21E2200 #define OS_GET_SNS_DATA_MGR 0x21E2200
#define OS_GET_SNS_FIRST_PAGE 0x2E212d0 #define OS_GET_SNS_FIRST_PAGE 0x2E212D0
#define OS_GET_SNS_TIMELINE_MGR 0x2DB3390 #define OS_GET_SNS_TIMELINE_MGR 0x2DB3390
#define OS_GET_SNS_NEXT_PAGE 0x2EC8970 #define OS_GET_SNS_NEXT_PAGE 0x2EC8970
#define OS_NEW_CHAT_MSG 0x1B5E140 #define OS_NEW_CHAT_MSG 0x1B5E140
@ -35,6 +35,7 @@ extern QWORD g_WeChatWinDllAddr;
#define OS_GET_MGR_BY_PREFIX_LOCAL_ID 0x213FB00 #define OS_GET_MGR_BY_PREFIX_LOCAL_ID 0x213FB00
#define OS_GET_PRE_DOWNLOAD_MGR 0x1C0EE70 #define OS_GET_PRE_DOWNLOAD_MGR 0x1C0EE70
#define OS_PUSH_ATTACH_TASK 0x1CDF4E0 #define OS_PUSH_ATTACH_TASK 0x1CDF4E0
#define OS_LOGIN_QR_CODE 0x59620D8
typedef QWORD (*GetSNSDataMgr_t)(); typedef QWORD (*GetSNSDataMgr_t)();
typedef QWORD (*GetSnsTimeLineMgr_t)(); typedef QWORD (*GetSnsTimeLineMgr_t)();
@ -348,8 +349,17 @@ int RevokeMsg(QWORD id)
string GetLoginUrl() string GetLoginUrl()
{ {
char url[] = "方法还没实现"; LPVOID targetAddress = reinterpret_cast<LPBYTE>(g_WeChatWinDllAddr) + OS_LOGIN_QR_CODE;
return "http://weixin.qq.com/x/" + string(url);
char *dataPtr = *reinterpret_cast<char **>(targetAddress); // 读取指针内容
if (!dataPtr) {
LOG_ERROR("Failed to get login url");
return "error";
}
// 读取字符串内容
std::string data(dataPtr, 22);
return "http://weixin.qq.com/x/" + data;
} }
int ReceiveTransfer(string wxid, string transferid, string transactionid) int ReceiveTransfer(string wxid, string transferid, string transactionid)

View File

@ -51,7 +51,7 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 39,3,3,0 FILEVERSION 39,3,4,0
PRODUCTVERSION 3,9,11,25 PRODUCTVERSION 3,9,11,25
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
@ -69,7 +69,7 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "WeChatFerry" VALUE "CompanyName", "WeChatFerry"
VALUE "FileDescription", "WeChatFerry" VALUE "FileDescription", "WeChatFerry"
VALUE "FileVersion", "39.3.3.0" VALUE "FileVersion", "39.3.4.0"
VALUE "InternalName", "spy.dll" VALUE "InternalName", "spy.dll"
VALUE "LegalCopyright", "Copyright (C) 2023" VALUE "LegalCopyright", "Copyright (C) 2023"
VALUE "OriginalFilename", "spy.dll" VALUE "OriginalFilename", "spy.dll"