ESS SDK Auto Released By kangning.tkn,Version：1.19.3

Signed-off-by: haowei.yao <haowei.yao@alibaba-inc.com>

CHANGELOG

@@ -1,3 +1,56 @@
+2018-07-11 Version: 1.19.3
+1, new function: Attach and Detach Rds instance of scalingGroup.
+
+
+2018-07-11 Version: 1.19.2
+1, Add DetectFaceAttributesService.
+2, Add cloudauthPageUrl to GetVerifyTokenResponse.
+
+2018-07-05 Version: 1.19.1
+1, new function, attach/detach load balancer of scalingGroup
+
+2018-07-05 Version: 1.19.0
+1, A new optional parameter 'Perspectives' is introduced to the 'Chat' API. By filling this parameter when calling 'Chat', you'll get the knowledge base content within the specified perspectives.
+
+2018-06-28 Version: 1.18.1
+1, ScalingConfiguration support hostName and passwordInherit
+2, ScalingConfiguration support modify
+
+2018-06-27 Version: 1.18.0
+1, Modify QueryDomainRealNameVerificationInfo Api, add a return value IdentityCredentialUrl, which is domain real name verification image, you can download it via a HTTP get request,It has validity for 30 seconds.
+2, Modify QueryRegistrantProfileRealNameVerificationInfo Api, add a return value IdentityCredentialUrl, which is domain real name verification image, you can download it via a HTTP get request,It has validity for 30 seconds
+
+
+2018-06-27 Version: 1.17.10
+1, DescribeNetworkInterfaces support query with vpcId
+
+2018-06-22 Version: 1.17.9
+1, rtc openapi
+
+
+2018-06-21 Version: 1.17.8
+1, This is add InstanceList.
+
+2018-06-20 Version: 1.17.7
+1, Add InstanceList in product security information query.
+
+2018-06-20 Version: 1.17.6
+1, Add InstanceList in product security information query.
+
+2018-06-14 Version: 1.17.5
+1, Add passwordInherit.
+
+2018-06-13 Version: 1.17.4
+1, Add API AddCasterEpisodeGroupContent,CreateCaster.
+2, Add Parameter fillMode for AddCasterLayout,ModifyCasterLayout.
+3, Add return value fillMode DescribeCasterLayouts.
+4, Update ErrorCode for StartCaster,StartCasterScene,DescribeCasters,CopyCaster.
+5, Update ErrorCode for ModifyCasterLayout,DeleteCasterLayout,DeleteLiveAppRecordConfig.
+6, Update ForbidLiveStream,DescribeLiveStreamsPublishList,DescribeLiveStreamsOnlineList.
+
+2018-06-13 Version: 1.17.3
+1, Add lifecycleHook.
+
 2018-06-08 Version: 1.17.2
 1, Add scdn interface，support scdn.
 

CMakeLists.txt

@@ -76,4 +76,7 @@ add_subdirectory(cloudauth)
 add_subdirectory(dyvmsapi)
 add_subdirectory(drds)
 add_subdirectory(jarvis)
-add_subdirectory(scdn)
+add_subdirectory(scdn)
+add_subdirectory(live)
+add_subdirectory(rtc)
+add_subdirectory(chatbot)

VERSION

@@ -1 +1 @@
-1.17.2
+1.19.3

chatbot/CMakeLists.txt

@@ -0,0 +1,86 @@
+#
+# 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.
+#
+
+set(public_header_dir ${CMAKE_CURRENT_SOURCE_DIR}/../include)
+
+set(chatbot_public_header 
+	include/alibabacloud/chatbot/ChatbotClient.h
+	include/alibabacloud/chatbot/ChatbotExport.h )
+
+set(chatbot_public_header_model 
+	include/alibabacloud/chatbot/model/ChatRequest.h
+	include/alibabacloud/chatbot/model/ChatResult.h )
+
+set(chatbot_src 
+	src/ChatbotClient.cc
+	src/model/ChatRequest.cc
+	src/model/ChatResult.cc )
+
+add_library(chatbot ${LIB_TYPE}
+	${chatbot_public_header}
+	${chatbot_public_header_model}
+	${chatbot_src})
+
+set_target_properties(chatbot
+	PROPERTIES
+	LINKER_LANGUAGE CXX
+	ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+	LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+	RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+	OUTPUT_NAME ${TARGET_OUTPUT_NAME_PREFIX}chatbot
+	)
+
+if(${LIB_TYPE} STREQUAL "SHARED")
+	set_target_properties(chatbot
+		PROPERTIES
+		DEFINE_SYMBOL ALIBABACLOUD_CHATBOT_LIBRARY)
+endif()
+
+target_include_directories(chatbot
+	PRIVATE include
+		${CMAKE_SOURCE_DIR}/core/include
+	)
+target_link_libraries(chatbot
+	core)
+
+if(CMAKE_HOST_WIN32)
+	ExternalProject_Get_Property(jsoncpp INSTALL_DIR)
+	set(jsoncpp_install_dir ${INSTALL_DIR})
+	add_dependencies(chatbot
+		jsoncpp)
+	target_include_directories(chatbot
+		PRIVATE	${jsoncpp_install_dir}/include)
+	target_link_libraries(chatbot
+		${jsoncpp_install_dir}/lib/jsoncpp.lib)
+	set_target_properties(chatbot
+    	PROPERTIES
+    		COMPILE_OPTIONS "/bigobj")
+else()
+	target_include_directories(chatbot
+		PRIVATE /usr/include/jsoncpp)
+	target_link_libraries(chatbot
+		jsoncpp)
+endif()
+
+install(FILES ${chatbot_public_header}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/alibabacloud/chatbot)
+install(FILES ${chatbot_public_header_model}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/alibabacloud/chatbot/model)
+install(TARGETS chatbot
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+	)

chatbot/include/alibabacloud/chatbot/ChatbotClient.h

