diff --git a/src/recon/ReconClient.cpp b/src/recon/ReconClient.cpp index da8f8b5..5a974d1 100644 --- a/src/recon/ReconClient.cpp +++ b/src/recon/ReconClient.cpp @@ -36,13 +36,11 @@ namespace Recon { std::string content; content.append("1"); auto resp = mRequest.post(mHost+CHECK_URL,content,mHeaders); - if (resp->httpCode() == 200){ - delete resp; + if (resp.httpCode() == 200){ return RequestResult::Success(); } else{ - mErrorMessage = resp->getContent(); - delete resp; + mErrorMessage = resp.getContent(); return RequestResult::Fail(mErrorMessage); } } @@ -63,13 +61,11 @@ namespace Recon { content.append(str); free(str); auto resp = mRequest.post(mHost+CREATE_URL,content,mHeaders); - if (resp->httpCode() == 201){ - delete resp; + if (resp.httpCode() == 201){ return RequestResult::Success(); } else{ - mErrorMessage = resp->getContent(); - delete resp; + mErrorMessage = resp.getContent(); return RequestResult::Fail(mErrorMessage); } } @@ -84,9 +80,8 @@ namespace Recon { content.append(str); free(str); auto resp = mRequest.post(mHost+QUERY_SCAN_URL,content,mHeaders); - if (resp->httpCode() == 200){ - cJSON * scans = cJSON_Parse(resp->getContent().data()); - delete resp; + if (resp.httpCode() == 200){ + cJSON * scans = cJSON_Parse(resp.getContent().data()); int size = cJSON_GetArraySize(scans); if (size == 1){ cJSON * scaninf = cJSON_GetArrayItem(scans, 0); @@ -101,8 +96,7 @@ namespace Recon { return RequestResult::Fail(mErrorMessage); } else{ - mErrorMessage = resp->getContent(); - delete resp; + mErrorMessage = resp.getContent(); return RequestResult::Fail(mErrorMessage); } } @@ -117,18 +111,15 @@ namespace Recon { content.append(str); free(str); auto resp = mRequest.post(mHost+QUERY_RECON_URL,content,mHeaders); - if (resp->httpCode() == 204){ - delete resp; + if (resp.httpCode() == 204){ return RequestResult::Success(); } - else if (resp->httpCode() == 200){ - aReconID = resp->getContent(); - delete resp; + else if (resp.httpCode() == 200){ + aReconID = resp.getContent(); return RequestResult::Success(aReconID); } else{ - mErrorMessage = resp->getContent(); - delete resp; + mErrorMessage = resp.getContent(); return RequestResult::Fail(mErrorMessage); } @@ -144,9 +135,8 @@ namespace Recon { content.append(str); free(str); auto resp = mRequest.post(mHost+QUERY_RECON_URL,content,mHeaders); - if (resp->httpCode() == 200){ - cJSON * task = cJSON_Parse(resp->getContent().data()); - delete resp; + if (resp.httpCode() == 200){ + cJSON * task = cJSON_Parse(resp.getContent().data()); aTask.ReconID = cJSON_GetObjectItem(task, "ReconID")->valuestring; aTask.ScanID= cJSON_GetObjectItem(task, "ScanID")->valuestring; aTask.Start = cJSON_GetObjectItem(task, "Start")->valueint!=0; @@ -155,8 +145,7 @@ namespace Recon { return RequestResult::Success(); } else{ - mErrorMessage = resp->getContent(); - delete resp; + mErrorMessage = resp.getContent(); return RequestResult::Fail(mErrorMessage); } } @@ -166,14 +155,12 @@ namespace Recon { std::string content; content.append("1"); auto resp = mRequest.post(mHost+QUERY_VERSION_URL,content,mHeaders); - if (resp->httpCode() == 200){ - std::string version = resp->getContent(); - delete resp; + if (resp.httpCode() == 200){ + std::string version = resp.getContent(); return RequestResult::Success(version); } else{ - mErrorMessage = resp->getContent(); - delete resp; + mErrorMessage = resp.getContent(); return RequestResult::Fail(mErrorMessage); } } @@ -199,13 +186,11 @@ namespace Recon { content.append(str); free(str); auto resp = mRequest.post(mHost+SET_PACS_URL,content,mHeaders); - if (resp->httpCode() == 200){ - delete resp; + if (resp.httpCode() == 200){ return RequestResult::Success(); } else{ - mErrorMessage = resp->getContent(); - delete resp; + mErrorMessage = resp.getContent(); return RequestResult::Fail(mErrorMessage); } } diff --git a/thirdParty/Req/pub/include/Request.h b/thirdParty/Req/pub/include/Request.h index de5c5dd..136ea34 100644 --- a/thirdParty/Req/pub/include/Request.h +++ b/thirdParty/Req/pub/include/Request.h @@ -15,10 +15,9 @@ namespace Req { Request &operator=(Request &&) = delete; Request &operator=(const Request &) = delete; ~Request(); - bool isValid(); void setClientCertificate(const std::string &cerPath, const std::string &keyPath); 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& headers = std::unordered_map()); @@ -28,8 +27,6 @@ namespace Req { std::string mCert; std::string mKey; bool mVerbose; - bool mValid; - }; } #endif // __REQUEST_H__ \ No newline at end of file diff --git a/thirdParty/Req/pub/include/Response.h b/thirdParty/Req/pub/include/Response.h index 1a9c906..b9ccbe8 100644 --- a/thirdParty/Req/pub/include/Response.h +++ b/thirdParty/Req/pub/include/Response.h @@ -7,7 +7,6 @@ namespace Req { { public: Response(); - static Response* ErrorResponse(const std::string & content); Response(Response &&) = default; Response(const Response &) = default; Response &operator=(Response &&) = delete; @@ -16,11 +15,9 @@ namespace Req { long httpCode(); void setHttpCode(long code); std::string& getContent(); - bool isResponsed(); private: long mHttpCode = 404; std::string mContent; - bool mResponsed; }; }; #endif // __RESPONSE_H__ \ No newline at end of file diff --git a/thirdParty/Req/pub/lib/libReq.so b/thirdParty/Req/pub/lib/libReq.so index b6cffa8..e877bce 100644 Binary files a/thirdParty/Req/pub/lib/libReq.so and b/thirdParty/Req/pub/lib/libReq.so differ