supported body parameter.
This commit is contained in:
@@ -36,6 +36,7 @@ public:
|
|||||||
size_t contentSize() const;
|
size_t contentSize() const;
|
||||||
bool hasContent() const;
|
bool hasContent() const;
|
||||||
ParameterCollection parameters() const;
|
ParameterCollection parameters() const;
|
||||||
|
ParameterCollection bodyParameters() const;
|
||||||
std::string product() const;
|
std::string product() const;
|
||||||
std::string resourcePath() const;
|
std::string resourcePath() const;
|
||||||
std::string version() const;
|
std::string version() const;
|
||||||
@@ -50,6 +51,7 @@ public:
|
|||||||
ParameterValueType getHeader(const ParameterNameType &name);
|
ParameterValueType getHeader(const ParameterNameType &name);
|
||||||
void removeHeader(const ParameterNameType &name);
|
void removeHeader(const ParameterNameType &name);
|
||||||
ParameterCollection headers() const;
|
ParameterCollection headers() const;
|
||||||
|
void setBodyParameter(const ParameterNameType &name, const ParameterValueType &value);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
ServiceRequest(const std::string &product, const std::string &version);
|
ServiceRequest(const std::string &product, const std::string &version);
|
||||||
@@ -81,6 +83,7 @@ private:
|
|||||||
char *content_;
|
char *content_;
|
||||||
size_t contentSize_;
|
size_t contentSize_;
|
||||||
ParameterCollection params_;
|
ParameterCollection params_;
|
||||||
|
ParameterCollection body_params_;
|
||||||
ParameterCollection headers_;
|
ParameterCollection headers_;
|
||||||
std::string product_;
|
std::string product_;
|
||||||
std::string resourcePath_;
|
std::string resourcePath_;
|
||||||
|
|||||||
@@ -63,28 +63,33 @@ HttpRequest RpcServiceClient::buildHttpRequest(const std::string & endpoint,
|
|||||||
const Credentials credentials = credentialsProvider_->getCredentials();
|
const Credentials credentials = credentialsProvider_->getCredentials();
|
||||||
|
|
||||||
Url url;
|
Url url;
|
||||||
if (msg.scheme().empty()) {
|
if (msg.scheme().empty())
|
||||||
|
{
|
||||||
url.setScheme("https");
|
url.setScheme("https");
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
url.setScheme(msg.scheme());
|
url.setScheme(msg.scheme());
|
||||||
}
|
}
|
||||||
url.setHost(endpoint);
|
url.setHost(endpoint);
|
||||||
url.setPath(msg.resourcePath());
|
url.setPath(msg.resourcePath());
|
||||||
|
|
||||||
|
std::map<std::string, std::string> signParams;
|
||||||
|
|
||||||
auto params = msg.parameters();
|
auto params = msg.parameters();
|
||||||
std::map <std::string, std::string> queryParams;
|
for (const auto &p : params)
|
||||||
for (const auto &p : params) {
|
{
|
||||||
if (!p.second.empty())
|
if (!p.second.empty())
|
||||||
queryParams[p.first] = p.second;
|
signParams[p.first] = p.second;
|
||||||
}
|
}
|
||||||
|
|
||||||
queryParams["AccessKeyId"] = credentials.accessKeyId();
|
signParams["AccessKeyId"] = credentials.accessKeyId();
|
||||||
queryParams["Format"] = "JSON";
|
signParams["Format"] = "JSON";
|
||||||
queryParams["RegionId"] = configuration().regionId();
|
signParams["RegionId"] = configuration().regionId();
|
||||||
queryParams["SecurityToken"] = credentials.sessionToken();
|
signParams["SecurityToken"] = credentials.sessionToken();
|
||||||
queryParams["SignatureMethod"] = signer_->name();
|
signParams["SignatureMethod"] = signer_->name();
|
||||||
queryParams["SignatureNonce"] = GenerateUuid();
|
signParams["SignatureNonce"] = GenerateUuid();
|
||||||
queryParams["SignatureVersion"] = signer_->version();
|
signParams["SignatureVersion"] = signer_->version();
|
||||||
std::time_t t = std::time(nullptr);
|
std::time_t t = std::time(nullptr);
|
||||||
std::stringstream ss;
|
std::stringstream ss;
|
||||||
#if defined(__GNUG__) && __GNUC__ < 5
|
#if defined(__GNUG__) && __GNUC__ < 5
|
||||||
@@ -94,28 +99,42 @@ HttpRequest RpcServiceClient::buildHttpRequest(const std::string & endpoint,
|
|||||||
#else
|
#else
|
||||||
ss << std::put_time(std::gmtime(&t), "%FT%TZ");
|
ss << std::put_time(std::gmtime(&t), "%FT%TZ");
|
||||||
#endif
|
#endif
|
||||||
queryParams["Timestamp"] = ss.str();
|
signParams["Timestamp"] = ss.str();
|
||||||
queryParams["Version"] = msg.version();
|
signParams["Version"] = msg.version();
|
||||||
|
|
||||||
|
std::map<std::string, std::string> query;
|
||||||
|
for (const auto &p : signParams)
|
||||||
|
{
|
||||||
|
query[p.first] = p.second;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto body_params = msg.bodyParameters();
|
||||||
|
for (const auto &p : body_params)
|
||||||
|
{
|
||||||
|
signParams[p.first] = p.second;
|
||||||
|
}
|
||||||
|
|
||||||
std::stringstream plaintext;
|
std::stringstream plaintext;
|
||||||
plaintext << HttpMethodToString(method)
|
plaintext << HttpMethodToString(method)
|
||||||
<< "&"
|
<< "&"
|
||||||
<< UrlEncode(url.path())
|
<< UrlEncode(url.path())
|
||||||
<< "&"
|
<< "&"
|
||||||
<< UrlEncode(canonicalizedQuery(queryParams));
|
<< UrlEncode(canonicalizedQuery(signParams));
|
||||||
|
query["Signature"] = signer_->generate(plaintext.str(),
|
||||||
queryParams["Signature"] = signer_->generate(plaintext.str(),
|
credentials.accessKeySecret() + "&");
|
||||||
credentials.accessKeySecret() + "&");
|
|
||||||
|
|
||||||
std::stringstream queryString;
|
std::stringstream queryString;
|
||||||
for (const auto &p : queryParams)
|
for (const auto &p : query)
|
||||||
queryString << "&" << p.first << "=" << UrlEncode(p.second);
|
queryString << "&" << p.first << "=" << UrlEncode(p.second);
|
||||||
url.setQuery(queryString.str().substr(1));
|
url.setQuery(queryString.str().substr(1));
|
||||||
|
|
||||||
HttpRequest request(url);
|
HttpRequest request(url);
|
||||||
if (msg.connectTimeout() != kInvalidTimeout) {
|
if (msg.connectTimeout() != kInvalidTimeout)
|
||||||
|
{
|
||||||
request.setConnectTimeout(msg.connectTimeout());
|
request.setConnectTimeout(msg.connectTimeout());
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
request.setConnectTimeout(configuration().connectTimeout());
|
request.setConnectTimeout(configuration().connectTimeout());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -127,16 +146,26 @@ HttpRequest RpcServiceClient::buildHttpRequest(const std::string & endpoint,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (msg.readTimeout() != kInvalidTimeout) {
|
if (msg.readTimeout() != kInvalidTimeout)
|
||||||
|
{
|
||||||
request.setReadTimeout(msg.readTimeout());
|
request.setReadTimeout(msg.readTimeout());
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
request.setReadTimeout(configuration().readTimeout());
|
request.setReadTimeout(configuration().readTimeout());
|
||||||
}
|
}
|
||||||
|
|
||||||
request.setMethod(method);
|
request.setMethod(method);
|
||||||
request.setHeader("Host", url.host());
|
request.setHeader("Host", url.host());
|
||||||
request.setHeader("x-sdk-client",
|
request.setHeader("x-sdk-client",
|
||||||
std::string("CPP/").append(ALIBABACLOUD_VERSION_STR));
|
std::string("CPP/").append(ALIBABACLOUD_VERSION_STR));
|
||||||
|
std::stringstream tmp;
|
||||||
|
for (const auto &p : body_params)
|
||||||
|
tmp << "&" << p.first << "=" << UrlEncode(p.second);
|
||||||
|
if(tmp.str().length() > 0){
|
||||||
|
std::string body = tmp.str().substr(1);
|
||||||
|
request.setBody(body.c_str(), body.length());
|
||||||
|
}
|
||||||
return request;
|
return request;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -137,6 +137,12 @@ ServiceRequest::ParameterCollection ServiceRequest::parameters() const
|
|||||||
return params_;
|
return params_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
ServiceRequest::ParameterCollection ServiceRequest::bodyParameters() const
|
||||||
|
{
|
||||||
|
return body_params_;
|
||||||
|
}
|
||||||
|
|
||||||
void ServiceRequest::removeParameter(const ParameterNameType &name)
|
void ServiceRequest::removeParameter(const ParameterNameType &name)
|
||||||
{
|
{
|
||||||
params_.erase(name);
|
params_.erase(name);
|
||||||
@@ -153,6 +159,11 @@ void ServiceRequest::setCoreParameter(const ParameterNameType &name, const Param
|
|||||||
setParameter(name, value);
|
setParameter(name, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ServiceRequest::setBodyParameter(const ParameterNameType &name, const ParameterValueType &value)
|
||||||
|
{
|
||||||
|
body_params_[name] = value;
|
||||||
|
}
|
||||||
|
|
||||||
void ServiceRequest::setParameters(const ParameterCollection ¶ms)
|
void ServiceRequest::setParameters(const ParameterCollection ¶ms)
|
||||||
{
|
{
|
||||||
params_ = params;
|
params_ = params;
|
||||||
@@ -162,7 +173,7 @@ void ServiceRequest::setJsonParameters(const ParameterNameType &name, const Para
|
|||||||
{
|
{
|
||||||
params_ = params;
|
params_ = params;
|
||||||
params_ = params;
|
params_ = params;
|
||||||
setCoreParameter(name, AlibabaCloud::MapToJson(params));
|
setParameter(name, AlibabaCloud::MapToJson(params));
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string ServiceRequest::version() const
|
std::string ServiceRequest::version() const
|
||||||
|
|||||||
Reference in New Issue
Block a user