@@ -0,0 +1,54 @@
+/*
+ * 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_CHATBOT_CHATBOTCLIENT_H_
+#define ALIBABACLOUD_CHATBOT_CHATBOTCLIENT_H_
+
+#include <future>
+#include <alibabacloud/core/AsyncCallerContext.h>
+#include <alibabacloud/core/EndpointProvider.h>
+#include <alibabacloud/core/RpcServiceClient.h>
+#include "ChatbotExport.h"
+#include "model/ChatRequest.h"
+#include "model/ChatResult.h"
+
+
+namespace AlibabaCloud
+{
+	namespace Chatbot
+	{
+		class ALIBABACLOUD_CHATBOT_EXPORT ChatbotClient : public RpcServiceClient
+		{
+		public:
+			typedef Outcome<Error, Model::ChatResult> ChatOutcome;
+			typedef std::future<ChatOutcome> ChatOutcomeCallable;
+			typedef std::function<void(const ChatbotClient*, const Model::ChatRequest&, const ChatOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ChatAsyncHandler;
+
+			ChatbotClient(const Credentials &credentials, const ClientConfiguration &configuration);
+			ChatbotClient(const std::shared_ptr<CredentialsProvider> &credentialsProvider, const ClientConfiguration &configuration);
+			ChatbotClient(const std::string &accessKeyId, const std::string &accessKeySecret, const ClientConfiguration &configuration);
+			~ChatbotClient();
+			ChatOutcome chat(const Model::ChatRequest &request)const;
+			void chatAsync(const Model::ChatRequest& request, const ChatAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ChatOutcomeCallable chatCallable(const Model::ChatRequest& request) const;
+	
+		private:
+			std::shared_ptr<EndpointProvider> endpointProvider_;
+		};
+	}
+}
+
+#endif // !ALIBABACLOUD_CHATBOT_CHATBOTCLIENT_H_

chatbot/include/alibabacloud/chatbot/ChatbotExport.h

@@ -0,0 +1,32 @@
+/*
+ * 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_CHATBOT_CHATBOTEXPORT_H_
+#define ALIBABACLOUD_CHATBOT_CHATBOTEXPORT_H_
+
+#include <alibabacloud/core/Global.h>
+
+#if defined(ALIBABACLOUD_SHARED)
+#	if defined(ALIBABACLOUD_CHATBOT_LIBRARY)
+#		define ALIBABACLOUD_CHATBOT_EXPORT ALIBABACLOUD_DECL_EXPORT
+#	else
+#		define ALIBABACLOUD_CHATBOT_EXPORT ALIBABACLOUD_DECL_IMPORT
+#	endif
+#else
+#	define ALIBABACLOUD_CHATBOT_EXPORT
+#endif
+
+#endif // !ALIBABACLOUD_CHATBOT_CHATBOTEXPORT_H_

chatbot/include/alibabacloud/chatbot/model/ChatRequest.h

@@ -0,0 +1,72 @@
+/*
+ * 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_CHATBOT_MODEL_CHATREQUEST_H_
+#define ALIBABACLOUD_CHATBOT_MODEL_CHATREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/chatbot/ChatbotExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Chatbot
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CHATBOT_EXPORT ChatRequest : public RpcServiceRequest
+			{
+
+			public:
+				ChatRequest();
+				~ChatRequest();
+
+				std::string getKnowledgeId()const;
+				void setKnowledgeId(const std::string& knowledgeId);
+				std::string getSenderId()const;
+				void setSenderId(const std::string& senderId);
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
+				std::string getSenderNick()const;
+				void setSenderNick(const std::string& senderNick);
+				std::vector<std::string> getPerspective()const;
+				void setPerspective(const std::vector<std::string>& perspective);
+				std::string getSessionId()const;
+				void setSessionId(const std::string& sessionId);
+				std::string getTag()const;
+				void setTag(const std::string& tag);
+				std::string getUtterance()const;
+				void setUtterance(const std::string& utterance);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+
+            private:
+				std::string knowledgeId_;
+				std::string senderId_;
+				std::string instanceId_;
+				std::string senderNick_;
+				std::vector<std::string> perspective_;
+				std::string sessionId_;
+				std::string tag_;
+				std::string utterance_;
+				std::string accessKeyId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CHATBOT_MODEL_CHATREQUEST_H_

chatbot/include/alibabacloud/chatbot/model/ChatResult.h

@@ -0,0 +1,85 @@
+/*
+ * 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_CHATBOT_MODEL_CHATRESULT_H_
+#define ALIBABACLOUD_CHATBOT_MODEL_CHATRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/chatbot/ChatbotExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Chatbot
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CHATBOT_EXPORT ChatResult : public ServiceResult
+			{
+			public:
+				struct Message
+				{
+					struct Text
+					{
+						std::string content;
+						std::string answerSource;
+					};
+					struct Knowledge
+					{
+						std::string content;
+						std::string answerSource;
+						std::string title;
+						std::string summary;
+						std::string id;
+					};
+					struct Recommend
+					{
+						std::string answerSource;
+						std::string content;
+						std::string title;
+						std::string summary;
+						std::string knowledgeId;
+					};
+					std::string type;
+					Text text;
+					std::vector<Message::Recommend> recommends;
+					Knowledge knowledge;
+				};
+
+
+				ChatResult();
+				explicit ChatResult(const std::string &payload);
+				~ChatResult();
+				std::vector<Message> getMessages()const;
+				std::string getTag()const;
+				std::string getSessionId()const;
+				std::string getMessageId()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<Message> messages_;
+				std::string tag_;
+				std::string sessionId_;
+				std::string messageId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CHATBOT_MODEL_CHATRESULT_H_

chatbot/src/ChatbotClient.cc

@@ -0,0 +1,89 @@
+/*
+ * 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/chatbot/ChatbotClient.h>
+#include <alibabacloud/core/SimpleCredentialsProvider.h>
+
+using namespace AlibabaCloud;
+using namespace AlibabaCloud::Location;
+using namespace AlibabaCloud::Chatbot;
+using namespace AlibabaCloud::Chatbot::Model;
+
+namespace
+{
+	const std::string SERVICE_NAME = "Chatbot";
+}
+
+ChatbotClient::ChatbotClient(const Credentials &credentials, const ClientConfiguration &configuration) :
+	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
+{
+	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "beebot");
+}
+
+ChatbotClient::ChatbotClient(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
+	RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration)
+{
+	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "beebot");
+}
+
+ChatbotClient::ChatbotClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
+	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
+{
+	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "beebot");
+}
+
+ChatbotClient::~ChatbotClient()
+{}
+
+ChatbotClient::ChatOutcome ChatbotClient::chat(const ChatRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ChatOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ChatOutcome(ChatResult(outcome.result()));
+	else
+		return ChatOutcome(outcome.error());
+}
+
+void ChatbotClient::chatAsync(const ChatRequest& request, const ChatAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, chat(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ChatbotClient::ChatOutcomeCallable ChatbotClient::chatCallable(const ChatRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ChatOutcome()>>(
+			[this, request]()
+			{
+			return this->chat(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+

chatbot/src/model/ChatRequest.cc

@@ -0,0 +1,127 @@
+/*
+ * 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/chatbot/model/ChatRequest.h>
+
+using AlibabaCloud::Chatbot::Model::ChatRequest;
+
+ChatRequest::ChatRequest() :
+	RpcServiceRequest("chatbot", "2017-10-11", "Chat")
+{}
+
+ChatRequest::~ChatRequest()
+{}
+
+std::string ChatRequest::getKnowledgeId()const
+{
+	return knowledgeId_;
+}
+
+void ChatRequest::setKnowledgeId(const std::string& knowledgeId)
+{
+	knowledgeId_ = knowledgeId;
+	setParameter("KnowledgeId", knowledgeId);
+}
+
+std::string ChatRequest::getSenderId()const
+{
+	return senderId_;
+}
+
+void ChatRequest::setSenderId(const std::string& senderId)
+{
+	senderId_ = senderId;
+	setParameter("SenderId", senderId);
+}
+
+std::string ChatRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void ChatRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setParameter("InstanceId", instanceId);
+}
+
+std::string ChatRequest::getSenderNick()const
+{
+	return senderNick_;
+}
+
+void ChatRequest::setSenderNick(const std::string& senderNick)
+{
+	senderNick_ = senderNick;
+	setParameter("SenderNick", senderNick);
+}
+
+std::vector<std::string> ChatRequest::getPerspective()const
+{
+	return perspective_;
+}
+
+void ChatRequest::setPerspective(const std::vector<std::string>& perspective)
+{
+	perspective_ = perspective;
+	for(int i = 0; i!= perspective.size(); i++)
+		setParameter("Perspective."+ std::to_string(i), perspective.at(i));
+}
+
+std::string ChatRequest::getSessionId()const
+{
+	return sessionId_;
+}
+
+void ChatRequest::setSessionId(const std::string& sessionId)
+{
+	sessionId_ = sessionId;
+	setParameter("SessionId", sessionId);
+}
+
+std::string ChatRequest::getTag()const
+{
+	return tag_;
+}
+
+void ChatRequest::setTag(const std::string& tag)
+{
+	tag_ = tag;
+	setParameter("Tag", tag);
+}
+
+std::string ChatRequest::getUtterance()const
+{
+	return utterance_;
+}
+
+void ChatRequest::setUtterance(const std::string& utterance)
+{
+	utterance_ = utterance;
+	setParameter("Utterance", utterance);
+}
+
+std::string ChatRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void ChatRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+

chatbot/src/model/ChatResult.cc

@@ -0,0 +1,111 @@
+/*
+ * 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/chatbot/model/ChatResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Chatbot;
+using namespace AlibabaCloud::Chatbot::Model;
+
+ChatResult::ChatResult() :
+	ServiceResult()
+{}
+
+ChatResult::ChatResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+ChatResult::~ChatResult()
+{}
+
+void ChatResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+
+	setRequestId(value["RequestId"].asString());
+	auto allMessages = value["Messages"]["Message"];
+	for (auto value : allMessages)
+	{
+		Message messagesObject;
+		if(!value["Type"].isNull())
+			messagesObject.type = value["Type"].asString();
+		auto allRecommends = value["Recommends"]["Recommend"];
+		for (auto value : allRecommends)
+		{
+			Message::Recommend recommendsObject;
+			if(!value["KnowledgeId"].isNull())
+				recommendsObject.knowledgeId = value["KnowledgeId"].asString();
+			if(!value["Title"].isNull())
+				recommendsObject.title = value["Title"].asString();
+			if(!value["AnswerSource"].isNull())
+				recommendsObject.answerSource = value["AnswerSource"].asString();
+			if(!value["Summary"].isNull())
+				recommendsObject.summary = value["Summary"].asString();
+			if(!value["Content"].isNull())
+				recommendsObject.content = value["Content"].asString();
+			messagesObject.recommends.push_back(recommendsObject);
+		}
+		auto textNode = value["Text"];
+		if(!textNode["Content"].isNull())
+			messagesObject.text.content = textNode["Content"].asString();
+		if(!textNode["AnswerSource"].isNull())
+			messagesObject.text.answerSource = textNode["AnswerSource"].asString();
+		auto knowledgeNode = value["Knowledge"];
+		if(!knowledgeNode["Id"].isNull())
+			messagesObject.knowledge.id = knowledgeNode["Id"].asString();
+		if(!knowledgeNode["Title"].isNull())
+			messagesObject.knowledge.title = knowledgeNode["Title"].asString();
+		if(!knowledgeNode["Summary"].isNull())
+			messagesObject.knowledge.summary = knowledgeNode["Summary"].asString();
+		if(!knowledgeNode["Content"].isNull())
+			messagesObject.knowledge.content = knowledgeNode["Content"].asString();
+		if(!knowledgeNode["AnswerSource"].isNull())
+			messagesObject.knowledge.answerSource = knowledgeNode["AnswerSource"].asString();
+		messages_.push_back(messagesObject);
+	}
+	if(!value["SessionId"].isNull())
+		sessionId_ = value["SessionId"].asString();
+	if(!value["MessageId"].isNull())
+		messageId_ = value["MessageId"].asString();
+	if(!value["Tag"].isNull())
+		tag_ = value["Tag"].asString();
+
+}
+
+std::vector<ChatResult::Message> ChatResult::getMessages()const
+{
+	return messages_;
+}
+
+std::string ChatResult::getTag()const
+{
+	return tag_;
+}
+
+std::string ChatResult::getSessionId()const
+{
+	return sessionId_;
+}
+
+std::string ChatResult::getMessageId()const
+{
+	return messageId_;
+}
+

cloudauth/CMakeLists.txt

@@ -25,6 +25,8 @@ set(cloudauth_public_header_model
 	include/alibabacloud/cloudauth/model/GetMaterialsResult.h
 	include/alibabacloud/cloudauth/model/GetVerifyTokenRequest.h
 	include/alibabacloud/cloudauth/model/GetVerifyTokenResult.h
+	include/alibabacloud/cloudauth/model/DetectFaceAttributesRequest.h
+	include/alibabacloud/cloudauth/model/DetectFaceAttributesResult.h
 	include/alibabacloud/cloudauth/model/CompareFacesRequest.h
 	include/alibabacloud/cloudauth/model/CompareFacesResult.h
 	include/alibabacloud/cloudauth/model/SubmitMaterialsRequest.h
@@ -38,6 +40,8 @@ set(cloudauth_src
 	src/model/GetMaterialsResult.cc
 	src/model/GetVerifyTokenRequest.cc
 	src/model/GetVerifyTokenResult.cc
+	src/model/DetectFaceAttributesRequest.cc
+	src/model/DetectFaceAttributesResult.cc
 	src/model/CompareFacesRequest.cc
 	src/model/CompareFacesResult.cc
 	src/model/SubmitMaterialsRequest.cc

cloudauth/include/alibabacloud/cloudauth/CloudauthClient.h

@@ -26,6 +26,8 @@
 #include "model/GetMaterialsResult.h"
 #include "model/GetVerifyTokenRequest.h"
 #include "model/GetVerifyTokenResult.h"
+#include "model/DetectFaceAttributesRequest.h"
+#include "model/DetectFaceAttributesResult.h"
 #include "model/CompareFacesRequest.h"
 #include "model/CompareFacesResult.h"
 #include "model/SubmitMaterialsRequest.h"
@@ -47,6 +49,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::GetVerifyTokenResult> GetVerifyTokenOutcome;
 			typedef std::future<GetVerifyTokenOutcome> GetVerifyTokenOutcomeCallable;
 			typedef std::function<void(const CloudauthClient*, const Model::GetVerifyTokenRequest&, const GetVerifyTokenOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetVerifyTokenAsyncHandler;
+			typedef Outcome<Error, Model::DetectFaceAttributesResult> DetectFaceAttributesOutcome;
+			typedef std::future<DetectFaceAttributesOutcome> DetectFaceAttributesOutcomeCallable;
+			typedef std::function<void(const CloudauthClient*, const Model::DetectFaceAttributesRequest&, const DetectFaceAttributesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DetectFaceAttributesAsyncHandler;
 			typedef Outcome<Error, Model::CompareFacesResult> CompareFacesOutcome;
 			typedef std::future<CompareFacesOutcome> CompareFacesOutcomeCallable;
 			typedef std::function<void(const CloudauthClient*, const Model::CompareFacesRequest&, const CompareFacesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CompareFacesAsyncHandler;
@@ -67,6 +72,9 @@ namespace AlibabaCloud
 			GetVerifyTokenOutcome getVerifyToken(const Model::GetVerifyTokenRequest &request)const;
 			void getVerifyTokenAsync(const Model::GetVerifyTokenRequest& request, const GetVerifyTokenAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			GetVerifyTokenOutcomeCallable getVerifyTokenCallable(const Model::GetVerifyTokenRequest& request) const;
+			DetectFaceAttributesOutcome detectFaceAttributes(const Model::DetectFaceAttributesRequest &request)const;
+			void detectFaceAttributesAsync(const Model::DetectFaceAttributesRequest& request, const DetectFaceAttributesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DetectFaceAttributesOutcomeCallable detectFaceAttributesCallable(const Model::DetectFaceAttributesRequest& request) const;
 			CompareFacesOutcome compareFaces(const Model::CompareFacesRequest &request)const;
 			void compareFacesAsync(const Model::CompareFacesRequest& request, const CompareFacesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CompareFacesOutcomeCallable compareFacesCallable(const Model::CompareFacesRequest& request) const;

cloudauth/include/alibabacloud/cloudauth/model/DetectFaceAttributesRequest.h

@@ -0,0 +1,69 @@
+/*
+ * 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_CLOUDAUTH_MODEL_DETECTFACEATTRIBUTESREQUEST_H_
+#define ALIBABACLOUD_CLOUDAUTH_MODEL_DETECTFACEATTRIBUTESREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/cloudauth/CloudauthExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cloudauth
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CLOUDAUTH_EXPORT DetectFaceAttributesRequest : public RpcServiceRequest
+			{
+
+			public:
+				DetectFaceAttributesRequest();
+				~DetectFaceAttributesRequest();
+
+				int getMaxNumPhotosPerCategory()const;
+				void setMaxNumPhotosPerCategory(int maxNumPhotosPerCategory);
+				int getMaxFaceNum()const;
+				void setMaxFaceNum(int maxFaceNum);
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getSourceIp()const;
+				void setSourceIp(const std::string& sourceIp);
+				std::string getRetAttributes()const;
+				void setRetAttributes(const std::string& retAttributes);
+				std::string getMaterialValue()const;
+				void setMaterialValue(const std::string& materialValue);
+				bool getDontSaveDB()const;
+				void setDontSaveDB(bool dontSaveDB);
+				std::string getClientTag()const;
+				void setClientTag(const std::string& clientTag);
+
+            private:
+				int maxNumPhotosPerCategory_;
+				int maxFaceNum_;
+				long resourceOwnerId_;
+				std::string sourceIp_;
+				std::string retAttributes_;
+				std::string materialValue_;
+				bool dontSaveDB_;
+				std::string clientTag_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CLOUDAUTH_MODEL_DETECTFACEATTRIBUTESREQUEST_H_

cloudauth/include/alibabacloud/cloudauth/model/DetectFaceAttributesResult.h

@@ -0,0 +1,102 @@
+/*
+ * 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_CLOUDAUTH_MODEL_DETECTFACEATTRIBUTESRESULT_H_
+#define ALIBABACLOUD_CLOUDAUTH_MODEL_DETECTFACEATTRIBUTESRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/cloudauth/CloudauthExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cloudauth
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CLOUDAUTH_EXPORT DetectFaceAttributesResult : public ServiceResult
+			{
+			public:
+				struct Data
+				{
+					struct FaceAttributesDetectInfo
+					{
+						struct FaceRect
+						{
+							int left;
+							int top;
+							int height;
+							int width;
+						};
+						struct FaceAttributes
+						{
+							struct Gender
+							{
+								float score;
+								std::string value;
+							};
+							struct Smiling
+							{
+								float value;
+								float threshold;
+							};
+							struct Headpose
+							{
+								float pitchAngle;
+								float rollAngle;
+								float yawAngle;
+							};
+							std::string ethnicity;
+							std::string facetype;
+							Headpose headpose;
+							std::string glasses;
+							float blur;
+							Smiling smiling;
+							Gender gender;
+							int age;
+						};
+						FaceAttributes faceAttributes;
+						FaceRect faceRect;
+					};
+					int imgWidth;
+					int imgHeight;
+					std::vector<FaceAttributesDetectInfo> faceInfos;
+				};
+
+
+				DetectFaceAttributesResult();
+				explicit DetectFaceAttributesResult(const std::string &payload);
+				~DetectFaceAttributesResult();
+				std::string getMessage()const;
+				Data getData()const;
+				std::string getCode()const;
+				bool getSuccess()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				Data data_;
+				std::string code_;
+				bool success_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CLOUDAUTH_MODEL_DETECTFACEATTRIBUTESRESULT_H_

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

@@ -36,10 +36,8 @@ 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/GetVerifyTokenResult.h

@@ -50,6 +50,7 @@ namespace AlibabaCloud
 						std::string endPoint;
 					};
 					StsToken stsToken;
+					std::string cloudauthPageUrl;
 					VerifyToken verifyToken;
 				};
 

cloudauth/src/CloudauthClient.cc

@@ -123,6 +123,42 @@ CloudauthClient::GetVerifyTokenOutcomeCallable CloudauthClient::getVerifyTokenCa
 	return task->get_future();
 }
 
+CloudauthClient::DetectFaceAttributesOutcome CloudauthClient::detectFaceAttributes(const DetectFaceAttributesRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DetectFaceAttributesOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DetectFaceAttributesOutcome(DetectFaceAttributesResult(outcome.result()));
+	else
+		return DetectFaceAttributesOutcome(outcome.error());
+}
+
+void CloudauthClient::detectFaceAttributesAsync(const DetectFaceAttributesRequest& request, const DetectFaceAttributesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, detectFaceAttributes(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+CloudauthClient::DetectFaceAttributesOutcomeCallable CloudauthClient::detectFaceAttributesCallable(const DetectFaceAttributesRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DetectFaceAttributesOutcome()>>(
+			[this, request]()
+			{
+			return this->detectFaceAttributes(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 CloudauthClient::CompareFacesOutcome CloudauthClient::compareFaces(const CompareFacesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

cloudauth/src/model/CompareFacesRequest.cc

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

cloudauth/src/model/DetectFaceAttributesRequest.cc

@@ -0,0 +1,115 @@
+/*
+ * 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/cloudauth/model/DetectFaceAttributesRequest.h>
+
+using AlibabaCloud::Cloudauth::Model::DetectFaceAttributesRequest;
+
+DetectFaceAttributesRequest::DetectFaceAttributesRequest() :
+	RpcServiceRequest("cloudauth", "2018-07-03", "DetectFaceAttributes")
+{}
+
+DetectFaceAttributesRequest::~DetectFaceAttributesRequest()
+{}
+
+int DetectFaceAttributesRequest::getMaxNumPhotosPerCategory()const
+{
+	return maxNumPhotosPerCategory_;
+}
+
+void DetectFaceAttributesRequest::setMaxNumPhotosPerCategory(int maxNumPhotosPerCategory)
+{
+	maxNumPhotosPerCategory_ = maxNumPhotosPerCategory;
+	setParameter("MaxNumPhotosPerCategory", std::to_string(maxNumPhotosPerCategory));
+}
+
+int DetectFaceAttributesRequest::getMaxFaceNum()const
+{
+	return maxFaceNum_;
+}
+
+void DetectFaceAttributesRequest::setMaxFaceNum(int maxFaceNum)
+{
+	maxFaceNum_ = maxFaceNum;
+	setParameter("MaxFaceNum", std::to_string(maxFaceNum));
+}
+
+long DetectFaceAttributesRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void DetectFaceAttributesRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string DetectFaceAttributesRequest::getSourceIp()const
+{
+	return sourceIp_;
+}
+
+void DetectFaceAttributesRequest::setSourceIp(const std::string& sourceIp)
+{
+	sourceIp_ = sourceIp;
+	setParameter("SourceIp", sourceIp);
+}
+
+std::string DetectFaceAttributesRequest::getRetAttributes()const
+{
+	return retAttributes_;
+}
+
+void DetectFaceAttributesRequest::setRetAttributes(const std::string& retAttributes)
+{
+	retAttributes_ = retAttributes;
+	setParameter("RetAttributes", retAttributes);
+}
+
+std::string DetectFaceAttributesRequest::getMaterialValue()const
+{
+	return materialValue_;
+}
+
+void DetectFaceAttributesRequest::setMaterialValue(const std::string& materialValue)
+{
+	materialValue_ = materialValue;
+	setParameter("MaterialValue", materialValue);
+}
+
+bool DetectFaceAttributesRequest::getDontSaveDB()const
+{
+	return dontSaveDB_;
+}
+
+void DetectFaceAttributesRequest::setDontSaveDB(bool dontSaveDB)
+{
+	dontSaveDB_ = dontSaveDB;
+	setParameter("DontSaveDB", std::to_string(dontSaveDB));
+}
+
+std::string DetectFaceAttributesRequest::getClientTag()const
+{
+	return clientTag_;
+}
+
+void DetectFaceAttributesRequest::setClientTag(const std::string& clientTag)
+{
+	clientTag_ = clientTag;
+	setParameter("ClientTag", clientTag);
+}
+

cloudauth/src/model/DetectFaceAttributesResult.cc

@@ -0,0 +1,119 @@
+/*
+ * 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/cloudauth/model/DetectFaceAttributesResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Cloudauth;
+using namespace AlibabaCloud::Cloudauth::Model;
+
+DetectFaceAttributesResult::DetectFaceAttributesResult() :
+	ServiceResult()
+{}
+
+DetectFaceAttributesResult::DetectFaceAttributesResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DetectFaceAttributesResult::~DetectFaceAttributesResult()
+{}
+
+void DetectFaceAttributesResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+
+	setRequestId(value["RequestId"].asString());
+	auto dataNode = value["Data"];
+	if(!dataNode["ImgWidth"].isNull())
+		data_.imgWidth = std::stoi(dataNode["ImgWidth"].asString());
+	if(!dataNode["ImgHeight"].isNull())
+		data_.imgHeight = std::stoi(dataNode["ImgHeight"].asString());
+	auto allFaceInfos = value["FaceInfos"]["FaceAttributesDetectInfo"];
+	for (auto value : allFaceInfos)
+	{
+		Data::FaceAttributesDetectInfo faceAttributesDetectInfoObject;
+		auto faceRectNode = value["FaceRect"];
+		if(!faceRectNode["Top"].isNull())
+			faceAttributesDetectInfoObject.faceRect.top = std::stoi(faceRectNode["Top"].asString());
+		if(!faceRectNode["Left"].isNull())
+			faceAttributesDetectInfoObject.faceRect.left = std::stoi(faceRectNode["Left"].asString());
+		if(!faceRectNode["Width"].isNull())
+			faceAttributesDetectInfoObject.faceRect.width = std::stoi(faceRectNode["Width"].asString());
+		if(!faceRectNode["Height"].isNull())
+			faceAttributesDetectInfoObject.faceRect.height = std::stoi(faceRectNode["Height"].asString());
+		auto faceAttributesNode = value["FaceAttributes"];
+		if(!faceAttributesNode["Age"].isNull())
+			faceAttributesDetectInfoObject.faceAttributes.age = std::stoi(faceAttributesNode["Age"].asString());
+		if(!faceAttributesNode["Glasses"].isNull())
+			faceAttributesDetectInfoObject.faceAttributes.glasses = faceAttributesNode["Glasses"].asString();
+		if(!faceAttributesNode["Facetype"].isNull())
+			faceAttributesDetectInfoObject.faceAttributes.facetype = faceAttributesNode["Facetype"].asString();
+		if(!faceAttributesNode["Blur"].isNull())
+			faceAttributesDetectInfoObject.faceAttributes.blur = std::stof(faceAttributesNode["Blur"].asString());
+		if(!faceAttributesNode["Ethnicity"].isNull())
+			faceAttributesDetectInfoObject.faceAttributes.ethnicity = faceAttributesNode["Ethnicity"].asString();
+		auto genderNode = faceAttributesNode["Gender"];
+		if(!genderNode["Score"].isNull())
+			faceAttributesDetectInfoObject.faceAttributes.gender.score = std::stof(genderNode["Score"].asString());
+		if(!genderNode["Value"].isNull())
+			faceAttributesDetectInfoObject.faceAttributes.gender.value = genderNode["Value"].asString();
+		auto smilingNode = faceAttributesNode["Smiling"];
+		if(!smilingNode["Value"].isNull())
+			faceAttributesDetectInfoObject.faceAttributes.smiling.value = std::stof(smilingNode["Value"].asString());
+		if(!smilingNode["Threshold"].isNull())
+			faceAttributesDetectInfoObject.faceAttributes.smiling.threshold = std::stof(smilingNode["Threshold"].asString());
+		auto headposeNode = faceAttributesNode["Headpose"];
+		if(!headposeNode["PitchAngle"].isNull())
+			faceAttributesDetectInfoObject.faceAttributes.headpose.pitchAngle = std::stof(headposeNode["PitchAngle"].asString());
+		if(!headposeNode["RollAngle"].isNull())
+			faceAttributesDetectInfoObject.faceAttributes.headpose.rollAngle = std::stof(headposeNode["RollAngle"].asString());
+		if(!headposeNode["YawAngle"].isNull())
+			faceAttributesDetectInfoObject.faceAttributes.headpose.yawAngle = std::stof(headposeNode["YawAngle"].asString());
+		data_.faceInfos.push_back(faceAttributesDetectInfoObject);
+	}
+	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();
+
+}
+
+std::string DetectFaceAttributesResult::getMessage()const
+{
+	return message_;
+}
+
+DetectFaceAttributesResult::Data DetectFaceAttributesResult::getData()const
+{
+	return data_;
+}
+
+std::string DetectFaceAttributesResult::getCode()const
+{
+	return code_;
+}
+
+bool DetectFaceAttributesResult::getSuccess()const
+{
+	return success_;
+}
+

cloudauth/src/model/GetMaterialsRequest.cc

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

cloudauth/src/model/GetMaterialsResult.cc

@@ -47,8 +47,6 @@ 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())
@@ -61,8 +59,6 @@ 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-05-04", "GetStatus")
+	RpcServiceRequest("cloudauth", "2018-07-03", "GetStatus")
 {}
 
 GetStatusRequest::~GetStatusRequest()

cloudauth/src/model/GetVerifyTokenRequest.cc

@@ -19,7 +19,7 @@
 using AlibabaCloud::Cloudauth::Model::GetVerifyTokenRequest;
 
 GetVerifyTokenRequest::GetVerifyTokenRequest() :
-	RpcServiceRequest("cloudauth", "2018-05-04", "GetVerifyToken")
+	RpcServiceRequest("cloudauth", "2018-07-03", "GetVerifyToken")
 {}
 
 GetVerifyTokenRequest::~GetVerifyTokenRequest()

cloudauth/src/model/GetVerifyTokenResult.cc

@@ -41,6 +41,8 @@ void GetVerifyTokenResult::parse(const std::string &payload)
 
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
+	if(!dataNode["CloudauthPageUrl"].isNull())
+		data_.cloudauthPageUrl = dataNode["CloudauthPageUrl"].asString();
 	auto verifyTokenNode = dataNode["VerifyToken"];
 	if(!verifyTokenNode["Token"].isNull())
 		data_.verifyToken.token = verifyTokenNode["Token"].asString();

cloudauth/src/model/SubmitMaterialsRequest.cc

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

domain/CMakeLists.txt

@@ -139,8 +139,12 @@ set(domain_public_header_model
 	include/alibabacloud/domain/model/QueryAuctionDetailResult.h
 	include/alibabacloud/domain/model/QueryDomainByInstanceIdRequest.h
 	include/alibabacloud/domain/model/QueryDomainByInstanceIdResult.h
+	include/alibabacloud/domain/model/QueryDomainRealNameVerificationInfoRequest.h
+	include/alibabacloud/domain/model/QueryDomainRealNameVerificationInfoResult.h
 	include/alibabacloud/domain/model/VerifyEmailRequest.h
 	include/alibabacloud/domain/model/VerifyEmailResult.h
+	include/alibabacloud/domain/model/SaveSingleTaskForDeletingDnsHostRequest.h
+	include/alibabacloud/domain/model/SaveSingleTaskForDeletingDnsHostResult.h
 	include/alibabacloud/domain/model/SaveBatchTaskForCreatingOrderRedeemRequest.h
 	include/alibabacloud/domain/model/SaveBatchTaskForCreatingOrderRedeemResult.h
 	include/alibabacloud/domain/model/SaveBatchTaskForDomainNameProxyServiceRequest.h
@@ -179,6 +183,8 @@ set(domain_public_header_model
 	include/alibabacloud/domain/model/SaveBatchTaskForUpdateProhibitionLockResult.h
 	include/alibabacloud/domain/model/SaveSingleTaskForCreatingDnsHostRequest.h
 	include/alibabacloud/domain/model/SaveSingleTaskForCreatingDnsHostResult.h
+	include/alibabacloud/domain/model/QueryEmailVerificationRequest.h
+	include/alibabacloud/domain/model/QueryEmailVerificationResult.h
 	include/alibabacloud/domain/model/DeleteRegistrantProfileRequest.h
 	include/alibabacloud/domain/model/DeleteRegistrantProfileResult.h
 	include/alibabacloud/domain/model/QueryBrokerDemandRecordRequest.h
@@ -193,6 +199,8 @@ set(domain_public_header_model
 	include/alibabacloud/domain/model/QueryFailReasonForRegistrantProfileRealNameVerificationResult.h
 	include/alibabacloud/domain/model/SaveBatchTaskForCreatingOrderRenewRequest.h
 	include/alibabacloud/domain/model/SaveBatchTaskForCreatingOrderRenewResult.h
+	include/alibabacloud/domain/model/CancelDomainVerificationRequest.h
+	include/alibabacloud/domain/model/CancelDomainVerificationResult.h
 	include/alibabacloud/domain/model/ConfirmTransferInEmailRequest.h
 	include/alibabacloud/domain/model/ConfirmTransferInEmailResult.h )
 
@@ -316,8 +324,12 @@ set(domain_src
 	src/model/QueryAuctionDetailResult.cc
 	src/model/QueryDomainByInstanceIdRequest.cc
 	src/model/QueryDomainByInstanceIdResult.cc
+	src/model/QueryDomainRealNameVerificationInfoRequest.cc
+	src/model/QueryDomainRealNameVerificationInfoResult.cc
 	src/model/VerifyEmailRequest.cc
 	src/model/VerifyEmailResult.cc
+	src/model/SaveSingleTaskForDeletingDnsHostRequest.cc
+	src/model/SaveSingleTaskForDeletingDnsHostResult.cc
 	src/model/SaveBatchTaskForCreatingOrderRedeemRequest.cc
 	src/model/SaveBatchTaskForCreatingOrderRedeemResult.cc
 	src/model/SaveBatchTaskForDomainNameProxyServiceRequest.cc
@@ -356,6 +368,8 @@ set(domain_src
 	src/model/SaveBatchTaskForUpdateProhibitionLockResult.cc
 	src/model/SaveSingleTaskForCreatingDnsHostRequest.cc
 	src/model/SaveSingleTaskForCreatingDnsHostResult.cc
+	src/model/QueryEmailVerificationRequest.cc
+	src/model/QueryEmailVerificationResult.cc
 	src/model/DeleteRegistrantProfileRequest.cc
 	src/model/DeleteRegistrantProfileResult.cc
 	src/model/QueryBrokerDemandRecordRequest.cc
@@ -370,6 +384,8 @@ set(domain_src
 	src/model/QueryFailReasonForRegistrantProfileRealNameVerificationResult.cc
 	src/model/SaveBatchTaskForCreatingOrderRenewRequest.cc
 	src/model/SaveBatchTaskForCreatingOrderRenewResult.cc
+	src/model/CancelDomainVerificationRequest.cc
+	src/model/CancelDomainVerificationResult.cc
 	src/model/ConfirmTransferInEmailRequest.cc
 	src/model/ConfirmTransferInEmailResult.cc )
 

domain/include/alibabacloud/domain/DomainClient.h

@@ -140,8 +140,12 @@
 #include "model/QueryAuctionDetailResult.h"
 #include "model/QueryDomainByInstanceIdRequest.h"
 #include "model/QueryDomainByInstanceIdResult.h"
+#include "model/QueryDomainRealNameVerificationInfoRequest.h"
+#include "model/QueryDomainRealNameVerificationInfoResult.h"
 #include "model/VerifyEmailRequest.h"
 #include "model/VerifyEmailResult.h"
+#include "model/SaveSingleTaskForDeletingDnsHostRequest.h"
+#include "model/SaveSingleTaskForDeletingDnsHostResult.h"
 #include "model/SaveBatchTaskForCreatingOrderRedeemRequest.h"
 #include "model/SaveBatchTaskForCreatingOrderRedeemResult.h"
 #include "model/SaveBatchTaskForDomainNameProxyServiceRequest.h"
@@ -180,6 +184,8 @@
 #include "model/SaveBatchTaskForUpdateProhibitionLockResult.h"
 #include "model/SaveSingleTaskForCreatingDnsHostRequest.h"
 #include "model/SaveSingleTaskForCreatingDnsHostResult.h"
+#include "model/QueryEmailVerificationRequest.h"
+#include "model/QueryEmailVerificationResult.h"
 #include "model/DeleteRegistrantProfileRequest.h"
 #include "model/DeleteRegistrantProfileResult.h"
 #include "model/QueryBrokerDemandRecordRequest.h"
@@ -194,6 +200,8 @@
 #include "model/QueryFailReasonForRegistrantProfileRealNameVerificationResult.h"
 #include "model/SaveBatchTaskForCreatingOrderRenewRequest.h"
 #include "model/SaveBatchTaskForCreatingOrderRenewResult.h"
+#include "model/CancelDomainVerificationRequest.h"
+#include "model/CancelDomainVerificationResult.h"
 #include "model/ConfirmTransferInEmailRequest.h"
 #include "model/ConfirmTransferInEmailResult.h"
 
@@ -382,9 +390,15 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::QueryDomainByInstanceIdResult> QueryDomainByInstanceIdOutcome;
 			typedef std::future<QueryDomainByInstanceIdOutcome> QueryDomainByInstanceIdOutcomeCallable;
 			typedef std::function<void(const DomainClient*, const Model::QueryDomainByInstanceIdRequest&, const QueryDomainByInstanceIdOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> QueryDomainByInstanceIdAsyncHandler;
+			typedef Outcome<Error, Model::QueryDomainRealNameVerificationInfoResult> QueryDomainRealNameVerificationInfoOutcome;
+			typedef std::future<QueryDomainRealNameVerificationInfoOutcome> QueryDomainRealNameVerificationInfoOutcomeCallable;
+			typedef std::function<void(const DomainClient*, const Model::QueryDomainRealNameVerificationInfoRequest&, const QueryDomainRealNameVerificationInfoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> QueryDomainRealNameVerificationInfoAsyncHandler;
 			typedef Outcome<Error, Model::VerifyEmailResult> VerifyEmailOutcome;
 			typedef std::future<VerifyEmailOutcome> VerifyEmailOutcomeCallable;
 			typedef std::function<void(const DomainClient*, const Model::VerifyEmailRequest&, const VerifyEmailOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> VerifyEmailAsyncHandler;
+			typedef Outcome<Error, Model::SaveSingleTaskForDeletingDnsHostResult> SaveSingleTaskForDeletingDnsHostOutcome;
+			typedef std::future<SaveSingleTaskForDeletingDnsHostOutcome> SaveSingleTaskForDeletingDnsHostOutcomeCallable;
+			typedef std::function<void(const DomainClient*, const Model::SaveSingleTaskForDeletingDnsHostRequest&, const SaveSingleTaskForDeletingDnsHostOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SaveSingleTaskForDeletingDnsHostAsyncHandler;
 			typedef Outcome<Error, Model::SaveBatchTaskForCreatingOrderRedeemResult> SaveBatchTaskForCreatingOrderRedeemOutcome;
 			typedef std::future<SaveBatchTaskForCreatingOrderRedeemOutcome> SaveBatchTaskForCreatingOrderRedeemOutcomeCallable;
 			typedef std::function<void(const DomainClient*, const Model::SaveBatchTaskForCreatingOrderRedeemRequest&, const SaveBatchTaskForCreatingOrderRedeemOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SaveBatchTaskForCreatingOrderRedeemAsyncHandler;
@@ -442,6 +456,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::SaveSingleTaskForCreatingDnsHostResult> SaveSingleTaskForCreatingDnsHostOutcome;
 			typedef std::future<SaveSingleTaskForCreatingDnsHostOutcome> SaveSingleTaskForCreatingDnsHostOutcomeCallable;
 			typedef std::function<void(const DomainClient*, const Model::SaveSingleTaskForCreatingDnsHostRequest&, const SaveSingleTaskForCreatingDnsHostOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SaveSingleTaskForCreatingDnsHostAsyncHandler;
+			typedef Outcome<Error, Model::QueryEmailVerificationResult> QueryEmailVerificationOutcome;
+			typedef std::future<QueryEmailVerificationOutcome> QueryEmailVerificationOutcomeCallable;
+			typedef std::function<void(const DomainClient*, const Model::QueryEmailVerificationRequest&, const QueryEmailVerificationOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> QueryEmailVerificationAsyncHandler;
 			typedef Outcome<Error, Model::DeleteRegistrantProfileResult> DeleteRegistrantProfileOutcome;
 			typedef std::future<DeleteRegistrantProfileOutcome> DeleteRegistrantProfileOutcomeCallable;
 			typedef std::function<void(const DomainClient*, const Model::DeleteRegistrantProfileRequest&, const DeleteRegistrantProfileOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteRegistrantProfileAsyncHandler;
@@ -463,6 +480,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::SaveBatchTaskForCreatingOrderRenewResult> SaveBatchTaskForCreatingOrderRenewOutcome;
 			typedef std::future<SaveBatchTaskForCreatingOrderRenewOutcome> SaveBatchTaskForCreatingOrderRenewOutcomeCallable;
 			typedef std::function<void(const DomainClient*, const Model::SaveBatchTaskForCreatingOrderRenewRequest&, const SaveBatchTaskForCreatingOrderRenewOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SaveBatchTaskForCreatingOrderRenewAsyncHandler;
+			typedef Outcome<Error, Model::CancelDomainVerificationResult> CancelDomainVerificationOutcome;
+			typedef std::future<CancelDomainVerificationOutcome> CancelDomainVerificationOutcomeCallable;
+			typedef std::function<void(const DomainClient*, const Model::CancelDomainVerificationRequest&, const CancelDomainVerificationOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CancelDomainVerificationAsyncHandler;
 			typedef Outcome<Error, Model::ConfirmTransferInEmailResult> ConfirmTransferInEmailOutcome;
 			typedef std::future<ConfirmTransferInEmailOutcome> ConfirmTransferInEmailOutcomeCallable;
 			typedef std::function<void(const DomainClient*, const Model::ConfirmTransferInEmailRequest&, const ConfirmTransferInEmailOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ConfirmTransferInEmailAsyncHandler;
@@ -648,9 +668,15 @@ namespace AlibabaCloud
 			QueryDomainByInstanceIdOutcome queryDomainByInstanceId(const Model::QueryDomainByInstanceIdRequest &request)const;
 			void queryDomainByInstanceIdAsync(const Model::QueryDomainByInstanceIdRequest& request, const QueryDomainByInstanceIdAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			QueryDomainByInstanceIdOutcomeCallable queryDomainByInstanceIdCallable(const Model::QueryDomainByInstanceIdRequest& request) const;
+			QueryDomainRealNameVerificationInfoOutcome queryDomainRealNameVerificationInfo(const Model::QueryDomainRealNameVerificationInfoRequest &request)const;
+			void queryDomainRealNameVerificationInfoAsync(const Model::QueryDomainRealNameVerificationInfoRequest& request, const QueryDomainRealNameVerificationInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			QueryDomainRealNameVerificationInfoOutcomeCallable queryDomainRealNameVerificationInfoCallable(const Model::QueryDomainRealNameVerificationInfoRequest& request) const;
 			VerifyEmailOutcome verifyEmail(const Model::VerifyEmailRequest &request)const;
 			void verifyEmailAsync(const Model::VerifyEmailRequest& request, const VerifyEmailAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			VerifyEmailOutcomeCallable verifyEmailCallable(const Model::VerifyEmailRequest& request) const;
+			SaveSingleTaskForDeletingDnsHostOutcome saveSingleTaskForDeletingDnsHost(const Model::SaveSingleTaskForDeletingDnsHostRequest &request)const;
+			void saveSingleTaskForDeletingDnsHostAsync(const Model::SaveSingleTaskForDeletingDnsHostRequest& request, const SaveSingleTaskForDeletingDnsHostAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			SaveSingleTaskForDeletingDnsHostOutcomeCallable saveSingleTaskForDeletingDnsHostCallable(const Model::SaveSingleTaskForDeletingDnsHostRequest& request) const;
 			SaveBatchTaskForCreatingOrderRedeemOutcome saveBatchTaskForCreatingOrderRedeem(const Model::SaveBatchTaskForCreatingOrderRedeemRequest &request)const;
 			void saveBatchTaskForCreatingOrderRedeemAsync(const Model::SaveBatchTaskForCreatingOrderRedeemRequest& request, const SaveBatchTaskForCreatingOrderRedeemAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			SaveBatchTaskForCreatingOrderRedeemOutcomeCallable saveBatchTaskForCreatingOrderRedeemCallable(const Model::SaveBatchTaskForCreatingOrderRedeemRequest& request) const;
@@ -708,6 +734,9 @@ namespace AlibabaCloud
 			SaveSingleTaskForCreatingDnsHostOutcome saveSingleTaskForCreatingDnsHost(const Model::SaveSingleTaskForCreatingDnsHostRequest &request)const;
 			void saveSingleTaskForCreatingDnsHostAsync(const Model::SaveSingleTaskForCreatingDnsHostRequest& request, const SaveSingleTaskForCreatingDnsHostAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			SaveSingleTaskForCreatingDnsHostOutcomeCallable saveSingleTaskForCreatingDnsHostCallable(const Model::SaveSingleTaskForCreatingDnsHostRequest& request) const;
+			QueryEmailVerificationOutcome queryEmailVerification(const Model::QueryEmailVerificationRequest &request)const;
+			void queryEmailVerificationAsync(const Model::QueryEmailVerificationRequest& request, const QueryEmailVerificationAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			QueryEmailVerificationOutcomeCallable queryEmailVerificationCallable(const Model::QueryEmailVerificationRequest& request) const;
 			DeleteRegistrantProfileOutcome deleteRegistrantProfile(const Model::DeleteRegistrantProfileRequest &request)const;
 			void deleteRegistrantProfileAsync(const Model::DeleteRegistrantProfileRequest& request, const DeleteRegistrantProfileAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteRegistrantProfileOutcomeCallable deleteRegistrantProfileCallable(const Model::DeleteRegistrantProfileRequest& request) const;
@@ -729,6 +758,9 @@ namespace AlibabaCloud
 			SaveBatchTaskForCreatingOrderRenewOutcome saveBatchTaskForCreatingOrderRenew(const Model::SaveBatchTaskForCreatingOrderRenewRequest &request)const;
 			void saveBatchTaskForCreatingOrderRenewAsync(const Model::SaveBatchTaskForCreatingOrderRenewRequest& request, const SaveBatchTaskForCreatingOrderRenewAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			SaveBatchTaskForCreatingOrderRenewOutcomeCallable saveBatchTaskForCreatingOrderRenewCallable(const Model::SaveBatchTaskForCreatingOrderRenewRequest& request) const;
+			CancelDomainVerificationOutcome cancelDomainVerification(const Model::CancelDomainVerificationRequest &request)const;
+			void cancelDomainVerificationAsync(const Model::CancelDomainVerificationRequest& request, const CancelDomainVerificationAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CancelDomainVerificationOutcomeCallable cancelDomainVerificationCallable(const Model::CancelDomainVerificationRequest& request) const;
 			ConfirmTransferInEmailOutcome confirmTransferInEmail(const Model::ConfirmTransferInEmailRequest &request)const;
 			void confirmTransferInEmailAsync(const Model::ConfirmTransferInEmailRequest& request, const ConfirmTransferInEmailAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ConfirmTransferInEmailOutcomeCallable confirmTransferInEmailCallable(const Model::ConfirmTransferInEmailRequest& request) const;

domain/include/alibabacloud/domain/model/CancelDomainVerificationRequest.h

@@ -0,0 +1,60 @@
+/*
+ * 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_DOMAIN_MODEL_CANCELDOMAINVERIFICATIONREQUEST_H_
+#define ALIBABACLOUD_DOMAIN_MODEL_CANCELDOMAINVERIFICATIONREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/domain/DomainExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Domain
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DOMAIN_EXPORT CancelDomainVerificationRequest : public RpcServiceRequest
+			{
+
+			public:
+				CancelDomainVerificationRequest();
+				~CancelDomainVerificationRequest();
+
+				std::string getActionType()const;
+				void setActionType(const std::string& actionType);
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
+				std::string getUserClientIp()const;
+				void setUserClientIp(const std::string& userClientIp);
+				std::string getLang()const;
+				void setLang(const std::string& lang);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+
+            private:
+				std::string actionType_;
+				std::string instanceId_;
+				std::string userClientIp_;
+				std::string lang_;
+				std::string accessKeyId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DOMAIN_MODEL_CANCELDOMAINVERIFICATIONREQUEST_H_

domain/include/alibabacloud/domain/model/CancelDomainVerificationResult.h

@@ -0,0 +1,49 @@
+/*
+ * 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_DOMAIN_MODEL_CANCELDOMAINVERIFICATIONRESULT_H_
+#define ALIBABACLOUD_DOMAIN_MODEL_CANCELDOMAINVERIFICATIONRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/domain/DomainExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Domain
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DOMAIN_EXPORT CancelDomainVerificationResult : public ServiceResult
+			{
+			public:
+
+
+				CancelDomainVerificationResult();
+				explicit CancelDomainVerificationResult(const std::string &payload);
+				~CancelDomainVerificationResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DOMAIN_MODEL_CANCELDOMAINVERIFICATIONRESULT_H_

domain/include/alibabacloud/domain/model/QueryDomainByInstanceIdResult.h

@@ -41,16 +41,20 @@ namespace AlibabaCloud
 				std::string getRegistrantUpdatingStatus()const;
 				std::string getEmail()const;
 				std::string getRegistrationDate()const;
+				long getRegistrationDateLong()const;
 				std::string getDomainName()const;
 				std::string getInstanceId()const;
 				std::string getRealNameStatus()const;
+				std::string getZhRegistrantName()const;
 				bool getPremium()const;
 				std::string getDomainNameVerificationStatus()const;
+				long getExpirationDateLong()const;
 				std::vector<std::string> getDnsList()const;
 				std::string getExpirationDate()const;
 				std::string getRegistrantName()const;
 				std::string getTransferOutStatus()const;
 				std::string getUserId()const;
+				std::string getZhRegistrantOrganization()const;
 				bool getEmailVerificationClientHold()const;
 				std::string getUpdateProhibitionLock()const;
 				int getEmailVerificationStatus()const;
@@ -65,16 +69,20 @@ namespace AlibabaCloud
 				std::string registrantUpdatingStatus_;
 				std::string email_;
 				std::string registrationDate_;
+				long registrationDateLong_;
 				std::string domainName_;
 				std::string instanceId_;
 				std::string realNameStatus_;
+				std::string zhRegistrantName_;
 				bool premium_;
 				std::string domainNameVerificationStatus_;
+				long expirationDateLong_;
 				std::vector<std::string> dnsList_;
 				std::string expirationDate_;
 				std::string registrantName_;
 				std::string transferOutStatus_;
 				std::string userId_;
+				std::string zhRegistrantOrganization_;
 				bool emailVerificationClientHold_;
 				std::string updateProhibitionLock_;
 				int emailVerificationStatus_;

domain/include/alibabacloud/domain/model/QueryDomainRealNameVerificationInfoRequest.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_DOMAIN_MODEL_QUERYDOMAINREALNAMEVERIFICATIONINFOREQUEST_H_
+#define ALIBABACLOUD_DOMAIN_MODEL_QUERYDOMAINREALNAMEVERIFICATIONINFOREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/domain/DomainExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Domain
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DOMAIN_EXPORT QueryDomainRealNameVerificationInfoRequest : public RpcServiceRequest
+			{
+
+			public:
+				QueryDomainRealNameVerificationInfoRequest();
+				~QueryDomainRealNameVerificationInfoRequest();
+
+				bool getFetchImage()const;
+				void setFetchImage(bool fetchImage);
+				std::string getUserClientIp()const;
+				void setUserClientIp(const std::string& userClientIp);
+				std::string getDomainName()const;
+				void setDomainName(const std::string& domainName);
+				std::string getLang()const;
+				void setLang(const std::string& lang);
+
+            private:
+				bool fetchImage_;
+				std::string userClientIp_;
+				std::string domainName_;
+				std::string lang_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DOMAIN_MODEL_QUERYDOMAINREALNAMEVERIFICATIONINFOREQUEST_H_

domain/include/alibabacloud/domain/model/QueryDomainRealNameVerificationInfoResult.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_DOMAIN_MODEL_QUERYDOMAINREALNAMEVERIFICATIONINFORESULT_H_
+#define ALIBABACLOUD_DOMAIN_MODEL_QUERYDOMAINREALNAMEVERIFICATIONINFORESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/domain/DomainExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Domain
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DOMAIN_EXPORT QueryDomainRealNameVerificationInfoResult : public ServiceResult
+			{
+			public:
+
+
+				QueryDomainRealNameVerificationInfoResult();
+				explicit QueryDomainRealNameVerificationInfoResult(const std::string &payload);
+				~QueryDomainRealNameVerificationInfoResult();
+				std::string getIdentityCredentialType()const;
+				std::string getDomainName()const;
+				std::string getInstanceId()const;
+				std::string getIdentityCredential()const;
+				std::string getSubmissionDate()const;
+				std::string getIdentityCredentialNo()const;
+				std::string getIdentityCredentialUrl()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string identityCredentialType_;
+				std::string domainName_;
+				std::string instanceId_;
+				std::string identityCredential_;
+				std::string submissionDate_;
+				std::string identityCredentialNo_;
+				std::string identityCredentialUrl_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DOMAIN_MODEL_QUERYDOMAINREALNAMEVERIFICATIONINFORESULT_H_

domain/include/alibabacloud/domain/model/QueryEmailVerificationRequest.h

@@ -0,0 +1,51 @@
+/*
+ * 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_DOMAIN_MODEL_QUERYEMAILVERIFICATIONREQUEST_H_
+#define ALIBABACLOUD_DOMAIN_MODEL_QUERYEMAILVERIFICATIONREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/domain/DomainExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Domain
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DOMAIN_EXPORT QueryEmailVerificationRequest : public RpcServiceRequest
+			{
+
+			public:
+				QueryEmailVerificationRequest();
+				~QueryEmailVerificationRequest();
+
+				std::string getLang()const;
+				void setLang(const std::string& lang);
+				std::string getEmail()const;
+				void setEmail(const std::string& email);
+
+            private:
+				std::string lang_;
+				std::string email_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DOMAIN_MODEL_QUERYEMAILVERIFICATIONREQUEST_H_

domain/include/alibabacloud/domain/model/QueryEmailVerificationResult.h

@@ -0,0 +1,69 @@
+/*
+ * 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_DOMAIN_MODEL_QUERYEMAILVERIFICATIONRESULT_H_
+#define ALIBABACLOUD_DOMAIN_MODEL_QUERYEMAILVERIFICATIONRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/domain/DomainExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Domain
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DOMAIN_EXPORT QueryEmailVerificationResult : public ServiceResult
+			{
+			public:
+
+
+				QueryEmailVerificationResult();
+				explicit QueryEmailVerificationResult(const std::string &payload);
+				~QueryEmailVerificationResult();
+				int getVerificationStatus()const;
+				std::string getGmtCreate()const;
+				std::string getEmail()const;
+				std::string getEmailVerificationNo()const;
+				std::string getConfirmIp()const;
+				std::string getUserId()const;
+				std::string getGmtModified()const;
+				std::string getSendIp()const;
+				std::string getVerificationTime()const;
+				std::string getTokenSendTime()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				int verificationStatus_;
+				std::string gmtCreate_;
+				std::string email_;
+				std::string emailVerificationNo_;
+				std::string confirmIp_;
+				std::string userId_;
+				std::string gmtModified_;
+				std::string sendIp_;
+				std::string verificationTime_;
+				std::string tokenSendTime_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DOMAIN_MODEL_QUERYEMAILVERIFICATIONRESULT_H_

domain/include/alibabacloud/domain/model/QueryRegistrantProfileRealNameVerificationInfoResult.h

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 				std::string getSubmissionDate()const;
 				std::string getIdentityCredentialNo()const;
 				long getRegistrantProfileId()const;
+				std::string getIdentityCredentialUrl()const;
 
 			protected:
 				void parse(const std::string &payload);
@@ -53,6 +54,7 @@ namespace AlibabaCloud
 				std::string submissionDate_;
 				std::string identityCredentialNo_;
 				long registrantProfileId_;
+				std::string identityCredentialUrl_;
 
 			};
 		}

domain/include/alibabacloud/domain/model/SaveSingleTaskForDeletingDnsHostRequest.h

@@ -0,0 +1,54 @@
+/*
+ * 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_DOMAIN_MODEL_SAVESINGLETASKFORDELETINGDNSHOSTREQUEST_H_
+#define ALIBABACLOUD_DOMAIN_MODEL_SAVESINGLETASKFORDELETINGDNSHOSTREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/domain/DomainExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Domain
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DOMAIN_EXPORT SaveSingleTaskForDeletingDnsHostRequest : public RpcServiceRequest
+			{
+
+			public:
+				SaveSingleTaskForDeletingDnsHostRequest();
+				~SaveSingleTaskForDeletingDnsHostRequest();
+
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
+				std::string getDnsName()const;
+				void setDnsName(const std::string& dnsName);
+				std::string getLang()const;
+				void setLang(const std::string& lang);
+
+            private:
+				std::string instanceId_;
+				std::string dnsName_;
+				std::string lang_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DOMAIN_MODEL_SAVESINGLETASKFORDELETINGDNSHOSTREQUEST_H_

domain/include/alibabacloud/domain/model/SaveSingleTaskForDeletingDnsHostResult.h

@@ -0,0 +1,51 @@
+/*
+ * 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_DOMAIN_MODEL_SAVESINGLETASKFORDELETINGDNSHOSTRESULT_H_
+#define ALIBABACLOUD_DOMAIN_MODEL_SAVESINGLETASKFORDELETINGDNSHOSTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/domain/DomainExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Domain
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DOMAIN_EXPORT SaveSingleTaskForDeletingDnsHostResult : public ServiceResult
+			{
+			public:
+
+
+				SaveSingleTaskForDeletingDnsHostResult();
+				explicit SaveSingleTaskForDeletingDnsHostResult(const std::string &payload);
+				~SaveSingleTaskForDeletingDnsHostResult();
+				std::string getTaskNo()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string taskNo_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DOMAIN_MODEL_SAVESINGLETASKFORDELETINGDNSHOSTRESULT_H_

domain/src/DomainClient.cc

@@ -2175,6 +2175,42 @@ DomainClient::QueryDomainByInstanceIdOutcomeCallable DomainClient::queryDomainBy
 	return task->get_future();
 }
 
+DomainClient::QueryDomainRealNameVerificationInfoOutcome DomainClient::queryDomainRealNameVerificationInfo(const QueryDomainRealNameVerificationInfoRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return QueryDomainRealNameVerificationInfoOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return QueryDomainRealNameVerificationInfoOutcome(QueryDomainRealNameVerificationInfoResult(outcome.result()));
+	else
+		return QueryDomainRealNameVerificationInfoOutcome(outcome.error());
+}
+
+void DomainClient::queryDomainRealNameVerificationInfoAsync(const QueryDomainRealNameVerificationInfoRequest& request, const QueryDomainRealNameVerificationInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, queryDomainRealNameVerificationInfo(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DomainClient::QueryDomainRealNameVerificationInfoOutcomeCallable DomainClient::queryDomainRealNameVerificationInfoCallable(const QueryDomainRealNameVerificationInfoRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<QueryDomainRealNameVerificationInfoOutcome()>>(
+			[this, request]()
+			{
+			return this->queryDomainRealNameVerificationInfo(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 DomainClient::VerifyEmailOutcome DomainClient::verifyEmail(const VerifyEmailRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -2211,6 +2247,42 @@ DomainClient::VerifyEmailOutcomeCallable DomainClient::verifyEmailCallable(const
 	return task->get_future();
 }
 
+DomainClient::SaveSingleTaskForDeletingDnsHostOutcome DomainClient::saveSingleTaskForDeletingDnsHost(const SaveSingleTaskForDeletingDnsHostRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return SaveSingleTaskForDeletingDnsHostOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return SaveSingleTaskForDeletingDnsHostOutcome(SaveSingleTaskForDeletingDnsHostResult(outcome.result()));
+	else
+		return SaveSingleTaskForDeletingDnsHostOutcome(outcome.error());
+}
+
+void DomainClient::saveSingleTaskForDeletingDnsHostAsync(const SaveSingleTaskForDeletingDnsHostRequest& request, const SaveSingleTaskForDeletingDnsHostAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, saveSingleTaskForDeletingDnsHost(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DomainClient::SaveSingleTaskForDeletingDnsHostOutcomeCallable DomainClient::saveSingleTaskForDeletingDnsHostCallable(const SaveSingleTaskForDeletingDnsHostRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<SaveSingleTaskForDeletingDnsHostOutcome()>>(
+			[this, request]()
+			{
+			return this->saveSingleTaskForDeletingDnsHost(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 DomainClient::SaveBatchTaskForCreatingOrderRedeemOutcome DomainClient::saveBatchTaskForCreatingOrderRedeem(const SaveBatchTaskForCreatingOrderRedeemRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -2895,6 +2967,42 @@ DomainClient::SaveSingleTaskForCreatingDnsHostOutcomeCallable DomainClient::save
 	return task->get_future();
 }
 
+DomainClient::QueryEmailVerificationOutcome DomainClient::queryEmailVerification(const QueryEmailVerificationRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return QueryEmailVerificationOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return QueryEmailVerificationOutcome(QueryEmailVerificationResult(outcome.result()));
+	else
+		return QueryEmailVerificationOutcome(outcome.error());
+}
+
+void DomainClient::queryEmailVerificationAsync(const QueryEmailVerificationRequest& request, const QueryEmailVerificationAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, queryEmailVerification(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DomainClient::QueryEmailVerificationOutcomeCallable DomainClient::queryEmailVerificationCallable(const QueryEmailVerificationRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<QueryEmailVerificationOutcome()>>(
+			[this, request]()
+			{
+			return this->queryEmailVerification(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 DomainClient::DeleteRegistrantProfileOutcome DomainClient::deleteRegistrantProfile(const DeleteRegistrantProfileRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -3147,6 +3255,42 @@ DomainClient::SaveBatchTaskForCreatingOrderRenewOutcomeCallable DomainClient::sa
 	return task->get_future();
 }
 
+DomainClient::CancelDomainVerificationOutcome DomainClient::cancelDomainVerification(const CancelDomainVerificationRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return CancelDomainVerificationOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return CancelDomainVerificationOutcome(CancelDomainVerificationResult(outcome.result()));
+	else
+		return CancelDomainVerificationOutcome(outcome.error());
+}
+
+void DomainClient::cancelDomainVerificationAsync(const CancelDomainVerificationRequest& request, const CancelDomainVerificationAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, cancelDomainVerification(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DomainClient::CancelDomainVerificationOutcomeCallable DomainClient::cancelDomainVerificationCallable(const CancelDomainVerificationRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<CancelDomainVerificationOutcome()>>(
+			[this, request]()
+			{
+			return this->cancelDomainVerification(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 DomainClient::ConfirmTransferInEmailOutcome DomainClient::confirmTransferInEmail(const ConfirmTransferInEmailRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

domain/src/model/CancelDomainVerificationRequest.cc

@@ -0,0 +1,82 @@
+/*
+ * 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/domain/model/CancelDomainVerificationRequest.h>
+
+using AlibabaCloud::Domain::Model::CancelDomainVerificationRequest;
+
+CancelDomainVerificationRequest::CancelDomainVerificationRequest() :
+	RpcServiceRequest("domain", "2018-01-29", "CancelDomainVerification")
+{}
+
+CancelDomainVerificationRequest::~CancelDomainVerificationRequest()
+{}
+
+std::string CancelDomainVerificationRequest::getActionType()const
+{
+	return actionType_;
+}
+
+void CancelDomainVerificationRequest::setActionType(const std::string& actionType)
+{
+	actionType_ = actionType;
+	setParameter("ActionType", actionType);
+}
+
+std::string CancelDomainVerificationRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void CancelDomainVerificationRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setParameter("InstanceId", instanceId);
+}
+
+std::string CancelDomainVerificationRequest::getUserClientIp()const
+{
+	return userClientIp_;
+}
+
+void CancelDomainVerificationRequest::setUserClientIp(const std::string& userClientIp)
+{
+	userClientIp_ = userClientIp;
+	setParameter("UserClientIp", userClientIp);
+}
+
+std::string CancelDomainVerificationRequest::getLang()const
+{
+	return lang_;
+}
+
+void CancelDomainVerificationRequest::setLang(const std::string& lang)
+{
+	lang_ = lang;
+	setParameter("Lang", lang);
+}
+
+std::string CancelDomainVerificationRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void CancelDomainVerificationRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+

domain/src/model/CancelDomainVerificationResult.cc

@@ -0,0 +1,45 @@
+/*
+ * 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/domain/model/CancelDomainVerificationResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Domain;
+using namespace AlibabaCloud::Domain::Model;
+
+CancelDomainVerificationResult::CancelDomainVerificationResult() :
+	ServiceResult()
+{}
+
+CancelDomainVerificationResult::CancelDomainVerificationResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+CancelDomainVerificationResult::~CancelDomainVerificationResult()
+{}
+
+void CancelDomainVerificationResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+
+	setRequestId(value["RequestId"].asString());
+
+}
+

domain/src/model/QueryDomainByInstanceIdResult.cc

@@ -81,6 +81,14 @@ void QueryDomainByInstanceIdResult::parse(const std::string &payload)
 		registrantType_ = value["RegistrantType"].asString();
 	if(!value["DomainNameVerificationStatus"].isNull())
 		domainNameVerificationStatus_ = value["DomainNameVerificationStatus"].asString();
+	if(!value["ZhRegistrantOrganization"].isNull())
+		zhRegistrantOrganization_ = value["ZhRegistrantOrganization"].asString();
+	if(!value["ZhRegistrantName"].isNull())
+		zhRegistrantName_ = value["ZhRegistrantName"].asString();
+	if(!value["RegistrationDateLong"].isNull())
+		registrationDateLong_ = std::stol(value["RegistrationDateLong"].asString());
+	if(!value["ExpirationDateLong"].isNull())
+		expirationDateLong_ = std::stol(value["ExpirationDateLong"].asString());
 
 }
 
@@ -104,6 +112,11 @@ std::string QueryDomainByInstanceIdResult::getRegistrationDate()const
 	return registrationDate_;
 }
 
+long QueryDomainByInstanceIdResult::getRegistrationDateLong()const
+{
+	return registrationDateLong_;
+}
+
 std::string QueryDomainByInstanceIdResult::getDomainName()const
 {
 	return domainName_;
@@ -119,6 +132,11 @@ std::string QueryDomainByInstanceIdResult::getRealNameStatus()const
 	return realNameStatus_;
 }
 
+std::string QueryDomainByInstanceIdResult::getZhRegistrantName()const
+{
+	return zhRegistrantName_;
+}
+
 bool QueryDomainByInstanceIdResult::getPremium()const
 {
 	return premium_;
@@ -129,6 +147,11 @@ std::string QueryDomainByInstanceIdResult::getDomainNameVerificationStatus()cons
 	return domainNameVerificationStatus_;
 }
 
+long QueryDomainByInstanceIdResult::getExpirationDateLong()const
+{
+	return expirationDateLong_;
+}
+
 std::vector<std::string> QueryDomainByInstanceIdResult::getDnsList()const
 {
 	return dnsList_;
@@ -154,6 +177,11 @@ std::string QueryDomainByInstanceIdResult::getUserId()const
 	return userId_;
 }
 
+std::string QueryDomainByInstanceIdResult::getZhRegistrantOrganization()const
+{
+	return zhRegistrantOrganization_;
+}
+
 bool QueryDomainByInstanceIdResult::getEmailVerificationClientHold()const
 {
 	return emailVerificationClientHold_;

domain/src/model/QueryDomainRealNameVerificationInfoRequest.cc

@@ -0,0 +1,71 @@
+/*
+ * 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/domain/model/QueryDomainRealNameVerificationInfoRequest.h>
+
+using AlibabaCloud::Domain::Model::QueryDomainRealNameVerificationInfoRequest;
+
+QueryDomainRealNameVerificationInfoRequest::QueryDomainRealNameVerificationInfoRequest() :
+	RpcServiceRequest("domain", "2018-01-29", "QueryDomainRealNameVerificationInfo")
+{}
+
+QueryDomainRealNameVerificationInfoRequest::~QueryDomainRealNameVerificationInfoRequest()
+{}
+
+bool QueryDomainRealNameVerificationInfoRequest::getFetchImage()const
+{
+	return fetchImage_;
+}
+
+void QueryDomainRealNameVerificationInfoRequest::setFetchImage(bool fetchImage)
+{
+	fetchImage_ = fetchImage;
+	setParameter("FetchImage", std::to_string(fetchImage));
+}
+
+std::string QueryDomainRealNameVerificationInfoRequest::getUserClientIp()const
+{
+	return userClientIp_;
+}
+
+void QueryDomainRealNameVerificationInfoRequest::setUserClientIp(const std::string& userClientIp)
+{
+	userClientIp_ = userClientIp;
+	setParameter("UserClientIp", userClientIp);
+}
+
+std::string QueryDomainRealNameVerificationInfoRequest::getDomainName()const
+{
+	return domainName_;
+}
+
+void QueryDomainRealNameVerificationInfoRequest::setDomainName(const std::string& domainName)
+{
+	domainName_ = domainName;
+	setParameter("DomainName", domainName);
+}
+
+std::string QueryDomainRealNameVerificationInfoRequest::getLang()const
+{
+	return lang_;
+}
+
+void QueryDomainRealNameVerificationInfoRequest::setLang(const std::string& lang)
+{
+	lang_ = lang;
+	setParameter("Lang", lang);
+}
+

domain/src/model/QueryDomainRealNameVerificationInfoResult.cc

@@ -0,0 +1,94 @@
+/*
+ * 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/domain/model/QueryDomainRealNameVerificationInfoResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Domain;
+using namespace AlibabaCloud::Domain::Model;
+
+QueryDomainRealNameVerificationInfoResult::QueryDomainRealNameVerificationInfoResult() :
+	ServiceResult()
+{}
+
+QueryDomainRealNameVerificationInfoResult::QueryDomainRealNameVerificationInfoResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+QueryDomainRealNameVerificationInfoResult::~QueryDomainRealNameVerificationInfoResult()
+{}
+
+void QueryDomainRealNameVerificationInfoResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+
+	setRequestId(value["RequestId"].asString());
+	if(!value["SubmissionDate"].isNull())
+		submissionDate_ = value["SubmissionDate"].asString();
+	if(!value["IdentityCredential"].isNull())
+		identityCredential_ = value["IdentityCredential"].asString();
+	if(!value["IdentityCredentialNo"].isNull())
+		identityCredentialNo_ = value["IdentityCredentialNo"].asString();
+	if(!value["IdentityCredentialType"].isNull())
+		identityCredentialType_ = value["IdentityCredentialType"].asString();
+	if(!value["DomainName"].isNull())
+		domainName_ = value["DomainName"].asString();
+	if(!value["InstanceId"].isNull())
+		instanceId_ = value["InstanceId"].asString();
+	if(!value["IdentityCredentialUrl"].isNull())
+		identityCredentialUrl_ = value["IdentityCredentialUrl"].asString();
+
+}
+
+std::string QueryDomainRealNameVerificationInfoResult::getIdentityCredentialType()const
+{
+	return identityCredentialType_;
+}
+
+std::string QueryDomainRealNameVerificationInfoResult::getDomainName()const
+{
+	return domainName_;
+}
+
+std::string QueryDomainRealNameVerificationInfoResult::getInstanceId()const
+{
+	return instanceId_;
+}
+
+std::string QueryDomainRealNameVerificationInfoResult::getIdentityCredential()const
+{
+	return identityCredential_;
+}
+
+std::string QueryDomainRealNameVerificationInfoResult::getSubmissionDate()const
+{
+	return submissionDate_;
+}
+
+std::string QueryDomainRealNameVerificationInfoResult::getIdentityCredentialNo()const
+{
+	return identityCredentialNo_;
+}
+
+std::string QueryDomainRealNameVerificationInfoResult::getIdentityCredentialUrl()const
+{
+	return identityCredentialUrl_;
+}
+

domain/src/model/QueryEmailVerificationRequest.cc

@@ -0,0 +1,49 @@
+/*
+ * 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/domain/model/QueryEmailVerificationRequest.h>
+
+using AlibabaCloud::Domain::Model::QueryEmailVerificationRequest;
+
+QueryEmailVerificationRequest::QueryEmailVerificationRequest() :
+	RpcServiceRequest("domain", "2018-01-29", "QueryEmailVerification")
+{}
+
+QueryEmailVerificationRequest::~QueryEmailVerificationRequest()
+{}
+
+std::string QueryEmailVerificationRequest::getLang()const
+{
+	return lang_;
+}
+
+void QueryEmailVerificationRequest::setLang(const std::string& lang)
+{
+	lang_ = lang;
+	setParameter("Lang", lang);
+}
+
+std::string QueryEmailVerificationRequest::getEmail()const
+{
+	return email_;
+}
+
+void QueryEmailVerificationRequest::setEmail(const std::string& email)
+{
+	email_ = email;
+	setParameter("Email", email);
+}
+

domain/src/model/QueryEmailVerificationResult.cc

@@ -0,0 +1,115 @@
+/*
+ * 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/domain/model/QueryEmailVerificationResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Domain;
+using namespace AlibabaCloud::Domain::Model;
+
+QueryEmailVerificationResult::QueryEmailVerificationResult() :
+	ServiceResult()
+{}
+
+QueryEmailVerificationResult::QueryEmailVerificationResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+QueryEmailVerificationResult::~QueryEmailVerificationResult()
+{}
+
+void QueryEmailVerificationResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+
+	setRequestId(value["RequestId"].asString());
+	if(!value["GmtCreate"].isNull())
+		gmtCreate_ = value["GmtCreate"].asString();
+	if(!value["GmtModified"].isNull())
+		gmtModified_ = value["GmtModified"].asString();
+	if(!value["Email"].isNull())
+		email_ = value["Email"].asString();
+	if(!value["UserId"].isNull())
+		userId_ = value["UserId"].asString();
+	if(!value["EmailVerificationNo"].isNull())
+		emailVerificationNo_ = value["EmailVerificationNo"].asString();
+	if(!value["TokenSendTime"].isNull())
+		tokenSendTime_ = value["TokenSendTime"].asString();
+	if(!value["VerificationStatus"].isNull())
+		verificationStatus_ = std::stoi(value["VerificationStatus"].asString());
+	if(!value["VerificationTime"].isNull())
+		verificationTime_ = value["VerificationTime"].asString();
+	if(!value["SendIp"].isNull())
+		sendIp_ = value["SendIp"].asString();
+	if(!value["ConfirmIp"].isNull())
+		confirmIp_ = value["ConfirmIp"].asString();
+
+}
+
+int QueryEmailVerificationResult::getVerificationStatus()const
+{
+	return verificationStatus_;
+}
+
+std::string QueryEmailVerificationResult::getGmtCreate()const
+{
+	return gmtCreate_;
+}
+
+std::string QueryEmailVerificationResult::getEmail()const
+{
+	return email_;
+}
+
+std::string QueryEmailVerificationResult::getEmailVerificationNo()const
+{
+	return emailVerificationNo_;
+}
+
+std::string QueryEmailVerificationResult::getConfirmIp()const
+{
+	return confirmIp_;
+}
+
+std::string QueryEmailVerificationResult::getUserId()const
+{
+	return userId_;
+}
+
+std::string QueryEmailVerificationResult::getGmtModified()const
+{
+	return gmtModified_;
+}
+
+std::string QueryEmailVerificationResult::getSendIp()const
+{
+	return sendIp_;
+}
+
+std::string QueryEmailVerificationResult::getVerificationTime()const
+{
+	return verificationTime_;
+}
+
+std::string QueryEmailVerificationResult::getTokenSendTime()const
+{
+	return tokenSendTime_;
+}
+

domain/src/model/QueryRegistrantProfileRealNameVerificationInfoResult.cc

@@ -52,6 +52,8 @@ void QueryRegistrantProfileRealNameVerificationInfoResult::parse(const std::stri
 		identityCredentialNo_ = value["IdentityCredentialNo"].asString();
 	if(!value["IdentityCredentialType"].isNull())
 		identityCredentialType_ = value["IdentityCredentialType"].asString();
+	if(!value["IdentityCredentialUrl"].isNull())
+		identityCredentialUrl_ = value["IdentityCredentialUrl"].asString();
 
 }
 
@@ -85,3 +87,8 @@ long QueryRegistrantProfileRealNameVerificationInfoResult::getRegistrantProfileI
 	return registrantProfileId_;
 }
 
+std::string QueryRegistrantProfileRealNameVerificationInfoResult::getIdentityCredentialUrl()const
+{
+	return identityCredentialUrl_;
+}
+

domain/src/model/SaveSingleTaskForDeletingDnsHostRequest.cc

@@ -0,0 +1,60 @@
+/*
+ * 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/domain/model/SaveSingleTaskForDeletingDnsHostRequest.h>
+
+using AlibabaCloud::Domain::Model::SaveSingleTaskForDeletingDnsHostRequest;
+
+SaveSingleTaskForDeletingDnsHostRequest::SaveSingleTaskForDeletingDnsHostRequest() :
+	RpcServiceRequest("domain", "2018-01-29", "SaveSingleTaskForDeletingDnsHost")
+{}
+
+SaveSingleTaskForDeletingDnsHostRequest::~SaveSingleTaskForDeletingDnsHostRequest()
+{}
+
+std::string SaveSingleTaskForDeletingDnsHostRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void SaveSingleTaskForDeletingDnsHostRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setParameter("InstanceId", instanceId);
+}
+
+std::string SaveSingleTaskForDeletingDnsHostRequest::getDnsName()const
+{
+	return dnsName_;
+}
+
+void SaveSingleTaskForDeletingDnsHostRequest::setDnsName(const std::string& dnsName)
+{
+	dnsName_ = dnsName;
+	setParameter("DnsName", dnsName);
+}
+
+std::string SaveSingleTaskForDeletingDnsHostRequest::getLang()const
+{
+	return lang_;
+}
+
+void SaveSingleTaskForDeletingDnsHostRequest::setLang(const std::string& lang)
+{
+	lang_ = lang;
+	setParameter("Lang", lang);
+}
+

domain/src/model/SaveSingleTaskForDeletingDnsHostResult.cc

@@ -0,0 +1,52 @@
+/*
+ * 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/domain/model/SaveSingleTaskForDeletingDnsHostResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Domain;
+using namespace AlibabaCloud::Domain::Model;
+
+SaveSingleTaskForDeletingDnsHostResult::SaveSingleTaskForDeletingDnsHostResult() :
+	ServiceResult()
+{}
+
+SaveSingleTaskForDeletingDnsHostResult::SaveSingleTaskForDeletingDnsHostResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+SaveSingleTaskForDeletingDnsHostResult::~SaveSingleTaskForDeletingDnsHostResult()
+{}
+
+void SaveSingleTaskForDeletingDnsHostResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+
+	setRequestId(value["RequestId"].asString());
+	if(!value["TaskNo"].isNull())
+		taskNo_ = value["TaskNo"].asString();
+
+}
+
+std::string SaveSingleTaskForDeletingDnsHostResult::getTaskNo()const
+{
+	return taskNo_;
+}
+

ecs/CMakeLists.txt

@@ -485,8 +485,6 @@ set(ecs_public_header_model
 	include/alibabacloud/ecs/model/AllocateEipAddressResult.h
 	include/alibabacloud/ecs/model/DeleteDiskRequest.h
 	include/alibabacloud/ecs/model/DeleteDiskResult.h
-	include/alibabacloud/ecs/model/DescribeEventsRequest.h
-	include/alibabacloud/ecs/model/DescribeEventsResult.h
 	include/alibabacloud/ecs/model/UnassociateHaVipRequest.h
 	include/alibabacloud/ecs/model/UnassociateHaVipResult.h
 	include/alibabacloud/ecs/model/ModifyHaVipAttributeRequest.h
@@ -972,8 +970,6 @@ set(ecs_src
 	src/model/AllocateEipAddressResult.cc
 	src/model/DeleteDiskRequest.cc
 	src/model/DeleteDiskResult.cc
-	src/model/DescribeEventsRequest.cc
-	src/model/DescribeEventsResult.cc
 	src/model/UnassociateHaVipRequest.cc
 	src/model/UnassociateHaVipResult.cc
 	src/model/ModifyHaVipAttributeRequest.cc

ecs/include/alibabacloud/ecs/EcsClient.h

@@ -486,8 +486,6 @@
 #include "model/AllocateEipAddressResult.h"
 #include "model/DeleteDiskRequest.h"
 #include "model/DeleteDiskResult.h"
-#include "model/DescribeEventsRequest.h"
-#include "model/DescribeEventsResult.h"
 #include "model/UnassociateHaVipRequest.h"
 #include "model/UnassociateHaVipResult.h"
 #include "model/ModifyHaVipAttributeRequest.h"
@@ -1211,9 +1209,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DeleteDiskResult> DeleteDiskOutcome;
 			typedef std::future<DeleteDiskOutcome> DeleteDiskOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::DeleteDiskRequest&, const DeleteDiskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteDiskAsyncHandler;
-			typedef Outcome<Error, Model::DescribeEventsResult> DescribeEventsOutcome;
-			typedef std::future<DescribeEventsOutcome> DescribeEventsOutcomeCallable;
-			typedef std::function<void(const EcsClient*, const Model::DescribeEventsRequest&, const DescribeEventsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeEventsAsyncHandler;
 			typedef Outcome<Error, Model::UnassociateHaVipResult> UnassociateHaVipOutcome;
 			typedef std::future<UnassociateHaVipOutcome> UnassociateHaVipOutcomeCallable;
 			typedef std::function<void(const EcsClient*, const Model::UnassociateHaVipRequest&, const UnassociateHaVipOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UnassociateHaVipAsyncHandler;
@@ -1942,9 +1937,6 @@ namespace AlibabaCloud
 			DeleteDiskOutcome deleteDisk(const Model::DeleteDiskRequest &request)const;
 			void deleteDiskAsync(const Model::DeleteDiskRequest& request, const DeleteDiskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteDiskOutcomeCallable deleteDiskCallable(const Model::DeleteDiskRequest& request) const;
-			DescribeEventsOutcome describeEvents(const Model::DescribeEventsRequest &request)const;
-			void describeEventsAsync(const Model::DescribeEventsRequest& request, const DescribeEventsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeEventsOutcomeCallable describeEventsCallable(const Model::DescribeEventsRequest& request) const;
 			UnassociateHaVipOutcome unassociateHaVip(const Model::UnassociateHaVipRequest &request)const;
 			void unassociateHaVipAsync(const Model::UnassociateHaVipRequest& request, const UnassociateHaVipAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			UnassociateHaVipOutcomeCallable unassociateHaVipCallable(const Model::UnassociateHaVipRequest& request) const;

ecs/include/alibabacloud/ecs/model/AssignPrivateIpAddressesRequest.h

@@ -51,8 +51,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -99,7 +97,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/AttachNetworkInterfaceRequest.h

@@ -49,8 +49,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -96,7 +94,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/AuthorizeSecurityGroupEgressRequest.h

@@ -59,8 +59,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -125,7 +123,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/AuthorizeSecurityGroupRequest.h

@@ -59,8 +59,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				long getSourceGroupOwnerId()const;
 				void setSourceGroupOwnerId(long sourceGroupOwnerId);
 				std::string getSourceGroupOwnerAccount()const;
@@ -125,7 +123,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				long sourceGroupOwnerId_;
 				std::string sourceGroupOwnerAccount_;
 				std::string securityToken_;

ecs/include/alibabacloud/ecs/model/CreateCommandRequest.h

@@ -59,8 +59,6 @@ namespace AlibabaCloud
 				void setTimeout(long timeout);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -109,7 +107,6 @@ namespace AlibabaCloud
 				std::string commandContent_;
 				long timeout_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

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

@@ -62,6 +62,8 @@ namespace AlibabaCloud
 				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 getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				std::string getImageName()const;
@@ -102,6 +104,7 @@ namespace AlibabaCloud
 				std::string tag3Key_;
 				std::string platform_;
 				std::string tag1Value_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::string imageName_;
 				std::string tag3Value_;

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

@@ -124,6 +124,8 @@ namespace AlibabaCloud
 				void setSystemDiskCategory(const std::string& systemDiskCategory);
 				std::string getUserData()const;
 				void setUserData(const std::string& userData);
+				bool getPasswordInherit()const;
+				void setPasswordInherit(bool passwordInherit);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				std::string getInstanceType()const;
@@ -201,6 +203,7 @@ namespace AlibabaCloud
 				std::string description_;
 				std::string systemDiskCategory_;
 				std::string userData_;
+				bool passwordInherit_;
 				std::string regionId_;
 				std::string instanceType_;
 				std::string instanceChargeType_;

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

@@ -62,6 +62,8 @@ 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;
@@ -82,6 +84,8 @@ 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;
@@ -92,12 +96,18 @@ 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<Tag> getTag()const;
 				void setTag(const std::vector<Tag>& tag);
 				long getCallerUid()const;
 				void setCallerUid(long callerUid);
 				int getPeriod()const;
 				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;
@@ -114,12 +124,16 @@ 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;
@@ -140,6 +154,8 @@ 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;
@@ -154,6 +170,8 @@ 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;
@@ -172,16 +190,21 @@ 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_;
@@ -192,14 +215,18 @@ 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<Tag> tag_;
 				long callerUid_;
 				int period_;
+				std::string templateResourceGroupId_;
+				std::string templateTag2Value_;
 				long ownerId_;
 				bool ak_mfa_present_;
 				bool security_transport_;
@@ -208,9 +235,11 @@ 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_;
@@ -221,6 +250,7 @@ namespace AlibabaCloud
 				std::string accessKeyId_;
 				std::string userData_;
 				std::string regionId_;
+				std::string templateTag5Value_;
 				std::string requestContent_;
 				std::string instanceType_;
 				std::string instanceChargeType_;
@@ -228,6 +258,7 @@ namespace AlibabaCloud
 				bool enableVmOsConfig_;
 				std::vector<NetworkInterface> networkInterface_;
 				std::string app_ip_;
+				std::string templateTag2Key_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string systemDiskDiskName_;
@@ -237,8 +268,10 @@ 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/CreateNetworkInterfacePermissionRequest.h

@@ -49,8 +49,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				long getAccountId()const;
 				void setAccountId(long accountId);
 				std::string getSecurityToken()const;
@@ -98,7 +96,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				long accountId_;
 				std::string securityToken_;
 				std::string regionId_;

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

@@ -35,8 +35,12 @@ namespace AlibabaCloud
 				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;
@@ -47,6 +51,8 @@ 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;
@@ -55,6 +61,8 @@ 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;
@@ -69,12 +77,16 @@ namespace AlibabaCloud
 				void setCallerBidEmail(const std::string& callerBidEmail);
 				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;
@@ -83,30 +95,42 @@ 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_;
@@ -114,18 +138,24 @@ namespace AlibabaCloud
 				std::string requestContent_;
 				std::string callerBidEmail_;
 				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/DeleteCommandRequest.h

@@ -51,8 +51,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -95,7 +93,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/DeleteLaunchTemplateRequest.h

@@ -51,8 +51,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -97,7 +95,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/DeleteLaunchTemplateVersionRequest.h

@@ -53,8 +53,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -100,7 +98,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/DeleteNetworkInterfacePermissionRequest.h

@@ -49,8 +49,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -96,7 +94,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/DeleteNetworkInterfaceRequest.h

@@ -49,8 +49,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -94,7 +92,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

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

@@ -53,8 +53,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -114,7 +112,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/DescribeBandwidthLimitationRequest.h

@@ -49,8 +49,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -102,7 +100,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/DescribeCloudAssistantStatusRequest.h

@@ -49,8 +49,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -94,7 +92,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/DescribeCommandsRequest.h

@@ -57,8 +57,6 @@ namespace AlibabaCloud
 				void setPageNumber(long pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -108,7 +106,6 @@ namespace AlibabaCloud
 				std::string callerType_;
 				long pageNumber_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/DescribeDisksFullStatusRequest.h

@@ -55,8 +55,6 @@ namespace AlibabaCloud
 				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getEventTimeStart()const;
 				void setEventTimeStart(const std::string& eventTimeStart);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -113,7 +111,6 @@ namespace AlibabaCloud
 				int pageNumber_;
 				std::string accessKeyId_;
 				std::string eventTimeStart_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

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

@@ -62,6 +62,8 @@ namespace AlibabaCloud
 				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;
 				void setIsSupportIoOptimized(bool isSupportIoOptimized);
 				std::string getRegionId()const;
@@ -117,6 +119,7 @@ namespace AlibabaCloud
 				int pageNumber_;
 				std::string imageOwnerAlias_;
 				std::string tag1Value_;
+				std::string resourceGroupId_;
 				bool isSupportIoOptimized_;
 				std::string regionId_;
 				std::string imageName_;

ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsRequest.h

@@ -55,8 +55,6 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -119,7 +117,6 @@ namespace AlibabaCloud
 				std::string callerType_;
 				int pageNumber_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/DescribeInstancesFullStatusRequest.h

@@ -53,8 +53,6 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -118,7 +116,6 @@ namespace AlibabaCloud
 				std::string callerType_;
 				int pageNumber_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/DescribeInvocationResultsRequest.h

@@ -53,8 +53,6 @@ namespace AlibabaCloud
 				void setPageNumber(long pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -106,7 +104,6 @@ namespace AlibabaCloud
 				std::string callerType_;
 				long pageNumber_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/DescribeInvocationsRequest.h

@@ -55,8 +55,6 @@ namespace AlibabaCloud
 				void setPageNumber(long pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -113,7 +111,6 @@ namespace AlibabaCloud
 				std::string callerType_;
 				long pageNumber_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/DescribeLaunchTemplateVersionsRequest.h

@@ -59,8 +59,6 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -115,7 +113,6 @@ namespace AlibabaCloud
 				std::string callerType_;
 				int pageNumber_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

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

@@ -35,10 +35,14 @@ namespace AlibabaCloud
 				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;
@@ -53,12 +57,14 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
+				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;
@@ -67,18 +73,26 @@ 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::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;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				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;
@@ -89,12 +103,20 @@ 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_;
@@ -102,25 +124,33 @@ namespace AlibabaCloud
 				std::string callerType_;
 				int pageNumber_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
+				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::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/DescribeNetworkInterfacePermissionsRequest.h

@@ -51,8 +51,6 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -101,7 +99,6 @@ namespace AlibabaCloud
 				std::string callerType_;
 				int pageNumber_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

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

@@ -35,14 +35,20 @@ namespace AlibabaCloud
 				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;
@@ -55,6 +61,8 @@ 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;
@@ -71,12 +79,16 @@ namespace AlibabaCloud
 				void setCallerBidEmail(const std::string& callerBidEmail);
 				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;
@@ -85,34 +97,48 @@ 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_;
@@ -121,19 +147,26 @@ namespace AlibabaCloud
 				int pageSize_;
 				std::string callerBidEmail_;
 				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/DescribeRegionsRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getAcceptLanguage()const;
+				void setAcceptLanguage(const std::string& acceptLanguage);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getInstanceChargeType()const;
@@ -52,6 +54,7 @@ namespace AlibabaCloud
 				long resourceOwnerId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
+				std::string acceptLanguage_;
 				long ownerId_;
 				std::string instanceChargeType_;
 				std::string resourceType_;

ecs/include/alibabacloud/ecs/model/DescribeRegionsResult.h

@@ -36,6 +36,7 @@ namespace AlibabaCloud
 				{
 					std::string status;
 					std::string regionId;
+					std::string regionEndpoint;
 					std::string localName;
 				};
 

ecs/include/alibabacloud/ecs/model/DescribeResourcesModificationRequest.h

@@ -49,8 +49,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -102,7 +100,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/DescribeSnapshotsResult.h

@@ -53,6 +53,7 @@ namespace AlibabaCloud
 					std::string sourceDiskSize;
 					std::string creationTime;
 					std::string sourceDiskType;
+					int remainTime;
 					std::vector<Snapshot::Tag> tags;
 				};
 

ecs/include/alibabacloud/ecs/model/DescribeSnapshotsUsageRequest.h

@@ -35,26 +35,42 @@ namespace AlibabaCloud
 				DescribeSnapshotsUsageRequest();
 				~DescribeSnapshotsUsageRequest();
 
+				std::string getApp_ip()const;
+				void setApp_ip(const std::string& app_ip);
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				long getCallerParentId()const;
 				void setCallerParentId(long callerParentId);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
 				bool getProxy_original_security_transport()const;
 				void setProxy_original_security_transport(bool proxy_original_security_transport);
+				std::string getCallerBid()const;
+				void setCallerBid(const std::string& callerBid);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
 				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);
+				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);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
+				bool getSecurity_transport()const;
+				void setSecurity_transport(bool security_transport);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
+				std::string getRequestId()const;
+				void setRequestId(const std::string& requestId);
 				bool getEnable()const;
 				void setEnable(bool enable);
 				std::string getRequestContent()const;
@@ -65,50 +81,31 @@ namespace AlibabaCloud
 				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 getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				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);
 
             private:
+				std::string app_ip_;
 				long resourceOwnerId_;
+				std::string resourceOwnerAccount_;
 				long callerParentId_;
+				std::string ownerAccount_;
 				bool proxy_original_security_transport_;
+				std::string callerBid_;
+				long ownerId_;
 				std::string proxy_original_source_ip_;
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
+				bool proxy_trust_transport_info_;
+				bool ak_mfa_present_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
+				bool security_transport_;
 				std::string securityToken_;
 				std::string regionId_;
+				std::string requestId_;
 				bool enable_;
 				std::string requestContent_;
 				std::string callerBidEmail_;
 				std::string callerUidEmail_;
 				long callerUid_;
-				std::string app_ip_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				std::string callerBid_;
-				long ownerId_;
-				bool proxy_trust_transport_info_;
-				bool ak_mfa_present_;
-				bool security_transport_;
-				std::string requestId_;
 
 			};
 		}

ecs/include/alibabacloud/ecs/model/DescribeSpotPriceHistoryRequest.h

@@ -55,8 +55,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -111,7 +109,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/DetachNetworkInterfaceRequest.h

@@ -49,8 +49,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -96,7 +94,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/GetInstanceConsoleOutputRequest.h

@@ -49,8 +49,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -94,7 +92,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/GetInstanceScreenshotRequest.h

@@ -49,8 +49,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -69,8 +67,8 @@ namespace AlibabaCloud
 				void setApp_ip(const std::string& app_ip);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				bool getWakeup()const;
-				void setWakeup(bool wakeup);
+				bool getWakeUp()const;
+				void setWakeUp(bool wakeUp);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
 				std::string getCallerBid()const;
@@ -96,7 +94,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;
@@ -106,7 +103,7 @@ namespace AlibabaCloud
 				long callerUid_;
 				std::string app_ip_;
 				std::string resourceOwnerAccount_;
-				bool wakeup_;
+				bool wakeUp_;
 				std::string ownerAccount_;
 				std::string callerBid_;
 				long ownerId_;

ecs/include/alibabacloud/ecs/model/InstallCloudAssistantRequest.h

@@ -49,8 +49,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -94,7 +92,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/InvokeCommandRequest.h

@@ -53,8 +53,6 @@ namespace AlibabaCloud
 				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getFrequency()const;
 				void setFrequency(const std::string& frequency);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -102,7 +100,6 @@ namespace AlibabaCloud
 				std::string callerType_;
 				std::string accessKeyId_;
 				std::string frequency_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/ModifyCommandRequest.h

@@ -59,8 +59,6 @@ namespace AlibabaCloud
 				void setTimeout(long timeout);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -109,7 +107,6 @@ namespace AlibabaCloud
 				std::string commandContent_;
 				long timeout_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/ModifyDiskChargeTypeRequest.h

@@ -37,6 +37,8 @@ namespace AlibabaCloud
 
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
+				std::string getDiskChargeType()const;
+				void setDiskChargeType(const std::string& diskChargeType);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
 				bool getAutoPay()const;
@@ -56,6 +58,7 @@ namespace AlibabaCloud
 
             private:
 				long resourceOwnerId_;
+				std::string diskChargeType_;
 				std::string instanceId_;
 				bool autoPay_;
 				std::string resourceOwnerAccount_;

ecs/include/alibabacloud/ecs/model/ModifyLaunchTemplateDefaultVersionRequest.h

@@ -51,8 +51,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -99,7 +97,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/ModifyNetworkInterfaceAttributeRequest.h

@@ -53,8 +53,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -102,7 +100,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/ModifySecurityGroupEgressRuleRequest.h

@@ -59,8 +59,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -125,7 +123,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;

ecs/include/alibabacloud/ecs/model/ModifySecurityGroupRuleRequest.h

@@ -59,8 +59,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				long getSourceGroupOwnerId()const;
 				void setSourceGroupOwnerId(long sourceGroupOwnerId);
 				std::string getSourceGroupOwnerAccount()const;
@@ -125,7 +123,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				long sourceGroupOwnerId_;
 				std::string sourceGroupOwnerAccount_;
 				std::string securityToken_;

ecs/include/alibabacloud/ecs/model/ReplaceSystemDiskRequest.h

@@ -57,6 +57,8 @@ namespace AlibabaCloud
 				void setPassword(const std::string& password);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
+				bool getPasswordInherit()const;
+				void setPasswordInherit(bool passwordInherit);
 				int getSystemDiskSize()const;
 				void setSystemDiskSize(int systemDiskSize);
 				std::string getDiskId()const;
@@ -78,6 +80,7 @@ namespace AlibabaCloud
 				std::string platform_;
 				std::string password_;
 				std::string instanceId_;
+				bool passwordInherit_;
 				int systemDiskSize_;
 				std::string diskId_;
 				bool useAdditionalService_;

ecs/include/alibabacloud/ecs/model/RevokeSecurityGroupEgressRequest.h

@@ -59,8 +59,6 @@ namespace AlibabaCloud
 				void setCallerType(const std::string& callerType);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
@@ -125,7 +123,6 @@ namespace AlibabaCloud
 				std::string ownerIdLoginEmail_;
 				std::string callerType_;
 				std::string accessKeyId_;
-				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string regionId_;
 				bool enable_;