1.0.7

Base/Base.vcxproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ShowAllFiles>false</ShowAllFiles>
+    <ShowAllFiles>true</ShowAllFiles>
   </PropertyGroup>
 </Project>

SProxy/CManageNetWork.cpp

@@ -83,12 +83,16 @@ void CManageNetWork::ThreadFun_login(LPARAM lParam)
 		msg = m_base_curl->GetLastErrorW();
 	}
 
-	if (!CApp::getSingletonPtr()->DataToUserInfo(data))
+	if (!data.empty())
 	{
-		code = -1;
-		msg = CApp::getSingletonPtr()->GetUserinfo()->GetLastErrorW();
+		if (!CApp::getSingletonPtr()->DataToUserInfo(data))
+		{
+			code = -1;
+			msg = CApp::getSingletonPtr()->GetUserinfo()->GetLastErrorW();
+		}
 	}
-	
+
+
 	DataToFile();
 
 	EventLogin* pEvt = new EventLogin(nullptr);
@@ -101,9 +105,12 @@ void CManageNetWork::ThreadFun_login(LPARAM lParam)
 void CManageNetWork::LoadFileToData() {
 	FileOperate f;
 	std::string path = std::filesystem::current_path().string();
-	if (f.open(path + "\\user.txt", std::fstream::in | std::fstream::out | std::fstream::app)) {
+	if (f.open(path + "\\user.json", std::fstream::in | std::fstream::out | std::fstream::app)) {
 		std::string data = f.readAll();
-
+		if (data.empty())
+		{
+			return;
+		}
 		nlohmann::json j3 = nlohmann::json::parse(data.begin(), data.end());
 		this->m_username = j3["username"].get<std::string>().c_str();
 		this->m_password = j3["password"].get<std::string>().c_str();
@@ -125,9 +132,9 @@ void CManageNetWork::DataToFile()
 
 	std::string path = std::filesystem::current_path().string();
 
-	f.create(path + "\\user.txt");
+	f.create(path + "\\user.json");
 
-	if (f.open(path + "\\user.txt", std::fstream::in | std::fstream::out | std::fstream::app)) {
+	if (f.open(path + "\\user.json", std::fstream::in | std::fstream::out | std::fstream::app)) {
 		f.write(str);
 	}
 

SProxy/CNetWork.cpp

@@ -36,14 +36,14 @@ void CNetWork::SetUrl(LPCSTR url)
 	m_url = url;
 }
 
-LPCSTR CNetWork::GetLastErrorA()
+SStringA CNetWork::GetLastErrorA()
 {
 	return SStringA().Format("%s", m_error_msg.c_str()).GetBuffer(0);
 }
 
-LPCWSTR CNetWork::GetLastErrorW()
+SStringW CNetWork::GetLastErrorW()
 {
-	return S_CA2W(m_error_msg.c_str(),CP_UTF8);
+	return S_CA2W(m_error_msg.c_str(),CP_UTF8).GetBuffer(0);
 }
 
 std::string CNetWork::GetUrl(std::string path, std::vector<cpr::Parameter> parame)
@@ -73,7 +73,8 @@ std::string CNetWork::PostUrl(std::string path, std::vector<cpr::Pair> parame)
 		m_http_status = r.status_code;
 		if (m_http_status == 0)
 		{
-			m_error_msg = "获取数据失败，可能是您的网络问题更换备用尝试";
+			//m_http_status = r.error.code;
+			m_error_msg = r.error.message;
 		}
 
 		return "";

SProxy/CNetWork.h

@@ -12,8 +12,8 @@ public:
 	HTTPRET PostLogin(LPCSTR username, LPCSTR password, std::string& data);
 	void SetUrl(LPCSTR url);
 
-	LPCSTR  GetLastErrorA();
-	LPCWSTR  GetLastErrorW();
+	SStringA  GetLastErrorA();
+	SStringW  GetLastErrorW();
 
 private:
 	std::string GetUrl(std::string path, std::vector<cpr::Parameter> parame);

SProxy/CUserInfo.cpp

@@ -13,6 +13,11 @@ CUserInfo::~CUserInfo()
 
 bool CUserInfo::Init(std::string data)
 {
+	if (data.empty())
+	{
+		return false;
+	}
+
 	try
 	{
 		nlohmann::json j = nlohmann::json::parse(data.begin(), data.end());
@@ -38,7 +43,7 @@ bool CUserInfo::Init(std::string data)
 		}
 		else
 		{
-			this->m_error_msg = j["msg"].get<std::string>();
+			this->m_error_msg = S_CA2W(j["msg"].get<std::string>().c_str(),CP_UTF8).GetBuffer(0);
 
 			return false;
 		}
@@ -47,20 +52,20 @@ bool CUserInfo::Init(std::string data)
 	}
 	catch (...)
 	{
-		this->m_error_msg = "解析数据错误";
+		this->m_error_msg = L"解析数据错误";
 		return false;
 	}
     return false;
 }
 
-LPCSTR CUserInfo::GetLastErrorA()
+SStringA CUserInfo::GetLastErrorA()
 {
-	return SStringA().Format("%s", m_error_msg.c_str()).GetBuffer(0);
+	return S_CW2A(m_error_msg,CP_UTF8);
 }
 
-LPCWSTR CUserInfo::GetLastErrorW()
+SStringW CUserInfo::GetLastErrorW()
 {
-	return S_CA2W(m_error_msg.c_str(), CP_UTF8);
+	return m_error_msg.GetBuffer(0);
 }
 
 

SProxy/CUserInfo.h

@@ -15,9 +15,9 @@ public:
 
  
 
-	LPCSTR GetLastErrorA();
+	SStringA GetLastErrorA();
 
-	LPCWSTR GetLastErrorW();
+	SStringW GetLastErrorW();
  
 	
 
@@ -35,6 +35,6 @@ public:
 	int port;
 
 private:
-	std::string m_error_msg;
+	SStringW m_error_msg;
 };
 

SProxy/IBaseCurl.h

@@ -22,8 +22,8 @@ public:
 	virtual HTTPRET PostLogin(LPCSTR username, LPCSTR password, std::string& data) = 0;
 
 
-	virtual LPCSTR  GetLastErrorA() = 0;
-	virtual LPCWSTR  GetLastErrorW() = 0;
+	virtual SStringA  GetLastErrorA() = 0;
+	virtual SStringW  GetLastErrorW() = 0;
 
 };