diff --git a/CHANGELOG b/CHANGELOG index 22857c4e8..2230c499c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2019-12-02 Version 1.36.205 +- Remove QuerySmsProdStatus OpenAPI. + 2019-11-29 Version 1.36.204 - Add RenewInstance. - Add RenewLogstash. diff --git a/VERSION b/VERSION index 2c89a3788..60a7f208a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.204 \ No newline at end of file +1.36.205 \ No newline at end of file diff --git a/dysmsapi/CMakeLists.txt b/dysmsapi/CMakeLists.txt index 84d8629d2..98d84f3fe 100644 --- a/dysmsapi/CMakeLists.txt +++ b/dysmsapi/CMakeLists.txt @@ -35,8 +35,6 @@ set(dysmsapi_public_header_model include/alibabacloud/dysmsapi/model/ModifySmsTemplateResult.h include/alibabacloud/dysmsapi/model/QuerySendDetailsRequest.h include/alibabacloud/dysmsapi/model/QuerySendDetailsResult.h - include/alibabacloud/dysmsapi/model/QuerySmsProdStatusRequest.h - include/alibabacloud/dysmsapi/model/QuerySmsProdStatusResult.h include/alibabacloud/dysmsapi/model/QuerySmsSignRequest.h include/alibabacloud/dysmsapi/model/QuerySmsSignResult.h include/alibabacloud/dysmsapi/model/QuerySmsTemplateRequest.h @@ -62,8 +60,6 @@ set(dysmsapi_src src/model/ModifySmsTemplateResult.cc src/model/QuerySendDetailsRequest.cc src/model/QuerySendDetailsResult.cc - src/model/QuerySmsProdStatusRequest.cc - src/model/QuerySmsProdStatusResult.cc src/model/QuerySmsSignRequest.cc src/model/QuerySmsSignResult.cc src/model/QuerySmsTemplateRequest.cc diff --git a/dysmsapi/include/alibabacloud/dysmsapi/DysmsapiClient.h b/dysmsapi/include/alibabacloud/dysmsapi/DysmsapiClient.h index 44911b5ed..0ebb49677 100644 --- a/dysmsapi/include/alibabacloud/dysmsapi/DysmsapiClient.h +++ b/dysmsapi/include/alibabacloud/dysmsapi/DysmsapiClient.h @@ -36,8 +36,6 @@ #include "model/ModifySmsTemplateResult.h" #include "model/QuerySendDetailsRequest.h" #include "model/QuerySendDetailsResult.h" -#include "model/QuerySmsProdStatusRequest.h" -#include "model/QuerySmsProdStatusResult.h" #include "model/QuerySmsSignRequest.h" #include "model/QuerySmsSignResult.h" #include "model/QuerySmsTemplateRequest.h" @@ -76,9 +74,6 @@ namespace AlibabaCloud typedef Outcome QuerySendDetailsOutcome; typedef std::future QuerySendDetailsOutcomeCallable; typedef std::function&)> QuerySendDetailsAsyncHandler; - typedef Outcome QuerySmsProdStatusOutcome; - typedef std::future QuerySmsProdStatusOutcomeCallable; - typedef std::function&)> QuerySmsProdStatusAsyncHandler; typedef Outcome QuerySmsSignOutcome; typedef std::future QuerySmsSignOutcomeCallable; typedef std::function&)> QuerySmsSignAsyncHandler; @@ -117,9 +112,6 @@ namespace AlibabaCloud QuerySendDetailsOutcome querySendDetails(const Model::QuerySendDetailsRequest &request)const; void querySendDetailsAsync(const Model::QuerySendDetailsRequest& request, const QuerySendDetailsAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; QuerySendDetailsOutcomeCallable querySendDetailsCallable(const Model::QuerySendDetailsRequest& request) const; - QuerySmsProdStatusOutcome querySmsProdStatus(const Model::QuerySmsProdStatusRequest &request)const; - void querySmsProdStatusAsync(const Model::QuerySmsProdStatusRequest& request, const QuerySmsProdStatusAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; - QuerySmsProdStatusOutcomeCallable querySmsProdStatusCallable(const Model::QuerySmsProdStatusRequest& request) const; QuerySmsSignOutcome querySmsSign(const Model::QuerySmsSignRequest &request)const; void querySmsSignAsync(const Model::QuerySmsSignRequest& request, const QuerySmsSignAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; QuerySmsSignOutcomeCallable querySmsSignCallable(const Model::QuerySmsSignRequest& request) const; diff --git a/dysmsapi/include/alibabacloud/dysmsapi/model/QuerySmsProdStatusRequest.h b/dysmsapi/include/alibabacloud/dysmsapi/model/QuerySmsProdStatusRequest.h deleted file mode 100644 index 6572ebc59..000000000 --- a/dysmsapi/include/alibabacloud/dysmsapi/model/QuerySmsProdStatusRequest.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2009-2017 Alibaba Cloud All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ALIBABACLOUD_DYSMSAPI_MODEL_QUERYSMSPRODSTATUSREQUEST_H_ -#define ALIBABACLOUD_DYSMSAPI_MODEL_QUERYSMSPRODSTATUSREQUEST_H_ - -#include -#include -#include -#include - -namespace AlibabaCloud -{ - namespace Dysmsapi - { - namespace Model - { - class ALIBABACLOUD_DYSMSAPI_EXPORT QuerySmsProdStatusRequest : public RpcServiceRequest - { - - public: - QuerySmsProdStatusRequest(); - ~QuerySmsProdStatusRequest(); - - long getResourceOwnerId()const; - void setResourceOwnerId(long resourceOwnerId); - std::string getResourceOwnerAccount()const; - void setResourceOwnerAccount(const std::string& resourceOwnerAccount); - long getOwnerId()const; - void setOwnerId(long ownerId); - std::string getAccessKeyId()const; - void setAccessKeyId(const std::string& accessKeyId); - long getAliyUid()const; - void setAliyUid(long aliyUid); - - private: - long resourceOwnerId_; - std::string resourceOwnerAccount_; - long ownerId_; - std::string accessKeyId_; - long aliyUid_; - - }; - } - } -} -#endif // !ALIBABACLOUD_DYSMSAPI_MODEL_QUERYSMSPRODSTATUSREQUEST_H_ \ No newline at end of file diff --git a/dysmsapi/include/alibabacloud/dysmsapi/model/QuerySmsProdStatusResult.h b/dysmsapi/include/alibabacloud/dysmsapi/model/QuerySmsProdStatusResult.h deleted file mode 100644 index 1a803581a..000000000 --- a/dysmsapi/include/alibabacloud/dysmsapi/model/QuerySmsProdStatusResult.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2009-2017 Alibaba Cloud All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ALIBABACLOUD_DYSMSAPI_MODEL_QUERYSMSPRODSTATUSRESULT_H_ -#define ALIBABACLOUD_DYSMSAPI_MODEL_QUERYSMSPRODSTATUSRESULT_H_ - -#include -#include -#include -#include -#include - -namespace AlibabaCloud -{ - namespace Dysmsapi - { - namespace Model - { - class ALIBABACLOUD_DYSMSAPI_EXPORT QuerySmsProdStatusResult : public ServiceResult - { - public: - - - QuerySmsProdStatusResult(); - explicit QuerySmsProdStatusResult(const std::string &payload); - ~QuerySmsProdStatusResult(); - std::string getData()const; - std::string getCode()const; - - protected: - void parse(const std::string &payload); - private: - std::string data_; - std::string code_; - - }; - } - } -} -#endif // !ALIBABACLOUD_DYSMSAPI_MODEL_QUERYSMSPRODSTATUSRESULT_H_ \ No newline at end of file diff --git a/dysmsapi/src/DysmsapiClient.cc b/dysmsapi/src/DysmsapiClient.cc index 6f9b877dd..7ccef0af3 100644 --- a/dysmsapi/src/DysmsapiClient.cc +++ b/dysmsapi/src/DysmsapiClient.cc @@ -303,42 +303,6 @@ DysmsapiClient::QuerySendDetailsOutcomeCallable DysmsapiClient::querySendDetails return task->get_future(); } -DysmsapiClient::QuerySmsProdStatusOutcome DysmsapiClient::querySmsProdStatus(const QuerySmsProdStatusRequest &request) const -{ - auto endpointOutcome = endpointProvider_->getEndpoint(); - if (!endpointOutcome.isSuccess()) - return QuerySmsProdStatusOutcome(endpointOutcome.error()); - - auto outcome = makeRequest(endpointOutcome.result(), request); - - if (outcome.isSuccess()) - return QuerySmsProdStatusOutcome(QuerySmsProdStatusResult(outcome.result())); - else - return QuerySmsProdStatusOutcome(outcome.error()); -} - -void DysmsapiClient::querySmsProdStatusAsync(const QuerySmsProdStatusRequest& request, const QuerySmsProdStatusAsyncHandler& handler, const std::shared_ptr& context) const -{ - auto fn = [this, request, handler, context]() - { - handler(this, request, querySmsProdStatus(request), context); - }; - - asyncExecute(new Runnable(fn)); -} - -DysmsapiClient::QuerySmsProdStatusOutcomeCallable DysmsapiClient::querySmsProdStatusCallable(const QuerySmsProdStatusRequest &request) const -{ - auto task = std::make_shared>( - [this, request]() - { - return this->querySmsProdStatus(request); - }); - - asyncExecute(new Runnable([task]() { (*task)(); })); - return task->get_future(); -} - DysmsapiClient::QuerySmsSignOutcome DysmsapiClient::querySmsSign(const QuerySmsSignRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/dysmsapi/src/model/AddSmsSignRequest.cc b/dysmsapi/src/model/AddSmsSignRequest.cc index 812159256..cb915fc82 100644 --- a/dysmsapi/src/model/AddSmsSignRequest.cc +++ b/dysmsapi/src/model/AddSmsSignRequest.cc @@ -79,12 +79,11 @@ std::vector AddSmsSignRequest::getSignFileList( void AddSmsSignRequest::setSignFileList(const std::vector& signFileList) { signFileList_ = signFileList; - int i = 0; - for(int i = 0; i!= signFileList.size(); i++) { - auto obj = signFileList.at(i); - std::string str ="SignFileList."+ std::to_string(i); - setCoreParameter(str + ".FileContents", obj.fileContents); - setCoreParameter(str + ".FileSuffix", obj.fileSuffix); + for(int dep1 = 0; dep1!= signFileList.size(); dep1++) { + auto signFileListObj = signFileList.at(dep1); + std::string signFileListObjStr = "SignFileList." + std::to_string(dep1); + setCoreParameter(signFileListObjStr + ".FileContents", signFileListObj.fileContents); + setCoreParameter(signFileListObjStr + ".FileSuffix", signFileListObj.fileSuffix); } } diff --git a/dysmsapi/src/model/ModifySmsSignRequest.cc b/dysmsapi/src/model/ModifySmsSignRequest.cc index 6fd698d25..8a2744636 100644 --- a/dysmsapi/src/model/ModifySmsSignRequest.cc +++ b/dysmsapi/src/model/ModifySmsSignRequest.cc @@ -79,12 +79,11 @@ std::vector ModifySmsSignRequest::getSignFil void ModifySmsSignRequest::setSignFileList(const std::vector& signFileList) { signFileList_ = signFileList; - int i = 0; - for(int i = 0; i!= signFileList.size(); i++) { - auto obj = signFileList.at(i); - std::string str ="SignFileList."+ std::to_string(i); - setCoreParameter(str + ".FileContents", obj.fileContents); - setCoreParameter(str + ".FileSuffix", obj.fileSuffix); + for(int dep1 = 0; dep1!= signFileList.size(); dep1++) { + auto signFileListObj = signFileList.at(dep1); + std::string signFileListObjStr = "SignFileList." + std::to_string(dep1); + setCoreParameter(signFileListObjStr + ".FileContents", signFileListObj.fileContents); + setCoreParameter(signFileListObjStr + ".FileSuffix", signFileListObj.fileSuffix); } } diff --git a/dysmsapi/src/model/QuerySmsProdStatusRequest.cc b/dysmsapi/src/model/QuerySmsProdStatusRequest.cc deleted file mode 100644 index f99fd2d4b..000000000 --- a/dysmsapi/src/model/QuerySmsProdStatusRequest.cc +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2009-2017 Alibaba Cloud All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -using AlibabaCloud::Dysmsapi::Model::QuerySmsProdStatusRequest; - -QuerySmsProdStatusRequest::QuerySmsProdStatusRequest() : - RpcServiceRequest("dysmsapi", "2017-05-25", "QuerySmsProdStatus") -{ - setMethod(HttpRequest::Method::Post); -} - -QuerySmsProdStatusRequest::~QuerySmsProdStatusRequest() -{} - -long QuerySmsProdStatusRequest::getResourceOwnerId()const -{ - return resourceOwnerId_; -} - -void QuerySmsProdStatusRequest::setResourceOwnerId(long resourceOwnerId) -{ - resourceOwnerId_ = resourceOwnerId; - setCoreParameter("ResourceOwnerId", std::to_string(resourceOwnerId)); -} - -std::string QuerySmsProdStatusRequest::getResourceOwnerAccount()const -{ - return resourceOwnerAccount_; -} - -void QuerySmsProdStatusRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount) -{ - resourceOwnerAccount_ = resourceOwnerAccount; - setCoreParameter("ResourceOwnerAccount", resourceOwnerAccount); -} - -long QuerySmsProdStatusRequest::getOwnerId()const -{ - return ownerId_; -} - -void QuerySmsProdStatusRequest::setOwnerId(long ownerId) -{ - ownerId_ = ownerId; - setCoreParameter("OwnerId", std::to_string(ownerId)); -} - -std::string QuerySmsProdStatusRequest::getAccessKeyId()const -{ - return accessKeyId_; -} - -void QuerySmsProdStatusRequest::setAccessKeyId(const std::string& accessKeyId) -{ - accessKeyId_ = accessKeyId; - setCoreParameter("AccessKeyId", accessKeyId); -} - -long QuerySmsProdStatusRequest::getAliyUid()const -{ - return aliyUid_; -} - -void QuerySmsProdStatusRequest::setAliyUid(long aliyUid) -{ - aliyUid_ = aliyUid; - setCoreParameter("AliyUid", std::to_string(aliyUid)); -} - diff --git a/dysmsapi/src/model/QuerySmsProdStatusResult.cc b/dysmsapi/src/model/QuerySmsProdStatusResult.cc deleted file mode 100644 index 9d071e6ef..000000000 --- a/dysmsapi/src/model/QuerySmsProdStatusResult.cc +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2009-2017 Alibaba Cloud All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -using namespace AlibabaCloud::Dysmsapi; -using namespace AlibabaCloud::Dysmsapi::Model; - -QuerySmsProdStatusResult::QuerySmsProdStatusResult() : - ServiceResult() -{} - -QuerySmsProdStatusResult::QuerySmsProdStatusResult(const std::string &payload) : - ServiceResult() -{ - parse(payload); -} - -QuerySmsProdStatusResult::~QuerySmsProdStatusResult() -{} - -void QuerySmsProdStatusResult::parse(const std::string &payload) -{ - Json::Reader reader; - Json::Value value; - reader.parse(payload, value); - setRequestId(value["RequestId"].asString()); - if(!value["Code"].isNull()) - code_ = value["Code"].asString(); - if(!value["Data"].isNull()) - data_ = value["Data"].asString(); - -} - -std::string QuerySmsProdStatusResult::getData()const -{ - return data_; -} - -std::string QuerySmsProdStatusResult::getCode()const -{ - return code_; -} -