Sfoglia il codice sorgente

自动切换登录节点完成

alroyso 2 anni fa
parent
commit
85e0ed3774
4 ha cambiato i file con 18 aggiunte e 6 eliminazioni
  1. 17 5
      SProxy/CNetWork.cpp
  2. BIN
      SProxy/LoginDlg.cpp
  3. BIN
      SProxy/LoginDlg.h
  4. 1 1
      SProxy/comm.h

+ 17 - 5
SProxy/CNetWork.cpp

@@ -74,7 +74,7 @@ HTTPRET CNetWork::GetServerNode(std::string& data) {
 
 
 HTTPRET CNetWork::GetSysConfig(std::string& data)
 HTTPRET CNetWork::GetSysConfig(std::string& data)
 {
 {
-	
+	AutoToggleNode();
 	std::vector<cpr::Parameter> p;
 	std::vector<cpr::Parameter> p;
 	std::string text = GetUrl("/api/client/v3/getconfig", p);
 	std::string text = GetUrl("/api/client/v3/getconfig", p);
 	if (text.empty()) {
 	if (text.empty()) {
@@ -234,7 +234,7 @@ SStringW CNetWork::GetLastErrorW()
 
 
 std::string CNetWork::GetUrl(std::string path, std::vector<cpr::Parameter> parame,std::string token)
 std::string CNetWork::GetUrl(std::string path, std::vector<cpr::Parameter> parame,std::string token)
 {
 {
-	AutoToggleNode();
+	
 
 
 	cpr::Parameters ps;
 	cpr::Parameters ps;
 	std::vector<cpr::Parameter>::iterator it_i;
 	std::vector<cpr::Parameter>::iterator it_i;
@@ -313,6 +313,7 @@ std::string CNetWork::GetUrl(std::string path, std::vector<cpr::Parameter> param
 		{
 		{
 			break;
 			break;
 		}
 		}
+		Sleep(3000);
 		count--;
 		count--;
 		Logger::getSingletonPtr()->INFO("get ÖØÊÔ" + std::to_string(count) + "´ÎÊý");
 		Logger::getSingletonPtr()->INFO("get ÖØÊÔ" + std::to_string(count) + "´ÎÊý");
 
 
@@ -425,9 +426,12 @@ void CNetWork::AutoToggleNode() {
 		ps.Add(*it_i);
 		ps.Add(*it_i);
 		//ps(cpr::Parameter({ it->first, it->second }));
 		//ps(cpr::Parameter({ it->first, it->second }));
 	}
 	}
+	//m_url_list.reserve(m_url.size());
+
 	//Çл»½Úµã£¬
 	//Çл»½Úµã£¬
 	for each (ServerListUrl  itme in m_url_list)
 	for each (ServerListUrl  itme in m_url_list)
 	{
 	{
+		cpr::Session m_session;
 		auto s = fmt::format("{0}{1}", itme.url, "/api/client/v3/version");
 		auto s = fmt::format("{0}{1}", itme.url, "/api/client/v3/version");
 		m_session.SetHeader(hander);
 		m_session.SetHeader(hander);
 		m_session.SetVerifySsl(false);
 		m_session.SetVerifySsl(false);
@@ -435,9 +439,17 @@ void CNetWork::AutoToggleNode() {
 		m_session.SetUrl(s.c_str());
 		m_session.SetUrl(s.c_str());
 		m_session.SetParameters(ps);
 		m_session.SetParameters(ps);
 		auto r = m_session.Get();
 		auto r = m_session.Get();
-		if (r.status_code == 200) {
-			m_url = itme.url;
-			Logger::getSingletonPtr()->INFO(S_CW2A(itme.name).GetBuffer(0));
+		if (r.status_code != 200) {
+			continue;
+		}
+		else
+		{
+			if (m_url != itme.url)
+			{
+				m_url = itme.url;
+				Logger::getSingletonPtr()->INFO(S_CW2A(itme.name).GetBuffer(0));
+			}
+			break;
 		}
 		}
 	}
 	}
 
 

BIN
SProxy/LoginDlg.cpp


BIN
SProxy/LoginDlg.h


+ 1 - 1
SProxy/comm.h

@@ -21,7 +21,7 @@ constexpr auto CONNECT_NODE_MSG = L"
 constexpr auto SUEECS_NODE_MSG = L"»ñÈ¡½Úµã³É¹¦.."; 
 constexpr auto SUEECS_NODE_MSG = L"»ñÈ¡½Úµã³É¹¦.."; 
 
 
 
 
-constexpr auto VERSION = L"1.2.0";
+constexpr auto VERSION = L"1.2.1";
 
 
 
 
 struct ServerListUrl {
 struct ServerListUrl {