fix：修复获取个人信息错误的bug

README.md

@@ -197,17 +197,16 @@ vcpkg
 |result|string|成功提示|
 |data|object|响应内容|
 |account|string|账号|
-|bigImage|string|头像大图|
+|headImage|string|头像|
 |city|string|城市|
 |country|string|国家|
-|currentDataPath|string|当前数据目录|
-|dataRootPath|string|根目录|
-|dataSavePath|string|保存目录|
+|currentDataPath|string|当前数据目录,登录的账号目录|
+|dataSavePath|string|微信保存目录|
 |mobile|string|手机|
 |name|string|昵称|
 |province|string|省|
-|smallImage|string|小头像|
 |wxid|string|wxid|
+|signature|string|个人签名|
 
 ###### 接口示例
 入参：
@@ -215,7 +214,7 @@ vcpkg
 ```
 响应：
 ``` javascript
-{"code":1,"data":{"account":"xx","bigImage":"https://wx.qlogo.cn/mmhead/ver_1xx","city":"xx","country":"CN","currentDataPath":"xxx","dataRootPath":"C:\\xx","dataSavePath":"C:\\xx","mobie":"13949175447","name":"xx","province":"xx","smallImage":"xx","wxid":"xx"},"result":"OK"}
+{"code":1,"data":{"account":"xx","headImage":"https://wx.qlogo.cn/mmhead/ver_1xx","city":"xx","country":"CN","currentDataPath":"C:\\xx\\wxid_xxxxx","dataSavePath":"C:\\xx","mobie":"13812345678","name":"xx","province":"xx","signature":"xx","wxid":"xx"},"result":"OK"}
 ```
 
 

src/api.cc

@@ -221,9 +221,8 @@ void api_handle(mg_http_message *hm, struct mg_connection *c, string &ret) {
             {"account", self_info.account},
             {"wxid", self_info.wxid},
             {"mobile", self_info.mobile},
-            {"smallImage", self_info.small_img},
-            {"bigImage", self_info.big_img},
-            {"dataRootPath",self_info.data_root_path},
+            {"headImage", self_info.head_img},
+            {"signature",self_info.signature},
             {"dataSavePath",self_info.data_save_path},
             {"currentDataPath",self_info.current_data_path},
         };
@@ -701,7 +700,7 @@ int http_start(int port) {
   #endif
   kHttpRuning = true;
   kHttpThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)http_server,
-                             (LPVOID)port, NULL, 0);
+                              (LPVOID)port, NULL, 0);
   return 0;
 }
 

src/common.cc

@@ -135,4 +135,11 @@ BOOL FindOrCreateDirectoryW(const wchar_t *path) {
     return false;
   }
   return true;
+}
+
+void CloseConsole(){
+  fclose(stdin);
+  fclose(stdout);
+  fclose(stderr);
+  FreeConsole();
 }

src/common.h

@@ -53,6 +53,7 @@ std::string Wstring2String(std::wstring wstr);
 /// @return 
 BOOL FindOrCreateDirectoryW(const wchar_t *path);
 
+void CloseConsole();
 
 template <typename T1, typename T2>
 std::vector<T1> split(T1 str, T2 letter) {

src/db_operation.cc

@@ -97,10 +97,15 @@ int Select(DWORD db_hanle, const char *sql,
   if (status == 0) {
     return 0;
   }
+  if(data.size() == 0){
+    return 1;
+  }
   vector<string> index;
-  for (size_t i = 0; i < data[0].size(); i++)
+  for (size_t i = 0; i < data[0].size(); i++){
     index.push_back(data[0][i].column_name);
+  }
   query_result.push_back(index);
+ 
   for (auto it : data) {
     vector<string> item;
     for (size_t i = 0; i < it.size(); i++) {

src/dllMain.cc

@@ -16,6 +16,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call,
       break;
     }
     case DLL_PROCESS_DETACH: {
+      CloseConsole();
       http_close();
       break;
     }

src/self_info.cc

@@ -20,136 +20,197 @@ using namespace std;
 #define WX_APP_DATA_SAVE_PATH_OFFSET 0x2E52DB0
 #define WX_CURRENT_DATA_PATH_OFFSET 0x2E4F290
 
-#define WX_LOGOUT_OFFSET  0xdd5c90
-#define WX_ACCOUT_SERVICE_OFFSET 0x707960
-
+#define WX_LOGOUT_OFFSET 0xdd5c90
+#define WX_ACCOUNT_SERVICE_OFFSET 0x707960
+#define WX_GET_APP_DATA_SAVE_PATH_OFFSET 0xeb4b00
+#define WX_GET_CURRENT_DATA_PATH_OFFSET 0xc11140
 int GetSelfInfo(SelfInfoInner &out) {
   DWORD base = GetWeChatWinBase();
-#ifdef _DEBUG
-  cout << "mobile:" << (char *)(base + WX_SELF_MOBILE_OFFSET) << endl;
-  cout << "name:" << (char *)(base + WX_SELF_NAME_OFFSET) << endl;
-  cout << "city:" << (char *)(base + WX_SELF_CITY_OFFSET) << endl;
-  cout << "city:" << (char *)(base + WX_SELF_CITY_OFFSET) << endl;
-  cout << "province:" << (char *)(base + WX_SELF_PROVINCE_OFFSET) << endl;
-  cout << "country:" << (char *)(base + WX_SELF_COUNTRY_OFFSET) << endl;
-  cout << "account:" << (char *)(base + WX_SELF_ACCOUNT_OFFSET) << endl;
-  cout << "wxid:" << (char *)(base + WX_SELF_ID_OFFSET) << endl;
-  cout << "small_img:" << (char *)(base + WX_SELF_SMALL_IMG_OFFSET) << endl;
-  cout << "big_img:" << (char *)(base + WX_SELF_BIG_IMG_OFFSET) << endl;
-#endif
-  if (*(DWORD *)(base + WX_SELF_NAME_OFFSET) == 0 ||
-      *(DWORD *)(base + WX_SELF_NAME_OFFSET + 0x10) == 0) {
-    out.name = string();
-  } else {
-    out.name = string((char *)(base + WX_SELF_NAME_OFFSET),
-                      *(DWORD *)(base + WX_SELF_NAME_OFFSET + 0x10));
+  DWORD accout_service_addr = base + WX_ACCOUNT_SERVICE_OFFSET;
+  DWORD get_app_save_addr = base + WX_GET_APP_DATA_SAVE_PATH_OFFSET;
+  DWORD get_current_data_path_addr = base + WX_GET_CURRENT_DATA_PATH_OFFSET;
+  DWORD service_addr = NULL;
+  __asm {
+      PUSHAD 
+      CALL       accout_service_addr                          
+      MOV        service_addr,EAX
+      POPAD
   }
-  if (*(DWORD *)(base + WX_SELF_MOBILE_OFFSET) == 0 ||
-      *(DWORD *)(base + WX_SELF_MOBILE_OFFSET + 0x10) == 0) {
-    out.mobile = string();
-  } else {
-    out.mobile = string((char *)(base + WX_SELF_MOBILE_OFFSET),
-                       *(DWORD *)(base + WX_SELF_MOBILE_OFFSET + 0x10));
+  if (service_addr) {
+    if (*(DWORD *)(service_addr + 0x44) == 0 ||
+        *(DWORD *)(service_addr + 0x44 + 0x10) == 0) {
+      out.wxid = string();
+    } else {
+      if (*(DWORD *)(service_addr + 0x44 + 0x14) == 0xF) {
+        out.wxid = string((char *)(service_addr + 0x44),
+                          *(DWORD *)(service_addr + 0x44 + 0x10));
+      } else {
+        out.wxid = string(*(char **)(service_addr + 0x44),
+                          *(DWORD *)(service_addr + 0x44 + 0x10));
+      }
+    }
+
+    if (*(DWORD *)(service_addr + 0xA8) == 0 ||
+        *(DWORD *)(service_addr + 0xA8 + 0x10) == 0) {
+      out.account = string();
+    } else {
+      if (*(DWORD *)(service_addr + 0xA8 + 0x14) == 0xF) {
+        out.account = string((char *)(service_addr + 0xA8),
+                             *(DWORD *)(service_addr + 0xA8 + 0x10));
+      } else {
+        out.account = string(*(char **)(service_addr + 0xA8),
+                             *(DWORD *)(service_addr + 0xA8 + 0x10));
+      }
+    }
+
+    if (*(DWORD *)(service_addr + 0xC0) == 0 ||
+        *(DWORD *)(service_addr + 0xC0 + 0x10) == 0) {
+      out.mobile = string();
+    } else {
+      if (*(DWORD *)(service_addr + 0xC0 + 0x14) == 0xF) {
+        out.mobile = string((char *)(service_addr + 0xC0),
+                            *(DWORD *)(service_addr + 0xC0 + 0x10));
+      } else {
+        out.mobile = string(*(char **)(service_addr + 0xC0),
+                            *(DWORD *)(service_addr + 0xC0 + 0x10));
+      }
+    }
+
+    if (*(DWORD *)(service_addr + 0xD8) == 0 ||
+        *(DWORD *)(service_addr + 0xD8 + 0x10) == 0) {
+      out.signature = string();
+    } else {
+      if (*(DWORD *)(service_addr + 0xD8 + 0x14) == 0xF) {
+        out.signature = string((char *)(service_addr + 0xD8),
+                               *(DWORD *)(service_addr + 0xD8 + 0x10));
+      } else {
+        out.signature = string(*(char **)(service_addr + 0xD8),
+                               *(DWORD *)(service_addr + 0xD8 + 0x10));
+      }
+    }
+
+    if (*(DWORD *)(service_addr + 0xF0) == 0 ||
+        *(DWORD *)(service_addr + 0xF0 + 0x10) == 0) {
+      out.country = string();
+    } else {
+      if (*(DWORD *)(service_addr + 0xF0 + 0x14) == 0xF) {
+        out.country = string((char *)(service_addr + 0xF0),
+                             *(DWORD *)(service_addr + 0xF0 + 0x10));
+      } else {
+        out.country = string(*(char **)(service_addr + 0xF0),
+                             *(DWORD *)(service_addr + 0xF0 + 0x10));
+      }
+    }
+
+    if (*(DWORD *)(service_addr + 0x108) == 0 ||
+        *(DWORD *)(service_addr + 0x108 + 0x10) == 0) {
+      out.province = string();
+    } else {
+      if (*(DWORD *)(service_addr + 0x108 + 0x14) == 0xF) {
+        out.province = string((char *)(service_addr + 0x108),
+                              *(DWORD *)(service_addr + 0x108 + 0x10));
+      } else {
+        out.province = string(*(char **)(service_addr + 0x108),
+                              *(DWORD *)(service_addr + 0x108 + 0x10));
+      }
+    }
+
+    if (*(DWORD *)(service_addr + 0x120) == 0 ||
+        *(DWORD *)(service_addr + 0x120 + 0x10) == 0) {
+      out.city = string();
+    } else {
+      if (*(DWORD *)(service_addr + 0x120 + 0x14) == 0xF) {
+        out.city = string((char *)(service_addr + 0x120),
+                          *(DWORD *)(service_addr + 0x120 + 0x10));
+      } else {
+        out.city = string(*(char **)(service_addr + 0x120),
+                          *(DWORD *)(service_addr + 0x120 + 0x10));
+      }
+    }
+
+    if (*(DWORD *)(service_addr + 0x150) == 0 ||
+        *(DWORD *)(service_addr + 0x150 + 0x10) == 0) {
+      out.name = string();
+    } else {
+      if (*(DWORD *)(service_addr + 0x150 + 0x14) == 0xF) {
+        out.name = string((char *)(service_addr + 0x150),
+                          *(DWORD *)(service_addr + 0x150 + 0x10));
+      } else {
+        out.name = string(*(char **)(service_addr + 0x150),
+                          *(DWORD *)(service_addr + 0x150 + 0x10));
+      }
+    }
+
+    if (*(DWORD *)(service_addr + 0x304) == 0 ||
+        *(DWORD *)(service_addr + 0x304 + 0x10) == 0) {
+      out.head_img = string();
+    } else {
+      if (*(DWORD *)(service_addr + 0x304 + 0x14) == 0xF) {
+        out.head_img = string((char *)(service_addr + 0x304),
+                              *(DWORD *)(service_addr + 0x304 + 0x10));
+      } else {
+        out.head_img = string(*(char **)(service_addr + 0x304),
+                              *(DWORD *)(service_addr + 0x304 + 0x10));
+      }
+    }
   }
 
-  if (*(DWORD *)(base + WX_SELF_CITY_OFFSET) == 0 ||
-      *(DWORD *)(base + WX_SELF_CITY_OFFSET + 0x10) == 0) {
-    out.city = string();
-  } else {
-    out.city = string((char *)(base + WX_SELF_CITY_OFFSET),
-                      *(DWORD *)(base + WX_SELF_CITY_OFFSET + 0x10));
+  WeChatString data_save_path;
+  WeChatString current_data_path;
+
+  __asm {
+      PUSHAD
+      LEA     ECX,data_save_path
+      CALL    get_app_save_addr
+      LEA     ECX,current_data_path
+      CALL    get_current_data_path_addr
+      POPAD
   }
 
-  if (*(DWORD *)(base + WX_SELF_PROVINCE_OFFSET) == 0 ||
-      *(DWORD *)(base + WX_SELF_PROVINCE_OFFSET + 0x10) == 0) {
-    out.province = string();
-  } else {
-    out.province = string((char *)(base + WX_SELF_PROVINCE_OFFSET),
-                          *(DWORD *)(base + WX_SELF_PROVINCE_OFFSET + 0x10));
+  if (data_save_path.ptr) {
+    out.data_save_path =
+        Wstring2String(wstring(data_save_path.ptr, data_save_path.length));
   }
-
-  if (*(DWORD *)(base + WX_SELF_COUNTRY_OFFSET) == 0 ||
-      *(DWORD *)(base + WX_SELF_COUNTRY_OFFSET + 0x10) == 0) {
-    out.country = string();
-  } else {
-    out.country = string((char *)(base + WX_SELF_COUNTRY_OFFSET),
-                         *(DWORD *)(base + WX_SELF_COUNTRY_OFFSET + 0x10));
-  }
-
-  if (*(DWORD *)(base + WX_SELF_ACCOUNT_OFFSET) == 0 ||
-      *(DWORD *)(base + WX_SELF_ACCOUNT_OFFSET + 0x10) == 0) {
-    out.account = string();
-  } else {
-    out.account = string(*(char **)(base + WX_SELF_ACCOUNT_OFFSET),
-                         *(DWORD *)(base + WX_SELF_ACCOUNT_OFFSET + 0x10));
-  }
-
-  if (*(DWORD *)(base + WX_SELF_ID_OFFSET) == 0 ||
-      *(DWORD *)(base + WX_SELF_ID_OFFSET + 0x10) == 0) {
-    out.wxid = string();
-  } else {
-    out.wxid = string(*(char **)(base + WX_SELF_ID_OFFSET),
-                      *(DWORD *)(base + WX_SELF_ID_OFFSET + 0x10));
-  }
-
-  if (*(DWORD *)(base + WX_SELF_SMALL_IMG_OFFSET) == 0 ||
-      *(DWORD *)(base + WX_SELF_SMALL_IMG_OFFSET + 0x10) == 0) {
-    out.small_img = string();
-  } else {
-    out.small_img = string(*(char **)(base + WX_SELF_SMALL_IMG_OFFSET),
-                           *(DWORD *)(base + WX_SELF_SMALL_IMG_OFFSET + 0x10));
-  }
-
-  if (*(DWORD *)(base + WX_SELF_BIG_IMG_OFFSET) == 0 ||
-      *(DWORD *)(base + WX_SELF_BIG_IMG_OFFSET + 0x10) == 0) {
-    out.big_img = string();
-  } else {
-    out.big_img = string(*(char **)(base + WX_SELF_BIG_IMG_OFFSET),
-                         *(DWORD *)(base + WX_SELF_BIG_IMG_OFFSET + 0x10));
-  }
-
-  if (*(DWORD *)(base + WX_APP_DATA_ROOT_PATH_OFFSET) == 0 ||
-      *(DWORD *)(base + WX_APP_DATA_ROOT_PATH_OFFSET + 0x4) == 0) {
-    out.data_root_path = string();
-  } else {
-    out.data_root_path = Wstring2String(wstring(*(wchar_t **)(base + WX_APP_DATA_ROOT_PATH_OFFSET),
-                         *(DWORD *)(base + WX_APP_DATA_ROOT_PATH_OFFSET + 0x4)));
-  }
-
-  if (*(DWORD *)(base + WX_APP_DATA_SAVE_PATH_OFFSET) == 0 ||
-      *(DWORD *)(base + WX_APP_DATA_SAVE_PATH_OFFSET + 0x4) == 0) {
+  else {
     out.data_save_path = string();
-  } else {
-    out.data_save_path = Wstring2String(wstring(*(wchar_t **)(base + WX_APP_DATA_SAVE_PATH_OFFSET),
-                         *(DWORD *)(base + WX_APP_DATA_SAVE_PATH_OFFSET + 0x4)));
-  }
-  if (*(DWORD *)(base + WX_CURRENT_DATA_PATH_OFFSET) == 0 ||
-      *(DWORD *)(base + WX_CURRENT_DATA_PATH_OFFSET + 0x4) == 0) {
-    out.current_data_path = string();
-  } else {
-    out.current_data_path = Wstring2String(wstring(*(wchar_t **)(base + WX_CURRENT_DATA_PATH_OFFSET),
-                         *(DWORD *)(base + WX_CURRENT_DATA_PATH_OFFSET + 0x4)));
   }
 
+  if (current_data_path.ptr) {
+    out.current_data_path = Wstring2String(
+        wstring(current_data_path.ptr, current_data_path.length));
+  } else {
+    out.current_data_path = string();
+  }
   return 1;
 }
 
-
-int CheckLogin(){
+int CheckLogin() {
   DWORD base = GetWeChatWinBase();
-  return *(DWORD*) (base + WX_LOGIN_STATUS_OFFSET);
+  DWORD accout_service_addr = base + WX_ACCOUNT_SERVICE_OFFSET;
+  DWORD service_addr = NULL;
+  __asm {
+      PUSHAD 
+      CALL       accout_service_addr                          
+      MOV        service_addr,EAX
+      POPAD
+  }
+  if (service_addr) {
+    return *(DWORD *)(service_addr + 0x4C8);
+  }
+  else {
+    return 0;
+  }
 }
 
-
-int Logout(){
+int Logout() {
   int success = 0;
-  if(!CheckLogin()){
+  if (!CheckLogin()) {
     return success;
   }
   DWORD base = GetWeChatWinBase();
-  DWORD account_service_addr = base + WX_ACCOUT_SERVICE_OFFSET;
+  DWORD account_service_addr = base + WX_ACCOUNT_SERVICE_OFFSET;
   DWORD logout_addr = base + WX_LOGOUT_OFFSET;
-  __asm{
+  __asm {
     PUSHAD
     CALL       account_service_addr                              
     PUSH       0x0

src/wechat_data.h

@@ -149,10 +149,9 @@ struct SelfInfoInner{
   std::string account;
   std::string wxid;
   std::string mobile;
-  std::string  small_img;
-  std::string big_img;
-  std::string data_root_path;
+  std::string head_img;
   std::string data_save_path;
+  std::string signature;
   std::string current_data_path;
 };