diff --git a/CHANGELOG b/CHANGELOG index 5fec020d9..98f004709 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-03-06 Version: 1.36.303 +- Supported Saf for oversea. + 2020-03-06 Version: 1.36.302 - Add request parameter groupType for OnsGroupCreate. - Add request parameter groupType for OnsGroupList. diff --git a/VERSION b/VERSION index 77de7b142..24e76c058 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.302 \ No newline at end of file +1.36.303 \ No newline at end of file diff --git a/saf/include/alibabacloud/saf/model/ExecuteRequestRequest.h b/saf/include/alibabacloud/saf/model/ExecuteRequestRequest.h old mode 100755 new mode 100644 diff --git a/saf/include/alibabacloud/saf/model/ExecuteRequestResult.h b/saf/include/alibabacloud/saf/model/ExecuteRequestResult.h old mode 100755 new mode 100644 index f82d68ed4..d80034a2e --- a/saf/include/alibabacloud/saf/model/ExecuteRequestResult.h +++ b/saf/include/alibabacloud/saf/model/ExecuteRequestResult.h @@ -32,26 +32,20 @@ namespace AlibabaCloud class ALIBABACLOUD_SAF_EXPORT ExecuteRequestResult : public ServiceResult { public: - struct Data - { - std::string score; - std::string extend; - std::string tags; - }; ExecuteRequestResult(); explicit ExecuteRequestResult(const std::string &payload); ~ExecuteRequestResult(); std::string getMessage()const; - Data getData()const; + std::string getData()const; int getCode()const; protected: void parse(const std::string &payload); private: std::string message_; - Data data_; + std::string data_; int code_; }; diff --git a/saf/src/model/ExecuteRequestRequest.cc b/saf/src/model/ExecuteRequestRequest.cc old mode 100755 new mode 100644 index 21e43235f..9237426bc --- a/saf/src/model/ExecuteRequestRequest.cc +++ b/saf/src/model/ExecuteRequestRequest.cc @@ -19,8 +19,10 @@ using AlibabaCloud::Saf::Model::ExecuteRequestRequest; ExecuteRequestRequest::ExecuteRequestRequest() : - RpcServiceRequest("saf", "2018-09-19", "ExecuteRequest") -{} + RpcServiceRequest("saf", "2019-05-21", "ExecuteRequest") +{ + setMethod(HttpRequest::Method::POST); +} ExecuteRequestRequest::~ExecuteRequestRequest() {} @@ -33,7 +35,7 @@ std::string ExecuteRequestRequest::getServiceParameters()const void ExecuteRequestRequest::setServiceParameters(const std::string& serviceParameters) { serviceParameters_ = serviceParameters; - setCoreParameter("ServiceParameters", serviceParameters); + setParameter("ServiceParameters", serviceParameters); } std::string ExecuteRequestRequest::getService()const @@ -44,6 +46,6 @@ std::string ExecuteRequestRequest::getService()const void ExecuteRequestRequest::setService(const std::string& service) { service_ = service; - setCoreParameter("Service", service); + setParameter("Service", service); } diff --git a/saf/src/model/ExecuteRequestResult.cc b/saf/src/model/ExecuteRequestResult.cc old mode 100755 new mode 100644 index ff8f15b41..843e6e35f --- a/saf/src/model/ExecuteRequestResult.cc +++ b/saf/src/model/ExecuteRequestResult.cc @@ -39,17 +39,12 @@ void ExecuteRequestResult::parse(const std::string &payload) Json::Value value; reader.parse(payload, value); setRequestId(value["RequestId"].asString()); - auto dataNode = value["Data"]; - if(!dataNode["Tags"].isNull()) - data_.tags = dataNode["Tags"].asString(); - if(!dataNode["Score"].isNull()) - data_.score = dataNode["Score"].asString(); - if(!dataNode["Extend"].isNull()) - data_.extend = dataNode["Extend"].asString(); if(!value["Code"].isNull()) code_ = std::stoi(value["Code"].asString()); if(!value["Message"].isNull()) message_ = value["Message"].asString(); + if(!value["Data"].isNull()) + data_ = value["Data"].asString(); } @@ -58,7 +53,7 @@ std::string ExecuteRequestResult::getMessage()const return message_; } -ExecuteRequestResult::Data ExecuteRequestResult::getData()const +std::string ExecuteRequestResult::getData()const { return data_; }