|
@@ -219,7 +219,7 @@ std::string CNetWork::GetUrl(std::string path, std::vector<cpr::Parameter> param
|
|
|
|
|
|
|
|
|
std::string res_test = "";
|
|
|
- auto session = GetSession();
|
|
|
+ //auto session = GetSession();
|
|
|
int count = 3;
|
|
|
do
|
|
|
{
|
|
@@ -230,21 +230,21 @@ std::string CNetWork::GetUrl(std::string path, std::vector<cpr::Parameter> param
|
|
|
|
|
|
if (parame.empty())
|
|
|
{
|
|
|
- session->SetHeader(hander);
|
|
|
- session->SetVerifySsl(false);
|
|
|
- session->SetTimeout(cpr::Timeout{TIMEOUTE});
|
|
|
- session->SetUrl(s.c_str());
|
|
|
+ m_session.SetHeader(hander);
|
|
|
+ m_session.SetVerifySsl(false);
|
|
|
+ m_session.SetTimeout(cpr::Timeout{TIMEOUTE});
|
|
|
+ m_session.SetUrl(s.c_str());
|
|
|
//session->SetDebugCallback()
|
|
|
- r = session->Get();
|
|
|
+ r = m_session.Get();
|
|
|
//r = cpr::Get(cpr::Url{ s.c_str() }, cpr::VerifySsl{ false }, hander, cpr::Timeout{ 60 * 1000 });
|
|
|
}
|
|
|
else {
|
|
|
- session->SetHeader(hander);
|
|
|
- session->SetVerifySsl(false);
|
|
|
- session->SetTimeout(cpr::Timeout{ TIMEOUTE });
|
|
|
- session->SetUrl(s.c_str());
|
|
|
- session->SetParameters(ps);
|
|
|
- r = session->Get();
|
|
|
+ m_session.SetHeader(hander);
|
|
|
+ m_session.SetVerifySsl(false);
|
|
|
+ m_session.SetTimeout(cpr::Timeout{ TIMEOUTE });
|
|
|
+ m_session.SetUrl(s.c_str());
|
|
|
+ m_session.SetParameters(ps);
|
|
|
+ r = m_session.Get();
|
|
|
//r = cpr::Get(cpr::Url{ s.c_str() }, cpr::VerifySsl{ false }, ps, hander, cpr::Timeout{ 60 * 1000 });
|
|
|
}
|
|
|
if (r.status_code == 200 || r.status_code == 201)
|
|
@@ -273,7 +273,7 @@ std::string CNetWork::GetUrl(std::string path, std::vector<cpr::Parameter> param
|
|
|
|
|
|
} while (res_test.empty());
|
|
|
|
|
|
- pullSession(session);
|
|
|
+ //pullSession(session);
|
|
|
|
|
|
return res_test;
|
|
|
}
|
|
@@ -296,7 +296,15 @@ std::string CNetWork::PostUrl(std::string path, std::vector<cpr::Pair> parame, s
|
|
|
|
|
|
|
|
|
std::string res_test = "";
|
|
|
- auto session = GetSession();
|
|
|
+ /**
|
|
|
+ * \brief
|
|
|
+ * \param
|
|
|
+ * \param
|
|
|
+ * \param
|
|
|
+ * \return
|
|
|
+ */
|
|
|
+
|
|
|
+
|
|
|
int count = 3;
|
|
|
do
|
|
|
{
|
|
@@ -308,19 +316,19 @@ std::string CNetWork::PostUrl(std::string path, std::vector<cpr::Pair> parame, s
|
|
|
if (parame.empty())
|
|
|
{
|
|
|
//r = cpr::Get(cpr::Url{ s.c_str() }, hander, cpr::VerifySsl{false}, cpr::Timeout{ 60 * 1000 });
|
|
|
- session->SetHeader(hander);
|
|
|
- session->SetVerifySsl(false);
|
|
|
- session->SetTimeout(cpr::Timeout{ TIMEOUTE });
|
|
|
- session->SetUrl(s.c_str());
|
|
|
- r = session->Get();
|
|
|
+ m_session.SetHeader(hander);
|
|
|
+ m_session.SetVerifySsl(false);
|
|
|
+ m_session.SetTimeout(cpr::Timeout{ TIMEOUTE });
|
|
|
+ m_session.SetUrl(s.c_str());
|
|
|
+ r = m_session.Get();
|
|
|
}
|
|
|
else {
|
|
|
- session->SetHeader(hander);
|
|
|
- session->SetVerifySsl(false);
|
|
|
- session->SetTimeout(cpr::Timeout{ TIMEOUTE });
|
|
|
- session->SetUrl(s.c_str());
|
|
|
- session->SetPayload(cpr::Payload{ parame.begin(),parame.end() });
|
|
|
- r = session->Post();
|
|
|
+ m_session.SetHeader(hander);
|
|
|
+ m_session.SetVerifySsl(false);
|
|
|
+ m_session.SetTimeout(cpr::Timeout{ TIMEOUTE });
|
|
|
+ m_session.SetUrl(s.c_str());
|
|
|
+ m_session.SetPayload(cpr::Payload{ parame.begin(),parame.end() });
|
|
|
+ r = m_session.Post();
|
|
|
//r = cpr::Post(cpr::Url{ s.c_str() }, cpr::VerifySsl{ false }, cpr::Payload{ parame.begin(),parame.end() }, hander, cpr::Timeout{ 60 * 1000 });
|
|
|
}
|
|
|
//Logger::getSingletonPtr()->DEBUG(r.url.c_str());
|
|
@@ -352,7 +360,7 @@ std::string CNetWork::PostUrl(std::string path, std::vector<cpr::Pair> parame, s
|
|
|
|
|
|
|
|
|
} while (res_test.empty());
|
|
|
- pullSession(session);
|
|
|
+ //pullSession(session);
|
|
|
|
|
|
return res_test;
|
|
|
}
|