Merge pull request #140 from 502647092/dev-3.9.2.23

feat: 0接口 新增二维码登录地址

CMakeLists.txt

@@ -5,7 +5,7 @@ project(wxhelper VERSION 1.0.0)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D '_UNICODE' /D 'UNICODE'")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D '_UNICODE' /D 'UNICODE' /D 'ELPP_THREAD_SAFE'")
 
 file(GLOB CPP_FILES  ${PROJECT_SOURCE_DIR}/src/*.cc  ${PROJECT_SOURCE_DIR}/src/*.cpp)
 

src/account_mgr.cc

@@ -181,6 +181,11 @@ int AccountMgr::GetSelfInfo(SelfInfoInner &out) {
   return 1;
 }
 
+string AccountMgr::GetLoginUrl() {
+  DWORD login_url_addr = base_addr_ + WX_LOGIN_URL_OFFSET;
+  return "http://weixin.qq.com/x/" + std::string(reinterpret_cast<char*>(*(DWORD*)login_url_addr));
+}
+
 int AccountMgr::CheckLogin() {
   int success = -1;
   DWORD accout_service_addr = base_addr_ + WX_ACCOUNT_SERVICE_OFFSET;

src/account_mgr.h

@@ -8,6 +8,9 @@ namespace wxhelper{
     public:
     explicit  AccountMgr(DWORD base);
      ~AccountMgr();
+
+     std::string GetLoginUrl();
+
      int GetSelfInfo(SelfInfoInner& out);
 
      int CheckLogin();

src/contact_mgr.cc

@@ -175,7 +175,7 @@ int ContactMgr::AddFriendByWxid(wchar_t *wxid,wchar_t* msg) {
   return success;
 }
 
- int ContactMgr::VerifyApply(wchar_t *v3, wchar_t *v4){
+ int ContactMgr::VerifyApply(wchar_t *v3, wchar_t *v4,int permission){
   int success = -1;
   DWORD set_value_addr = base_addr_ + WX_INIT_CHAT_MSG_OFFSET;
   DWORD verify_addr = base_addr_ + WX_VERIFY_OK_OFFSET;
@@ -186,12 +186,13 @@ int ContactMgr::AddFriendByWxid(wchar_t *wxid,wchar_t* msg) {
   WeChatString v3_str(v3);
   char helper_obj[0x40] = {0};
   char nullbuffer[0x3CC] = {0};
+  int flag = permission < 0 ? 0:permission;
   __asm {
       PUSHAD  
       PUSHFD         
       LEA        ECX,helper_obj
       CALL       new_helper_addr
-      MOV        ESI,0x0
+      MOV        ESI,flag
       MOV        EDI,0x6                   
       PUSH       ESI
       PUSH       EDI

src/contact_mgr.h

@@ -14,7 +14,7 @@ class ContactMgr : public BaseMgr {
   int DelContact(wchar_t* wxid);
   std::wstring GetContactOrChatRoomNickname(wchar_t* id);
   int AddFriendByWxid(wchar_t* wxid,wchar_t* msg);
-  int VerifyApply(wchar_t *v3, wchar_t *v4);
+  int VerifyApply(wchar_t *v3, wchar_t *v4,int permission);
 };
 }  // namespace wxhelper
 

src/http_handler.cc

@@ -94,7 +94,7 @@ string Dispatch(struct mg_connection *c, struct mg_http_message *hm) {
     case WECHAT_IS_LOGIN: {
       int success = -1;
       success = g_context.account_mgr->CheckLogin();
-      json ret_data = {{"result", "OK"}, {"code", success}};
+      json ret_data = {{"result", "OK"}, {"code", success}, {"login_url", g_context.account_mgr->GetLoginUrl()}};
       ret = ret_data.dump();
       break;
     }
@@ -252,7 +252,8 @@ string Dispatch(struct mg_connection *c, struct mg_http_message *hm) {
     case WECHAT_CONTACT_VERIFY_APPLY: {
       wstring v3 = GetWStringParam(j_param, "v3");
       wstring v4 = GetWStringParam(j_param, "v4");
-      int success = g_context.contact_mgr->VerifyApply(WS2LPWS(v3),WS2LPWS(v4));
+      int permission = GetIntParam(j_param, "permission");
+      int success = g_context.contact_mgr->VerifyApply(WS2LPWS(v3),WS2LPWS(v4),permission);
       json ret_data = {{"code", success}, {"result", "OK"}};
       ret = ret_data.dump();
       break;

src/wechat_function.h

@@ -116,6 +116,7 @@
 
 
 //login
+#define WX_LOGIN_URL_OFFSET 0x3040DE8
 #define WX_LOGOUT_OFFSET 0xe58870
 #define WX_ACCOUNT_SERVICE_OFFSET 0x768c80
 #define WX_GET_APP_DATA_SAVE_PATH_OFFSET 0xf3a610