ESS SDK Auto Released By wujin.lhr,Version：1.22.5

Signed-off-by: yixiong.jxy <yixiong.jxy@alibaba-inc.com>

CHANGELOG

@@ -1,3 +1,46 @@
+2018-08-16 Version: 1.22.5
+1, ModifyScalingConfiguration add imageName.
+2, CreateScalingConfiguration add imageName.
+
+2018-08-15 Version: 1.22.4
+1, Fix bug in GetMaterials API.
+2, GetVerifyToken added a new param VerifyConfigs
+
+2018-08-15 Version: 1.22.3
+1, Add domain operation api AddLiveDomain,DeleteLiveDomain,DescribeLiveDomainDetail,StartLiveDomain,StopLiveDomain.
+2, Add certificate operation api DescribeLiveCertificateDetail,DescribeLiveCertificateList,SetLiveDomainCertificate.
+3, Add domain config api BatchSetLiveDomainConfigs,BatchDeleteLiveDomainConfigs,DeleteLiveSpecificConfig,DescribeLiveDomainConfigs.
+
+2018-08-15 Version: 1.22.2
+1, Update ecs tag to 20 maximum
+
+
+2018-08-14 Version: 1.22.1
+1, Change parameter name of Dialogue
+
+2018-08-13 Version: 1.22.0
+1, New userinfo fields for registerface input parameter.
+2, New userinfo fields for updateface input parameter.
+3, New userinfo fields for queryface output parameter.
+
+2018-08-13 Version: 1.21.6
+1, Add cross domain support.
+2, Add parameter SerialNumber to interface RebootSmartAccessGateway.
+
+2018-08-08 Version: 1.21.5
+1, The official release 4.0.0
+
+2018-08-08 Version: 1.21.4
+1, Update FC apis.
+
+2018-08-08 Version: 1.21.3
+1, First release.
+
+2018-08-07 Version: 1.21.2
+1, Add api GetGatewayBySubDevice.
+2, Modified the time related response parameters.
+3, Add messageId in response with InvokeThingService，SetDeviceProperty and NotifyAddThingTopo.
+
 2018-08-05 Version: 1.21.1
 1, Add Interface SubmitSubtitleJob
 2, Support convert ttml、stl subtitle to vtt

CMakeLists.txt

@@ -82,4 +82,8 @@ add_subdirectory(rtc)
 add_subdirectory(chatbot)
 add_subdirectory(teslastream)
 add_subdirectory(mopen)
-add_subdirectory(mts)
+add_subdirectory(mts)
+add_subdirectory(iot)
+add_subdirectory(linkface)
+add_subdirectory(ots)
+add_subdirectory(smartag)

VERSION

@@ -1 +1 @@
-1.21.1
+1.22.5

ccc/CMakeLists.txt

