sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Req lib to lastest version

Browse Source
This commit is contained in:
kradchen
2023-11-16 11:43:31 +08:00
parent 17cdc48e8d
commit b3b6d5c5f9
4 changed files with 20 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/recon/ReconClient.cpp
View File

@@ -36,13 +36,11 @@ namespace Recon {
std::string content; std::string content;
content.append("1"); content.append("1");
auto resp = mRequest.post(mHost+CHECK_URL,content,mHeaders); auto resp = mRequest.post(mHost+CHECK_URL,content,mHeaders);
if (resp->httpCode() == 200){ if (resp.httpCode() == 200){
delete resp;
return RequestResult::Success(); return RequestResult::Success();
} }
else{ else{
mErrorMessage = resp->getContent(); mErrorMessage = resp.getContent();
delete resp;
return RequestResult::Fail(mErrorMessage); return RequestResult::Fail(mErrorMessage);
} }
} }
@@ -63,13 +61,11 @@ namespace Recon {
content.append(str); content.append(str);
free(str); free(str);
auto resp = mRequest.post(mHost+CREATE_URL,content,mHeaders); auto resp = mRequest.post(mHost+CREATE_URL,content,mHeaders);
if (resp->httpCode() == 201){ if (resp.httpCode() == 201){
delete resp;
return RequestResult::Success(); return RequestResult::Success();
} }
else{ else{
mErrorMessage = resp->getContent(); mErrorMessage = resp.getContent();
delete resp;
return RequestResult::Fail(mErrorMessage); return RequestResult::Fail(mErrorMessage);
} }
} }
@@ -84,9 +80,8 @@ namespace Recon {
content.append(str); content.append(str);
free(str); free(str);
auto resp = mRequest.post(mHost+QUERY_SCAN_URL,content,mHeaders); auto resp = mRequest.post(mHost+QUERY_SCAN_URL,content,mHeaders);
if (resp->httpCode() == 200){ if (resp.httpCode() == 200){
cJSON * scans = cJSON_Parse(resp->getContent().data()); cJSON * scans = cJSON_Parse(resp.getContent().data());
delete resp;
int size = cJSON_GetArraySize(scans); int size = cJSON_GetArraySize(scans);
if (size == 1){ if (size == 1){
cJSON * scaninf = cJSON_GetArrayItem(scans, 0); cJSON * scaninf = cJSON_GetArrayItem(scans, 0);
@@ -101,8 +96,7 @@ namespace Recon {
return RequestResult::Fail(mErrorMessage); return RequestResult::Fail(mErrorMessage);
} }
else{ else{
mErrorMessage = resp->getContent(); mErrorMessage = resp.getContent();
delete resp;
return RequestResult::Fail(mErrorMessage); return RequestResult::Fail(mErrorMessage);
} }
} }
@@ -117,18 +111,15 @@ namespace Recon {
content.append(str); content.append(str);
free(str); free(str);
auto resp = mRequest.post(mHost+QUERY_RECON_URL,content,mHeaders); auto resp = mRequest.post(mHost+QUERY_RECON_URL,content,mHeaders);
if (resp->httpCode() == 204){ if (resp.httpCode() == 204){
delete resp;
return RequestResult::Success(); return RequestResult::Success();
} }
else if (resp->httpCode() == 200){ else if (resp.httpCode() == 200){
aReconID = resp->getContent(); aReconID = resp.getContent();
delete resp;
return RequestResult::Success(aReconID); return RequestResult::Success(aReconID);
} }
else{ else{
mErrorMessage = resp->getContent(); mErrorMessage = resp.getContent();
delete resp;
return RequestResult::Fail(mErrorMessage); return RequestResult::Fail(mErrorMessage);
} }
@@ -144,9 +135,8 @@ namespace Recon {
content.append(str); content.append(str);
free(str); free(str);
auto resp = mRequest.post(mHost+QUERY_RECON_URL,content,mHeaders); auto resp = mRequest.post(mHost+QUERY_RECON_URL,content,mHeaders);
if (resp->httpCode() == 200){ if (resp.httpCode() == 200){
cJSON * task = cJSON_Parse(resp->getContent().data()); cJSON * task = cJSON_Parse(resp.getContent().data());
delete resp;
aTask.ReconID = cJSON_GetObjectItem(task, "ReconID")->valuestring; aTask.ReconID = cJSON_GetObjectItem(task, "ReconID")->valuestring;
aTask.ScanID= cJSON_GetObjectItem(task, "ScanID")->valuestring; aTask.ScanID= cJSON_GetObjectItem(task, "ScanID")->valuestring;
aTask.Start = cJSON_GetObjectItem(task, "Start")->valueint!=0; aTask.Start = cJSON_GetObjectItem(task, "Start")->valueint!=0;
@@ -155,8 +145,7 @@ namespace Recon {
return RequestResult::Success(); return RequestResult::Success();
} }
else{ else{
mErrorMessage = resp->getContent(); mErrorMessage = resp.getContent();
delete resp;
return RequestResult::Fail(mErrorMessage); return RequestResult::Fail(mErrorMessage);
} }
} }
@@ -166,14 +155,12 @@ namespace Recon {
std::string content; std::string content;
content.append("1"); content.append("1");
auto resp = mRequest.post(mHost+QUERY_VERSION_URL,content,mHeaders); auto resp = mRequest.post(mHost+QUERY_VERSION_URL,content,mHeaders);
if (resp->httpCode() == 200){ if (resp.httpCode() == 200){
std::string version = resp->getContent(); std::string version = resp.getContent();
delete resp;
return RequestResult::Success(version); return RequestResult::Success(version);
} }
else{ else{
mErrorMessage = resp->getContent(); mErrorMessage = resp.getContent();
delete resp;
return RequestResult::Fail(mErrorMessage); return RequestResult::Fail(mErrorMessage);
} }
} }
@@ -199,13 +186,11 @@ namespace Recon {
content.append(str); content.append(str);
free(str); free(str);
auto resp = mRequest.post(mHost+SET_PACS_URL,content,mHeaders); auto resp = mRequest.post(mHost+SET_PACS_URL,content,mHeaders);
if (resp->httpCode() == 200){ if (resp.httpCode() == 200){
delete resp;
return RequestResult::Success(); return RequestResult::Success();
} }
else{ else{
mErrorMessage = resp->getContent(); mErrorMessage = resp.getContent();
delete resp;
return RequestResult::Fail(mErrorMessage); return RequestResult::Fail(mErrorMessage);
} }
} }

5
thirdParty/Req/pub/include/Request.h vendored
View File

@@ -15,10 +15,9 @@ namespace Req {
Request &operator=(Request &&) = delete; Request &operator=(Request &&) = delete;
Request &operator=(const Request &) = delete; Request &operator=(const Request &) = delete;
~Request(); ~Request();
bool isValid();
void setClientCertificate(const std::string &cerPath, const std::string &keyPath); void setClientCertificate(const std::string &cerPath, const std::string &keyPath);
void setVerbose(bool verbose); void setVerbose(bool verbose);
Response* post(const std::string& url, const std::string &body = std::string(), Response post(const std::string& url, const std::string &body = std::string(),
const std::unordered_map<std::string, std::string>& headers = const std::unordered_map<std::string, std::string>& headers =
std::unordered_map<std::string, std::string>()); std::unordered_map<std::string, std::string>());
@@ -28,8 +27,6 @@ namespace Req {
std::string mCert; std::string mCert;
std::string mKey; std::string mKey;
bool mVerbose; bool mVerbose;
bool mValid;
}; };
} }
#endif // __REQUEST_H__ #endif // __REQUEST_H__

3
thirdParty/Req/pub/include/Response.h vendored
View File

@@ -7,7 +7,6 @@ namespace Req {
{ {
public: public:
Response(); Response();
static Response* ErrorResponse(const std::string & content);
Response(Response &&) = default; Response(Response &&) = default;
Response(const Response &) = default; Response(const Response &) = default;
Response &operator=(Response &&) = delete; Response &operator=(Response &&) = delete;
@@ -16,11 +15,9 @@ namespace Req {
long httpCode(); long httpCode();
void setHttpCode(long code); void setHttpCode(long code);
std::string& getContent(); std::string& getContent();
bool isResponsed();
private: private:
long mHttpCode = 404; long mHttpCode = 404;
std::string mContent; std::string mContent;
bool mResponsed;
}; };
}; };
#endif // __RESPONSE_H__ #endif // __RESPONSE_H__

BIN
thirdParty/Req/pub/lib/libReq.so vendored
View File

Binary file not shown.