1585346868/aliyun-openapi-cpp-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade sdk core:

Browse Source 
supported json param;
change the way of include Utils.h;
This commit is contained in:
wb-hx510875
2019-08-14 11:13:26 +08:00
parent 090cb08688
commit 08faebee0d
17 changed files with 657 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
core/src/CoreClient.cc
View File

@@ -14,11 +14,12 @@
* limitations under the License.
*/
#include <alibabacloud/core/CoreClient.h>
#include <json/json.h>
#include <alibabacloud/core/Signer.h>
#include "CurlHttpClient.h"
#include "Executor.h"
#include <alibabacloud/core/Utils.h>
#include <alibabacloud/core/CoreClient.h>
#include <alibabacloud/core/Signer.h>
#include <json/json.h>
/*!
* \class AlibabaCloud::CoreClient CoreClient.h <alibabacloud/core/CoreClient.h>
@@ -27,33 +28,27 @@
namespace AlibabaCloud {
CoreClient::CoreClient(const std::string & servicename,
const ClientConfiguration &configuration) :
serviceName_(servicename),
configuration_(configuration),
httpClient_(new CurlHttpClient) {
CoreClient::CoreClient(const std::string &servicename,
const ClientConfiguration &configuration)
: serviceName_(servicename), configuration_(configuration),
httpClient_(new CurlHttpClient) {
httpClient_->setProxy(configuration.proxy());
}
CoreClient::~CoreClient() {
delete httpClient_;
}
CoreClient::~CoreClient() { delete httpClient_; }
ClientConfiguration CoreClient::configuration()const {
return configuration_;
}
ClientConfiguration CoreClient::configuration() const { return configuration_; }
std::string CoreClient::serviceName()const {
return serviceName_;
}
std::string CoreClient::serviceName() const { return serviceName_; }
void CoreClient::asyncExecute(Runnable * r)const {
void CoreClient::asyncExecute(Runnable *r) const {
Executor::instance()->execute(r);
}
HttpClient::HttpResponseOutcome CoreClient::AttemptRequest(
const std::string & endpoint,
const ServiceRequest & request, HttpRequest::Method method) const {
HttpClient::HttpResponseOutcome
CoreClient::AttemptRequest(const std::string &endpoint,
const ServiceRequest &request,
HttpRequest::Method method) const {
auto r = buildHttpRequest(endpoint, request, method);
auto outcome = httpClient_->makeRequest(r);
if (!outcome.isSuccess())
@@ -64,13 +59,17 @@ HttpClient::HttpResponseOutcome CoreClient::AttemptRequest(
return outcome;
}
Error CoreClient::buildCoreError(const HttpResponse &response)const {
Error CoreClient::buildCoreError(const HttpResponse &response) const {
Json::Reader reader;
Json::Value value;
if (!reader.parse(std::string(response.body(), response.bodySize()), value)) {
if (response.bodySize() > 0) {
if (!reader.parse(std::string(response.body(), response.bodySize()), value))
{
if (response.bodySize() > 0)
{
return Error("InvalidResponse", response.body());
} else {
}
else
{
return Error("InvalidResponse", "body is empty");
}
}
@@ -80,14 +79,15 @@ Error CoreClient::buildCoreError(const HttpResponse &response)const {
error.setErrorMessage(value["Message"].asString());
error.setHost(value["HostId"].asString());
error.setRequestId(value["RequestId"].asString());
if (value["Code"].asString().empty() || value["Message"].asString().empty()) {
if (value["Code"].asString().empty() || value["Message"].asString().empty())
{
error.setDetail(std::string(response.body()));
}
return error;
}
bool CoreClient::hasResponseError(const HttpResponse &response)const {
bool CoreClient::hasResponseError(const HttpResponse &response) const {
return response.statusCode() < 200 || response.statusCode() > 299;
}
} // namespace AlibabaCloud
} // namespace AlibabaCloud