@@ -141,6 +141,8 @@ set(ccc_public_header_model
 	include/alibabacloud/ccc/model/ListRolesResult.h
 	include/alibabacloud/ccc/model/ListConfigRequest.h
 	include/alibabacloud/ccc/model/ListConfigResult.h
+	include/alibabacloud/ccc/model/LaunchShortMessageAppraiseRequest.h
+	include/alibabacloud/ccc/model/LaunchShortMessageAppraiseResult.h
 	include/alibabacloud/ccc/model/ModifyPhoneNumberRequest.h
 	include/alibabacloud/ccc/model/ModifyPhoneNumberResult.h
 	include/alibabacloud/ccc/model/ListScenariosRequest.h
@@ -300,6 +302,8 @@ set(ccc_src
 	src/model/ListRolesResult.cc
 	src/model/ListConfigRequest.cc
 	src/model/ListConfigResult.cc
+	src/model/LaunchShortMessageAppraiseRequest.cc
+	src/model/LaunchShortMessageAppraiseResult.cc
 	src/model/ModifyPhoneNumberRequest.cc
 	src/model/ModifyPhoneNumberResult.cc
 	src/model/ListScenariosRequest.cc

ccc/include/alibabacloud/ccc/CCCClient.h

@@ -142,6 +142,8 @@
 #include "model/ListRolesResult.h"
 #include "model/ListConfigRequest.h"
 #include "model/ListConfigResult.h"
+#include "model/LaunchShortMessageAppraiseRequest.h"
+#include "model/LaunchShortMessageAppraiseResult.h"
 #include "model/ModifyPhoneNumberRequest.h"
 #include "model/ModifyPhoneNumberResult.h"
 #include "model/ListScenariosRequest.h"
@@ -367,6 +369,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ListConfigResult> ListConfigOutcome;
 			typedef std::future<ListConfigOutcome> ListConfigOutcomeCallable;
 			typedef std::function<void(const CCCClient*, const Model::ListConfigRequest&, const ListConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListConfigAsyncHandler;
+			typedef Outcome<Error, Model::LaunchShortMessageAppraiseResult> LaunchShortMessageAppraiseOutcome;
+			typedef std::future<LaunchShortMessageAppraiseOutcome> LaunchShortMessageAppraiseOutcomeCallable;
+			typedef std::function<void(const CCCClient*, const Model::LaunchShortMessageAppraiseRequest&, const LaunchShortMessageAppraiseOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> LaunchShortMessageAppraiseAsyncHandler;
 			typedef Outcome<Error, Model::ModifyPhoneNumberResult> ModifyPhoneNumberOutcome;
 			typedef std::future<ModifyPhoneNumberOutcome> ModifyPhoneNumberOutcomeCallable;
 			typedef std::function<void(const CCCClient*, const Model::ModifyPhoneNumberRequest&, const ModifyPhoneNumberOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyPhoneNumberAsyncHandler;
@@ -606,6 +611,9 @@ namespace AlibabaCloud
 			ListConfigOutcome listConfig(const Model::ListConfigRequest &request)const;
 			void listConfigAsync(const Model::ListConfigRequest& request, const ListConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListConfigOutcomeCallable listConfigCallable(const Model::ListConfigRequest& request) const;
+			LaunchShortMessageAppraiseOutcome launchShortMessageAppraise(const Model::LaunchShortMessageAppraiseRequest &request)const;
+			void launchShortMessageAppraiseAsync(const Model::LaunchShortMessageAppraiseRequest& request, const LaunchShortMessageAppraiseAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			LaunchShortMessageAppraiseOutcomeCallable launchShortMessageAppraiseCallable(const Model::LaunchShortMessageAppraiseRequest& request) const;
 			ModifyPhoneNumberOutcome modifyPhoneNumber(const Model::ModifyPhoneNumberRequest &request)const;
 			void modifyPhoneNumberAsync(const Model::ModifyPhoneNumberRequest& request, const ModifyPhoneNumberAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyPhoneNumberOutcomeCallable modifyPhoneNumberCallable(const Model::ModifyPhoneNumberRequest& request) const;

ccc/include/alibabacloud/ccc/model/DialogueRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setInstanceId(const std::string& instanceId);
 				std::string getCalledNumber()const;
 				void setCalledNumber(const std::string& calledNumber);
+				std::string getActionKey()const;
+				void setActionKey(const std::string& actionKey);
 				std::string getActionParams()const;
 				void setActionParams(const std::string& actionParams);
 				std::string getCallType()const;
@@ -59,6 +61,7 @@ namespace AlibabaCloud
 				std::string callingNumber_;
 				std::string instanceId_;
 				std::string calledNumber_;
+				std::string actionKey_;
 				std::string actionParams_;
 				std::string callType_;
 				std::string scenarioId_;

ccc/include/alibabacloud/ccc/model/LaunchShortMessageAppraiseRequest.h

@@ -0,0 +1,63 @@
+/*
+ * 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_CCC_MODEL_LAUNCHSHORTMESSAGEAPPRAISEREQUEST_H_
+#define ALIBABACLOUD_CCC_MODEL_LAUNCHSHORTMESSAGEAPPRAISEREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/ccc/CCCExport.h>
+
+namespace AlibabaCloud
+{
+	namespace CCC
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CCC_EXPORT LaunchShortMessageAppraiseRequest : public RpcServiceRequest
+			{
+
+			public:
+				LaunchShortMessageAppraiseRequest();
+				~LaunchShortMessageAppraiseRequest();
+
+				std::string getAcid()const;
+				void setAcid(const std::string& acid);
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
+				int getContactType()const;
+				void setContactType(int contactType);
+				std::string getPhoneNumbers()const;
+				void setPhoneNumbers(const std::string& phoneNumbers);
+				std::string getSkillGroupId()const;
+				void setSkillGroupId(const std::string& skillGroupId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+
+            private:
+				std::string acid_;
+				std::string instanceId_;
+				int contactType_;
+				std::string phoneNumbers_;
+				std::string skillGroupId_;
+				std::string accessKeyId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CCC_MODEL_LAUNCHSHORTMESSAGEAPPRAISEREQUEST_H_

ccc/include/alibabacloud/ccc/model/LaunchShortMessageAppraiseResult.h

@@ -0,0 +1,57 @@
+/*
+ * 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_CCC_MODEL_LAUNCHSHORTMESSAGEAPPRAISERESULT_H_
+#define ALIBABACLOUD_CCC_MODEL_LAUNCHSHORTMESSAGEAPPRAISERESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/ccc/CCCExport.h>
+
+namespace AlibabaCloud
+{
+	namespace CCC
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CCC_EXPORT LaunchShortMessageAppraiseResult : public ServiceResult
+			{
+			public:
+
+
+				LaunchShortMessageAppraiseResult();
+				explicit LaunchShortMessageAppraiseResult(const std::string &payload);
+				~LaunchShortMessageAppraiseResult();
+				std::string getMessage()const;
+				int getHttpStatusCode()const;
+				std::string getCode()const;
+				bool getSuccess()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				int httpStatusCode_;
+				std::string code_;
+				bool success_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CCC_MODEL_LAUNCHSHORTMESSAGEAPPRAISERESULT_H_

ccc/src/CCCClient.cc

@@ -2211,6 +2211,42 @@ CCCClient::ListConfigOutcomeCallable CCCClient::listConfigCallable(const ListCon
 	return task->get_future();
 }
 
+CCCClient::LaunchShortMessageAppraiseOutcome CCCClient::launchShortMessageAppraise(const LaunchShortMessageAppraiseRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return LaunchShortMessageAppraiseOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return LaunchShortMessageAppraiseOutcome(LaunchShortMessageAppraiseResult(outcome.result()));
+	else
+		return LaunchShortMessageAppraiseOutcome(outcome.error());
+}
+
+void CCCClient::launchShortMessageAppraiseAsync(const LaunchShortMessageAppraiseRequest& request, const LaunchShortMessageAppraiseAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, launchShortMessageAppraise(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+CCCClient::LaunchShortMessageAppraiseOutcomeCallable CCCClient::launchShortMessageAppraiseCallable(const LaunchShortMessageAppraiseRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<LaunchShortMessageAppraiseOutcome()>>(
+			[this, request]()
+			{
+			return this->launchShortMessageAppraise(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 CCCClient::ModifyPhoneNumberOutcome CCCClient::modifyPhoneNumber(const ModifyPhoneNumberRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

ccc/src/model/DialogueRequest.cc

@@ -69,6 +69,17 @@ void DialogueRequest::setCalledNumber(const std::string& calledNumber)
 	setParameter("CalledNumber", calledNumber);
 }
 
+std::string DialogueRequest::getActionKey()const
+{
+	return actionKey_;
+}
+
+void DialogueRequest::setActionKey(const std::string& actionKey)
+{
+	actionKey_ = actionKey;
+	setParameter("ActionKey", actionKey);
+}
+
 std::string DialogueRequest::getActionParams()const
 {
 	return actionParams_;

ccc/src/model/LaunchShortMessageAppraiseRequest.cc

@@ -0,0 +1,93 @@
+/*
+ * 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 <alibabacloud/ccc/model/LaunchShortMessageAppraiseRequest.h>
+
+using AlibabaCloud::CCC::Model::LaunchShortMessageAppraiseRequest;
+
+LaunchShortMessageAppraiseRequest::LaunchShortMessageAppraiseRequest() :
+	RpcServiceRequest("ccc", "2017-07-05", "LaunchShortMessageAppraise")
+{}
+
+LaunchShortMessageAppraiseRequest::~LaunchShortMessageAppraiseRequest()
+{}
+
+std::string LaunchShortMessageAppraiseRequest::getAcid()const
+{
+	return acid_;
+}
+
+void LaunchShortMessageAppraiseRequest::setAcid(const std::string& acid)
+{
+	acid_ = acid;
+	setParameter("Acid", acid);
+}
+
+std::string LaunchShortMessageAppraiseRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void LaunchShortMessageAppraiseRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setParameter("InstanceId", instanceId);
+}
+
+int LaunchShortMessageAppraiseRequest::getContactType()const
+{
+	return contactType_;
+}
+
+void LaunchShortMessageAppraiseRequest::setContactType(int contactType)
+{
+	contactType_ = contactType;
+	setParameter("ContactType", std::to_string(contactType));
+}
+
+std::string LaunchShortMessageAppraiseRequest::getPhoneNumbers()const
+{
+	return phoneNumbers_;
+}
+
+void LaunchShortMessageAppraiseRequest::setPhoneNumbers(const std::string& phoneNumbers)
+{
+	phoneNumbers_ = phoneNumbers;
+	setParameter("PhoneNumbers", phoneNumbers);
+}
+
+std::string LaunchShortMessageAppraiseRequest::getSkillGroupId()const
+{
+	return skillGroupId_;
+}
+
+void LaunchShortMessageAppraiseRequest::setSkillGroupId(const std::string& skillGroupId)
+{
+	skillGroupId_ = skillGroupId;
+	setParameter("SkillGroupId", skillGroupId);
+}
+
+std::string LaunchShortMessageAppraiseRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void LaunchShortMessageAppraiseRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+

ccc/src/model/LaunchShortMessageAppraiseResult.cc

@@ -0,0 +1,73 @@
+/*
+ * 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 <alibabacloud/ccc/model/LaunchShortMessageAppraiseResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::CCC;
+using namespace AlibabaCloud::CCC::Model;
+
+LaunchShortMessageAppraiseResult::LaunchShortMessageAppraiseResult() :
+	ServiceResult()
+{}
+
+LaunchShortMessageAppraiseResult::LaunchShortMessageAppraiseResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+LaunchShortMessageAppraiseResult::~LaunchShortMessageAppraiseResult()
+{}
+
+void LaunchShortMessageAppraiseResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+
+	setRequestId(value["RequestId"].asString());
+	if(!value["Success"].isNull())
+		success_ = value["Success"].asString() == "true";
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["HttpStatusCode"].isNull())
+		httpStatusCode_ = std::stoi(value["HttpStatusCode"].asString());
+
+}
+
+std::string LaunchShortMessageAppraiseResult::getMessage()const
+{
+	return message_;
+}
+
+int LaunchShortMessageAppraiseResult::getHttpStatusCode()const
+{
+	return httpStatusCode_;
+}
+
+std::string LaunchShortMessageAppraiseResult::getCode()const
+{
+	return code_;
+}
+
+bool LaunchShortMessageAppraiseResult::getSuccess()const
+{
+	return success_;
+}
+

cdn/CMakeLists.txt

@@ -77,8 +77,6 @@ set(cdn_public_header_model
 	include/alibabacloud/cdn/model/DescribeDomainAverageResponseTimeResult.h
 	include/alibabacloud/cdn/model/DescribeLiveStreamBitRateDataRequest.h
 	include/alibabacloud/cdn/model/DescribeLiveStreamBitRateDataResult.h
-	include/alibabacloud/cdn/model/SetUserDomainBlackListRequest.h
-	include/alibabacloud/cdn/model/SetUserDomainBlackListResult.h
 	include/alibabacloud/cdn/model/SetLocationAccessRestrictionRequest.h
 	include/alibabacloud/cdn/model/SetLocationAccessRestrictionResult.h
 	include/alibabacloud/cdn/model/DescribeUserCustomLogConfigRequest.h
@@ -291,8 +289,6 @@ set(cdn_public_header_model
 	include/alibabacloud/cdn/model/AddLiveAppSnapshotConfigResult.h
 	include/alibabacloud/cdn/model/DescribeDomainISPDataRequest.h
 	include/alibabacloud/cdn/model/DescribeDomainISPDataResult.h
-	include/alibabacloud/cdn/model/ClearUserDomainBlackListRequest.h
-	include/alibabacloud/cdn/model/ClearUserDomainBlackListResult.h
 	include/alibabacloud/cdn/model/DescribeDomainFileSizeProportionDataRequest.h
 	include/alibabacloud/cdn/model/DescribeDomainFileSizeProportionDataResult.h
 	include/alibabacloud/cdn/model/DescribeLiveSpecificDomainMappingRequest.h
@@ -311,10 +307,6 @@ set(cdn_public_header_model
 	include/alibabacloud/cdn/model/UpdateFCTriggerResult.h
 	include/alibabacloud/cdn/model/DescribeFCTriggerRequest.h
 	include/alibabacloud/cdn/model/DescribeFCTriggerResult.h
-	include/alibabacloud/cdn/model/SetUserBlackListRequest.h
-	include/alibabacloud/cdn/model/SetUserBlackListResult.h
-	include/alibabacloud/cdn/model/GetUserDomainBlackListRequest.h
-	include/alibabacloud/cdn/model/GetUserDomainBlackListResult.h
 	include/alibabacloud/cdn/model/DescribeDomainCCAttackInfoRequest.h
 	include/alibabacloud/cdn/model/DescribeDomainCCAttackInfoResult.h
 	include/alibabacloud/cdn/model/DescribeLiveStreamsPublishListRequest.h
@@ -325,8 +317,6 @@ set(cdn_public_header_model
 	include/alibabacloud/cdn/model/DeleteLivePullStreamInfoResult.h
 	include/alibabacloud/cdn/model/DescribeDomainDownstreamBpsOfEdgeRequest.h
 	include/alibabacloud/cdn/model/DescribeDomainDownstreamBpsOfEdgeResult.h
-	include/alibabacloud/cdn/model/ClearUserBlackListRequest.h
-	include/alibabacloud/cdn/model/ClearUserBlackListResult.h
 	include/alibabacloud/cdn/model/DescribeDomainMax95BpsDataRequest.h
 	include/alibabacloud/cdn/model/DescribeDomainMax95BpsDataResult.h
 	include/alibabacloud/cdn/model/SetHttpsOptionConfigRequest.h
@@ -428,8 +418,6 @@ set(cdn_src
 	src/model/DescribeDomainAverageResponseTimeResult.cc
 	src/model/DescribeLiveStreamBitRateDataRequest.cc
 	src/model/DescribeLiveStreamBitRateDataResult.cc
-	src/model/SetUserDomainBlackListRequest.cc
-	src/model/SetUserDomainBlackListResult.cc
 	src/model/SetLocationAccessRestrictionRequest.cc
 	src/model/SetLocationAccessRestrictionResult.cc
 	src/model/DescribeUserCustomLogConfigRequest.cc
@@ -642,8 +630,6 @@ set(cdn_src
 	src/model/AddLiveAppSnapshotConfigResult.cc
 	src/model/DescribeDomainISPDataRequest.cc
 	src/model/DescribeDomainISPDataResult.cc
-	src/model/ClearUserDomainBlackListRequest.cc
-	src/model/ClearUserDomainBlackListResult.cc
 	src/model/DescribeDomainFileSizeProportionDataRequest.cc
 	src/model/DescribeDomainFileSizeProportionDataResult.cc
 	src/model/DescribeLiveSpecificDomainMappingRequest.cc
@@ -662,10 +648,6 @@ set(cdn_src
 	src/model/UpdateFCTriggerResult.cc
 	src/model/DescribeFCTriggerRequest.cc
 	src/model/DescribeFCTriggerResult.cc
-	src/model/SetUserBlackListRequest.cc
-	src/model/SetUserBlackListResult.cc
-	src/model/GetUserDomainBlackListRequest.cc
-	src/model/GetUserDomainBlackListResult.cc
 	src/model/DescribeDomainCCAttackInfoRequest.cc
 	src/model/DescribeDomainCCAttackInfoResult.cc
 	src/model/DescribeLiveStreamsPublishListRequest.cc
@@ -676,8 +658,6 @@ set(cdn_src
 	src/model/DeleteLivePullStreamInfoResult.cc
 	src/model/DescribeDomainDownstreamBpsOfEdgeRequest.cc
 	src/model/DescribeDomainDownstreamBpsOfEdgeResult.cc
-	src/model/ClearUserBlackListRequest.cc
-	src/model/ClearUserBlackListResult.cc
 	src/model/DescribeDomainMax95BpsDataRequest.cc
 	src/model/DescribeDomainMax95BpsDataResult.cc
 	src/model/SetHttpsOptionConfigRequest.cc

cdn/include/alibabacloud/cdn/CdnClient.h

@@ -78,8 +78,6 @@
 #include "model/DescribeDomainAverageResponseTimeResult.h"
 #include "model/DescribeLiveStreamBitRateDataRequest.h"
 #include "model/DescribeLiveStreamBitRateDataResult.h"
-#include "model/SetUserDomainBlackListRequest.h"
-#include "model/SetUserDomainBlackListResult.h"
 #include "model/SetLocationAccessRestrictionRequest.h"
 #include "model/SetLocationAccessRestrictionResult.h"
 #include "model/DescribeUserCustomLogConfigRequest.h"
@@ -292,8 +290,6 @@
 #include "model/AddLiveAppSnapshotConfigResult.h"
 #include "model/DescribeDomainISPDataRequest.h"
 #include "model/DescribeDomainISPDataResult.h"
-#include "model/ClearUserDomainBlackListRequest.h"
-#include "model/ClearUserDomainBlackListResult.h"
 #include "model/DescribeDomainFileSizeProportionDataRequest.h"
 #include "model/DescribeDomainFileSizeProportionDataResult.h"
 #include "model/DescribeLiveSpecificDomainMappingRequest.h"
@@ -312,10 +308,6 @@
 #include "model/UpdateFCTriggerResult.h"
 #include "model/DescribeFCTriggerRequest.h"
 #include "model/DescribeFCTriggerResult.h"
-#include "model/SetUserBlackListRequest.h"
-#include "model/SetUserBlackListResult.h"
-#include "model/GetUserDomainBlackListRequest.h"
-#include "model/GetUserDomainBlackListResult.h"
 #include "model/DescribeDomainCCAttackInfoRequest.h"
 #include "model/DescribeDomainCCAttackInfoResult.h"
 #include "model/DescribeLiveStreamsPublishListRequest.h"
@@ -326,8 +318,6 @@
 #include "model/DeleteLivePullStreamInfoResult.h"
 #include "model/DescribeDomainDownstreamBpsOfEdgeRequest.h"
 #include "model/DescribeDomainDownstreamBpsOfEdgeResult.h"
-#include "model/ClearUserBlackListRequest.h"
-#include "model/ClearUserBlackListResult.h"
 #include "model/DescribeDomainMax95BpsDataRequest.h"
 #include "model/DescribeDomainMax95BpsDataResult.h"
 #include "model/SetHttpsOptionConfigRequest.h"
@@ -463,9 +453,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeLiveStreamBitRateDataResult> DescribeLiveStreamBitRateDataOutcome;
 			typedef std::future<DescribeLiveStreamBitRateDataOutcome> DescribeLiveStreamBitRateDataOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::DescribeLiveStreamBitRateDataRequest&, const DescribeLiveStreamBitRateDataOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeLiveStreamBitRateDataAsyncHandler;
-			typedef Outcome<Error, Model::SetUserDomainBlackListResult> SetUserDomainBlackListOutcome;
-			typedef std::future<SetUserDomainBlackListOutcome> SetUserDomainBlackListOutcomeCallable;
-			typedef std::function<void(const CdnClient*, const Model::SetUserDomainBlackListRequest&, const SetUserDomainBlackListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SetUserDomainBlackListAsyncHandler;
 			typedef Outcome<Error, Model::SetLocationAccessRestrictionResult> SetLocationAccessRestrictionOutcome;
 			typedef std::future<SetLocationAccessRestrictionOutcome> SetLocationAccessRestrictionOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::SetLocationAccessRestrictionRequest&, const SetLocationAccessRestrictionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SetLocationAccessRestrictionAsyncHandler;
@@ -784,9 +771,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDomainISPDataResult> DescribeDomainISPDataOutcome;
 			typedef std::future<DescribeDomainISPDataOutcome> DescribeDomainISPDataOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::DescribeDomainISPDataRequest&, const DescribeDomainISPDataOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDomainISPDataAsyncHandler;
-			typedef Outcome<Error, Model::ClearUserDomainBlackListResult> ClearUserDomainBlackListOutcome;
-			typedef std::future<ClearUserDomainBlackListOutcome> ClearUserDomainBlackListOutcomeCallable;
-			typedef std::function<void(const CdnClient*, const Model::ClearUserDomainBlackListRequest&, const ClearUserDomainBlackListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ClearUserDomainBlackListAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDomainFileSizeProportionDataResult> DescribeDomainFileSizeProportionDataOutcome;
 			typedef std::future<DescribeDomainFileSizeProportionDataOutcome> DescribeDomainFileSizeProportionDataOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::DescribeDomainFileSizeProportionDataRequest&, const DescribeDomainFileSizeProportionDataOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDomainFileSizeProportionDataAsyncHandler;
@@ -814,12 +798,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeFCTriggerResult> DescribeFCTriggerOutcome;
 			typedef std::future<DescribeFCTriggerOutcome> DescribeFCTriggerOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::DescribeFCTriggerRequest&, const DescribeFCTriggerOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeFCTriggerAsyncHandler;
-			typedef Outcome<Error, Model::SetUserBlackListResult> SetUserBlackListOutcome;
-			typedef std::future<SetUserBlackListOutcome> SetUserBlackListOutcomeCallable;
-			typedef std::function<void(const CdnClient*, const Model::SetUserBlackListRequest&, const SetUserBlackListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SetUserBlackListAsyncHandler;
-			typedef Outcome<Error, Model::GetUserDomainBlackListResult> GetUserDomainBlackListOutcome;
-			typedef std::future<GetUserDomainBlackListOutcome> GetUserDomainBlackListOutcomeCallable;
-			typedef std::function<void(const CdnClient*, const Model::GetUserDomainBlackListRequest&, const GetUserDomainBlackListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetUserDomainBlackListAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDomainCCAttackInfoResult> DescribeDomainCCAttackInfoOutcome;
 			typedef std::future<DescribeDomainCCAttackInfoOutcome> DescribeDomainCCAttackInfoOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::DescribeDomainCCAttackInfoRequest&, const DescribeDomainCCAttackInfoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDomainCCAttackInfoAsyncHandler;
@@ -835,9 +813,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDomainDownstreamBpsOfEdgeResult> DescribeDomainDownstreamBpsOfEdgeOutcome;
 			typedef std::future<DescribeDomainDownstreamBpsOfEdgeOutcome> DescribeDomainDownstreamBpsOfEdgeOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::DescribeDomainDownstreamBpsOfEdgeRequest&, const DescribeDomainDownstreamBpsOfEdgeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDomainDownstreamBpsOfEdgeAsyncHandler;
-			typedef Outcome<Error, Model::ClearUserBlackListResult> ClearUserBlackListOutcome;
-			typedef std::future<ClearUserBlackListOutcome> ClearUserBlackListOutcomeCallable;
-			typedef std::function<void(const CdnClient*, const Model::ClearUserBlackListRequest&, const ClearUserBlackListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ClearUserBlackListAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDomainMax95BpsDataResult> DescribeDomainMax95BpsDataOutcome;
 			typedef std::future<DescribeDomainMax95BpsDataOutcome> DescribeDomainMax95BpsDataOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::DescribeDomainMax95BpsDataRequest&, const DescribeDomainMax95BpsDataOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDomainMax95BpsDataAsyncHandler;
@@ -990,9 +965,6 @@ namespace AlibabaCloud
 			DescribeLiveStreamBitRateDataOutcome describeLiveStreamBitRateData(const Model::DescribeLiveStreamBitRateDataRequest &request)const;
 			void describeLiveStreamBitRateDataAsync(const Model::DescribeLiveStreamBitRateDataRequest& request, const DescribeLiveStreamBitRateDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeLiveStreamBitRateDataOutcomeCallable describeLiveStreamBitRateDataCallable(const Model::DescribeLiveStreamBitRateDataRequest& request) const;
-			SetUserDomainBlackListOutcome setUserDomainBlackList(const Model::SetUserDomainBlackListRequest &request)const;
-			void setUserDomainBlackListAsync(const Model::SetUserDomainBlackListRequest& request, const SetUserDomainBlackListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			SetUserDomainBlackListOutcomeCallable setUserDomainBlackListCallable(const Model::SetUserDomainBlackListRequest& request) const;
 			SetLocationAccessRestrictionOutcome setLocationAccessRestriction(const Model::SetLocationAccessRestrictionRequest &request)const;
 			void setLocationAccessRestrictionAsync(const Model::SetLocationAccessRestrictionRequest& request, const SetLocationAccessRestrictionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			SetLocationAccessRestrictionOutcomeCallable setLocationAccessRestrictionCallable(const Model::SetLocationAccessRestrictionRequest& request) const;
@@ -1311,9 +1283,6 @@ namespace AlibabaCloud
 			DescribeDomainISPDataOutcome describeDomainISPData(const Model::DescribeDomainISPDataRequest &request)const;
 			void describeDomainISPDataAsync(const Model::DescribeDomainISPDataRequest& request, const DescribeDomainISPDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDomainISPDataOutcomeCallable describeDomainISPDataCallable(const Model::DescribeDomainISPDataRequest& request) const;
-			ClearUserDomainBlackListOutcome clearUserDomainBlackList(const Model::ClearUserDomainBlackListRequest &request)const;
-			void clearUserDomainBlackListAsync(const Model::ClearUserDomainBlackListRequest& request, const ClearUserDomainBlackListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			ClearUserDomainBlackListOutcomeCallable clearUserDomainBlackListCallable(const Model::ClearUserDomainBlackListRequest& request) const;
 			DescribeDomainFileSizeProportionDataOutcome describeDomainFileSizeProportionData(const Model::DescribeDomainFileSizeProportionDataRequest &request)const;
 			void describeDomainFileSizeProportionDataAsync(const Model::DescribeDomainFileSizeProportionDataRequest& request, const DescribeDomainFileSizeProportionDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDomainFileSizeProportionDataOutcomeCallable describeDomainFileSizeProportionDataCallable(const Model::DescribeDomainFileSizeProportionDataRequest& request) const;
@@ -1341,12 +1310,6 @@ namespace AlibabaCloud
 			DescribeFCTriggerOutcome describeFCTrigger(const Model::DescribeFCTriggerRequest &request)const;
 			void describeFCTriggerAsync(const Model::DescribeFCTriggerRequest& request, const DescribeFCTriggerAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeFCTriggerOutcomeCallable describeFCTriggerCallable(const Model::DescribeFCTriggerRequest& request) const;
-			SetUserBlackListOutcome setUserBlackList(const Model::SetUserBlackListRequest &request)const;
-			void setUserBlackListAsync(const Model::SetUserBlackListRequest& request, const SetUserBlackListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			SetUserBlackListOutcomeCallable setUserBlackListCallable(const Model::SetUserBlackListRequest& request) const;
-			GetUserDomainBlackListOutcome getUserDomainBlackList(const Model::GetUserDomainBlackListRequest &request)const;
-			void getUserDomainBlackListAsync(const Model::GetUserDomainBlackListRequest& request, const GetUserDomainBlackListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			GetUserDomainBlackListOutcomeCallable getUserDomainBlackListCallable(const Model::GetUserDomainBlackListRequest& request) const;
 			DescribeDomainCCAttackInfoOutcome describeDomainCCAttackInfo(const Model::DescribeDomainCCAttackInfoRequest &request)const;
 			void describeDomainCCAttackInfoAsync(const Model::DescribeDomainCCAttackInfoRequest& request, const DescribeDomainCCAttackInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDomainCCAttackInfoOutcomeCallable describeDomainCCAttackInfoCallable(const Model::DescribeDomainCCAttackInfoRequest& request) const;
@@ -1362,9 +1325,6 @@ namespace AlibabaCloud
 			DescribeDomainDownstreamBpsOfEdgeOutcome describeDomainDownstreamBpsOfEdge(const Model::DescribeDomainDownstreamBpsOfEdgeRequest &request)const;
 			void describeDomainDownstreamBpsOfEdgeAsync(const Model::DescribeDomainDownstreamBpsOfEdgeRequest& request, const DescribeDomainDownstreamBpsOfEdgeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDomainDownstreamBpsOfEdgeOutcomeCallable describeDomainDownstreamBpsOfEdgeCallable(const Model::DescribeDomainDownstreamBpsOfEdgeRequest& request) const;
-			ClearUserBlackListOutcome clearUserBlackList(const Model::ClearUserBlackListRequest &request)const;
-			void clearUserBlackListAsync(const Model::ClearUserBlackListRequest& request, const ClearUserBlackListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			ClearUserBlackListOutcomeCallable clearUserBlackListCallable(const Model::ClearUserBlackListRequest& request) const;
 			DescribeDomainMax95BpsDataOutcome describeDomainMax95BpsData(const Model::DescribeDomainMax95BpsDataRequest &request)const;
 			void describeDomainMax95BpsDataAsync(const Model::DescribeDomainMax95BpsDataRequest& request, const DescribeDomainMax95BpsDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDomainMax95BpsDataOutcomeCallable describeDomainMax95BpsDataCallable(const Model::DescribeDomainMax95BpsDataRequest& request) const;

cdn/include/alibabacloud/cdn/model/DescribeDomainCertificateInfoRequest.h

@@ -37,6 +37,8 @@ namespace AlibabaCloud
 
 				std::string getApp_ip()const;
 				void setApp_ip(const std::string& app_ip);
+				std::string getPopProduct()const;
+				void setPopProduct(const std::string& popProduct);
 				std::string getProduct()const;
 				void setProduct(const std::string& product);
 				long getCallerParentId()const;
@@ -80,6 +82,7 @@ namespace AlibabaCloud
 
             private:
 				std::string app_ip_;
+				std::string popProduct_;
 				std::string product_;
 				long callerParentId_;
 				std::string domainName_;

cdn/include/alibabacloud/cdn/model/DescribeDomainCertificateInfoResult.h

@@ -35,14 +35,19 @@ namespace AlibabaCloud
 				struct CertInfo
 				{
 					std::string status;
-					std::string certLife;
 					std::string domainName;
+					std::string certType;
+					std::string certStartTime;
+					std::string serverCertificateStatus;
+					std::string serverCertificate;
+					std::string certUpdateTime;
+					std::string certLife;
 					std::string certDomainName;
 					std::string certOrg;
-					std::string certType;
+					std::string certCommonName;
 					std::string certExpireTime;
+					std::string domainCnameStatus;
 					std::string certName;
-					std::string serverCertificateStatus;
 				};
 
 

cdn/include/alibabacloud/cdn/model/DescribeDomainPathDataRequest.h

@@ -67,6 +67,8 @@ namespace AlibabaCloud
 				void setCallerUid(long callerUid);
 				std::string getApp_ip()const;
 				void setApp_ip(const std::string& app_ip);
+				std::string getProduct()const;
+				void setProduct(const std::string& product);
 				std::string getDomainName()const;
 				void setDomainName(const std::string& domainName);
 				std::string getEndTime()const;
@@ -103,6 +105,7 @@ namespace AlibabaCloud
 				std::string callerUidEmail_;
 				long callerUid_;
 				std::string app_ip_;
+				std::string product_;
 				std::string domainName_;
 				std::string endTime_;
 				std::string callerBid_;

cdn/include/alibabacloud/cdn/model/DescribeUserCustomLogConfigRequest.h

@@ -35,20 +35,11 @@ namespace AlibabaCloud
 				DescribeUserCustomLogConfigRequest();
 				~DescribeUserCustomLogConfigRequest();
 
-				std::string getSecurityToken()const;
-				void setSecurityToken(const std::string& securityToken);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getVersion()const;
-				void setVersion(const std::string& version);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
 
             private:
-				std::string securityToken_;
 				long ownerId_;
-				std::string version_;
-				std::string accessKeyId_;
 
 			};
 		}

cdn/include/alibabacloud/cdn/model/PushObjectCacheRequest.h

@@ -35,6 +35,8 @@ namespace AlibabaCloud
 				PushObjectCacheRequest();
 				~PushObjectCacheRequest();
 
+				std::string getArea()const;
+				void setArea(const std::string& area);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getObjectPath()const;
@@ -45,6 +47,7 @@ namespace AlibabaCloud
 				void setAccessKeyId(const std::string& accessKeyId);
 
             private:
+				std::string area_;
 				std::string securityToken_;
 				std::string objectPath_;
 				long ownerId_;

cdn/src/CdnClient.cc

@@ -1059,42 +1059,6 @@ CdnClient::DescribeLiveStreamBitRateDataOutcomeCallable CdnClient::describeLiveS
 	return task->get_future();
 }
 
-CdnClient::SetUserDomainBlackListOutcome CdnClient::setUserDomainBlackList(const SetUserDomainBlackListRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return SetUserDomainBlackListOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return SetUserDomainBlackListOutcome(SetUserDomainBlackListResult(outcome.result()));
-	else
-		return SetUserDomainBlackListOutcome(outcome.error());
-}
-
-void CdnClient::setUserDomainBlackListAsync(const SetUserDomainBlackListRequest& request, const SetUserDomainBlackListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, setUserDomainBlackList(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-CdnClient::SetUserDomainBlackListOutcomeCallable CdnClient::setUserDomainBlackListCallable(const SetUserDomainBlackListRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<SetUserDomainBlackListOutcome()>>(
-			[this, request]()
-			{
-			return this->setUserDomainBlackList(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 CdnClient::SetLocationAccessRestrictionOutcome CdnClient::setLocationAccessRestriction(const SetLocationAccessRestrictionRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -4911,42 +4875,6 @@ CdnClient::DescribeDomainISPDataOutcomeCallable CdnClient::describeDomainISPData
 	return task->get_future();
 }
 
-CdnClient::ClearUserDomainBlackListOutcome CdnClient::clearUserDomainBlackList(const ClearUserDomainBlackListRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return ClearUserDomainBlackListOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return ClearUserDomainBlackListOutcome(ClearUserDomainBlackListResult(outcome.result()));
-	else
-		return ClearUserDomainBlackListOutcome(outcome.error());
-}
-
-void CdnClient::clearUserDomainBlackListAsync(const ClearUserDomainBlackListRequest& request, const ClearUserDomainBlackListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, clearUserDomainBlackList(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-CdnClient::ClearUserDomainBlackListOutcomeCallable CdnClient::clearUserDomainBlackListCallable(const ClearUserDomainBlackListRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<ClearUserDomainBlackListOutcome()>>(
-			[this, request]()
-			{
-			return this->clearUserDomainBlackList(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 CdnClient::DescribeDomainFileSizeProportionDataOutcome CdnClient::describeDomainFileSizeProportionData(const DescribeDomainFileSizeProportionDataRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -5271,78 +5199,6 @@ CdnClient::DescribeFCTriggerOutcomeCallable CdnClient::describeFCTriggerCallable
 	return task->get_future();
 }
 
-CdnClient::SetUserBlackListOutcome CdnClient::setUserBlackList(const SetUserBlackListRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return SetUserBlackListOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return SetUserBlackListOutcome(SetUserBlackListResult(outcome.result()));
-	else
-		return SetUserBlackListOutcome(outcome.error());
-}
-
-void CdnClient::setUserBlackListAsync(const SetUserBlackListRequest& request, const SetUserBlackListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, setUserBlackList(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-CdnClient::SetUserBlackListOutcomeCallable CdnClient::setUserBlackListCallable(const SetUserBlackListRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<SetUserBlackListOutcome()>>(
-			[this, request]()
-			{
-			return this->setUserBlackList(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
-CdnClient::GetUserDomainBlackListOutcome CdnClient::getUserDomainBlackList(const GetUserDomainBlackListRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return GetUserDomainBlackListOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return GetUserDomainBlackListOutcome(GetUserDomainBlackListResult(outcome.result()));
-	else
-		return GetUserDomainBlackListOutcome(outcome.error());
-}
-
-void CdnClient::getUserDomainBlackListAsync(const GetUserDomainBlackListRequest& request, const GetUserDomainBlackListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, getUserDomainBlackList(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-CdnClient::GetUserDomainBlackListOutcomeCallable CdnClient::getUserDomainBlackListCallable(const GetUserDomainBlackListRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<GetUserDomainBlackListOutcome()>>(
-			[this, request]()
-			{
-			return this->getUserDomainBlackList(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 CdnClient::DescribeDomainCCAttackInfoOutcome CdnClient::describeDomainCCAttackInfo(const DescribeDomainCCAttackInfoRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -5523,42 +5379,6 @@ CdnClient::DescribeDomainDownstreamBpsOfEdgeOutcomeCallable CdnClient::describeD
 	return task->get_future();
 }
 
-CdnClient::ClearUserBlackListOutcome CdnClient::clearUserBlackList(const ClearUserBlackListRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return ClearUserBlackListOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return ClearUserBlackListOutcome(ClearUserBlackListResult(outcome.result()));
-	else
-		return ClearUserBlackListOutcome(outcome.error());
-}
-
-void CdnClient::clearUserBlackListAsync(const ClearUserBlackListRequest& request, const ClearUserBlackListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, clearUserBlackList(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-CdnClient::ClearUserBlackListOutcomeCallable CdnClient::clearUserBlackListCallable(const ClearUserBlackListRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<ClearUserBlackListOutcome()>>(
-			[this, request]()
-			{
-			return this->clearUserBlackList(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 CdnClient::DescribeDomainMax95BpsDataOutcome CdnClient::describeDomainMax95BpsData(const DescribeDomainMax95BpsDataRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

cdn/src/model/ClearUserBlackListRequest.cc

@@ -1,71 +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 <alibabacloud/cdn/model/ClearUserBlackListRequest.h>
-
-using AlibabaCloud::Cdn::Model::ClearUserBlackListRequest;
-
-ClearUserBlackListRequest::ClearUserBlackListRequest() :
-	RpcServiceRequest("cdn", "2014-11-11", "ClearUserBlackList")
-{}
-
-ClearUserBlackListRequest::~ClearUserBlackListRequest()
-{}
-
-std::string ClearUserBlackListRequest::getSecurityToken()const
-{
-	return securityToken_;
-}
-
-void ClearUserBlackListRequest::setSecurityToken(const std::string& securityToken)
-{
-	securityToken_ = securityToken;
-	setParameter("SecurityToken", securityToken);
-}
-
-std::string ClearUserBlackListRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void ClearUserBlackListRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setParameter("OwnerAccount", ownerAccount);
-}
-
-long ClearUserBlackListRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void ClearUserBlackListRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string ClearUserBlackListRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void ClearUserBlackListRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-

cdn/src/model/DescribeDomainCertificateInfoRequest.cc

@@ -36,6 +36,17 @@ void DescribeDomainCertificateInfoRequest::setApp_ip(const std::string& app_ip)
 	setParameter("App_ip", app_ip);
 }
 
+std::string DescribeDomainCertificateInfoRequest::getPopProduct()const
+{
+	return popProduct_;
+}
+
+void DescribeDomainCertificateInfoRequest::setPopProduct(const std::string& popProduct)
+{
+	popProduct_ = popProduct;
+	setParameter("PopProduct", popProduct);
+}
+
 std::string DescribeDomainCertificateInfoRequest::getProduct()const
 {
 	return product_;

cdn/src/model/DescribeDomainCertificateInfoResult.cc

@@ -62,6 +62,16 @@ void DescribeDomainCertificateInfoResult::parse(const std::string &payload)
 			certInfosObject.serverCertificateStatus = value["ServerCertificateStatus"].asString();
 		if(!value["Status"].isNull())
 			certInfosObject.status = value["Status"].asString();
+		if(!value["ServerCertificate"].isNull())
+			certInfosObject.serverCertificate = value["ServerCertificate"].asString();
+		if(!value["CertUpdateTime"].isNull())
+			certInfosObject.certUpdateTime = value["CertUpdateTime"].asString();
+		if(!value["CertStartTime"].isNull())
+			certInfosObject.certStartTime = value["CertStartTime"].asString();
+		if(!value["CertCommonName"].isNull())
+			certInfosObject.certCommonName = value["CertCommonName"].asString();
+		if(!value["DomainCnameStatus"].isNull())
+			certInfosObject.domainCnameStatus = value["DomainCnameStatus"].asString();
 		certInfos_.push_back(certInfosObject);
 	}
 

cdn/src/model/DescribeDomainPathDataRequest.cc

@@ -201,6 +201,17 @@ void DescribeDomainPathDataRequest::setApp_ip(const std::string& app_ip)
 	setParameter("App_ip", app_ip);
 }
 
+std::string DescribeDomainPathDataRequest::getProduct()const
+{
+	return product_;
+}
+
+void DescribeDomainPathDataRequest::setProduct(const std::string& product)
+{
+	product_ = product;
+	setParameter("Product", product);
+}
+
 std::string DescribeDomainPathDataRequest::getDomainName()const
 {
 	return domainName_;

cdn/src/model/DescribeUserCustomLogConfigRequest.cc

@@ -25,17 +25,6 @@ DescribeUserCustomLogConfigRequest::DescribeUserCustomLogConfigRequest() :
 DescribeUserCustomLogConfigRequest::~DescribeUserCustomLogConfigRequest()
 {}
 
-std::string DescribeUserCustomLogConfigRequest::getSecurityToken()const
-{
-	return securityToken_;
-}
-
-void DescribeUserCustomLogConfigRequest::setSecurityToken(const std::string& securityToken)
-{
-	securityToken_ = securityToken;
-	setParameter("SecurityToken", securityToken);
-}
-
 long DescribeUserCustomLogConfigRequest::getOwnerId()const
 {
 	return ownerId_;
@@ -47,25 +36,3 @@ void DescribeUserCustomLogConfigRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
-std::string DescribeUserCustomLogConfigRequest::getVersion()const
-{
-	return version_;
-}
-
-void DescribeUserCustomLogConfigRequest::setVersion(const std::string& version)
-{
-	version_ = version;
-	setParameter("Version", version);
-}
-
-std::string DescribeUserCustomLogConfigRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void DescribeUserCustomLogConfigRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-

cdn/src/model/GetUserDomainBlackListRequest.cc

@@ -1,82 +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 <alibabacloud/cdn/model/GetUserDomainBlackListRequest.h>
-
-using AlibabaCloud::Cdn::Model::GetUserDomainBlackListRequest;
-
-GetUserDomainBlackListRequest::GetUserDomainBlackListRequest() :
-	RpcServiceRequest("cdn", "2014-11-11", "GetUserDomainBlackList")
-{}
-
-GetUserDomainBlackListRequest::~GetUserDomainBlackListRequest()
-{}
-
-std::string GetUserDomainBlackListRequest::getSecurityToken()const
-{
-	return securityToken_;
-}
-
-void GetUserDomainBlackListRequest::setSecurityToken(const std::string& securityToken)
-{
-	securityToken_ = securityToken;
-	setParameter("SecurityToken", securityToken);
-}
-
-std::string GetUserDomainBlackListRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void GetUserDomainBlackListRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setParameter("OwnerAccount", ownerAccount);
-}
-
-std::string GetUserDomainBlackListRequest::getDomainName()const
-{
-	return domainName_;
-}
-
-void GetUserDomainBlackListRequest::setDomainName(const std::string& domainName)
-{
-	domainName_ = domainName;
-	setParameter("DomainName", domainName);
-}
-
-long GetUserDomainBlackListRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void GetUserDomainBlackListRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string GetUserDomainBlackListRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void GetUserDomainBlackListRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-

cdn/src/model/PushObjectCacheRequest.cc

@@ -25,6 +25,17 @@ PushObjectCacheRequest::PushObjectCacheRequest() :
 PushObjectCacheRequest::~PushObjectCacheRequest()
 {}
 
+std::string PushObjectCacheRequest::getArea()const
+{
+	return area_;
+}
+
+void PushObjectCacheRequest::setArea(const std::string& area)
+{
+	area_ = area;
+	setParameter("Area", area);
+}
+
 std::string PushObjectCacheRequest::getSecurityToken()const
 {
 	return securityToken_;

cdn/src/model/SetUserDomainBlackListRequest.cc

@@ -1,82 +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 <alibabacloud/cdn/model/SetUserDomainBlackListRequest.h>
-
-using AlibabaCloud::Cdn::Model::SetUserDomainBlackListRequest;
-
-SetUserDomainBlackListRequest::SetUserDomainBlackListRequest() :
-	RpcServiceRequest("cdn", "2014-11-11", "SetUserDomainBlackList")
-{}
-
-SetUserDomainBlackListRequest::~SetUserDomainBlackListRequest()
-{}
-
-std::string SetUserDomainBlackListRequest::getSecurityToken()const
-{
-	return securityToken_;
-}
-
-void SetUserDomainBlackListRequest::setSecurityToken(const std::string& securityToken)
-{
-	securityToken_ = securityToken;
-	setParameter("SecurityToken", securityToken);
-}
-
-std::string SetUserDomainBlackListRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void SetUserDomainBlackListRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setParameter("OwnerAccount", ownerAccount);
-}
-
-std::string SetUserDomainBlackListRequest::getDomainName()const
-{
-	return domainName_;
-}
-
-void SetUserDomainBlackListRequest::setDomainName(const std::string& domainName)
-{
-	domainName_ = domainName;
-	setParameter("DomainName", domainName);
-}
-
-long SetUserDomainBlackListRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void SetUserDomainBlackListRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string SetUserDomainBlackListRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void SetUserDomainBlackListRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-

cloudauth/include/alibabacloud/cloudauth/model/GetMaterialsResult.h

@@ -36,8 +36,10 @@ namespace AlibabaCloud
 				{
 					std::string facePic;
 					std::string identificationNumber;
+					std::string idCardStartDate;
 					std::string address;
 					std::string idCardFrontPic;
+					std::string ethnicGroup;
 					std::string sex;
 					std::string idCardExpiry;
 					std::string idCardType;

cloudauth/include/alibabacloud/cloudauth/model/GetVerifyTokenRequest.h

@@ -45,6 +45,8 @@ namespace AlibabaCloud
 				void setSourceIp(const std::string& sourceIp);
 				std::string getBinding()const;
 				void setBinding(const std::string& binding);
+				std::string getVerifyConfigs()const;
+				void setVerifyConfigs(const std::string& verifyConfigs);
 				std::string getTicketId()const;
 				void setTicketId(const std::string& ticketId);
 
@@ -54,6 +56,7 @@ namespace AlibabaCloud
 				std::string biz_;
 				std::string sourceIp_;
 				std::string binding_;
+				std::string verifyConfigs_;
 				std::string ticketId_;
 
 			};

cloudauth/src/model/CompareFacesRequest.cc

@@ -19,7 +19,7 @@
 using AlibabaCloud::Cloudauth::Model::CompareFacesRequest;
 
 CompareFacesRequest::CompareFacesRequest() :
-	RpcServiceRequest("cloudauth", "2018-07-03", "CompareFaces")
+	RpcServiceRequest("cloudauth", "2018-08-07", "CompareFaces")
 {}
 
 CompareFacesRequest::~CompareFacesRequest()

cloudauth/src/model/DetectFaceAttributesRequest.cc

@@ -19,7 +19,7 @@
 using AlibabaCloud::Cloudauth::Model::DetectFaceAttributesRequest;
 
 DetectFaceAttributesRequest::DetectFaceAttributesRequest() :
-	RpcServiceRequest("cloudauth", "2018-07-03", "DetectFaceAttributes")
+	RpcServiceRequest("cloudauth", "2018-08-07", "DetectFaceAttributes")
 {}
 
 DetectFaceAttributesRequest::~DetectFaceAttributesRequest()

cloudauth/src/model/GetMaterialsRequest.cc

@@ -19,7 +19,7 @@
 using AlibabaCloud::Cloudauth::Model::GetMaterialsRequest;
 
 GetMaterialsRequest::GetMaterialsRequest() :
-	RpcServiceRequest("cloudauth", "2018-07-03", "GetMaterials")
+	RpcServiceRequest("cloudauth", "2018-08-07", "GetMaterials")
 {}
 
 GetMaterialsRequest::~GetMaterialsRequest()

cloudauth/src/model/GetMaterialsResult.cc

@@ -47,6 +47,8 @@ void GetMaterialsResult::parse(const std::string &payload)
 		data_.identificationNumber = dataNode["IdentificationNumber"].asString();
 	if(!dataNode["IdCardType"].isNull())
 		data_.idCardType = dataNode["IdCardType"].asString();
+	if(!dataNode["IdCardStartDate"].isNull())
+		data_.idCardStartDate = dataNode["IdCardStartDate"].asString();
 	if(!dataNode["IdCardExpiry"].isNull())
 		data_.idCardExpiry = dataNode["IdCardExpiry"].asString();
 	if(!dataNode["Address"].isNull())
@@ -59,6 +61,8 @@ void GetMaterialsResult::parse(const std::string &payload)
 		data_.idCardBackPic = dataNode["IdCardBackPic"].asString();
 	if(!dataNode["FacePic"].isNull())
 		data_.facePic = dataNode["FacePic"].asString();
+	if(!dataNode["EthnicGroup"].isNull())
+		data_.ethnicGroup = dataNode["EthnicGroup"].asString();
 	if(!value["Success"].isNull())
 		success_ = value["Success"].asString() == "true";
 	if(!value["Code"].isNull())

cloudauth/src/model/GetStatusRequest.cc

@@ -19,7 +19,7 @@
 using AlibabaCloud::Cloudauth::Model::GetStatusRequest;
 
 GetStatusRequest::GetStatusRequest() :
-	RpcServiceRequest("cloudauth", "2018-07-03", "GetStatus")
+	RpcServiceRequest("cloudauth", "2018-08-07", "GetStatus")
 {}
 
 GetStatusRequest::~GetStatusRequest()

cloudauth/src/model/GetVerifyTokenRequest.cc

@@ -19,7 +19,7 @@
 using AlibabaCloud::Cloudauth::Model::GetVerifyTokenRequest;
 
 GetVerifyTokenRequest::GetVerifyTokenRequest() :
-	RpcServiceRequest("cloudauth", "2018-07-03", "GetVerifyToken")
+	RpcServiceRequest("cloudauth", "2018-08-07", "GetVerifyToken")
 {}
 
 GetVerifyTokenRequest::~GetVerifyTokenRequest()
@@ -80,6 +80,17 @@ void GetVerifyTokenRequest::setBinding(const std::string& binding)
 	setParameter("Binding", binding);
 }
 
+std::string GetVerifyTokenRequest::getVerifyConfigs()const
+{
+	return verifyConfigs_;
+}
+
+void GetVerifyTokenRequest::setVerifyConfigs(const std::string& verifyConfigs)
+{
+	verifyConfigs_ = verifyConfigs;
+	setParameter("VerifyConfigs", verifyConfigs);
+}
+
 std::string GetVerifyTokenRequest::getTicketId()const
 {
 	return ticketId_;

cloudauth/src/model/SubmitMaterialsRequest.cc

@@ -19,7 +19,7 @@
 using AlibabaCloud::Cloudauth::Model::SubmitMaterialsRequest;
 
 SubmitMaterialsRequest::SubmitMaterialsRequest() :
-	RpcServiceRequest("cloudauth", "2018-07-03", "SubmitMaterials")
+	RpcServiceRequest("cloudauth", "2018-08-07", "SubmitMaterials")
 {}
 
 SubmitMaterialsRequest::~SubmitMaterialsRequest()

ecs/CMakeLists.txt

@@ -35,6 +35,8 @@ set(ecs_public_header_model
 	include/alibabacloud/ecs/model/CreateNatGatewayResult.h
 	include/alibabacloud/ecs/model/AttachDiskRequest.h
 	include/alibabacloud/ecs/model/AttachDiskResult.h
+	include/alibabacloud/ecs/model/DescribeEniMonitorDataRequest.h
+	include/alibabacloud/ecs/model/DescribeEniMonitorDataResult.h
 	include/alibabacloud/ecs/model/ReInitDiskRequest.h
 	include/alibabacloud/ecs/model/ReInitDiskResult.h
 	include/alibabacloud/ecs/model/CreateHaVipRequest.h
@@ -401,6 +403,8 @@ set(ecs_public_header_model
 	include/alibabacloud/ecs/model/ReleasePublicIpAddressResult.h
 	include/alibabacloud/ecs/model/CreateVirtualBorderRouterRequest.h
 	include/alibabacloud/ecs/model/CreateVirtualBorderRouterResult.h
+	include/alibabacloud/ecs/model/DescribeAccountAttributesRequest.h
+	include/alibabacloud/ecs/model/DescribeAccountAttributesResult.h
 	include/alibabacloud/ecs/model/EipFillParamsRequest.h
 	include/alibabacloud/ecs/model/EipFillParamsResult.h
 	include/alibabacloud/ecs/model/ModifyPrepayInstanceSpecRequest.h
@@ -520,6 +524,8 @@ set(ecs_src
 	src/model/CreateNatGatewayResult.cc
 	src/model/AttachDiskRequest.cc
 	src/model/AttachDiskResult.cc
+	src/model/DescribeEniMonitorDataRequest.cc
+	src/model/DescribeEniMonitorDataResult.cc
 	src/model/ReInitDiskRequest.cc
 	src/model/ReInitDiskResult.cc
 	src/model/CreateHaVipRequest.cc
@@ -886,6 +892,8 @@ set(ecs_src
 	src/model/ReleasePublicIpAddressResult.cc
 	src/model/CreateVirtualBorderRouterRequest.cc
 	src/model/CreateVirtualBorderRouterResult.cc
+	src/model/DescribeAccountAttributesRequest.cc
+	src/model/DescribeAccountAttributesResult.cc
 	src/model/EipFillParamsRequest.cc
 	src/model/EipFillParamsResult.cc
 	src/model/ModifyPrepayInstanceSpecRequest.cc

ecs/include/alibabacloud/ecs/EcsClient.h

@@ -36,6 +36,8 @@
 #include "model/CreateNatGatewayResult.h"
 #include "model/AttachDiskRequest.h"
 #include "model/AttachDiskResult.h"
+#include "model/DescribeEniMonitorDataRequest.h"
+#include "model/DescribeEniMonitorDataResult.h"
 #include "model/ReInitDiskRequest.h"
 #include "model/ReInitDiskResult.h"
 #include "model/CreateHaVipRequest.h"
@@ -402,6 +404,8 @@
 #include "model/ReleasePublicIpAddressResult.h"
 #include "model/CreateVirtualBorderRouterRequest.h"
 #include "model/CreateVirtualBorderRouterResult.h"
+#include "model/DescribeAccountAttributesRequest.h"
+#include "model/DescribeAccountAttributesResult.h"
 #include "model/EipFillParamsRequest.h"
 #include "model/EipFillParamsResult.h"
 #include "model/ModifyPrepayInstanceSpecRequest.h"
@@ -534,6 +538,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::AttachDiskResult> AttachDiskOutcome;
 			typedef std::future<AttachDiskOutcome> AttachDiskOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::AttachDiskRequest&, const AttachDiskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> AttachDiskAsyncHandler;
+			typedef Outcome<Error, Model::DescribeEniMonitorDataResult> DescribeEniMonitorDataOutcome;
+			typedef std::future<DescribeEniMonitorDataOutcome> DescribeEniMonitorDataOutcomeCallable;
+			typedef std::function<void(const EcsClient*, const Model::DescribeEniMonitorDataRequest&, const DescribeEniMonitorDataOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeEniMonitorDataAsyncHandler;
 			typedef Outcome<Error, Model::ReInitDiskResult> ReInitDiskOutcome;
 			typedef std::future<ReInitDiskOutcome> ReInitDiskOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::ReInitDiskRequest&, const ReInitDiskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ReInitDiskAsyncHandler;
@@ -1083,6 +1090,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreateVirtualBorderRouterResult> CreateVirtualBorderRouterOutcome;
 			typedef std::future<CreateVirtualBorderRouterOutcome> CreateVirtualBorderRouterOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::CreateVirtualBorderRouterRequest&, const CreateVirtualBorderRouterOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateVirtualBorderRouterAsyncHandler;
+			typedef Outcome<Error, Model::DescribeAccountAttributesResult> DescribeAccountAttributesOutcome;
+			typedef std::future<DescribeAccountAttributesOutcome> DescribeAccountAttributesOutcomeCallable;
+			typedef std::function<void(const EcsClient*, const Model::DescribeAccountAttributesRequest&, const DescribeAccountAttributesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAccountAttributesAsyncHandler;
 			typedef Outcome<Error, Model::EipFillParamsResult> EipFillParamsOutcome;
 			typedef std::future<EipFillParamsOutcome> EipFillParamsOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::EipFillParamsRequest&, const EipFillParamsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> EipFillParamsAsyncHandler;
@@ -1262,6 +1272,9 @@ namespace AlibabaCloud
 			AttachDiskOutcome attachDisk(const Model::AttachDiskRequest &request)const;
 			void attachDiskAsync(const Model::AttachDiskRequest& request, const AttachDiskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			AttachDiskOutcomeCallable attachDiskCallable(const Model::AttachDiskRequest& request) const;
+			DescribeEniMonitorDataOutcome describeEniMonitorData(const Model::DescribeEniMonitorDataRequest &request)const;
+			void describeEniMonitorDataAsync(const Model::DescribeEniMonitorDataRequest& request, const DescribeEniMonitorDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeEniMonitorDataOutcomeCallable describeEniMonitorDataCallable(const Model::DescribeEniMonitorDataRequest& request) const;
 			ReInitDiskOutcome reInitDisk(const Model::ReInitDiskRequest &request)const;
 			void reInitDiskAsync(const Model::ReInitDiskRequest& request, const ReInitDiskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ReInitDiskOutcomeCallable reInitDiskCallable(const Model::ReInitDiskRequest& request) const;
@@ -1811,6 +1824,9 @@ namespace AlibabaCloud
 			CreateVirtualBorderRouterOutcome createVirtualBorderRouter(const Model::CreateVirtualBorderRouterRequest &request)const;
 			void createVirtualBorderRouterAsync(const Model::CreateVirtualBorderRouterRequest& request, const CreateVirtualBorderRouterAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateVirtualBorderRouterOutcomeCallable createVirtualBorderRouterCallable(const Model::CreateVirtualBorderRouterRequest& request) const;
+			DescribeAccountAttributesOutcome describeAccountAttributes(const Model::DescribeAccountAttributesRequest &request)const;
+			void describeAccountAttributesAsync(const Model::DescribeAccountAttributesRequest& request, const DescribeAccountAttributesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeAccountAttributesOutcomeCallable describeAccountAttributesCallable(const Model::DescribeAccountAttributesRequest& request) const;
 			EipFillParamsOutcome eipFillParams(const Model::EipFillParamsRequest &request)const;
 			void eipFillParamsAsync(const Model::EipFillParamsRequest& request, const EipFillParamsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			EipFillParamsOutcomeCallable eipFillParamsCallable(const Model::EipFillParamsRequest& request) const;

ecs/include/alibabacloud/ecs/model/AddTagsRequest.h

@@ -30,61 +30,39 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT AddTagsRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				AddTagsRequest();
 				~AddTagsRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceId()const;
 				void setResourceId(const std::string& resourceId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getResourceType()const;
 				void setResourceType(const std::string& resourceType);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
 				std::string resourceId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
-				std::string tag3Key_;
+				std::string regionId_;
+				std::vector<Tag> tag_;
 				long ownerId_;
 				std::string resourceType_;
-				std::string tag5Value_;
-				std::string tag1Key_;
-				std::string tag1Value_;
-				std::string regionId_;
-				std::string tag2Value_;
-				std::string tag4Key_;
-				std::string tag3Value_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/CopyImageRequest.h

@@ -30,73 +30,51 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CopyImageRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				CopyImageRequest();
 				~CopyImageRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getImageId()const;
 				void setImageId(const std::string& imageId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
+				bool getEncrypted()const;
+				void setEncrypted(bool encrypted);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getDestinationImageName()const;
 				void setDestinationImageName(const std::string& destinationImageName);
 				std::string getDestinationRegionId()const;
 				void setDestinationRegionId(const std::string& destinationRegionId);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				bool getEncrypted()const;
-				void setEncrypted(bool encrypted);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				std::string getDestinationDescription()const;
 				void setDestinationDescription(const std::string& destinationDescription);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
 				std::string imageId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
+				bool encrypted_;
 				std::string resourceOwnerAccount_;
+				std::string regionId_;
 				std::string destinationImageName_;
 				std::string destinationRegionId_;
 				std::string ownerAccount_;
-				std::string tag3Key_;
+				std::vector<Tag> tag_;
 				long ownerId_;
-				std::string tag5Value_;
-				std::string tag1Key_;
-				std::string tag1Value_;
-				bool encrypted_;
-				std::string regionId_;
-				std::string tag2Value_;
-				std::string tag4Key_;
 				std::string destinationDescription_;
-				std::string tag3Value_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/CreateDiskRequest.h

@@ -30,85 +30,63 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CreateDiskRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				CreateDiskRequest();
 				~CreateDiskRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getSnapshotId()const;
 				void setSnapshotId(const std::string& snapshotId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				std::string getDescription()const;
-				void setDescription(const std::string& description);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
-				std::string getDiskName()const;
-				void setDiskName(const std::string& diskName);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getDiskCategory()const;
-				void setDiskCategory(const std::string& diskCategory);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getClientToken()const;
+				void setClientToken(const std::string& clientToken);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getDescription()const;
+				void setDescription(const std::string& description);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
+				std::string getDiskName()const;
+				void setDiskName(const std::string& diskName);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				int getSize()const;
 				void setSize(int size);
 				bool getEncrypted()const;
 				void setEncrypted(bool encrypted);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getDiskCategory()const;
+				void setDiskCategory(const std::string& diskCategory);
 				std::string getZoneId()const;
 				void setZoneId(const std::string& zoneId);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
 				std::string snapshotId_;
-				std::string tag2Key_;
-				std::string clientToken_;
-				std::string description_;
-				std::string tag3Key_;
-				std::string diskName_;
-				std::string tag1Value_;
-				std::string resourceGroupId_;
-				std::string regionId_;
-				std::string diskCategory_;
-				std::string tag3Value_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
+				std::string clientToken_;
 				std::string ownerAccount_;
+				std::string description_;
 				long ownerId_;
-				std::string tag5Value_;
-				std::string tag1Key_;
+				std::string diskName_;
+				std::string resourceGroupId_;
 				int size_;
 				bool encrypted_;
-				std::string tag2Value_;
+				std::string regionId_;
+				std::string diskCategory_;
 				std::string zoneId_;
-				std::string tag4Key_;
+				std::vector<Tag> tag_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/CreateImageRequest.h

@@ -32,10 +32,15 @@ namespace AlibabaCloud
 			{
 				struct DiskDeviceMapping
 				{
-					int size;
 					std::string snapshotId;
-					std::string device;
+					int size;
 					std::string diskType;
+					std::string device;
+				};
+				struct Tag
+				{
+					std::string value;
+					std::string key;
 				};
 
 			public:
@@ -44,81 +49,54 @@ namespace AlibabaCloud
 
 				std::vector<DiskDeviceMapping> getDiskDeviceMapping()const;
 				void setDiskDeviceMapping(const std::vector<DiskDeviceMapping>& diskDeviceMapping);
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getSnapshotId()const;
 				void setSnapshotId(const std::string& snapshotId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getClientToken()const;
 				void setClientToken(const std::string& clientToken);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
 				std::string getPlatform()const;
 				void setPlatform(const std::string& platform);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				std::string getImageName()const;
 				void setImageName(const std::string& imageName);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
-				std::string getArchitecture()const;
-				void setArchitecture(const std::string& architecture);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getInstanceId()const;
-				void setInstanceId(const std::string& instanceId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
 				std::string getImageVersion()const;
 				void setImageVersion(const std::string& imageVersion);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
+				std::string getArchitecture()const;
+				void setArchitecture(const std::string& architecture);
 
             private:
 				std::vector<DiskDeviceMapping> diskDeviceMapping_;
-				std::string tag4Value_;
 				long resourceOwnerId_;
 				std::string snapshotId_;
-				std::string tag2Key_;
+				std::string resourceOwnerAccount_;
 				std::string clientToken_;
+				std::string ownerAccount_;
 				std::string description_;
-				std::string tag3Key_;
+				long ownerId_;
 				std::string platform_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
+				std::string instanceId_;
 				std::string regionId_;
 				std::string imageName_;
-				std::string tag3Value_;
-				std::string architecture_;
-				std::string tag5Key_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string tag5Value_;
-				std::string tag1Key_;
-				std::string instanceId_;
-				std::string tag2Value_;
 				std::string imageVersion_;
-				std::string tag4Key_;
+				std::vector<Tag> tag_;
+				std::string architecture_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/CreateInstanceRequest.h

@@ -30,46 +30,45 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CreateInstanceRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 				struct DataDisk
 				{
-					int size;
-					std::string snapshotId;
-					std::string category;
 					std::string diskName;
+					std::string snapshotId;
+					int size;
+					bool encrypted;
 					std::string description;
+					std::string category;
 					std::string device;
 					bool deleteWithInstance;
-					bool encrypted;
 				};
 
 			public:
 				CreateInstanceRequest();
 				~CreateInstanceRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
 				std::string getHpcClusterId()const;
 				void setHpcClusterId(const std::string& hpcClusterId);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
 				std::string getSecurityEnhancementStrategy()const;
 				void setSecurityEnhancementStrategy(const std::string& securityEnhancementStrategy);
 				std::string getKeyPairName()const;
 				void setKeyPairName(const std::string& keyPairName);
 				float getSpotPriceLimit()const;
 				void setSpotPriceLimit(float spotPriceLimit);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getHostName()const;
 				void setHostName(const std::string& hostName);
 				std::string getPassword()const;
 				void setPassword(const std::string& password);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				int getAutoRenewPeriod()const;
 				void setAutoRenewPeriod(int autoRenewPeriod);
 				std::string getNodeControllerId()const;
@@ -78,8 +77,6 @@ namespace AlibabaCloud
 				void setPeriod(int period);
 				bool getDryRun()const;
 				void setDryRun(bool dryRun);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getVSwitchId()const;
@@ -98,8 +95,6 @@ namespace AlibabaCloud
 				void setInternetChargeType(const std::string& internetChargeType);
 				std::string getZoneId()const;
 				void setZoneId(const std::string& zoneId);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				int getInternetMaxBandwidthIn()const;
 				void setInternetMaxBandwidthIn(int internetMaxBandwidthIn);
 				bool getUseAdditionalService()const;
@@ -132,8 +127,6 @@ namespace AlibabaCloud
 				void setInstanceType(const std::string& instanceType);
 				std::string getInstanceChargeType()const;
 				void setInstanceChargeType(const std::string& instanceChargeType);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 				std::string getDeploymentSetId()const;
 				void setDeploymentSetId(const std::string& deploymentSetId);
 				std::string getInnerIpAddress()const;
@@ -152,35 +145,25 @@ namespace AlibabaCloud
 				void setClusterId(const std::string& clusterId);
 				std::vector<DataDisk> getDataDisk()const;
 				void setDataDisk(const std::vector<DataDisk>& dataDisk);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
 				int getSystemDiskSize()const;
 				void setSystemDiskSize(int systemDiskSize);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
 				std::string getSystemDiskDescription()const;
 				void setSystemDiskDescription(const std::string& systemDiskDescription);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
 				std::string hpcClusterId_;
-				std::string tag3Key_;
 				std::string securityEnhancementStrategy_;
 				std::string keyPairName_;
 				float spotPriceLimit_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
 				std::string hostName_;
 				std::string password_;
+				std::vector<Tag> tag_;
 				int autoRenewPeriod_;
 				std::string nodeControllerId_;
 				int period_;
 				bool dryRun_;
-				std::string tag5Key_;
 				long ownerId_;
 				std::string vSwitchId_;
 				std::string privateIpAddress_;
@@ -190,7 +173,6 @@ namespace AlibabaCloud
 				bool autoRenew_;
 				std::string internetChargeType_;
 				std::string zoneId_;
-				std::string tag4Key_;
 				int internetMaxBandwidthIn_;
 				bool useAdditionalService_;
 				std::string imageId_;
@@ -207,7 +189,6 @@ namespace AlibabaCloud
 				std::string regionId_;
 				std::string instanceType_;
 				std::string instanceChargeType_;
-				std::string tag3Value_;
 				std::string deploymentSetId_;
 				std::string innerIpAddress_;
 				std::string resourceOwnerAccount_;
@@ -217,10 +198,7 @@ namespace AlibabaCloud
 				std::string dedicatedHostId_;
 				std::string clusterId_;
 				std::vector<DataDisk> dataDisk_;
-				std::string tag5Value_;
-				std::string tag1Key_;
 				int systemDiskSize_;
-				std::string tag2Value_;
 				std::string systemDiskDescription_;
 
 			};

ecs/include/alibabacloud/ecs/model/CreateKeyPairRequest.h

@@ -30,61 +30,39 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CreateKeyPairRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				CreateKeyPairRequest();
 				~CreateKeyPairRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
-				std::string getKeyPairName()const;
-				void setKeyPairName(const std::string& keyPairName);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
+				std::string getKeyPairName()const;
+				void setKeyPairName(const std::string& keyPairName);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
 
             private:
-				std::string tag4Value_;
-				long resourceOwnerId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
-				std::string resourceOwnerAccount_;
-				std::string tag3Key_;
-				std::string keyPairName_;
-				long ownerId_;
-				std::string tag5Value_;
-				std::string tag1Key_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
+				long resourceOwnerId_;
+				std::string resourceOwnerAccount_;
 				std::string regionId_;
-				std::string tag2Value_;
-				std::string tag4Key_;
-				std::string tag3Value_;
+				std::string keyPairName_;
+				std::vector<Tag> tag_;
+				long ownerId_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/CreateLaunchTemplateRequest.h

@@ -30,6 +30,11 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CreateLaunchTemplateRequest : public RpcServiceRequest
 			{
+				struct TemplateTag
+				{
+					std::string key;
+					std::string value;
+				};
 				struct Tag
 				{
 					std::string key;
@@ -62,8 +67,6 @@ namespace AlibabaCloud
 				void setLaunchTemplateName(const std::string& launchTemplateName);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTemplateTag4Key()const;
-				void setTemplateTag4Key(const std::string& templateTag4Key);
 				long getCallerParentId()const;
 				void setCallerParentId(long callerParentId);
 				std::string getSecurityEnhancementStrategy()const;
@@ -84,8 +87,6 @@ namespace AlibabaCloud
 				void setImageOwnerAlias(const std::string& imageOwnerAlias);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getTemplateTag3Key()const;
-				void setTemplateTag3Key(const std::string& templateTag3Key);
 				std::string getHostName()const;
 				void setHostName(const std::string& hostName);
 				std::string getSecurityToken()const;
@@ -96,8 +97,8 @@ namespace AlibabaCloud
 				void setSystemDiskIops(int systemDiskIops);
 				std::string getCallerBidEmail()const;
 				void setCallerBidEmail(const std::string& callerBidEmail);
-				std::string getTemplateTag3Value()const;
-				void setTemplateTag3Value(const std::string& templateTag3Value);
+				std::vector<TemplateTag> getTemplateTag()const;
+				void setTemplateTag(const std::vector<TemplateTag>& templateTag);
 				std::vector<Tag> getTag()const;
 				void setTag(const std::vector<Tag>& tag);
 				long getCallerUid()const;
@@ -106,8 +107,6 @@ namespace AlibabaCloud
 				void setPeriod(int period);
 				std::string getTemplateResourceGroupId()const;
 				void setTemplateResourceGroupId(const std::string& templateResourceGroupId);
-				std::string getTemplateTag2Value()const;
-				void setTemplateTag2Value(const std::string& templateTag2Value);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				bool getAk_mfa_present()const;
@@ -124,16 +123,12 @@ namespace AlibabaCloud
 				void setRequestId(const std::string& requestId);
 				std::string getInternetChargeType()const;
 				void setInternetChargeType(const std::string& internetChargeType);
-				std::string getTemplateTag5Key()const;
-				void setTemplateTag5Key(const std::string& templateTag5Key);
 				std::string getZoneId()const;
 				void setZoneId(const std::string& zoneId);
 				int getInternetMaxBandwidthIn()const;
 				void setInternetMaxBandwidthIn(int internetMaxBandwidthIn);
 				std::string getVersionDescription()const;
 				void setVersionDescription(const std::string& versionDescription);
-				std::string getTemplateTag1Value()const;
-				void setTemplateTag1Value(const std::string& templateTag1Value);
 				std::string getImageId()const;
 				void setImageId(const std::string& imageId);
 				std::string getIoOptimized()const;
@@ -154,8 +149,6 @@ namespace AlibabaCloud
 				void setUserData(const std::string& userData);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
-				std::string getTemplateTag5Value()const;
-				void setTemplateTag5Value(const std::string& templateTag5Value);
 				std::string getRequestContent()const;
 				void setRequestContent(const std::string& requestContent);
 				std::string getInstanceType()const;
@@ -170,8 +163,6 @@ namespace AlibabaCloud
 				void setNetworkInterface(const std::vector<NetworkInterface>& networkInterface);
 				std::string getApp_ip()const;
 				void setApp_ip(const std::string& app_ip);
-				std::string getTemplateTag2Key()const;
-				void setTemplateTag2Key(const std::string& templateTag2Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -190,21 +181,16 @@ namespace AlibabaCloud
 				void setDataDisk(const std::vector<DataDisk>& dataDisk);
 				bool getProxy_trust_transport_info()const;
 				void setProxy_trust_transport_info(bool proxy_trust_transport_info);
-				std::string getTemplateTag4Value()const;
-				void setTemplateTag4Value(const std::string& templateTag4Value);
 				int getSystemDiskSize()const;
 				void setSystemDiskSize(int systemDiskSize);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
-				std::string getTemplateTag1Key()const;
-				void setTemplateTag1Key(const std::string& templateTag1Key);
 				std::string getSystemDiskDescription()const;
 				void setSystemDiskDescription(const std::string& systemDiskDescription);
 
             private:
 				std::string launchTemplateName_;
 				long resourceOwnerId_;
-				std::string templateTag4Key_;
 				long callerParentId_;
 				std::string securityEnhancementStrategy_;
 				std::string networkType_;
@@ -215,18 +201,16 @@ namespace AlibabaCloud
 				std::string callerType_;
 				std::string imageOwnerAlias_;
 				std::string resourceGroupId_;
-				std::string templateTag3Key_;
 				std::string hostName_;
 				std::string securityToken_;
 				bool enable_;
 				int systemDiskIops_;
 				std::string callerBidEmail_;
-				std::string templateTag3Value_;
+				std::vector<TemplateTag> templateTag_;
 				std::vector<Tag> tag_;
 				long callerUid_;
 				int period_;
 				std::string templateResourceGroupId_;
-				std::string templateTag2Value_;
 				long ownerId_;
 				bool ak_mfa_present_;
 				bool security_transport_;
@@ -235,11 +219,9 @@ namespace AlibabaCloud
 				std::string instanceName_;
 				std::string requestId_;
 				std::string internetChargeType_;
-				std::string templateTag5Key_;
 				std::string zoneId_;
 				int internetMaxBandwidthIn_;
 				std::string versionDescription_;
-				std::string templateTag1Value_;
 				std::string imageId_;
 				std::string ioOptimized_;
 				std::string securityGroupId_;
@@ -250,7 +232,6 @@ namespace AlibabaCloud
 				std::string accessKeyId_;
 				std::string userData_;
 				std::string regionId_;
-				std::string templateTag5Value_;
 				std::string requestContent_;
 				std::string instanceType_;
 				std::string instanceChargeType_;
@@ -258,7 +239,6 @@ namespace AlibabaCloud
 				bool enableVmOsConfig_;
 				std::vector<NetworkInterface> networkInterface_;
 				std::string app_ip_;
-				std::string templateTag2Key_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string systemDiskDiskName_;
@@ -268,10 +248,8 @@ namespace AlibabaCloud
 				int spotDuration_;
 				std::vector<DataDisk> dataDisk_;
 				bool proxy_trust_transport_info_;
-				std::string templateTag4Value_;
 				int systemDiskSize_;
 				std::string vpcId_;
-				std::string templateTag1Key_;
 				std::string systemDiskDescription_;
 
 			};

ecs/include/alibabacloud/ecs/model/CreateNatGatewayRequest.h

@@ -32,9 +32,9 @@ namespace AlibabaCloud
 			{
 				struct BandwidthPackage
 				{
-					int ipCount;
 					int bandwidth;
 					std::string zone;
+					int ipCount;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/CreateNetworkInterfaceRequest.h

@@ -30,17 +30,18 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CreateNetworkInterfaceRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string key;
+					std::string value;
+				};
 
 			public:
 				CreateNetworkInterfaceRequest();
 				~CreateNetworkInterfaceRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
 				std::string getClientToken()const;
 				void setClientToken(const std::string& clientToken);
 				long getCallerParentId()const;
@@ -51,8 +52,6 @@ namespace AlibabaCloud
 				void setProxy_original_security_transport(bool proxy_original_security_transport);
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
 				std::string getProxy_original_source_ip()const;
 				void setProxy_original_source_ip(const std::string& proxy_original_source_ip);
 				std::string getOwnerIdLoginEmail()const;
@@ -61,8 +60,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
@@ -75,18 +72,16 @@ namespace AlibabaCloud
 				void setRequestContent(const std::string& requestContent);
 				std::string getCallerBidEmail()const;
 				void setCallerBidEmail(const std::string& callerBidEmail);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				std::string getCallerUidEmail()const;
 				void setCallerUidEmail(const std::string& callerUidEmail);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 				std::string getNetworkInterfaceName()const;
 				void setNetworkInterfaceName(const std::string& networkInterfaceName);
 				long getCallerUid()const;
 				void setCallerUid(long callerUid);
 				std::string getApp_ip()const;
 				void setApp_ip(const std::string& app_ip);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -95,67 +90,50 @@ namespace AlibabaCloud
 				void setCallerBid(const std::string& callerBid);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
 				bool getProxy_trust_transport_info()const;
 				void setProxy_trust_transport_info(bool proxy_trust_transport_info);
 				bool getAk_mfa_present()const;
 				void setAk_mfa_present(bool ak_mfa_present);
 				bool getSecurity_transport()const;
 				void setSecurity_transport(bool security_transport);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
 				std::string getVSwitchId()const;
 				void setVSwitchId(const std::string& vSwitchId);
 				std::string getRequestId()const;
 				void setRequestId(const std::string& requestId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				std::string getPrimaryIpAddress()const;
 				void setPrimaryIpAddress(const std::string& primaryIpAddress);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
 				std::string clientToken_;
 				long callerParentId_;
 				std::string securityGroupId_;
 				bool proxy_original_security_transport_;
 				std::string description_;
-				std::string tag3Key_;
 				std::string proxy_original_source_ip_;
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;
 				std::string requestContent_;
 				std::string callerBidEmail_;
+				std::vector<Tag> tag_;
 				std::string callerUidEmail_;
-				std::string tag3Value_;
 				std::string networkInterfaceName_;
 				long callerUid_;
 				std::string app_ip_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string callerBid_;
 				long ownerId_;
-				std::string tag5Value_;
 				bool proxy_trust_transport_info_;
 				bool ak_mfa_present_;
 				bool security_transport_;
-				std::string tag1Key_;
 				std::string vSwitchId_;
 				std::string requestId_;
-				std::string tag2Value_;
-				std::string tag4Key_;
 				std::string primaryIpAddress_;
 
 			};

ecs/include/alibabacloud/ecs/model/CreateRouteEntryRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct NextHopList
 				{
-					std::string nextHopType;
 					std::string nextHopId;
+					std::string nextHopType;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/CreateSecurityGroupRequest.h

@@ -30,73 +30,51 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CreateSecurityGroupRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				CreateSecurityGroupRequest();
 				~CreateSecurityGroupRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getClientToken()const;
 				void setClientToken(const std::string& clientToken);
+				std::string getVpcId()const;
+				void setVpcId(const std::string& vpcId);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getSecurityGroupName()const;
 				void setSecurityGroupName(const std::string& securityGroupName);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getVpcId()const;
-				void setVpcId(const std::string& vpcId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 
             private:
-				std::string tag4Value_;
+				std::string resourceGroupId_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
+				std::string regionId_;
 				std::string clientToken_;
+				std::string vpcId_;
 				std::string ownerAccount_;
 				std::string description_;
-				std::string tag3Key_;
+				std::vector<Tag> tag_;
 				long ownerId_;
 				std::string securityGroupName_;
-				std::string tag5Value_;
-				std::string tag1Key_;
-				std::string tag1Value_;
-				std::string resourceGroupId_;
-				std::string regionId_;
-				std::string vpcId_;
-				std::string tag2Value_;
-				std::string tag4Key_;
-				std::string tag3Value_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/CreateSnapshotRequest.h

@@ -30,19 +30,18 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT CreateSnapshotRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				CreateSnapshotRequest();
 				~CreateSnapshotRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getClientToken()const;
@@ -51,46 +50,25 @@ namespace AlibabaCloud
 				void setOwnerAccount(const std::string& ownerAccount);
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
-				std::string getSnapshotName()const;
-				void setSnapshotName(const std::string& snapshotName);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				std::string getDiskId()const;
 				void setDiskId(const std::string& diskId);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
+				std::string getSnapshotName()const;
+				void setSnapshotName(const std::string& snapshotName);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
 				std::string clientToken_;
 				std::string ownerAccount_;
 				std::string description_;
-				std::string snapshotName_;
-				std::string tag3Key_;
-				long ownerId_;
-				std::string tag5Value_;
-				std::string tag1Key_;
-				std::string tag1Value_;
-				std::string tag2Value_;
-				std::string tag4Key_;
 				std::string diskId_;
-				std::string tag3Value_;
+				std::string snapshotName_;
+				std::vector<Tag> tag_;
+				long ownerId_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/CreateVSwitchRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getClientToken()const;
 				void setClientToken(const std::string& clientToken);
 				std::string getVpcId()const;
@@ -59,6 +61,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string resourceOwnerAccount_;
+				std::string regionId_;
 				std::string clientToken_;
 				std::string vpcId_;
 				std::string vSwitchName_;

ecs/include/alibabacloud/ecs/model/DeletePhysicalConnectionRequest.h

@@ -47,8 +47,6 @@ namespace AlibabaCloud
 				void setPhysicalConnectionId(const std::string& physicalConnectionId);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getUserCidr()const;
-				void setUserCidr(const std::string& userCidr);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 
@@ -59,7 +57,6 @@ namespace AlibabaCloud
 				std::string clientToken_;
 				std::string physicalConnectionId_;
 				std::string ownerAccount_;
-				std::string userCidr_;
 				long ownerId_;
 
 			};

ecs/include/alibabacloud/ecs/model/DeleteRouteEntryRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct NextHopList
 				{
-					std::string nextHopType;
 					std::string nextHopId;
+					std::string nextHopType;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/DeleteVSwitchRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
 				long getOwnerId()const;
@@ -50,6 +52,7 @@ namespace AlibabaCloud
 				std::string vSwitchId_;
 				long resourceOwnerId_;
 				std::string resourceOwnerAccount_;
+				std::string regionId_;
 				std::string ownerAccount_;
 				long ownerId_;
 

ecs/include/alibabacloud/ecs/model/DeleteVpcRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
 				std::string getOwnerAccount()const;
@@ -49,6 +51,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string resourceOwnerAccount_;
+				std::string regionId_;
 				std::string vpcId_;
 				std::string ownerAccount_;
 				long ownerId_;

ecs/include/alibabacloud/ecs/model/DescribeAccessPointsRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct Filter
 				{
-					std::string key;
 					std::vector<std::string> value;
+					std::string key;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/DescribeAccountAttributesRequest.h

@@ -0,0 +1,117 @@
+/*
+ * 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_ECS_MODEL_DESCRIBEACCOUNTATTRIBUTESREQUEST_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEACCOUNTATTRIBUTESREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/ecs/EcsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Ecs
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ECS_EXPORT DescribeAccountAttributesRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeAccountAttributesRequest();
+				~DescribeAccountAttributesRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				long getCallerParentId()const;
+				void setCallerParentId(long callerParentId);
+				bool getProxy_original_security_transport()const;
+				void setProxy_original_security_transport(bool proxy_original_security_transport);
+				std::vector<std::string> getAttributeName()const;
+				void setAttributeName(const std::vector<std::string>& attributeName);
+				std::string getProxy_original_source_ip()const;
+				void setProxy_original_source_ip(const std::string& proxy_original_source_ip);
+				std::string getOwnerIdLoginEmail()const;
+				void setOwnerIdLoginEmail(const std::string& ownerIdLoginEmail);
+				std::string getCallerType()const;
+				void setCallerType(const std::string& callerType);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				bool getEnable()const;
+				void setEnable(bool enable);
+				std::string getRequestContent()const;
+				void setRequestContent(const std::string& requestContent);
+				std::string getCallerBidEmail()const;
+				void setCallerBidEmail(const std::string& callerBidEmail);
+				std::string getCallerUidEmail()const;
+				void setCallerUidEmail(const std::string& callerUidEmail);
+				long getCallerUid()const;
+				void setCallerUid(long callerUid);
+				std::string getApp_ip()const;
+				void setApp_ip(const std::string& app_ip);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getCallerBid()const;
+				void setCallerBid(const std::string& callerBid);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				bool getProxy_trust_transport_info()const;
+				void setProxy_trust_transport_info(bool proxy_trust_transport_info);
+				bool getAk_mfa_present()const;
+				void setAk_mfa_present(bool ak_mfa_present);
+				bool getSecurity_transport()const;
+				void setSecurity_transport(bool security_transport);
+				std::string getRequestId()const;
+				void setRequestId(const std::string& requestId);
+				std::string getZoneId()const;
+				void setZoneId(const std::string& zoneId);
+
+            private:
+				long resourceOwnerId_;
+				long callerParentId_;
+				bool proxy_original_security_transport_;
+				std::vector<std::string> attributeName_;
+				std::string proxy_original_source_ip_;
+				std::string ownerIdLoginEmail_;
+				std::string callerType_;
+				std::string accessKeyId_;
+				std::string securityToken_;
+				std::string regionId_;
+				bool enable_;
+				std::string requestContent_;
+				std::string callerBidEmail_;
+				std::string callerUidEmail_;
+				long callerUid_;
+				std::string app_ip_;
+				std::string resourceOwnerAccount_;
+				std::string callerBid_;
+				long ownerId_;
+				bool proxy_trust_transport_info_;
+				bool ak_mfa_present_;
+				bool security_transport_;
+				std::string requestId_;
+				std::string zoneId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEACCOUNTATTRIBUTESREQUEST_H_

ecs/include/alibabacloud/ecs/model/DescribeAccountAttributesResult.h

@@ -0,0 +1,64 @@
+/*
+ * 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_ECS_MODEL_DESCRIBEACCOUNTATTRIBUTESRESULT_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEACCOUNTATTRIBUTESRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/ecs/EcsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Ecs
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ECS_EXPORT DescribeAccountAttributesResult : public ServiceResult
+			{
+			public:
+				struct AccountAttributeItem
+				{
+					struct ValueItem
+					{
+						std::string zoneId;
+						std::string instanceChargeType;
+						std::string value;
+						int count;
+						std::string instanceType;
+					};
+					std::vector<AccountAttributeItem::ValueItem> attributeValues;
+					std::string attributeName;
+				};
+
+
+				DescribeAccountAttributesResult();
+				explicit DescribeAccountAttributesResult(const std::string &payload);
+				~DescribeAccountAttributesResult();
+				std::vector<AccountAttributeItem> getAccountAttributeItems()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<AccountAttributeItem> accountAttributeItems_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEACCOUNTATTRIBUTESRESULT_H_

ecs/include/alibabacloud/ecs/model/DescribeAvailableResourceRequest.h

@@ -91,6 +91,8 @@ namespace AlibabaCloud
 				void setCallerBid(const std::string& callerBid);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
+				std::string getResourceType()const;
+				void setResourceType(const std::string& resourceType);
 				bool getProxy_trust_transport_info()const;
 				void setProxy_trust_transport_info(bool proxy_trust_transport_info);
 				bool getAk_mfa_present()const;
@@ -135,6 +137,7 @@ namespace AlibabaCloud
 				std::string dedicatedHostId_;
 				std::string callerBid_;
 				long ownerId_;
+				std::string resourceType_;
 				bool proxy_trust_transport_info_;
 				bool ak_mfa_present_;
 				bool security_transport_;

ecs/include/alibabacloud/ecs/model/DescribeDisksRequest.h

@@ -30,31 +30,28 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeDisksRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				DescribeDisksRequest();
 				~DescribeDisksRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getSnapshotId()const;
 				void setSnapshotId(const std::string& snapshotId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
 				std::string getFilter2Value()const;
 				void setFilter2Value(const std::string& filter2Value);
 				std::string getAutoSnapshotPolicyId()const;
 				void setAutoSnapshotPolicyId(const std::string& autoSnapshotPolicyId);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
 				int getPageNumber()const;
 				void setPageNumber(int pageNumber);
 				std::string getDiskName()const;
 				void setDiskName(const std::string& diskName);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				bool getDeleteAutoSnapshot()const;
 				void setDeleteAutoSnapshot(bool deleteAutoSnapshot);
 				std::string getResourceGroupId()const;
@@ -71,16 +68,14 @@ namespace AlibabaCloud
 				void setPageSize(int pageSize);
 				std::string getDiskIds()const;
 				void setDiskIds(const std::string& diskIds);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				bool getDeleteWithInstance()const;
 				void setDeleteWithInstance(bool deleteWithInstance);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 				bool getEnableAutoSnapshot()const;
 				void setEnableAutoSnapshot(bool enableAutoSnapshot);
 				bool getDryRun()const;
 				void setDryRun(bool dryRun);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -97,10 +92,6 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				std::string getDiskType()const;
 				void setDiskType(const std::string& diskType);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
 				std::vector<std::string> getAdditionalAttributes()const;
 				void setAdditionalAttributes(const std::vector<std::string>& additionalAttributes);
 				bool getEnableShared()const;
@@ -109,28 +100,20 @@ namespace AlibabaCloud
 				void setInstanceId(const std::string& instanceId);
 				bool getEncrypted()const;
 				void setEncrypted(bool encrypted);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
 				std::string getZoneId()const;
 				void setZoneId(const std::string& zoneId);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				std::string getCategory()const;
 				void setCategory(const std::string& category);
 				std::string getStatus()const;
 				void setStatus(const std::string& status);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
 				std::string snapshotId_;
-				std::string tag2Key_;
 				std::string filter2Value_;
 				std::string autoSnapshotPolicyId_;
-				std::string tag3Key_;
 				int pageNumber_;
 				std::string diskName_;
-				std::string tag1Value_;
 				bool deleteAutoSnapshot_;
 				std::string resourceGroupId_;
 				std::string diskChargeType_;
@@ -139,11 +122,10 @@ namespace AlibabaCloud
 				std::string regionId_;
 				int pageSize_;
 				std::string diskIds_;
+				std::vector<Tag> tag_;
 				bool deleteWithInstance_;
-				std::string tag3Value_;
 				bool enableAutoSnapshot_;
 				bool dryRun_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string filter1Value_;
@@ -152,15 +134,11 @@ namespace AlibabaCloud
 				std::string filter2Key_;
 				long ownerId_;
 				std::string diskType_;
-				std::string tag5Value_;
-				std::string tag1Key_;
 				std::vector<std::string> additionalAttributes_;
 				bool enableShared_;
 				std::string instanceId_;
 				bool encrypted_;
-				std::string tag2Value_;
 				std::string zoneId_;
-				std::string tag4Key_;
 				std::string category_;
 				std::string status_;
 

ecs/include/alibabacloud/ecs/model/DescribeEniMonitorDataRequest.h

@@ -0,0 +1,129 @@
+/*
+ * 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_ECS_MODEL_DESCRIBEENIMONITORDATAREQUEST_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEENIMONITORDATAREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/ecs/EcsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Ecs
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ECS_EXPORT DescribeEniMonitorDataRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeEniMonitorDataRequest();
+				~DescribeEniMonitorDataRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				long getCallerParentId()const;
+				void setCallerParentId(long callerParentId);
+				bool getProxy_original_security_transport()const;
+				void setProxy_original_security_transport(bool proxy_original_security_transport);
+				std::string getStartTime()const;
+				void setStartTime(const std::string& startTime);
+				std::string getProxy_original_source_ip()const;
+				void setProxy_original_source_ip(const std::string& proxy_original_source_ip);
+				std::string getOwnerIdLoginEmail()const;
+				void setOwnerIdLoginEmail(const std::string& ownerIdLoginEmail);
+				std::string getCallerType()const;
+				void setCallerType(const std::string& callerType);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				bool getEnable()const;
+				void setEnable(bool enable);
+				std::string getRequestContent()const;
+				void setRequestContent(const std::string& requestContent);
+				std::string getCallerBidEmail()const;
+				void setCallerBidEmail(const std::string& callerBidEmail);
+				std::string getCallerUidEmail()const;
+				void setCallerUidEmail(const std::string& callerUidEmail);
+				long getCallerUid()const;
+				void setCallerUid(long callerUid);
+				std::string getApp_ip()const;
+				void setApp_ip(const std::string& app_ip);
+				int getPeriod()const;
+				void setPeriod(int period);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getEndTime()const;
+				void setEndTime(const std::string& endTime);
+				std::string getCallerBid()const;
+				void setCallerBid(const std::string& callerBid);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				bool getProxy_trust_transport_info()const;
+				void setProxy_trust_transport_info(bool proxy_trust_transport_info);
+				bool getAk_mfa_present()const;
+				void setAk_mfa_present(bool ak_mfa_present);
+				bool getSecurity_transport()const;
+				void setSecurity_transport(bool security_transport);
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
+				std::string getRequestId()const;
+				void setRequestId(const std::string& requestId);
+				std::string getEniId()const;
+				void setEniId(const std::string& eniId);
+
+            private:
+				long resourceOwnerId_;
+				long callerParentId_;
+				bool proxy_original_security_transport_;
+				std::string startTime_;
+				std::string proxy_original_source_ip_;
+				std::string ownerIdLoginEmail_;
+				std::string callerType_;
+				std::string accessKeyId_;
+				std::string securityToken_;
+				std::string regionId_;
+				bool enable_;
+				std::string requestContent_;
+				std::string callerBidEmail_;
+				std::string callerUidEmail_;
+				long callerUid_;
+				std::string app_ip_;
+				int period_;
+				std::string resourceOwnerAccount_;
+				std::string ownerAccount_;
+				std::string endTime_;
+				std::string callerBid_;
+				long ownerId_;
+				bool proxy_trust_transport_info_;
+				bool ak_mfa_present_;
+				bool security_transport_;
+				std::string instanceId_;
+				std::string requestId_;
+				std::string eniId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEENIMONITORDATAREQUEST_H_

ecs/include/alibabacloud/ecs/model/DescribeEniMonitorDataResult.h

@@ -0,0 +1,64 @@
+/*
+ * 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_ECS_MODEL_DESCRIBEENIMONITORDATARESULT_H_
+#define ALIBABACLOUD_ECS_MODEL_DESCRIBEENIMONITORDATARESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/ecs/EcsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Ecs
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ECS_EXPORT DescribeEniMonitorDataResult : public ServiceResult
+			{
+			public:
+				struct EniMonitorData
+				{
+					std::string dropPacketRx;
+					std::string packetTx;
+					std::string packetRx;
+					std::string eniId;
+					std::string dropPacketTx;
+					std::string intranetTx;
+					std::string timeStamp;
+					std::string intranetRx;
+				};
+
+
+				DescribeEniMonitorDataResult();
+				explicit DescribeEniMonitorDataResult(const std::string &payload);
+				~DescribeEniMonitorDataResult();
+				int getTotalCount()const;
+				std::vector<EniMonitorData> getMonitorData()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				int totalCount_;
+				std::vector<EniMonitorData> monitorData_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBEENIMONITORDATARESULT_H_

ecs/include/alibabacloud/ecs/model/DescribeHaVipsRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct Filter
 				{
-					std::string key;
 					std::vector<std::string> value;
+					std::string key;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/DescribeImageSupportInstanceTypesRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct Filter
 				{
-					std::string key;
 					std::string value;
+					std::string key;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/DescribeImagesRequest.h

@@ -30,18 +30,21 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeImagesRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 				struct Filter
 				{
-					std::string key;
 					std::string value;
+					std::string key;
 				};
 
 			public:
 				DescribeImagesRequest();
 				~DescribeImagesRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				std::string getActionType()const;
 				void setActionType(const std::string& actionType);
 				long getResourceOwnerId()const;
@@ -50,18 +53,12 @@ namespace AlibabaCloud
 				void setImageId(const std::string& imageId);
 				std::string getSnapshotId()const;
 				void setSnapshotId(const std::string& snapshotId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
 				std::string getUsage()const;
 				void setUsage(const std::string& usage);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
 				int getPageNumber()const;
 				void setPageNumber(int pageNumber);
 				std::string getImageOwnerAlias()const;
 				void setImageOwnerAlias(const std::string& imageOwnerAlias);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
 				bool getIsSupportIoOptimized()const;
@@ -76,14 +73,12 @@ namespace AlibabaCloud
 				void setPageSize(int pageSize);
 				std::string getInstanceType()const;
 				void setInstanceType(const std::string& instanceType);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				std::string getArchitecture()const;
 				void setArchitecture(const std::string& architecture);
 				bool getDryRun()const;
 				void setDryRun(bool dryRun);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -94,31 +89,19 @@ namespace AlibabaCloud
 				void setOSType(const std::string& oSType);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
 				std::vector<Filter> getFilter()const;
 				void setFilter(const std::vector<Filter>& filter);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				std::string getStatus()const;
 				void setStatus(const std::string& status);
 
             private:
-				std::string tag4Value_;
 				std::string actionType_;
 				long resourceOwnerId_;
 				std::string imageId_;
 				std::string snapshotId_;
-				std::string tag2Key_;
 				std::string usage_;
-				std::string tag3Key_;
 				int pageNumber_;
 				std::string imageOwnerAlias_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
 				bool isSupportIoOptimized_;
 				std::string regionId_;
@@ -126,20 +109,15 @@ namespace AlibabaCloud
 				bool isSupportCloudinit_;
 				int pageSize_;
 				std::string instanceType_;
-				std::string tag3Value_;
+				std::vector<Tag> tag_;
 				std::string architecture_;
 				bool dryRun_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				bool showExpired_;
 				std::string oSType_;
 				long ownerId_;
-				std::string tag5Value_;
-				std::string tag1Key_;
 				std::vector<Filter> filter_;
-				std::string tag2Value_;
-				std::string tag4Key_;
 				std::string status_;
 
 			};

ecs/include/alibabacloud/ecs/model/DescribeInstancesRequest.h

@@ -30,163 +30,141 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeInstancesRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				DescribeInstancesRequest();
 				~DescribeInstancesRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				std::string getInnerIpAddresses()const;
 				void setInnerIpAddresses(const std::string& innerIpAddresses);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
+				std::string getImageId()const;
+				void setImageId(const std::string& imageId);
 				std::string getPrivateIpAddresses()const;
 				void setPrivateIpAddresses(const std::string& privateIpAddresses);
 				std::string getHpcClusterId()const;
 				void setHpcClusterId(const std::string& hpcClusterId);
 				std::string getFilter2Value()const;
 				void setFilter2Value(const std::string& filter2Value);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
-				std::string getKeyPairName()const;
-				void setKeyPairName(const std::string& keyPairName);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getLockReason()const;
-				void setLockReason(const std::string& lockReason);
-				std::string getFilter1Key()const;
-				void setFilter1Key(const std::string& filter1Key);
-				bool getDeviceAvailable()const;
-				void setDeviceAvailable(bool deviceAvailable);
-				std::string getFilter3Value()const;
-				void setFilter3Value(const std::string& filter3Value);
-				bool getDryRun()const;
-				void setDryRun(bool dryRun);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
-				std::string getFilter1Value()const;
-				void setFilter1Value(const std::string& filter1Value);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getVSwitchId()const;
-				void setVSwitchId(const std::string& vSwitchId);
-				std::string getInstanceName()const;
-				void setInstanceName(const std::string& instanceName);
-				std::string getInstanceIds()const;
-				void setInstanceIds(const std::string& instanceIds);
-				std::string getInternetChargeType()const;
-				void setInternetChargeType(const std::string& internetChargeType);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getInstanceNetworkType()const;
-				void setInstanceNetworkType(const std::string& instanceNetworkType);
-				std::string getStatus()const;
-				void setStatus(const std::string& status);
-				std::string getImageId()const;
-				void setImageId(const std::string& imageId);
 				std::string getFilter4Value()const;
 				void setFilter4Value(const std::string& filter4Value);
 				bool getIoOptimized()const;
 				void setIoOptimized(bool ioOptimized);
 				std::string getSecurityGroupId()const;
 				void setSecurityGroupId(const std::string& securityGroupId);
+				std::string getKeyPairName()const;
+				void setKeyPairName(const std::string& keyPairName);
 				std::string getFilter4Key()const;
 				void setFilter4Key(const std::string& filter4Key);
 				int getPageNumber()const;
 				void setPageNumber(int pageNumber);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
+				std::string getLockReason()const;
+				void setLockReason(const std::string& lockReason);
+				std::string getFilter1Key()const;
+				void setFilter1Key(const std::string& filter1Key);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				std::string getRdmaIpAddresses()const;
 				void setRdmaIpAddresses(const std::string& rdmaIpAddresses);
+				bool getDeviceAvailable()const;
+				void setDeviceAvailable(bool deviceAvailable);
 				int getPageSize()const;
 				void setPageSize(int pageSize);
 				std::string getPublicIpAddresses()const;
 				void setPublicIpAddresses(const std::string& publicIpAddresses);
 				std::string getInstanceType()const;
 				void setInstanceType(const std::string& instanceType);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				std::string getInstanceChargeType()const;
 				void setInstanceChargeType(const std::string& instanceChargeType);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
+				std::string getFilter3Value()const;
+				void setFilter3Value(const std::string& filter3Value);
+				bool getDryRun()const;
+				void setDryRun(bool dryRun);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
 				std::string getInstanceTypeFamily()const;
 				void setInstanceTypeFamily(const std::string& instanceTypeFamily);
+				std::string getFilter1Value()const;
+				void setFilter1Value(const std::string& filter1Value);
 				std::string getFilter2Key()const;
 				void setFilter2Key(const std::string& filter2Key);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getVSwitchId()const;
+				void setVSwitchId(const std::string& vSwitchId);
 				std::string getEipAddresses()const;
 				void setEipAddresses(const std::string& eipAddresses);
+				std::string getInstanceName()const;
+				void setInstanceName(const std::string& instanceName);
+				std::string getInstanceIds()const;
+				void setInstanceIds(const std::string& instanceIds);
+				std::string getInternetChargeType()const;
+				void setInternetChargeType(const std::string& internetChargeType);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
+				std::string getZoneId()const;
+				void setZoneId(const std::string& zoneId);
 				std::string getFilter3Key()const;
 				void setFilter3Key(const std::string& filter3Key);
+				std::string getInstanceNetworkType()const;
+				void setInstanceNetworkType(const std::string& instanceNetworkType);
+				std::string getStatus()const;
+				void setStatus(const std::string& status);
 
             private:
-				std::string tag4Value_;
 				std::string innerIpAddresses_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
+				std::string imageId_;
 				std::string privateIpAddresses_;
 				std::string hpcClusterId_;
 				std::string filter2Value_;
-				std::string tag3Key_;
-				std::string keyPairName_;
-				std::string tag1Value_;
-				std::string resourceGroupId_;
-				std::string lockReason_;
-				std::string filter1Key_;
-				bool deviceAvailable_;
-				std::string filter3Value_;
-				bool dryRun_;
-				std::string tag5Key_;
-				std::string filter1Value_;
-				long ownerId_;
-				std::string vSwitchId_;
-				std::string instanceName_;
-				std::string instanceIds_;
-				std::string internetChargeType_;
-				std::string zoneId_;
-				std::string tag4Key_;
-				std::string instanceNetworkType_;
-				std::string status_;
-				std::string imageId_;
 				std::string filter4Value_;
 				bool ioOptimized_;
 				std::string securityGroupId_;
+				std::string keyPairName_;
 				std::string filter4Key_;
 				int pageNumber_;
+				std::string resourceGroupId_;
+				std::string lockReason_;
+				std::string filter1Key_;
 				std::string regionId_;
 				std::string rdmaIpAddresses_;
+				bool deviceAvailable_;
 				int pageSize_;
 				std::string publicIpAddresses_;
 				std::string instanceType_;
+				std::vector<Tag> tag_;
 				std::string instanceChargeType_;
-				std::string tag3Value_;
+				std::string filter3Value_;
+				bool dryRun_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string instanceTypeFamily_;
+				std::string filter1Value_;
 				std::string filter2Key_;
-				std::string tag5Value_;
-				std::string tag1Key_;
+				long ownerId_;
+				std::string vSwitchId_;
 				std::string eipAddresses_;
+				std::string instanceName_;
+				std::string instanceIds_;
+				std::string internetChargeType_;
 				std::string vpcId_;
-				std::string tag2Value_;
+				std::string zoneId_;
 				std::string filter3Key_;
+				std::string instanceNetworkType_;
+				std::string status_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/DescribeKeyPairsRequest.h

@@ -30,70 +30,48 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeKeyPairsRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				DescribeKeyPairsRequest();
 				~DescribeKeyPairsRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getKeyPairFingerPrint()const;
-				void setKeyPairFingerPrint(const std::string& keyPairFingerPrint);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
-				std::string getKeyPairName()const;
-				void setKeyPairName(const std::string& keyPairName);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
+				std::string getKeyPairFingerPrint()const;
+				void setKeyPairFingerPrint(const std::string& keyPairFingerPrint);
 				int getPageSize()const;
 				void setPageSize(int pageSize);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
+				std::string getKeyPairName()const;
+				void setKeyPairName(const std::string& keyPairName);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				int getPageNumber()const;
+				void setPageNumber(int pageNumber);
 
             private:
-				std::string tag4Value_;
-				long resourceOwnerId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
-				std::string resourceOwnerAccount_;
-				std::string keyPairFingerPrint_;
-				std::string tag3Key_;
-				std::string keyPairName_;
-				long ownerId_;
-				std::string tag5Value_;
-				int pageNumber_;
-				std::string tag1Key_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
+				long resourceOwnerId_;
+				std::string resourceOwnerAccount_;
 				std::string regionId_;
-				std::string tag2Value_;
+				std::string keyPairFingerPrint_;
 				int pageSize_;
-				std::string tag4Key_;
-				std::string tag3Value_;
+				std::string keyPairName_;
+				std::vector<Tag> tag_;
+				long ownerId_;
+				int pageNumber_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/DescribeLaunchTemplatesRequest.h

@@ -30,19 +30,20 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeLaunchTemplatesRequest : public RpcServiceRequest
 			{
+				struct TemplateTag
+				{
+					std::string key;
+					std::string value;
+				};
 
 			public:
 				DescribeLaunchTemplatesRequest();
 				~DescribeLaunchTemplatesRequest();
 
-				std::string getTemplateTag1Value()const;
-				void setTemplateTag1Value(const std::string& templateTag1Value);
 				std::vector<std::string> getLaunchTemplateName()const;
 				void setLaunchTemplateName(const std::vector<std::string>& launchTemplateName);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTemplateTag4Key()const;
-				void setTemplateTag4Key(const std::string& templateTag4Key);
 				long getCallerParentId()const;
 				void setCallerParentId(long callerParentId);
 				bool getProxy_original_security_transport()const;
@@ -57,14 +58,10 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getTemplateTag3Key()const;
-				void setTemplateTag3Key(const std::string& templateTag3Key);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
-				std::string getTemplateTag5Value()const;
-				void setTemplateTag5Value(const std::string& templateTag5Value);
 				bool getEnable()const;
 				void setEnable(bool enable);
 				std::string getRequestContent()const;
@@ -73,16 +70,14 @@ namespace AlibabaCloud
 				void setPageSize(int pageSize);
 				std::string getCallerBidEmail()const;
 				void setCallerBidEmail(const std::string& callerBidEmail);
-				std::string getTemplateTag3Value()const;
-				void setTemplateTag3Value(const std::string& templateTag3Value);
+				std::vector<TemplateTag> getTemplateTag()const;
+				void setTemplateTag(const std::vector<TemplateTag>& templateTag);
 				std::string getCallerUidEmail()const;
 				void setCallerUidEmail(const std::string& callerUidEmail);
 				long getCallerUid()const;
 				void setCallerUid(long callerUid);
 				std::string getApp_ip()const;
 				void setApp_ip(const std::string& app_ip);
-				std::string getTemplateTag2Key()const;
-				void setTemplateTag2Key(const std::string& templateTag2Key);
 				std::vector<std::string> getLaunchTemplateId()const;
 				void setLaunchTemplateId(const std::vector<std::string>& launchTemplateId);
 				std::string getResourceOwnerAccount()const;
@@ -91,8 +86,6 @@ namespace AlibabaCloud
 				void setOwnerAccount(const std::string& ownerAccount);
 				std::string getTemplateResourceGroupId()const;
 				void setTemplateResourceGroupId(const std::string& templateResourceGroupId);
-				std::string getTemplateTag2Value()const;
-				void setTemplateTag2Value(const std::string& templateTag2Value);
 				std::string getCallerBid()const;
 				void setCallerBid(const std::string& callerBid);
 				long getOwnerId()const;
@@ -103,20 +96,12 @@ namespace AlibabaCloud
 				void setAk_mfa_present(bool ak_mfa_present);
 				bool getSecurity_transport()const;
 				void setSecurity_transport(bool security_transport);
-				std::string getTemplateTag4Value()const;
-				void setTemplateTag4Value(const std::string& templateTag4Value);
 				std::string getRequestId()const;
 				void setRequestId(const std::string& requestId);
-				std::string getTemplateTag5Key()const;
-				void setTemplateTag5Key(const std::string& templateTag5Key);
-				std::string getTemplateTag1Key()const;
-				void setTemplateTag1Key(const std::string& templateTag1Key);
 
             private:
-				std::string templateTag1Value_;
 				std::vector<std::string> launchTemplateName_;
 				long resourceOwnerId_;
-				std::string templateTag4Key_;
 				long callerParentId_;
 				bool proxy_original_security_transport_;
 				std::string proxy_original_source_ip_;
@@ -124,33 +109,26 @@ namespace AlibabaCloud
 				std::string callerType_;
 				int pageNumber_;
 				std::string accessKeyId_;
-				std::string templateTag3Key_;
 				std::string securityToken_;
 				std::string regionId_;
-				std::string templateTag5Value_;
 				bool enable_;
 				std::string requestContent_;
 				int pageSize_;
 				std::string callerBidEmail_;
-				std::string templateTag3Value_;
+				std::vector<TemplateTag> templateTag_;
 				std::string callerUidEmail_;
 				long callerUid_;
 				std::string app_ip_;
-				std::string templateTag2Key_;
 				std::vector<std::string> launchTemplateId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string templateResourceGroupId_;
-				std::string templateTag2Value_;
 				std::string callerBid_;
 				long ownerId_;
 				bool proxy_trust_transport_info_;
 				bool ak_mfa_present_;
 				bool security_transport_;
-				std::string templateTag4Value_;
 				std::string requestId_;
-				std::string templateTag5Key_;
-				std::string templateTag1Key_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/DescribeNetworkInterfacesRequest.h

@@ -30,25 +30,24 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeNetworkInterfacesRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string key;
+					std::string value;
+				};
 
 			public:
 				DescribeNetworkInterfacesRequest();
 				~DescribeNetworkInterfacesRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
 				long getCallerParentId()const;
 				void setCallerParentId(long callerParentId);
 				std::string getSecurityGroupId()const;
 				void setSecurityGroupId(const std::string& securityGroupId);
 				bool getProxy_original_security_transport()const;
 				void setProxy_original_security_transport(bool proxy_original_security_transport);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
 				std::string getProxy_original_source_ip()const;
 				void setProxy_original_source_ip(const std::string& proxy_original_source_ip);
 				std::string getType()const;
@@ -61,8 +60,6 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
@@ -77,18 +74,16 @@ namespace AlibabaCloud
 				void setPageSize(int pageSize);
 				std::string getCallerBidEmail()const;
 				void setCallerBidEmail(const std::string& callerBidEmail);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				std::string getCallerUidEmail()const;
 				void setCallerUidEmail(const std::string& callerUidEmail);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 				std::string getNetworkInterfaceName()const;
 				void setNetworkInterfaceName(const std::string& networkInterfaceName);
 				long getCallerUid()const;
 				void setCallerUid(long callerUid);
 				std::string getApp_ip()const;
 				void setApp_ip(const std::string& app_ip);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -97,48 +92,36 @@ namespace AlibabaCloud
 				void setCallerBid(const std::string& callerBid);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
 				bool getProxy_trust_transport_info()const;
 				void setProxy_trust_transport_info(bool proxy_trust_transport_info);
 				bool getAk_mfa_present()const;
 				void setAk_mfa_present(bool ak_mfa_present);
 				bool getSecurity_transport()const;
 				void setSecurity_transport(bool security_transport);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
 				std::string getVSwitchId()const;
 				void setVSwitchId(const std::string& vSwitchId);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
 				std::string getRequestId()const;
 				void setRequestId(const std::string& requestId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				std::string getPrimaryIpAddress()const;
 				void setPrimaryIpAddress(const std::string& primaryIpAddress);
 				std::vector<std::string> getNetworkInterfaceId()const;
 				void setNetworkInterfaceId(const std::vector<std::string>& networkInterfaceId);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
 				long callerParentId_;
 				std::string securityGroupId_;
 				bool proxy_original_security_transport_;
-				std::string tag3Key_;
 				std::string proxy_original_source_ip_;
 				std::string type_;
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				int pageNumber_;
 				std::string accessKeyId_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
@@ -146,27 +129,22 @@ namespace AlibabaCloud
 				std::string requestContent_;
 				int pageSize_;
 				std::string callerBidEmail_;
+				std::vector<Tag> tag_;
 				std::string callerUidEmail_;
-				std::string tag3Value_;
 				std::string networkInterfaceName_;
 				long callerUid_;
 				std::string app_ip_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string callerBid_;
 				long ownerId_;
-				std::string tag5Value_;
 				bool proxy_trust_transport_info_;
 				bool ak_mfa_present_;
 				bool security_transport_;
-				std::string tag1Key_;
 				std::string vSwitchId_;
 				std::string instanceId_;
 				std::string requestId_;
-				std::string tag2Value_;
 				std::string vpcId_;
-				std::string tag4Key_;
 				std::string primaryIpAddress_;
 				std::vector<std::string> networkInterfaceId_;
 

ecs/include/alibabacloud/ecs/model/DescribePhysicalConnectionsRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct Filter
 				{
-					std::string key;
 					std::vector<std::string> value;
+					std::string key;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/DescribeResourceByTagsRequest.h

@@ -30,64 +30,42 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeResourceByTagsRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				DescribeResourceByTagsRequest();
 				~DescribeResourceByTagsRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				int getPageSize()const;
+				void setPageSize(int pageSize);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getResourceType()const;
 				void setResourceType(const std::string& resourceType);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
 				int getPageNumber()const;
 				void setPageNumber(int pageNumber);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
-				std::string tag3Key_;
+				std::string regionId_;
+				int pageSize_;
+				std::vector<Tag> tag_;
 				long ownerId_;
 				std::string resourceType_;
-				std::string tag5Value_;
 				int pageNumber_;
-				std::string tag1Key_;
-				std::string tag1Value_;
-				std::string regionId_;
-				std::string tag2Value_;
-				int pageSize_;
-				std::string tag4Key_;
-				std::string tag3Value_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/DescribeRouterInterfacesRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct Filter
 				{
-					std::string key;
 					std::vector<std::string> value;
+					std::string key;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/DescribeSecurityGroupsRequest.h

@@ -30,91 +30,69 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeSecurityGroupsRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				DescribeSecurityGroupsRequest();
 				~DescribeSecurityGroupsRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				bool getFuzzyQuery()const;
-				void setFuzzyQuery(bool fuzzyQuery);
-				std::string getSecurityGroupId()const;
-				void setSecurityGroupId(const std::string& securityGroupId);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
-				bool getIsQueryEcsCount()const;
-				void setIsQueryEcsCount(bool isQueryEcsCount);
-				std::string getNetworkType()const;
-				void setNetworkType(const std::string& networkType);
-				std::string getSecurityGroupName()const;
-				void setSecurityGroupName(const std::string& securityGroupName);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 				bool getDryRun()const;
 				void setDryRun(bool dryRun);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
+				bool getFuzzyQuery()const;
+				void setFuzzyQuery(bool fuzzyQuery);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getSecurityGroupId()const;
+				void setSecurityGroupId(const std::string& securityGroupId);
+				bool getIsQueryEcsCount()const;
+				void setIsQueryEcsCount(bool isQueryEcsCount);
+				std::string getNetworkType()const;
+				void setNetworkType(const std::string& networkType);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getSecurityGroupIds()const;
 				void setSecurityGroupIds(const std::string& securityGroupIds);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
+				std::string getSecurityGroupName()const;
+				void setSecurityGroupName(const std::string& securityGroupName);
+				int getPageNumber()const;
+				void setPageNumber(int pageNumber);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
+				int getPageSize()const;
+				void setPageSize(int pageSize);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
-				bool fuzzyQuery_;
-				std::string securityGroupId_;
-				std::string tag3Key_;
-				bool isQueryEcsCount_;
-				std::string networkType_;
-				std::string securityGroupName_;
-				int pageNumber_;
-				std::string tag1Value_;
-				std::string resourceGroupId_;
-				std::string regionId_;
-				int pageSize_;
-				std::string tag3Value_;
 				bool dryRun_;
-				std::string tag5Key_;
+				bool fuzzyQuery_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
+				std::string securityGroupId_;
+				bool isQueryEcsCount_;
+				std::string networkType_;
 				long ownerId_;
 				std::string securityGroupIds_;
-				std::string tag5Value_;
-				std::string tag1Key_;
+				std::string securityGroupName_;
+				int pageNumber_;
+				std::string resourceGroupId_;
+				std::string regionId_;
 				std::string vpcId_;
-				std::string tag2Value_;
-				std::string tag4Key_;
+				int pageSize_;
+				std::vector<Tag> tag_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/DescribeSnapshotLinksResult.h

@@ -39,6 +39,7 @@ namespace AlibabaCloud
 					int sourceDiskSize;
 					std::string instanceId;
 					std::string snapshotLinkId;
+					std::string sourceDiskName;
 					std::string regionId;
 					std::string sourceDiskType;
 					int totalSize;

ecs/include/alibabacloud/ecs/model/DescribeSnapshotsRequest.h

@@ -30,17 +30,18 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeSnapshotsRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				DescribeSnapshotsRequest();
 				~DescribeSnapshotsRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
 				std::string getFilter2Value()const;
 				void setFilter2Value(const std::string& filter2Value);
 				std::string getSnapshotIds()const;
@@ -51,12 +52,8 @@ namespace AlibabaCloud
 				void setSnapshotLinkId(const std::string& snapshotLinkId);
 				std::string getSnapshotName()const;
 				void setSnapshotName(const std::string& snapshotName);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
 				int getPageNumber()const;
 				void setPageNumber(int pageNumber);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getFilter1Key()const;
@@ -67,12 +64,10 @@ namespace AlibabaCloud
 				void setPageSize(int pageSize);
 				std::string getDiskId()const;
 				void setDiskId(const std::string& diskId);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				bool getDryRun()const;
 				void setDryRun(bool dryRun);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -85,56 +80,39 @@ namespace AlibabaCloud
 				void setFilter2Key(const std::string& filter2Key);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
 				bool getEncrypted()const;
 				void setEncrypted(bool encrypted);
 				std::string getSnapshotType()const;
 				void setSnapshotType(const std::string& snapshotType);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
 				std::string getStatus()const;
 				void setStatus(const std::string& status);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
-				std::string tag2Key_;
 				std::string filter2Value_;
 				std::string snapshotIds_;
 				std::string usage_;
 				std::string snapshotLinkId_;
 				std::string snapshotName_;
-				std::string tag3Key_;
 				int pageNumber_;
-				std::string tag1Value_;
 				std::string resourceGroupId_;
 				std::string filter1Key_;
 				std::string regionId_;
 				int pageSize_;
 				std::string diskId_;
-				std::string tag3Value_;
+				std::vector<Tag> tag_;
 				bool dryRun_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string sourceDiskType_;
 				std::string filter1Value_;
 				std::string filter2Key_;
 				long ownerId_;
-				std::string tag5Value_;
-				std::string tag1Key_;
 				std::string instanceId_;
 				bool encrypted_;
 				std::string snapshotType_;
-				std::string tag2Value_;
-				std::string tag4Key_;
 				std::string status_;
 
 			};

ecs/include/alibabacloud/ecs/model/DescribeTagsRequest.h

@@ -30,67 +30,45 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT DescribeTagsRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				DescribeTagsRequest();
 				~DescribeTagsRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceId()const;
 				void setResourceId(const std::string& resourceId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				int getPageSize()const;
+				void setPageSize(int pageSize);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getResourceType()const;
 				void setResourceType(const std::string& resourceType);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
 				int getPageNumber()const;
 				void setPageNumber(int pageNumber);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
 				std::string resourceId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
-				std::string tag3Key_;
+				std::string regionId_;
+				int pageSize_;
+				std::vector<Tag> tag_;
 				long ownerId_;
 				std::string resourceType_;
-				std::string tag5Value_;
 				int pageNumber_;
-				std::string tag1Key_;
-				std::string tag1Value_;
-				std::string regionId_;
-				std::string tag2Value_;
-				int pageSize_;
-				std::string tag4Key_;
-				std::string tag3Value_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/DescribeVirtualBorderRoutersForPhysicalConnectionRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct Filter
 				{
-					std::string key;
 					std::vector<std::string> value;
+					std::string key;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/DescribeVirtualBorderRoutersRequest.h

@@ -32,8 +32,8 @@ namespace AlibabaCloud
 			{
 				struct Filter
 				{
-					std::string key;
 					std::vector<std::string> value;
+					std::string key;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/ImportImageRequest.h

@@ -32,12 +32,12 @@ namespace AlibabaCloud
 			{
 				struct DiskDeviceMapping
 				{
-					std::string format;
 					std::string oSSBucket;
-					std::string oSSObject;
 					int diskImSize;
-					int diskImageSize;
+					std::string format;
 					std::string device;
+					std::string oSSObject;
+					int diskImageSize;
 				};
 
 			public:

ecs/include/alibabacloud/ecs/model/ModifyVSwitchAttributeRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getVSwitchName()const;
 				void setVSwitchName(const std::string& vSwitchName);
 				std::string getOwnerAccount()const;
@@ -54,6 +56,7 @@ namespace AlibabaCloud
 				std::string vSwitchId_;
 				long resourceOwnerId_;
 				std::string resourceOwnerAccount_;
+				std::string regionId_;
 				std::string vSwitchName_;
 				std::string ownerAccount_;
 				std::string description_;

ecs/include/alibabacloud/ecs/model/ModifyVpcAttributeRequest.h

@@ -41,10 +41,14 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getCidrBlock()const;
+				void setCidrBlock(const std::string& cidrBlock);
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
 				std::string getUserCidr()const;
@@ -56,8 +60,10 @@ namespace AlibabaCloud
 				std::string vpcName_;
 				long resourceOwnerId_;
 				std::string resourceOwnerAccount_;
+				std::string regionId_;
 				std::string vpcId_;
 				std::string ownerAccount_;
+				std::string cidrBlock_;
 				std::string description_;
 				std::string userCidr_;
 				long ownerId_;

ecs/include/alibabacloud/ecs/model/RemoveTagsRequest.h

@@ -30,61 +30,39 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ECS_EXPORT RemoveTagsRequest : public RpcServiceRequest
 			{
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				RemoveTagsRequest();
 				~RemoveTagsRequest();
 
-				std::string getTag4Value()const;
-				void setTag4Value(const std::string& tag4Value);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getResourceId()const;
 				void setResourceId(const std::string& resourceId);
-				std::string getTag2Key()const;
-				void setTag2Key(const std::string& tag2Key);
-				std::string getTag5Key()const;
-				void setTag5Key(const std::string& tag5Key);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getTag3Key()const;
-				void setTag3Key(const std::string& tag3Key);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getResourceType()const;
 				void setResourceType(const std::string& resourceType);
-				std::string getTag5Value()const;
-				void setTag5Value(const std::string& tag5Value);
-				std::string getTag1Key()const;
-				void setTag1Key(const std::string& tag1Key);
-				std::string getTag1Value()const;
-				void setTag1Value(const std::string& tag1Value);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getTag2Value()const;
-				void setTag2Value(const std::string& tag2Value);
-				std::string getTag4Key()const;
-				void setTag4Key(const std::string& tag4Key);
-				std::string getTag3Value()const;
-				void setTag3Value(const std::string& tag3Value);
 
             private:
-				std::string tag4Value_;
 				long resourceOwnerId_;
 				std::string resourceId_;
-				std::string tag2Key_;
-				std::string tag5Key_;
 				std::string resourceOwnerAccount_;
-				std::string tag3Key_;
+				std::string regionId_;
+				std::vector<Tag> tag_;
 				long ownerId_;
 				std::string resourceType_;
-				std::string tag5Value_;
-				std::string tag1Key_;
-				std::string tag1Value_;
-				std::string regionId_;
-				std::string tag2Value_;
-				std::string tag4Key_;
-				std::string tag3Value_;
 
 			};
 		}

ecs/src/EcsClient.cc

@@ -303,6 +303,42 @@ EcsClient::AttachDiskOutcomeCallable EcsClient::attachDiskCallable(const AttachD
 	return task->get_future();
 }
 
+EcsClient::DescribeEniMonitorDataOutcome EcsClient::describeEniMonitorData(const DescribeEniMonitorDataRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeEniMonitorDataOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeEniMonitorDataOutcome(DescribeEniMonitorDataResult(outcome.result()));
+	else
+		return DescribeEniMonitorDataOutcome(outcome.error());
+}
+
+void EcsClient::describeEniMonitorDataAsync(const DescribeEniMonitorDataRequest& request, const DescribeEniMonitorDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeEniMonitorData(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EcsClient::DescribeEniMonitorDataOutcomeCallable EcsClient::describeEniMonitorDataCallable(const DescribeEniMonitorDataRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeEniMonitorDataOutcome()>>(
+			[this, request]()
+			{
+			return this->describeEniMonitorData(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 EcsClient::ReInitDiskOutcome EcsClient::reInitDisk(const ReInitDiskRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -6891,6 +6927,42 @@ EcsClient::CreateVirtualBorderRouterOutcomeCallable EcsClient::createVirtualBord
 	return task->get_future();
 }
 
+EcsClient::DescribeAccountAttributesOutcome EcsClient::describeAccountAttributes(const DescribeAccountAttributesRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeAccountAttributesOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeAccountAttributesOutcome(DescribeAccountAttributesResult(outcome.result()));
+	else
+		return DescribeAccountAttributesOutcome(outcome.error());
+}
+
+void EcsClient::describeAccountAttributesAsync(const DescribeAccountAttributesRequest& request, const DescribeAccountAttributesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeAccountAttributes(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+EcsClient::DescribeAccountAttributesOutcomeCallable EcsClient::describeAccountAttributesCallable(const DescribeAccountAttributesRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeAccountAttributesOutcome()>>(
+			[this, request]()
+			{
+			return this->describeAccountAttributes(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 EcsClient::EipFillParamsOutcome EcsClient::eipFillParams(const EipFillParamsRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

ecs/src/model/AddTagsRequest.cc

@@ -25,17 +25,6 @@ AddTagsRequest::AddTagsRequest() :
 AddTagsRequest::~AddTagsRequest()
 {}
 
-std::string AddTagsRequest::getTag4Value()const
-{
-	return tag4Value_;
-}
-
-void AddTagsRequest::setTag4Value(const std::string& tag4Value)
-{
-	tag4Value_ = tag4Value;
-	setParameter("Tag4Value", tag4Value);
-}
-
 long AddTagsRequest::getResourceOwnerId()const
 {
 	return resourceOwnerId_;
@@ -58,28 +47,6 @@ void AddTagsRequest::setResourceId(const std::string& resourceId)
 	setParameter("ResourceId", resourceId);
 }
 
-std::string AddTagsRequest::getTag2Key()const
-{
-	return tag2Key_;
-}
-
-void AddTagsRequest::setTag2Key(const std::string& tag2Key)
-{
-	tag2Key_ = tag2Key;
-	setParameter("Tag2Key", tag2Key);
-}
-
-std::string AddTagsRequest::getTag5Key()const
-{
-	return tag5Key_;
-}
-
-void AddTagsRequest::setTag5Key(const std::string& tag5Key)
-{
-	tag5Key_ = tag5Key;
-	setParameter("Tag5Key", tag5Key);
-}
-
 std::string AddTagsRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;
@@ -91,15 +58,32 @@ void AddTagsRequest::setResourceOwnerAccount(const std::string& resourceOwnerAcc
 	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
 }
 
-std::string AddTagsRequest::getTag3Key()const
+std::string AddTagsRequest::getRegionId()const
 {
-	return tag3Key_;
+	return regionId_;
 }
 
-void AddTagsRequest::setTag3Key(const std::string& tag3Key)
+void AddTagsRequest::setRegionId(const std::string& regionId)
 {
-	tag3Key_ = tag3Key;
-	setParameter("Tag3Key", tag3Key);
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::vector<AddTagsRequest::Tag> AddTagsRequest::getTag()const
+{
+	return tag_;
+}
+
+void AddTagsRequest::setTag(const std::vector<Tag>& tag)
+{
+	tag_ = tag;
+	int i = 0;
+	for(int i = 0; i!= tag.size(); i++)	{
+		auto obj = tag.at(i);
+		std::string str ="Tag."+ std::to_string(i);
+		setParameter(str + ".Value", obj.value);
+		setParameter(str + ".Key", obj.key);
+	}
 }
 
 long AddTagsRequest::getOwnerId()const
@@ -124,80 +108,3 @@ void AddTagsRequest::setResourceType(const std::string& resourceType)
 	setParameter("ResourceType", resourceType);
 }
 
-std::string AddTagsRequest::getTag5Value()const
-{
-	return tag5Value_;
-}
-
-void AddTagsRequest::setTag5Value(const std::string& tag5Value)
-{
-	tag5Value_ = tag5Value;
-	setParameter("Tag5Value", tag5Value);
-}
-
-std::string AddTagsRequest::getTag1Key()const
-{
-	return tag1Key_;
-}
-
-void AddTagsRequest::setTag1Key(const std::string& tag1Key)
-{
-	tag1Key_ = tag1Key;
-	setParameter("Tag1Key", tag1Key);
-}
-
-std::string AddTagsRequest::getTag1Value()const
-{
-	return tag1Value_;
-}
-
-void AddTagsRequest::setTag1Value(const std::string& tag1Value)
-{
-	tag1Value_ = tag1Value;
-	setParameter("Tag1Value", tag1Value);
-}
-
-std::string AddTagsRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void AddTagsRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setParameter("RegionId", regionId);
-}
-
-std::string AddTagsRequest::getTag2Value()const
-{
-	return tag2Value_;
-}
-
-void AddTagsRequest::setTag2Value(const std::string& tag2Value)
-{
-	tag2Value_ = tag2Value;
-	setParameter("Tag2Value", tag2Value);
-}
-
-std::string AddTagsRequest::getTag4Key()const
-{
-	return tag4Key_;
-}
-
-void AddTagsRequest::setTag4Key(const std::string& tag4Key)
-{
-	tag4Key_ = tag4Key;
-	setParameter("Tag4Key", tag4Key);
-}
-
-std::string AddTagsRequest::getTag3Value()const
-{
-	return tag3Value_;
-}
-
-void AddTagsRequest::setTag3Value(const std::string& tag3Value)
-{
-	tag3Value_ = tag3Value;
-	setParameter("Tag3Value", tag3Value);
-}
-

ecs/src/model/CopyImageRequest.cc

@@ -25,17 +25,6 @@ CopyImageRequest::CopyImageRequest() :
 CopyImageRequest::~CopyImageRequest()
 {}
 
-std::string CopyImageRequest::getTag4Value()const
-{
-	return tag4Value_;
-}
-
-void CopyImageRequest::setTag4Value(const std::string& tag4Value)
-{
-	tag4Value_ = tag4Value;
-	setParameter("Tag4Value", tag4Value);
-}
-
 long CopyImageRequest::getResourceOwnerId()const
 {
 	return resourceOwnerId_;
@@ -58,26 +47,15 @@ void CopyImageRequest::setImageId(const std::string& imageId)
 	setParameter("ImageId", imageId);
 }
 
-std::string CopyImageRequest::getTag2Key()const
+bool CopyImageRequest::getEncrypted()const
 {
-	return tag2Key_;
+	return encrypted_;
 }
 
-void CopyImageRequest::setTag2Key(const std::string& tag2Key)
+void CopyImageRequest::setEncrypted(bool encrypted)
 {
-	tag2Key_ = tag2Key;
-	setParameter("Tag2Key", tag2Key);
-}
-
-std::string CopyImageRequest::getTag5Key()const
-{
-	return tag5Key_;
-}
-
-void CopyImageRequest::setTag5Key(const std::string& tag5Key)
-{
-	tag5Key_ = tag5Key;
-	setParameter("Tag5Key", tag5Key);
+	encrypted_ = encrypted;
+	setParameter("Encrypted", std::to_string(encrypted));
 }
 
 std::string CopyImageRequest::getResourceOwnerAccount()const
@@ -91,6 +69,17 @@ void CopyImageRequest::setResourceOwnerAccount(const std::string& resourceOwnerA
 	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
 }
 
+std::string CopyImageRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void CopyImageRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
 std::string CopyImageRequest::getDestinationImageName()const
 {
 	return destinationImageName_;
@@ -124,15 +113,21 @@ void CopyImageRequest::setOwnerAccount(const std::string& ownerAccount)
 	setParameter("OwnerAccount", ownerAccount);
 }
 
-std::string CopyImageRequest::getTag3Key()const
+std::vector<CopyImageRequest::Tag> CopyImageRequest::getTag()const
 {
-	return tag3Key_;
+	return tag_;
 }
 
-void CopyImageRequest::setTag3Key(const std::string& tag3Key)
+void CopyImageRequest::setTag(const std::vector<Tag>& tag)
 {
-	tag3Key_ = tag3Key;
-	setParameter("Tag3Key", tag3Key);
+	tag_ = tag;
+	int i = 0;
+	for(int i = 0; i!= tag.size(); i++)	{
+		auto obj = tag.at(i);
+		std::string str ="Tag."+ std::to_string(i);
+		setParameter(str + ".Value", obj.value);
+		setParameter(str + ".Key", obj.key);
+	}
 }
 
 long CopyImageRequest::getOwnerId()const
@@ -146,83 +141,6 @@ void CopyImageRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
-std::string CopyImageRequest::getTag5Value()const
-{
-	return tag5Value_;
-}
-
-void CopyImageRequest::setTag5Value(const std::string& tag5Value)
-{
-	tag5Value_ = tag5Value;
-	setParameter("Tag5Value", tag5Value);
-}
-
-std::string CopyImageRequest::getTag1Key()const
-{
-	return tag1Key_;
-}
-
-void CopyImageRequest::setTag1Key(const std::string& tag1Key)
-{
-	tag1Key_ = tag1Key;
-	setParameter("Tag1Key", tag1Key);
-}
-
-std::string CopyImageRequest::getTag1Value()const
-{
-	return tag1Value_;
-}
-
-void CopyImageRequest::setTag1Value(const std::string& tag1Value)
-{
-	tag1Value_ = tag1Value;
-	setParameter("Tag1Value", tag1Value);
-}
-
-bool CopyImageRequest::getEncrypted()const
-{
-	return encrypted_;
-}
-
-void CopyImageRequest::setEncrypted(bool encrypted)
-{
-	encrypted_ = encrypted;
-	setParameter("Encrypted", std::to_string(encrypted));
-}
-
-std::string CopyImageRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void CopyImageRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setParameter("RegionId", regionId);
-}
-
-std::string CopyImageRequest::getTag2Value()const
-{
-	return tag2Value_;
-}
-
-void CopyImageRequest::setTag2Value(const std::string& tag2Value)
-{
-	tag2Value_ = tag2Value;
-	setParameter("Tag2Value", tag2Value);
-}
-
-std::string CopyImageRequest::getTag4Key()const
-{
-	return tag4Key_;
-}
-
-void CopyImageRequest::setTag4Key(const std::string& tag4Key)
-{
-	tag4Key_ = tag4Key;
-	setParameter("Tag4Key", tag4Key);
-}
-
 std::string CopyImageRequest::getDestinationDescription()const
 {
 	return destinationDescription_;
@@ -234,14 +152,3 @@ void CopyImageRequest::setDestinationDescription(const std::string& destinationD
 	setParameter("DestinationDescription", destinationDescription);
 }
 
-std::string CopyImageRequest::getTag3Value()const
-{
-	return tag3Value_;
-}
-
-void CopyImageRequest::setTag3Value(const std::string& tag3Value)
-{
-	tag3Value_ = tag3Value;
-	setParameter("Tag3Value", tag3Value);
-}
-

ecs/src/model/CreateDiskRequest.cc

@@ -25,17 +25,6 @@ CreateDiskRequest::CreateDiskRequest() :
 CreateDiskRequest::~CreateDiskRequest()
 {}
 
-std::string CreateDiskRequest::getTag4Value()const
-{
-	return tag4Value_;
-}
-
-void CreateDiskRequest::setTag4Value(const std::string& tag4Value)
-{
-	tag4Value_ = tag4Value;
-	setParameter("Tag4Value", tag4Value);
-}
-
 long CreateDiskRequest::getResourceOwnerId()const
 {
 	return resourceOwnerId_;
@@ -58,15 +47,15 @@ void CreateDiskRequest::setSnapshotId(const std::string& snapshotId)
 	setParameter("SnapshotId", snapshotId);
 }
 
-std::string CreateDiskRequest::getTag2Key()const
+std::string CreateDiskRequest::getResourceOwnerAccount()const
 {
-	return tag2Key_;
+	return resourceOwnerAccount_;
 }
 
-void CreateDiskRequest::setTag2Key(const std::string& tag2Key)
+void CreateDiskRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
 {
-	tag2Key_ = tag2Key;
-	setParameter("Tag2Key", tag2Key);
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
 }
 
 std::string CreateDiskRequest::getClientToken()const
@@ -80,116 +69,6 @@ void CreateDiskRequest::setClientToken(const std::string& clientToken)
 	setParameter("ClientToken", clientToken);
 }
 
-std::string CreateDiskRequest::getDescription()const
-{
-	return description_;
-}
-
-void CreateDiskRequest::setDescription(const std::string& description)
-{
-	description_ = description;
-	setParameter("Description", description);
-}
-
-std::string CreateDiskRequest::getTag3Key()const
-{
-	return tag3Key_;
-}
-
-void CreateDiskRequest::setTag3Key(const std::string& tag3Key)
-{
-	tag3Key_ = tag3Key;
-	setParameter("Tag3Key", tag3Key);
-}
-
-std::string CreateDiskRequest::getDiskName()const
-{
-	return diskName_;
-}
-
-void CreateDiskRequest::setDiskName(const std::string& diskName)
-{
-	diskName_ = diskName;
-	setParameter("DiskName", diskName);
-}
-
-std::string CreateDiskRequest::getTag1Value()const
-{
-	return tag1Value_;
-}
-
-void CreateDiskRequest::setTag1Value(const std::string& tag1Value)
-{
-	tag1Value_ = tag1Value;
-	setParameter("Tag1Value", tag1Value);
-}
-
-std::string CreateDiskRequest::getResourceGroupId()const
-{
-	return resourceGroupId_;
-}
-
-void CreateDiskRequest::setResourceGroupId(const std::string& resourceGroupId)
-{
-	resourceGroupId_ = resourceGroupId;
-	setParameter("ResourceGroupId", resourceGroupId);
-}
-
-std::string CreateDiskRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void CreateDiskRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setParameter("RegionId", regionId);
-}
-
-std::string CreateDiskRequest::getDiskCategory()const
-{
-	return diskCategory_;
-}
-
-void CreateDiskRequest::setDiskCategory(const std::string& diskCategory)
-{
-	diskCategory_ = diskCategory;
-	setParameter("DiskCategory", diskCategory);
-}
-
-std::string CreateDiskRequest::getTag3Value()const
-{
-	return tag3Value_;
-}
-
-void CreateDiskRequest::setTag3Value(const std::string& tag3Value)
-{
-	tag3Value_ = tag3Value;
-	setParameter("Tag3Value", tag3Value);
-}
-
-std::string CreateDiskRequest::getTag5Key()const
-{
-	return tag5Key_;
-}
-
-void CreateDiskRequest::setTag5Key(const std::string& tag5Key)
-{
-	tag5Key_ = tag5Key;
-	setParameter("Tag5Key", tag5Key);
-}
-
-std::string CreateDiskRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void CreateDiskRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
 std::string CreateDiskRequest::getOwnerAccount()const
 {
 	return ownerAccount_;
@@ -201,6 +80,17 @@ void CreateDiskRequest::setOwnerAccount(const std::string& ownerAccount)
 	setParameter("OwnerAccount", ownerAccount);
 }
 
+std::string CreateDiskRequest::getDescription()const
+{
+	return description_;
+}
+
+void CreateDiskRequest::setDescription(const std::string& description)
+{
+	description_ = description;
+	setParameter("Description", description);
+}
+
 long CreateDiskRequest::getOwnerId()const
 {
 	return ownerId_;
@@ -212,26 +102,26 @@ void CreateDiskRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
-std::string CreateDiskRequest::getTag5Value()const
+std::string CreateDiskRequest::getDiskName()const
 {
-	return tag5Value_;
+	return diskName_;
 }
 
-void CreateDiskRequest::setTag5Value(const std::string& tag5Value)
+void CreateDiskRequest::setDiskName(const std::string& diskName)
 {
-	tag5Value_ = tag5Value;
-	setParameter("Tag5Value", tag5Value);
+	diskName_ = diskName;
+	setParameter("DiskName", diskName);
 }
 
-std::string CreateDiskRequest::getTag1Key()const
+std::string CreateDiskRequest::getResourceGroupId()const
 {
-	return tag1Key_;
+	return resourceGroupId_;
 }
 
-void CreateDiskRequest::setTag1Key(const std::string& tag1Key)
+void CreateDiskRequest::setResourceGroupId(const std::string& resourceGroupId)
 {
-	tag1Key_ = tag1Key;
-	setParameter("Tag1Key", tag1Key);
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
 }
 
 int CreateDiskRequest::getSize()const
@@ -256,15 +146,26 @@ void CreateDiskRequest::setEncrypted(bool encrypted)
 	setParameter("Encrypted", std::to_string(encrypted));
 }
 
-std::string CreateDiskRequest::getTag2Value()const
+std::string CreateDiskRequest::getRegionId()const
 {
-	return tag2Value_;
+	return regionId_;
 }
 
-void CreateDiskRequest::setTag2Value(const std::string& tag2Value)
+void CreateDiskRequest::setRegionId(const std::string& regionId)
 {
-	tag2Value_ = tag2Value;
-	setParameter("Tag2Value", tag2Value);
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string CreateDiskRequest::getDiskCategory()const
+{
+	return diskCategory_;
+}
+
+void CreateDiskRequest::setDiskCategory(const std::string& diskCategory)
+{
+	diskCategory_ = diskCategory;
+	setParameter("DiskCategory", diskCategory);
 }
 
 std::string CreateDiskRequest::getZoneId()const
@@ -278,14 +179,20 @@ void CreateDiskRequest::setZoneId(const std::string& zoneId)
 	setParameter("ZoneId", zoneId);
 }
 
-std::string CreateDiskRequest::getTag4Key()const
+std::vector<CreateDiskRequest::Tag> CreateDiskRequest::getTag()const
 {
-	return tag4Key_;
+	return tag_;
 }
 
-void CreateDiskRequest::setTag4Key(const std::string& tag4Key)
+void CreateDiskRequest::setTag(const std::vector<Tag>& tag)
 {
-	tag4Key_ = tag4Key;
-	setParameter("Tag4Key", tag4Key);
+	tag_ = tag;
+	int i = 0;
+	for(int i = 0; i!= tag.size(); i++)	{
+		auto obj = tag.at(i);
+		std::string str ="Tag."+ std::to_string(i);
+		setParameter(str + ".Value", obj.value);
+		setParameter(str + ".Key", obj.key);
+	}
 }
 

ecs/src/model/CreateImageRequest.cc

@@ -37,24 +37,13 @@ void CreateImageRequest::setDiskDeviceMapping(const std::vector<DiskDeviceMappin
 	for(int i = 0; i!= diskDeviceMapping.size(); i++)	{
 		auto obj = diskDeviceMapping.at(i);
 		std::string str ="DiskDeviceMapping."+ std::to_string(i);
-		setParameter(str + ".Size", std::to_string(obj.size));
 		setParameter(str + ".SnapshotId", obj.snapshotId);
-		setParameter(str + ".Device", obj.device);
+		setParameter(str + ".Size", std::to_string(obj.size));
 		setParameter(str + ".DiskType", obj.diskType);
+		setParameter(str + ".Device", obj.device);
 	}
 }
 
-std::string CreateImageRequest::getTag4Value()const
-{
-	return tag4Value_;
-}
-
-void CreateImageRequest::setTag4Value(const std::string& tag4Value)
-{
-	tag4Value_ = tag4Value;
-	setParameter("Tag4Value", tag4Value);
-}
-
 long CreateImageRequest::getResourceOwnerId()const
 {
 	return resourceOwnerId_;
@@ -77,15 +66,15 @@ void CreateImageRequest::setSnapshotId(const std::string& snapshotId)
 	setParameter("SnapshotId", snapshotId);
 }
 
-std::string CreateImageRequest::getTag2Key()const
+std::string CreateImageRequest::getResourceOwnerAccount()const
 {
-	return tag2Key_;
+	return resourceOwnerAccount_;
 }
 
-void CreateImageRequest::setTag2Key(const std::string& tag2Key)
+void CreateImageRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
 {
-	tag2Key_ = tag2Key;
-	setParameter("Tag2Key", tag2Key);
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
 }
 
 std::string CreateImageRequest::getClientToken()const
@@ -99,6 +88,17 @@ void CreateImageRequest::setClientToken(const std::string& clientToken)
 	setParameter("ClientToken", clientToken);
 }
 
+std::string CreateImageRequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void CreateImageRequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setParameter("OwnerAccount", ownerAccount);
+}
+
 std::string CreateImageRequest::getDescription()const
 {
 	return description_;
@@ -110,15 +110,15 @@ void CreateImageRequest::setDescription(const std::string& description)
 	setParameter("Description", description);
 }
 
-std::string CreateImageRequest::getTag3Key()const
+long CreateImageRequest::getOwnerId()const
 {
-	return tag3Key_;
+	return ownerId_;
 }
 
-void CreateImageRequest::setTag3Key(const std::string& tag3Key)
+void CreateImageRequest::setOwnerId(long ownerId)
 {
-	tag3Key_ = tag3Key;
-	setParameter("Tag3Key", tag3Key);
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
 }
 
 std::string CreateImageRequest::getPlatform()const
@@ -132,17 +132,6 @@ void CreateImageRequest::setPlatform(const std::string& platform)
 	setParameter("Platform", platform);
 }
 
-std::string CreateImageRequest::getTag1Value()const
-{
-	return tag1Value_;
-}
-
-void CreateImageRequest::setTag1Value(const std::string& tag1Value)
-{
-	tag1Value_ = tag1Value;
-	setParameter("Tag1Value", tag1Value);
-}
-
 std::string CreateImageRequest::getResourceGroupId()const
 {
 	return resourceGroupId_;
@@ -154,6 +143,17 @@ void CreateImageRequest::setResourceGroupId(const std::string& resourceGroupId)
 	setParameter("ResourceGroupId", resourceGroupId);
 }
 
+std::string CreateImageRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void CreateImageRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setParameter("InstanceId", instanceId);
+}
+
 std::string CreateImageRequest::getRegionId()const
 {
 	return regionId_;
@@ -176,15 +176,32 @@ void CreateImageRequest::setImageName(const std::string& imageName)
 	setParameter("ImageName", imageName);
 }
 
-std::string CreateImageRequest::getTag3Value()const
+std::string CreateImageRequest::getImageVersion()const
 {
-	return tag3Value_;
+	return imageVersion_;
 }
 
-void CreateImageRequest::setTag3Value(const std::string& tag3Value)
+void CreateImageRequest::setImageVersion(const std::string& imageVersion)
 {
-	tag3Value_ = tag3Value;
-	setParameter("Tag3Value", tag3Value);
+	imageVersion_ = imageVersion;
+	setParameter("ImageVersion", imageVersion);
+}
+
+std::vector<CreateImageRequest::Tag> CreateImageRequest::getTag()const
+{
+	return tag_;
+}
+
+void CreateImageRequest::setTag(const std::vector<Tag>& tag)
+{
+	tag_ = tag;
+	int i = 0;
+	for(int i = 0; i!= tag.size(); i++)	{
+		auto obj = tag.at(i);
+		std::string str ="Tag."+ std::to_string(i);
+		setParameter(str + ".Value", obj.value);
+		setParameter(str + ".Key", obj.key);
+	}
 }
 
 std::string CreateImageRequest::getArchitecture()const
@@ -198,113 +215,3 @@ void CreateImageRequest::setArchitecture(const std::string& architecture)
 	setParameter("Architecture", architecture);
 }
 
-std::string CreateImageRequest::getTag5Key()const
-{
-	return tag5Key_;
-}
-
-void CreateImageRequest::setTag5Key(const std::string& tag5Key)
-{
-	tag5Key_ = tag5Key;
-	setParameter("Tag5Key", tag5Key);
-}
-
-std::string CreateImageRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void CreateImageRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string CreateImageRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void CreateImageRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setParameter("OwnerAccount", ownerAccount);
-}
-
-long CreateImageRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void CreateImageRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string CreateImageRequest::getTag5Value()const
-{
-	return tag5Value_;
-}
-
-void CreateImageRequest::setTag5Value(const std::string& tag5Value)
-{
-	tag5Value_ = tag5Value;
-	setParameter("Tag5Value", tag5Value);
-}
-
-std::string CreateImageRequest::getTag1Key()const
-{
-	return tag1Key_;
-}
-
-void CreateImageRequest::setTag1Key(const std::string& tag1Key)
-{
-	tag1Key_ = tag1Key;
-	setParameter("Tag1Key", tag1Key);
-}
-
-std::string CreateImageRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void CreateImageRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setParameter("InstanceId", instanceId);
-}
-
-std::string CreateImageRequest::getTag2Value()const
-{
-	return tag2Value_;
-}
-
-void CreateImageRequest::setTag2Value(const std::string& tag2Value)
-{
-	tag2Value_ = tag2Value;
-	setParameter("Tag2Value", tag2Value);
-}
-
-std::string CreateImageRequest::getImageVersion()const
-{
-	return imageVersion_;
-}
-
-void CreateImageRequest::setImageVersion(const std::string& imageVersion)
-{
-	imageVersion_ = imageVersion;
-	setParameter("ImageVersion", imageVersion);
-}
-
-std::string CreateImageRequest::getTag4Key()const
-{
-	return tag4Key_;
-}
-
-void CreateImageRequest::setTag4Key(const std::string& tag4Key)
-{
-	tag4Key_ = tag4Key;
-	setParameter("Tag4Key", tag4Key);
-}
-

ecs/src/model/CreateInstanceRequest.cc

@@ -25,17 +25,6 @@ CreateInstanceRequest::CreateInstanceRequest() :
 CreateInstanceRequest::~CreateInstanceRequest()
 {}
 
-std::string CreateInstanceRequest::getTag4Value()const
-{
-	return tag4Value_;
-}
-
-void CreateInstanceRequest::setTag4Value(const std::string& tag4Value)
-{
-	tag4Value_ = tag4Value;
-	setParameter("Tag4Value", tag4Value);
-}
-
 long CreateInstanceRequest::getResourceOwnerId()const
 {
 	return resourceOwnerId_;
@@ -47,17 +36,6 @@ void CreateInstanceRequest::setResourceOwnerId(long resourceOwnerId)
 	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
-std::string CreateInstanceRequest::getTag2Key()const
-{
-	return tag2Key_;
-}
-
-void CreateInstanceRequest::setTag2Key(const std::string& tag2Key)
-{
-	tag2Key_ = tag2Key;
-	setParameter("Tag2Key", tag2Key);
-}
-
 std::string CreateInstanceRequest::getHpcClusterId()const
 {
 	return hpcClusterId_;
@@ -69,17 +47,6 @@ void CreateInstanceRequest::setHpcClusterId(const std::string& hpcClusterId)
 	setParameter("HpcClusterId", hpcClusterId);
 }
 
-std::string CreateInstanceRequest::getTag3Key()const
-{
-	return tag3Key_;
-}
-
-void CreateInstanceRequest::setTag3Key(const std::string& tag3Key)
-{
-	tag3Key_ = tag3Key;
-	setParameter("Tag3Key", tag3Key);
-}
-
 std::string CreateInstanceRequest::getSecurityEnhancementStrategy()const
 {
 	return securityEnhancementStrategy_;
@@ -113,17 +80,6 @@ void CreateInstanceRequest::setSpotPriceLimit(float spotPriceLimit)
 	setParameter("SpotPriceLimit", std::to_string(spotPriceLimit));
 }
 
-std::string CreateInstanceRequest::getTag1Value()const
-{
-	return tag1Value_;
-}
-
-void CreateInstanceRequest::setTag1Value(const std::string& tag1Value)
-{
-	tag1Value_ = tag1Value;
-	setParameter("Tag1Value", tag1Value);
-}
-
 std::string CreateInstanceRequest::getResourceGroupId()const
 {
 	return resourceGroupId_;
@@ -157,6 +113,23 @@ void CreateInstanceRequest::setPassword(const std::string& password)
 	setParameter("Password", password);
 }
 
+std::vector<CreateInstanceRequest::Tag> CreateInstanceRequest::getTag()const
+{
+	return tag_;
+}
+
+void CreateInstanceRequest::setTag(const std::vector<Tag>& tag)
+{
+	tag_ = tag;
+	int i = 0;
+	for(int i = 0; i!= tag.size(); i++)	{
+		auto obj = tag.at(i);
+		std::string str ="Tag."+ std::to_string(i);
+		setParameter(str + ".Value", obj.value);
+		setParameter(str + ".Key", obj.key);
+	}
+}
+
 int CreateInstanceRequest::getAutoRenewPeriod()const
 {
 	return autoRenewPeriod_;
@@ -201,17 +174,6 @@ void CreateInstanceRequest::setDryRun(bool dryRun)
 	setParameter("DryRun", std::to_string(dryRun));
 }
 
-std::string CreateInstanceRequest::getTag5Key()const
-{
-	return tag5Key_;
-}
-
-void CreateInstanceRequest::setTag5Key(const std::string& tag5Key)
-{
-	tag5Key_ = tag5Key;
-	setParameter("Tag5Key", tag5Key);
-}
-
 long CreateInstanceRequest::getOwnerId()const
 {
 	return ownerId_;
@@ -311,17 +273,6 @@ void CreateInstanceRequest::setZoneId(const std::string& zoneId)
 	setParameter("ZoneId", zoneId);
 }
 
-std::string CreateInstanceRequest::getTag4Key()const
-{
-	return tag4Key_;
-}
-
-void CreateInstanceRequest::setTag4Key(const std::string& tag4Key)
-{
-	tag4Key_ = tag4Key;
-	setParameter("Tag4Key", tag4Key);
-}
-
 int CreateInstanceRequest::getInternetMaxBandwidthIn()const
 {
 	return internetMaxBandwidthIn_;
@@ -498,17 +449,6 @@ void CreateInstanceRequest::setInstanceChargeType(const std::string& instanceCha
 	setParameter("InstanceChargeType", instanceChargeType);
 }
 
-std::string CreateInstanceRequest::getTag3Value()const
-{
-	return tag3Value_;
-}
-
-void CreateInstanceRequest::setTag3Value(const std::string& tag3Value)
-{
-	tag3Value_ = tag3Value;
-	setParameter("Tag3Value", tag3Value);
-}
-
 std::string CreateInstanceRequest::getDeploymentSetId()const
 {
 	return deploymentSetId_;
@@ -609,39 +549,17 @@ void CreateInstanceRequest::setDataDisk(const std::vector<DataDisk>& dataDisk)
 	for(int i = 0; i!= dataDisk.size(); i++)	{
 		auto obj = dataDisk.at(i);
 		std::string str ="DataDisk."+ std::to_string(i);
-		setParameter(str + ".Size", std::to_string(obj.size));
-		setParameter(str + ".SnapshotId", obj.snapshotId);
-		setParameter(str + ".Category", obj.category);
 		setParameter(str + ".DiskName", obj.diskName);
+		setParameter(str + ".SnapshotId", obj.snapshotId);
+		setParameter(str + ".Size", std::to_string(obj.size));
+		setParameter(str + ".Encrypted", std::to_string(obj.encrypted));
 		setParameter(str + ".Description", obj.description);
+		setParameter(str + ".Category", obj.category);
 		setParameter(str + ".Device", obj.device);
 		setParameter(str + ".DeleteWithInstance", std::to_string(obj.deleteWithInstance));
-		setParameter(str + ".Encrypted", std::to_string(obj.encrypted));
 	}
 }
 
-std::string CreateInstanceRequest::getTag5Value()const
-{
-	return tag5Value_;
-}
-
-void CreateInstanceRequest::setTag5Value(const std::string& tag5Value)
-{
-	tag5Value_ = tag5Value;
-	setParameter("Tag5Value", tag5Value);
-}
-
-std::string CreateInstanceRequest::getTag1Key()const
-{
-	return tag1Key_;
-}
-
-void CreateInstanceRequest::setTag1Key(const std::string& tag1Key)
-{
-	tag1Key_ = tag1Key;
-	setParameter("Tag1Key", tag1Key);
-}
-
 int CreateInstanceRequest::getSystemDiskSize()const
 {
 	return systemDiskSize_;
@@ -653,17 +571,6 @@ void CreateInstanceRequest::setSystemDiskSize(int systemDiskSize)
 	setParameter("SystemDiskSize", std::to_string(systemDiskSize));
 }
 
-std::string CreateInstanceRequest::getTag2Value()const
-{
-	return tag2Value_;
-}
-
-void CreateInstanceRequest::setTag2Value(const std::string& tag2Value)
-{
-	tag2Value_ = tag2Value;
-	setParameter("Tag2Value", tag2Value);
-}
-
 std::string CreateInstanceRequest::getSystemDiskDescription()const
 {
 	return systemDiskDescription_;

ecs/src/model/CreateKeyPairRequest.cc

@@ -25,15 +25,15 @@ CreateKeyPairRequest::CreateKeyPairRequest() :
 CreateKeyPairRequest::~CreateKeyPairRequest()
 {}
 
-std::string CreateKeyPairRequest::getTag4Value()const
+std::string CreateKeyPairRequest::getResourceGroupId()const
 {
-	return tag4Value_;
+	return resourceGroupId_;
 }
 
-void CreateKeyPairRequest::setTag4Value(const std::string& tag4Value)
+void CreateKeyPairRequest::setResourceGroupId(const std::string& resourceGroupId)
 {
-	tag4Value_ = tag4Value;
-	setParameter("Tag4Value", tag4Value);
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
 }
 
 long CreateKeyPairRequest::getResourceOwnerId()const
@@ -47,28 +47,6 @@ void CreateKeyPairRequest::setResourceOwnerId(long resourceOwnerId)
 	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
-std::string CreateKeyPairRequest::getTag2Key()const
-{
-	return tag2Key_;
-}
-
-void CreateKeyPairRequest::setTag2Key(const std::string& tag2Key)
-{
-	tag2Key_ = tag2Key;
-	setParameter("Tag2Key", tag2Key);
-}
-
-std::string CreateKeyPairRequest::getTag5Key()const
-{
-	return tag5Key_;
-}
-
-void CreateKeyPairRequest::setTag5Key(const std::string& tag5Key)
-{
-	tag5Key_ = tag5Key;
-	setParameter("Tag5Key", tag5Key);
-}
-
 std::string CreateKeyPairRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;
@@ -80,83 +58,6 @@ void CreateKeyPairRequest::setResourceOwnerAccount(const std::string& resourceOw
 	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
 }
 
-std::string CreateKeyPairRequest::getTag3Key()const
-{
-	return tag3Key_;
-}
-
-void CreateKeyPairRequest::setTag3Key(const std::string& tag3Key)
-{
-	tag3Key_ = tag3Key;
-	setParameter("Tag3Key", tag3Key);
-}
-
-std::string CreateKeyPairRequest::getKeyPairName()const
-{
-	return keyPairName_;
-}
-
-void CreateKeyPairRequest::setKeyPairName(const std::string& keyPairName)
-{
-	keyPairName_ = keyPairName;
-	setParameter("KeyPairName", keyPairName);
-}
-
-long CreateKeyPairRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void CreateKeyPairRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string CreateKeyPairRequest::getTag5Value()const
-{
-	return tag5Value_;
-}
-
-void CreateKeyPairRequest::setTag5Value(const std::string& tag5Value)
-{
-	tag5Value_ = tag5Value;
-	setParameter("Tag5Value", tag5Value);
-}
-
-std::string CreateKeyPairRequest::getTag1Key()const
-{
-	return tag1Key_;
-}
-
-void CreateKeyPairRequest::setTag1Key(const std::string& tag1Key)
-{
-	tag1Key_ = tag1Key;
-	setParameter("Tag1Key", tag1Key);
-}
-
-std::string CreateKeyPairRequest::getTag1Value()const
-{
-	return tag1Value_;
-}
-
-void CreateKeyPairRequest::setTag1Value(const std::string& tag1Value)
-{
-	tag1Value_ = tag1Value;
-	setParameter("Tag1Value", tag1Value);
-}
-
-std::string CreateKeyPairRequest::getResourceGroupId()const
-{
-	return resourceGroupId_;
-}
-
-void CreateKeyPairRequest::setResourceGroupId(const std::string& resourceGroupId)
-{
-	resourceGroupId_ = resourceGroupId;
-	setParameter("ResourceGroupId", resourceGroupId);
-}
-
 std::string CreateKeyPairRequest::getRegionId()const
 {
 	return regionId_;
@@ -168,36 +69,42 @@ void CreateKeyPairRequest::setRegionId(const std::string& regionId)
 	setParameter("RegionId", regionId);
 }
 
-std::string CreateKeyPairRequest::getTag2Value()const
+std::string CreateKeyPairRequest::getKeyPairName()const
 {
-	return tag2Value_;
+	return keyPairName_;
 }
 
-void CreateKeyPairRequest::setTag2Value(const std::string& tag2Value)
+void CreateKeyPairRequest::setKeyPairName(const std::string& keyPairName)
 {
-	tag2Value_ = tag2Value;
-	setParameter("Tag2Value", tag2Value);
+	keyPairName_ = keyPairName;
+	setParameter("KeyPairName", keyPairName);
 }
 
-std::string CreateKeyPairRequest::getTag4Key()const
+std::vector<CreateKeyPairRequest::Tag> CreateKeyPairRequest::getTag()const
 {
-	return tag4Key_;
+	return tag_;
 }
 
-void CreateKeyPairRequest::setTag4Key(const std::string& tag4Key)
+void CreateKeyPairRequest::setTag(const std::vector<Tag>& tag)
 {
-	tag4Key_ = tag4Key;
-	setParameter("Tag4Key", tag4Key);
+	tag_ = tag;
+	int i = 0;
+	for(int i = 0; i!= tag.size(); i++)	{
+		auto obj = tag.at(i);
+		std::string str ="Tag."+ std::to_string(i);
+		setParameter(str + ".Value", obj.value);
+		setParameter(str + ".Key", obj.key);
+	}
 }
 
-std::string CreateKeyPairRequest::getTag3Value()const
+long CreateKeyPairRequest::getOwnerId()const
 {
-	return tag3Value_;
+	return ownerId_;
 }
 
-void CreateKeyPairRequest::setTag3Value(const std::string& tag3Value)
+void CreateKeyPairRequest::setOwnerId(long ownerId)
 {
-	tag3Value_ = tag3Value;
-	setParameter("Tag3Value", tag3Value);
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
 }
 

ecs/src/model/CreateLaunchTemplateRequest.cc

@@ -47,17 +47,6 @@ void CreateLaunchTemplateRequest::setResourceOwnerId(long resourceOwnerId)
 	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
-std::string CreateLaunchTemplateRequest::getTemplateTag4Key()const
-{
-	return templateTag4Key_;
-}
-
-void CreateLaunchTemplateRequest::setTemplateTag4Key(const std::string& templateTag4Key)
-{
-	templateTag4Key_ = templateTag4Key;
-	setParameter("TemplateTag4Key", templateTag4Key);
-}
-
 long CreateLaunchTemplateRequest::getCallerParentId()const
 {
 	return callerParentId_;
@@ -168,17 +157,6 @@ void CreateLaunchTemplateRequest::setResourceGroupId(const std::string& resource
 	setParameter("ResourceGroupId", resourceGroupId);
 }
 
-std::string CreateLaunchTemplateRequest::getTemplateTag3Key()const
-{
-	return templateTag3Key_;
-}
-
-void CreateLaunchTemplateRequest::setTemplateTag3Key(const std::string& templateTag3Key)
-{
-	templateTag3Key_ = templateTag3Key;
-	setParameter("TemplateTag3Key", templateTag3Key);
-}
-
 std::string CreateLaunchTemplateRequest::getHostName()const
 {
 	return hostName_;
@@ -234,15 +212,21 @@ void CreateLaunchTemplateRequest::setCallerBidEmail(const std::string& callerBid
 	setParameter("CallerBidEmail", callerBidEmail);
 }
 
-std::string CreateLaunchTemplateRequest::getTemplateTag3Value()const
+std::vector<CreateLaunchTemplateRequest::TemplateTag> CreateLaunchTemplateRequest::getTemplateTag()const
 {
-	return templateTag3Value_;
+	return templateTag_;
 }
 
-void CreateLaunchTemplateRequest::setTemplateTag3Value(const std::string& templateTag3Value)
+void CreateLaunchTemplateRequest::setTemplateTag(const std::vector<TemplateTag>& templateTag)
 {
-	templateTag3Value_ = templateTag3Value;
-	setParameter("TemplateTag3Value", templateTag3Value);
+	templateTag_ = templateTag;
+	int i = 0;
+	for(int i = 0; i!= templateTag.size(); i++)	{
+		auto obj = templateTag.at(i);
+		std::string str ="TemplateTag."+ std::to_string(i);
+		setParameter(str + ".Key", obj.key);
+		setParameter(str + ".Value", obj.value);
+	}
 }
 
 std::vector<CreateLaunchTemplateRequest::Tag> CreateLaunchTemplateRequest::getTag()const
@@ -295,17 +279,6 @@ void CreateLaunchTemplateRequest::setTemplateResourceGroupId(const std::string&
 	setParameter("TemplateResourceGroupId", templateResourceGroupId);
 }
 
-std::string CreateLaunchTemplateRequest::getTemplateTag2Value()const
-{
-	return templateTag2Value_;
-}
-
-void CreateLaunchTemplateRequest::setTemplateTag2Value(const std::string& templateTag2Value)
-{
-	templateTag2Value_ = templateTag2Value;
-	setParameter("TemplateTag2Value", templateTag2Value);
-}
-
 long CreateLaunchTemplateRequest::getOwnerId()const
 {
 	return ownerId_;
@@ -394,17 +367,6 @@ void CreateLaunchTemplateRequest::setInternetChargeType(const std::string& inter
 	setParameter("InternetChargeType", internetChargeType);
 }
 
-std::string CreateLaunchTemplateRequest::getTemplateTag5Key()const
-{
-	return templateTag5Key_;
-}
-
-void CreateLaunchTemplateRequest::setTemplateTag5Key(const std::string& templateTag5Key)
-{
-	templateTag5Key_ = templateTag5Key;
-	setParameter("TemplateTag5Key", templateTag5Key);
-}
-
 std::string CreateLaunchTemplateRequest::getZoneId()const
 {
 	return zoneId_;
@@ -438,17 +400,6 @@ void CreateLaunchTemplateRequest::setVersionDescription(const std::string& versi
 	setParameter("VersionDescription", versionDescription);
 }
 
-std::string CreateLaunchTemplateRequest::getTemplateTag1Value()const
-{
-	return templateTag1Value_;
-}
-
-void CreateLaunchTemplateRequest::setTemplateTag1Value(const std::string& templateTag1Value)
-{
-	templateTag1Value_ = templateTag1Value;
-	setParameter("TemplateTag1Value", templateTag1Value);
-}
-
 std::string CreateLaunchTemplateRequest::getImageId()const
 {
 	return imageId_;
@@ -559,17 +510,6 @@ void CreateLaunchTemplateRequest::setRegionId(const std::string& regionId)
 	setParameter("RegionId", regionId);
 }
 
-std::string CreateLaunchTemplateRequest::getTemplateTag5Value()const
-{
-	return templateTag5Value_;
-}
-
-void CreateLaunchTemplateRequest::setTemplateTag5Value(const std::string& templateTag5Value)
-{
-	templateTag5Value_ = templateTag5Value;
-	setParameter("TemplateTag5Value", templateTag5Value);
-}
-
 std::string CreateLaunchTemplateRequest::getRequestContent()const
 {
 	return requestContent_;
@@ -656,17 +596,6 @@ void CreateLaunchTemplateRequest::setApp_ip(const std::string& app_ip)
 	setParameter("App_ip", app_ip);
 }
 
-std::string CreateLaunchTemplateRequest::getTemplateTag2Key()const
-{
-	return templateTag2Key_;
-}
-
-void CreateLaunchTemplateRequest::setTemplateTag2Key(const std::string& templateTag2Key)
-{
-	templateTag2Key_ = templateTag2Key;
-	setParameter("TemplateTag2Key", templateTag2Key);
-}
-
 std::string CreateLaunchTemplateRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;
@@ -777,17 +706,6 @@ void CreateLaunchTemplateRequest::setProxy_trust_transport_info(bool proxy_trust
 	setParameter("Proxy_trust_transport_info", std::to_string(proxy_trust_transport_info));
 }
 
-std::string CreateLaunchTemplateRequest::getTemplateTag4Value()const
-{
-	return templateTag4Value_;
-}
-
-void CreateLaunchTemplateRequest::setTemplateTag4Value(const std::string& templateTag4Value)
-{
-	templateTag4Value_ = templateTag4Value;
-	setParameter("TemplateTag4Value", templateTag4Value);
-}
-
 int CreateLaunchTemplateRequest::getSystemDiskSize()const
 {
 	return systemDiskSize_;
@@ -810,17 +728,6 @@ void CreateLaunchTemplateRequest::setVpcId(const std::string& vpcId)
 	setParameter("VpcId", vpcId);
 }
 
-std::string CreateLaunchTemplateRequest::getTemplateTag1Key()const
-{
-	return templateTag1Key_;
-}
-
-void CreateLaunchTemplateRequest::setTemplateTag1Key(const std::string& templateTag1Key)
-{
-	templateTag1Key_ = templateTag1Key;
-	setParameter("TemplateTag1Key", templateTag1Key);
-}
-
 std::string CreateLaunchTemplateRequest::getSystemDiskDescription()const
 {
 	return systemDiskDescription_;

ecs/src/model/CreateNatGatewayRequest.cc

@@ -136,9 +136,9 @@ void CreateNatGatewayRequest::setBandwidthPackage(const std::vector<BandwidthPac
 	for(int i = 0; i!= bandwidthPackage.size(); i++)	{
 		auto obj = bandwidthPackage.at(i);
 		std::string str ="BandwidthPackage."+ std::to_string(i);
-		setParameter(str + ".IpCount", std::to_string(obj.ipCount));
 		setParameter(str + ".Bandwidth", std::to_string(obj.bandwidth));
 		setParameter(str + ".Zone", obj.zone);
+		setParameter(str + ".IpCount", std::to_string(obj.ipCount));
 	}
 }
 

ecs/src/model/CreateNetworkInterfaceRequest.cc

@@ -25,17 +25,6 @@ CreateNetworkInterfaceRequest::CreateNetworkInterfaceRequest() :
 CreateNetworkInterfaceRequest::~CreateNetworkInterfaceRequest()
 {}
 
-std::string CreateNetworkInterfaceRequest::getTag4Value()const
-{
-	return tag4Value_;
-}
-
-void CreateNetworkInterfaceRequest::setTag4Value(const std::string& tag4Value)
-{
-	tag4Value_ = tag4Value;
-	setParameter("Tag4Value", tag4Value);
-}
-
 long CreateNetworkInterfaceRequest::getResourceOwnerId()const
 {
 	return resourceOwnerId_;
@@ -47,17 +36,6 @@ void CreateNetworkInterfaceRequest::setResourceOwnerId(long resourceOwnerId)
 	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
-std::string CreateNetworkInterfaceRequest::getTag2Key()const
-{
-	return tag2Key_;
-}
-
-void CreateNetworkInterfaceRequest::setTag2Key(const std::string& tag2Key)
-{
-	tag2Key_ = tag2Key;
-	setParameter("Tag2Key", tag2Key);
-}
-
 std::string CreateNetworkInterfaceRequest::getClientToken()const
 {
 	return clientToken_;
@@ -113,17 +91,6 @@ void CreateNetworkInterfaceRequest::setDescription(const std::string& descriptio
 	setParameter("Description", description);
 }
 
-std::string CreateNetworkInterfaceRequest::getTag3Key()const
-{
-	return tag3Key_;
-}
-
-void CreateNetworkInterfaceRequest::setTag3Key(const std::string& tag3Key)
-{
-	tag3Key_ = tag3Key;
-	setParameter("Tag3Key", tag3Key);
-}
-
 std::string CreateNetworkInterfaceRequest::getProxy_original_source_ip()const
 {
 	return proxy_original_source_ip_;
@@ -168,17 +135,6 @@ void CreateNetworkInterfaceRequest::setAccessKeyId(const std::string& accessKeyI
 	setParameter("AccessKeyId", accessKeyId);
 }
 
-std::string CreateNetworkInterfaceRequest::getTag1Value()const
-{
-	return tag1Value_;
-}
-
-void CreateNetworkInterfaceRequest::setTag1Value(const std::string& tag1Value)
-{
-	tag1Value_ = tag1Value;
-	setParameter("Tag1Value", tag1Value);
-}
-
 std::string CreateNetworkInterfaceRequest::getResourceGroupId()const
 {
 	return resourceGroupId_;
@@ -245,6 +201,23 @@ void CreateNetworkInterfaceRequest::setCallerBidEmail(const std::string& callerB
 	setParameter("CallerBidEmail", callerBidEmail);
 }
 
+std::vector<CreateNetworkInterfaceRequest::Tag> CreateNetworkInterfaceRequest::getTag()const
+{
+	return tag_;
+}
+
+void CreateNetworkInterfaceRequest::setTag(const std::vector<Tag>& tag)
+{
+	tag_ = tag;
+	int i = 0;
+	for(int i = 0; i!= tag.size(); i++)	{
+		auto obj = tag.at(i);
+		std::string str ="Tag."+ std::to_string(i);
+		setParameter(str + ".Key", obj.key);
+		setParameter(str + ".Value", obj.value);
+	}
+}
+
 std::string CreateNetworkInterfaceRequest::getCallerUidEmail()const
 {
 	return callerUidEmail_;
@@ -256,17 +229,6 @@ void CreateNetworkInterfaceRequest::setCallerUidEmail(const std::string& callerU
 	setParameter("CallerUidEmail", callerUidEmail);
 }
 
-std::string CreateNetworkInterfaceRequest::getTag3Value()const
-{
-	return tag3Value_;
-}
-
-void CreateNetworkInterfaceRequest::setTag3Value(const std::string& tag3Value)
-{
-	tag3Value_ = tag3Value;
-	setParameter("Tag3Value", tag3Value);
-}
-
 std::string CreateNetworkInterfaceRequest::getNetworkInterfaceName()const
 {
 	return networkInterfaceName_;
@@ -300,17 +262,6 @@ void CreateNetworkInterfaceRequest::setApp_ip(const std::string& app_ip)
 	setParameter("App_ip", app_ip);
 }
 
-std::string CreateNetworkInterfaceRequest::getTag5Key()const
-{
-	return tag5Key_;
-}
-
-void CreateNetworkInterfaceRequest::setTag5Key(const std::string& tag5Key)
-{
-	tag5Key_ = tag5Key;
-	setParameter("Tag5Key", tag5Key);
-}
-
 std::string CreateNetworkInterfaceRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;
@@ -355,17 +306,6 @@ void CreateNetworkInterfaceRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
-std::string CreateNetworkInterfaceRequest::getTag5Value()const
-{
-	return tag5Value_;
-}
-
-void CreateNetworkInterfaceRequest::setTag5Value(const std::string& tag5Value)
-{
-	tag5Value_ = tag5Value;
-	setParameter("Tag5Value", tag5Value);
-}
-
 bool CreateNetworkInterfaceRequest::getProxy_trust_transport_info()const
 {
 	return proxy_trust_transport_info_;
@@ -399,17 +339,6 @@ void CreateNetworkInterfaceRequest::setSecurity_transport(bool security_transpor
 	setParameter("Security_transport", std::to_string(security_transport));
 }
 
-std::string CreateNetworkInterfaceRequest::getTag1Key()const
-{
-	return tag1Key_;
-}
-
-void CreateNetworkInterfaceRequest::setTag1Key(const std::string& tag1Key)
-{
-	tag1Key_ = tag1Key;
-	setParameter("Tag1Key", tag1Key);
-}
-
 std::string CreateNetworkInterfaceRequest::getVSwitchId()const
 {
 	return vSwitchId_;
@@ -432,28 +361,6 @@ void CreateNetworkInterfaceRequest::setRequestId(const std::string& requestId)
 	setParameter("RequestId", requestId);
 }
 
-std::string CreateNetworkInterfaceRequest::getTag2Value()const
-{
-	return tag2Value_;
-}
-
-void CreateNetworkInterfaceRequest::setTag2Value(const std::string& tag2Value)
-{
-	tag2Value_ = tag2Value;
-	setParameter("Tag2Value", tag2Value);
-}
-
-std::string CreateNetworkInterfaceRequest::getTag4Key()const
-{
-	return tag4Key_;
-}
-
-void CreateNetworkInterfaceRequest::setTag4Key(const std::string& tag4Key)
-{
-	tag4Key_ = tag4Key;
-	setParameter("Tag4Key", tag4Key);
-}
-
 std::string CreateNetworkInterfaceRequest::getPrimaryIpAddress()const
 {
 	return primaryIpAddress_;

ecs/src/model/CreateRouteEntryRequest.cc

@@ -125,8 +125,8 @@ void CreateRouteEntryRequest::setNextHopList(const std::vector<NextHopList>& nex
 	for(int i = 0; i!= nextHopList.size(); i++)	{
 		auto obj = nextHopList.at(i);
 		std::string str ="NextHopList."+ std::to_string(i);
-		setParameter(str + ".NextHopType", obj.nextHopType);
 		setParameter(str + ".NextHopId", obj.nextHopId);
+		setParameter(str + ".NextHopType", obj.nextHopType);
 	}
 }
 

ecs/src/model/CreateSecurityGroupRequest.cc

@@ -25,15 +25,15 @@ CreateSecurityGroupRequest::CreateSecurityGroupRequest() :
 CreateSecurityGroupRequest::~CreateSecurityGroupRequest()
 {}
 
-std::string CreateSecurityGroupRequest::getTag4Value()const
+std::string CreateSecurityGroupRequest::getResourceGroupId()const
 {
-	return tag4Value_;
+	return resourceGroupId_;
 }
 
-void CreateSecurityGroupRequest::setTag4Value(const std::string& tag4Value)
+void CreateSecurityGroupRequest::setResourceGroupId(const std::string& resourceGroupId)
 {
-	tag4Value_ = tag4Value;
-	setParameter("Tag4Value", tag4Value);
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
 }
 
 long CreateSecurityGroupRequest::getResourceOwnerId()const
@@ -47,28 +47,6 @@ void CreateSecurityGroupRequest::setResourceOwnerId(long resourceOwnerId)
 	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
-std::string CreateSecurityGroupRequest::getTag2Key()const
-{
-	return tag2Key_;
-}
-
-void CreateSecurityGroupRequest::setTag2Key(const std::string& tag2Key)
-{
-	tag2Key_ = tag2Key;
-	setParameter("Tag2Key", tag2Key);
-}
-
-std::string CreateSecurityGroupRequest::getTag5Key()const
-{
-	return tag5Key_;
-}
-
-void CreateSecurityGroupRequest::setTag5Key(const std::string& tag5Key)
-{
-	tag5Key_ = tag5Key;
-	setParameter("Tag5Key", tag5Key);
-}
-
 std::string CreateSecurityGroupRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;
@@ -80,6 +58,17 @@ void CreateSecurityGroupRequest::setResourceOwnerAccount(const std::string& reso
 	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
 }
 
+std::string CreateSecurityGroupRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void CreateSecurityGroupRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
 std::string CreateSecurityGroupRequest::getClientToken()const
 {
 	return clientToken_;
@@ -91,6 +80,17 @@ void CreateSecurityGroupRequest::setClientToken(const std::string& clientToken)
 	setParameter("ClientToken", clientToken);
 }
 
+std::string CreateSecurityGroupRequest::getVpcId()const
+{
+	return vpcId_;
+}
+
+void CreateSecurityGroupRequest::setVpcId(const std::string& vpcId)
+{
+	vpcId_ = vpcId;
+	setParameter("VpcId", vpcId);
+}
+
 std::string CreateSecurityGroupRequest::getOwnerAccount()const
 {
 	return ownerAccount_;
@@ -113,15 +113,21 @@ void CreateSecurityGroupRequest::setDescription(const std::string& description)
 	setParameter("Description", description);
 }
 
-std::string CreateSecurityGroupRequest::getTag3Key()const
+std::vector<CreateSecurityGroupRequest::Tag> CreateSecurityGroupRequest::getTag()const
 {
-	return tag3Key_;
+	return tag_;
 }
 
-void CreateSecurityGroupRequest::setTag3Key(const std::string& tag3Key)
+void CreateSecurityGroupRequest::setTag(const std::vector<Tag>& tag)
 {
-	tag3Key_ = tag3Key;
-	setParameter("Tag3Key", tag3Key);
+	tag_ = tag;
+	int i = 0;
+	for(int i = 0; i!= tag.size(); i++)	{
+		auto obj = tag.at(i);
+		std::string str ="Tag."+ std::to_string(i);
+		setParameter(str + ".Value", obj.value);
+		setParameter(str + ".Key", obj.key);
+	}
 }
 
 long CreateSecurityGroupRequest::getOwnerId()const
@@ -146,102 +152,3 @@ void CreateSecurityGroupRequest::setSecurityGroupName(const std::string& securit
 	setParameter("SecurityGroupName", securityGroupName);
 }
 
-std::string CreateSecurityGroupRequest::getTag5Value()const
-{
-	return tag5Value_;
-}
-
-void CreateSecurityGroupRequest::setTag5Value(const std::string& tag5Value)
-{
-	tag5Value_ = tag5Value;
-	setParameter("Tag5Value", tag5Value);
-}
-
-std::string CreateSecurityGroupRequest::getTag1Key()const
-{
-	return tag1Key_;
-}
-
-void CreateSecurityGroupRequest::setTag1Key(const std::string& tag1Key)
-{
-	tag1Key_ = tag1Key;
-	setParameter("Tag1Key", tag1Key);
-}
-
-std::string CreateSecurityGroupRequest::getTag1Value()const
-{
-	return tag1Value_;
-}
-
-void CreateSecurityGroupRequest::setTag1Value(const std::string& tag1Value)
-{
-	tag1Value_ = tag1Value;
-	setParameter("Tag1Value", tag1Value);
-}
-
-std::string CreateSecurityGroupRequest::getResourceGroupId()const
-{
-	return resourceGroupId_;
-}
-
-void CreateSecurityGroupRequest::setResourceGroupId(const std::string& resourceGroupId)
-{
-	resourceGroupId_ = resourceGroupId;
-	setParameter("ResourceGroupId", resourceGroupId);
-}
-
-std::string CreateSecurityGroupRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void CreateSecurityGroupRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setParameter("RegionId", regionId);
-}
-
-std::string CreateSecurityGroupRequest::getVpcId()const
-{
-	return vpcId_;
-}
-
-void CreateSecurityGroupRequest::setVpcId(const std::string& vpcId)
-{
-	vpcId_ = vpcId;
-	setParameter("VpcId", vpcId);
-}
-
-std::string CreateSecurityGroupRequest::getTag2Value()const
-{
-	return tag2Value_;
-}
-
-void CreateSecurityGroupRequest::setTag2Value(const std::string& tag2Value)
-{
-	tag2Value_ = tag2Value;
-	setParameter("Tag2Value", tag2Value);
-}
-
-std::string CreateSecurityGroupRequest::getTag4Key()const
-{
-	return tag4Key_;
-}
-
-void CreateSecurityGroupRequest::setTag4Key(const std::string& tag4Key)
-{
-	tag4Key_ = tag4Key;
-	setParameter("Tag4Key", tag4Key);
-}
-
-std::string CreateSecurityGroupRequest::getTag3Value()const
-{
-	return tag3Value_;
-}
-
-void CreateSecurityGroupRequest::setTag3Value(const std::string& tag3Value)
-{
-	tag3Value_ = tag3Value;
-	setParameter("Tag3Value", tag3Value);
-}
-

ecs/src/model/CreateSnapshotRequest.cc

@@ -25,17 +25,6 @@ CreateSnapshotRequest::CreateSnapshotRequest() :
 CreateSnapshotRequest::~CreateSnapshotRequest()
 {}
 
-std::string CreateSnapshotRequest::getTag4Value()const
-{
-	return tag4Value_;
-}
-
-void CreateSnapshotRequest::setTag4Value(const std::string& tag4Value)
-{
-	tag4Value_ = tag4Value;
-	setParameter("Tag4Value", tag4Value);
-}
-
 long CreateSnapshotRequest::getResourceOwnerId()const
 {
 	return resourceOwnerId_;
@@ -47,28 +36,6 @@ void CreateSnapshotRequest::setResourceOwnerId(long resourceOwnerId)
 	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
-std::string CreateSnapshotRequest::getTag2Key()const
-{
-	return tag2Key_;
-}
-
-void CreateSnapshotRequest::setTag2Key(const std::string& tag2Key)
-{
-	tag2Key_ = tag2Key;
-	setParameter("Tag2Key", tag2Key);
-}
-
-std::string CreateSnapshotRequest::getTag5Key()const
-{
-	return tag5Key_;
-}
-
-void CreateSnapshotRequest::setTag5Key(const std::string& tag5Key)
-{
-	tag5Key_ = tag5Key;
-	setParameter("Tag5Key", tag5Key);
-}
-
 std::string CreateSnapshotRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;
@@ -113,6 +80,17 @@ void CreateSnapshotRequest::setDescription(const std::string& description)
 	setParameter("Description", description);
 }
 
+std::string CreateSnapshotRequest::getDiskId()const
+{
+	return diskId_;
+}
+
+void CreateSnapshotRequest::setDiskId(const std::string& diskId)
+{
+	diskId_ = diskId;
+	setParameter("DiskId", diskId);
+}
+
 std::string CreateSnapshotRequest::getSnapshotName()const
 {
 	return snapshotName_;
@@ -124,15 +102,21 @@ void CreateSnapshotRequest::setSnapshotName(const std::string& snapshotName)
 	setParameter("SnapshotName", snapshotName);
 }
 
-std::string CreateSnapshotRequest::getTag3Key()const
+std::vector<CreateSnapshotRequest::Tag> CreateSnapshotRequest::getTag()const
 {
-	return tag3Key_;
+	return tag_;
 }
 
-void CreateSnapshotRequest::setTag3Key(const std::string& tag3Key)
+void CreateSnapshotRequest::setTag(const std::vector<Tag>& tag)
 {
-	tag3Key_ = tag3Key;
-	setParameter("Tag3Key", tag3Key);
+	tag_ = tag;
+	int i = 0;
+	for(int i = 0; i!= tag.size(); i++)	{
+		auto obj = tag.at(i);
+		std::string str ="Tag."+ std::to_string(i);
+		setParameter(str + ".Value", obj.value);
+		setParameter(str + ".Key", obj.key);
+	}
 }
 
 long CreateSnapshotRequest::getOwnerId()const
@@ -146,80 +130,3 @@ void CreateSnapshotRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
-std::string CreateSnapshotRequest::getTag5Value()const
-{
-	return tag5Value_;
-}
-
-void CreateSnapshotRequest::setTag5Value(const std::string& tag5Value)
-{
-	tag5Value_ = tag5Value;
-	setParameter("Tag5Value", tag5Value);
-}
-
-std::string CreateSnapshotRequest::getTag1Key()const
-{
-	return tag1Key_;
-}
-
-void CreateSnapshotRequest::setTag1Key(const std::string& tag1Key)
-{
-	tag1Key_ = tag1Key;
-	setParameter("Tag1Key", tag1Key);
-}
-
-std::string CreateSnapshotRequest::getTag1Value()const
-{
-	return tag1Value_;
-}
-
-void CreateSnapshotRequest::setTag1Value(const std::string& tag1Value)
-{
-	tag1Value_ = tag1Value;
-	setParameter("Tag1Value", tag1Value);
-}
-
-std::string CreateSnapshotRequest::getTag2Value()const
-{
-	return tag2Value_;
-}
-
-void CreateSnapshotRequest::setTag2Value(const std::string& tag2Value)
-{
-	tag2Value_ = tag2Value;
-	setParameter("Tag2Value", tag2Value);
-}
-
-std::string CreateSnapshotRequest::getTag4Key()const
-{
-	return tag4Key_;
-}
-
-void CreateSnapshotRequest::setTag4Key(const std::string& tag4Key)
-{
-	tag4Key_ = tag4Key;
-	setParameter("Tag4Key", tag4Key);
-}
-
-std::string CreateSnapshotRequest::getDiskId()const
-{
-	return diskId_;
-}
-
-void CreateSnapshotRequest::setDiskId(const std::string& diskId)
-{
-	diskId_ = diskId;
-	setParameter("DiskId", diskId);
-}
-
-std::string CreateSnapshotRequest::getTag3Value()const
-{
-	return tag3Value_;
-}
-
-void CreateSnapshotRequest::setTag3Value(const std::string& tag3Value)
-{
-	tag3Value_ = tag3Value;
-	setParameter("Tag3Value", tag3Value);
-}
-

ecs/src/model/CreateVSwitchRequest.cc

@@ -47,6 +47,17 @@ void CreateVSwitchRequest::setResourceOwnerAccount(const std::string& resourceOw
 	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
 }
 
+std::string CreateVSwitchRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void CreateVSwitchRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
 std::string CreateVSwitchRequest::getClientToken()const
 {
 	return clientToken_;

ecs/src/model/DeletePhysicalConnectionRequest.cc

@@ -91,17 +91,6 @@ void DeletePhysicalConnectionRequest::setOwnerAccount(const std::string& ownerAc
 	setParameter("OwnerAccount", ownerAccount);
 }
 
-std::string DeletePhysicalConnectionRequest::getUserCidr()const
-{
-	return userCidr_;
-}
-
-void DeletePhysicalConnectionRequest::setUserCidr(const std::string& userCidr)
-{
-	userCidr_ = userCidr;
-	setParameter("UserCidr", userCidr);
-}
-
 long DeletePhysicalConnectionRequest::getOwnerId()const
 {
 	return ownerId_;

ecs/src/model/DeleteRouteEntryRequest.cc

@@ -103,8 +103,8 @@ void DeleteRouteEntryRequest::setNextHopList(const std::vector<NextHopList>& nex
 	for(int i = 0; i!= nextHopList.size(); i++)	{
 		auto obj = nextHopList.at(i);
 		std::string str ="NextHopList."+ std::to_string(i);
-		setParameter(str + ".NextHopType", obj.nextHopType);
 		setParameter(str + ".NextHopId", obj.nextHopId);
+		setParameter(str + ".NextHopType", obj.nextHopType);
 	}
 }
 

ecs/src/model/DeleteVSwitchRequest.cc

@@ -58,6 +58,17 @@ void DeleteVSwitchRequest::setResourceOwnerAccount(const std::string& resourceOw
 	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
 }
 
+std::string DeleteVSwitchRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void DeleteVSwitchRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
 std::string DeleteVSwitchRequest::getOwnerAccount()const
 {
 	return ownerAccount_;