Update sdk.

VERSION

@@ -1 +1 @@
-1.36.783
+1.36.1165

actiontrail/include/alibabacloud/actiontrail/model/CreateTrailRequest.h

@@ -37,18 +37,14 @@ namespace AlibabaCloud
 
 				std::string getSlsProjectArn()const;
 				void setSlsProjectArn(const std::string& slsProjectArn);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getSlsWriteRoleArn()const;
 				void setSlsWriteRoleArn(const std::string& slsWriteRoleArn);
 				bool getIsOrganizationTrail()const;
 				void setIsOrganizationTrail(bool isOrganizationTrail);
 				std::string getOssKeyPrefix()const;
 				void setOssKeyPrefix(const std::string& ossKeyPrefix);
-				std::string getMnsTopicArn()const;
-				void setMnsTopicArn(const std::string& mnsTopicArn);
-				std::string getRoleName()const;
-				void setRoleName(const std::string& roleName);
+				std::string getOssWriteRoleArn()const;
+				void setOssWriteRoleArn(const std::string& ossWriteRoleArn);
 				std::string getEventRW()const;
 				void setEventRW(const std::string& eventRW);
 				std::string getName()const;
@@ -60,12 +56,10 @@ namespace AlibabaCloud
 
             private:
 				std::string slsProjectArn_;
-				std::string accessKeyId_;
 				std::string slsWriteRoleArn_;
 				bool isOrganizationTrail_;
 				std::string ossKeyPrefix_;
-				std::string mnsTopicArn_;
-				std::string roleName_;
+				std::string ossWriteRoleArn_;
 				std::string eventRW_;
 				std::string name_;
 				std::string ossBucketName_;

actiontrail/include/alibabacloud/actiontrail/model/CreateTrailResult.h

@@ -38,13 +38,12 @@ namespace AlibabaCloud
 				explicit CreateTrailResult(const std::string &payload);
 				~CreateTrailResult();
 				std::string getSlsProjectArn()const;
-				std::string getMnsTopicArn()const;
-				std::string getRoleName()const;
 				std::string getEventRW()const;
 				std::string getHomeRegion()const;
 				std::string getOssKeyPrefix()const;
 				std::string getOssBucketName()const;
 				std::string getSlsWriteRoleArn()const;
+				std::string getOssWriteRoleArn()const;
 				std::string getTrailRegion()const;
 				std::string getName()const;
 
@@ -52,13 +51,12 @@ namespace AlibabaCloud
 				void parse(const std::string &payload);
 			private:
 				std::string slsProjectArn_;
-				std::string mnsTopicArn_;
-				std::string roleName_;
 				std::string eventRW_;
 				std::string homeRegion_;
 				std::string ossKeyPrefix_;
 				std::string ossBucketName_;
 				std::string slsWriteRoleArn_;
+				std::string ossWriteRoleArn_;
 				std::string trailRegion_;
 				std::string name_;
 

actiontrail/include/alibabacloud/actiontrail/model/DeleteTrailRequest.h

@@ -35,13 +35,10 @@ namespace AlibabaCloud
 				DeleteTrailRequest();
 				~DeleteTrailRequest();
 
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getName()const;
 				void setName(const std::string& name);
 
             private:
-				std::string accessKeyId_;
 				std::string name_;
 
 			};

actiontrail/include/alibabacloud/actiontrail/model/DescribeRegionsRequest.h

@@ -35,11 +35,11 @@ namespace AlibabaCloud
 				DescribeRegionsRequest();
 				~DescribeRegionsRequest();
 
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getAcceptLanguage()const;
+				void setAcceptLanguage(const std::string& acceptLanguage);
 
             private:
-				std::string accessKeyId_;
+				std::string acceptLanguage_;
 
 			};
 		}

actiontrail/include/alibabacloud/actiontrail/model/DescribeRegionsResult.h

@@ -32,25 +32,23 @@ namespace AlibabaCloud
 			class ALIBABACLOUD_ACTIONTRAIL_EXPORT DescribeRegionsResult : public ServiceResult
 			{
 			public:
-				struct Regions
+				struct Region
 				{
-					struct RegionItem
-					{
-						std::string regionId;
-					};
-					std::vector<RegionItem> region;
+					std::string regionId;
+					std::string regionEndpoint;
+					std::string localName;
 				};
 
 
 				DescribeRegionsResult();
 				explicit DescribeRegionsResult(const std::string &payload);
 				~DescribeRegionsResult();
-				Regions getRegions()const;
+				std::vector<Region> getRegions()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				Regions regions_;
+				std::vector<Region> regions_;
 
 			};
 		}

actiontrail/include/alibabacloud/actiontrail/model/DescribeTrailsRequest.h

@@ -35,16 +35,16 @@ namespace AlibabaCloud
 				DescribeTrailsRequest();
 				~DescribeTrailsRequest();
 
+				bool getIncludeOrganizationTrail()const;
+				void setIncludeOrganizationTrail(bool includeOrganizationTrail);
 				bool getIncludeShadowTrails()const;
 				void setIncludeShadowTrails(bool includeShadowTrails);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getNameList()const;
 				void setNameList(const std::string& nameList);
 
             private:
+				bool includeOrganizationTrail_;
 				bool includeShadowTrails_;
-				std::string accessKeyId_;
 				std::string nameList_;
 
 			};

actiontrail/include/alibabacloud/actiontrail/model/DescribeTrailsResult.h

@@ -32,36 +32,39 @@ namespace AlibabaCloud
 			class ALIBABACLOUD_ACTIONTRAIL_EXPORT DescribeTrailsResult : public ServiceResult
 			{
 			public:
-				struct TrailListItem
+				struct Trail
 				{
 					std::string status;
-					std::string mnsTopicArn;
 					std::string homeRegion;
-					std::string createTime;
 					std::string startLoggingTime;
+					std::string createTime;
 					std::string stopLoggingTime;
+					std::string organizationId;
 					std::string slsWriteRoleArn;
+					std::string ossBucketLocation;
 					std::string trailRegion;
 					std::string name;
 					bool isOrganizationTrail;
 					std::string slsProjectArn;
-					std::string roleName;
 					std::string eventRW;
 					std::string ossKeyPrefix;
 					std::string updateTime;
+					std::string region;
 					std::string ossBucketName;
+					std::string ossWriteRoleArn;
+					long isShadowTrail;
 				};
 
 
 				DescribeTrailsResult();
 				explicit DescribeTrailsResult(const std::string &payload);
 				~DescribeTrailsResult();
-				std::vector<TrailListItem> getTrailList()const;
+				std::vector<Trail> getTrailList()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::vector<TrailListItem> trailList_;
+				std::vector<Trail> trailList_;
 
 			};
 		}

actiontrail/include/alibabacloud/actiontrail/model/GetTrailStatusRequest.h

@@ -35,15 +35,12 @@ namespace AlibabaCloud
 				GetTrailStatusRequest();
 				~GetTrailStatusRequest();
 
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getName()const;
 				void setName(const std::string& name);
 				bool getIsOrganizationTrail()const;
 				void setIsOrganizationTrail(bool isOrganizationTrail);
 
             private:
-				std::string accessKeyId_;
 				std::string name_;
 				bool isOrganizationTrail_;
 

actiontrail/include/alibabacloud/actiontrail/model/GetTrailStatusResult.h

@@ -37,20 +37,28 @@ namespace AlibabaCloud
 				GetTrailStatusResult();
 				explicit GetTrailStatusResult(const std::string &payload);
 				~GetTrailStatusResult();
+				std::string getLatestDeliveryLogServiceTime()const;
+				std::string getLatestDeliveryLogServiceError()const;
 				std::string getStartLoggingTime()const;
+				bool getOssBucketStatus()const;
 				std::string getLatestDeliveryError()const;
 				std::string getStopLoggingTime()const;
-				bool getIsLogging()const;
+				bool getSlsLogStoreStatus()const;
 				std::string getLatestDeliveryTime()const;
+				bool getIsLogging()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
+				std::string latestDeliveryLogServiceTime_;
+				std::string latestDeliveryLogServiceError_;
 				std::string startLoggingTime_;
+				bool ossBucketStatus_;
 				std::string latestDeliveryError_;
 				std::string stopLoggingTime_;
-				bool isLogging_;
+				bool slsLogStoreStatus_;
 				std::string latestDeliveryTime_;
+				bool isLogging_;
 
 			};
 		}

actiontrail/include/alibabacloud/actiontrail/model/LookupEventsRequest.h

@@ -30,58 +30,37 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ACTIONTRAIL_EXPORT LookupEventsRequest : public RpcServiceRequest
 			{
+			public:
+				struct LookupAttribute
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				LookupEventsRequest();
 				~LookupEventsRequest();
 
-				std::string getRequest()const;
-				void setRequest(const std::string& request);
-				std::string getStartTime()const;
-				void setStartTime(const std::string& startTime);
-				std::string getEventName()const;
-				void setEventName(const std::string& eventName);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getNextToken()const;
-				void setNextToken(const std::string& nextToken);
-				std::string getServiceName()const;
-				void setServiceName(const std::string& serviceName);
-				std::string getEvent()const;
-				void setEvent(const std::string& event);
-				std::string getEventAccessKeyId()const;
-				void setEventAccessKeyId(const std::string& eventAccessKeyId);
 				std::string getEndTime()const;
 				void setEndTime(const std::string& endTime);
-				std::string getEventRW()const;
-				void setEventRW(const std::string& eventRW);
-				std::string getResourceType()const;
-				void setResourceType(const std::string& resourceType);
+				std::string getStartTime()const;
+				void setStartTime(const std::string& startTime);
+				std::string getNextToken()const;
+				void setNextToken(const std::string& nextToken);
+				std::vector<LookupAttribute> getLookupAttribute()const;
+				void setLookupAttribute(const std::vector<LookupAttribute>& lookupAttribute);
 				std::string getMaxResults()const;
 				void setMaxResults(const std::string& maxResults);
-				std::string getEventType()const;
-				void setEventType(const std::string& eventType);
-				std::string getResourceName()const;
-				void setResourceName(const std::string& resourceName);
-				std::string getUser()const;
-				void setUser(const std::string& user);
+				std::string getDirection()const;
+				void setDirection(const std::string& direction);
 
             private:
-				std::string request_;
-				std::string startTime_;
-				std::string eventName_;
-				std::string accessKeyId_;
-				std::string nextToken_;
-				std::string serviceName_;
-				std::string event_;
-				std::string eventAccessKeyId_;
 				std::string endTime_;
-				std::string eventRW_;
-				std::string resourceType_;
+				std::string startTime_;
+				std::string nextToken_;
+				std::vector<LookupAttribute> lookupAttribute_;
 				std::string maxResults_;
-				std::string eventType_;
-				std::string resourceName_;
-				std::string user_;
+				std::string direction_;
 
 			};
 		}

actiontrail/include/alibabacloud/actiontrail/model/LookupEventsResult.h

@@ -37,16 +37,16 @@ namespace AlibabaCloud
 				LookupEventsResult();
 				explicit LookupEventsResult(const std::string &payload);
 				~LookupEventsResult();
-				std::string getNextToken()const;
 				std::string getEndTime()const;
+				std::string getNextToken()const;
 				std::vector<std::string> getEvents()const;
 				std::string getStartTime()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::string nextToken_;
 				std::string endTime_;
+				std::string nextToken_;
 				std::vector<std::string> events_;
 				std::string startTime_;
 

actiontrail/include/alibabacloud/actiontrail/model/StartLoggingRequest.h

@@ -35,13 +35,10 @@ namespace AlibabaCloud
 				StartLoggingRequest();
 				~StartLoggingRequest();
 
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getName()const;
 				void setName(const std::string& name);
 
             private:
-				std::string accessKeyId_;
 				std::string name_;
 
 			};

actiontrail/include/alibabacloud/actiontrail/model/StartLoggingResult.h

@@ -37,14 +37,10 @@ namespace AlibabaCloud
 				StartLoggingResult();
 				explicit StartLoggingResult(const std::string &payload);
 				~StartLoggingResult();
-				std::string getParam()const;
-				std::string getResult()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::string param_;
-				std::string result_;
 
 			};
 		}

actiontrail/include/alibabacloud/actiontrail/model/StopLoggingRequest.h

@@ -35,13 +35,10 @@ namespace AlibabaCloud
 				StopLoggingRequest();
 				~StopLoggingRequest();
 
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getName()const;
 				void setName(const std::string& name);
 
             private:
-				std::string accessKeyId_;
 				std::string name_;
 
 			};

actiontrail/include/alibabacloud/actiontrail/model/UpdateTrailRequest.h

@@ -37,16 +37,12 @@ namespace AlibabaCloud
 
 				std::string getSlsProjectArn()const;
 				void setSlsProjectArn(const std::string& slsProjectArn);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getSlsWriteRoleArn()const;
 				void setSlsWriteRoleArn(const std::string& slsWriteRoleArn);
 				std::string getOssKeyPrefix()const;
 				void setOssKeyPrefix(const std::string& ossKeyPrefix);
-				std::string getMnsTopicArn()const;
-				void setMnsTopicArn(const std::string& mnsTopicArn);
-				std::string getRoleName()const;
-				void setRoleName(const std::string& roleName);
+				std::string getOssWriteRoleArn()const;
+				void setOssWriteRoleArn(const std::string& ossWriteRoleArn);
 				std::string getEventRW()const;
 				void setEventRW(const std::string& eventRW);
 				std::string getName()const;
@@ -58,11 +54,9 @@ namespace AlibabaCloud
 
             private:
 				std::string slsProjectArn_;
-				std::string accessKeyId_;
 				std::string slsWriteRoleArn_;
 				std::string ossKeyPrefix_;
-				std::string mnsTopicArn_;
-				std::string roleName_;
+				std::string ossWriteRoleArn_;
 				std::string eventRW_;
 				std::string name_;
 				std::string ossBucketName_;

actiontrail/include/alibabacloud/actiontrail/model/UpdateTrailResult.h

@@ -38,13 +38,12 @@ namespace AlibabaCloud
 				explicit UpdateTrailResult(const std::string &payload);
 				~UpdateTrailResult();
 				std::string getSlsProjectArn()const;
-				std::string getMnsTopicArn()const;
-				std::string getRoleName()const;
 				std::string getEventRW()const;
 				std::string getHomeRegion()const;
 				std::string getOssKeyPrefix()const;
 				std::string getOssBucketName()const;
 				std::string getSlsWriteRoleArn()const;
+				std::string getOssWriteRoleArn()const;
 				std::string getTrailRegion()const;
 				std::string getName()const;
 
@@ -52,13 +51,12 @@ namespace AlibabaCloud
 				void parse(const std::string &payload);
 			private:
 				std::string slsProjectArn_;
-				std::string mnsTopicArn_;
-				std::string roleName_;
 				std::string eventRW_;
 				std::string homeRegion_;
 				std::string ossKeyPrefix_;
 				std::string ossBucketName_;
 				std::string slsWriteRoleArn_;
+				std::string ossWriteRoleArn_;
 				std::string trailRegion_;
 				std::string name_;
 

actiontrail/src/model/CreateTrailRequest.cc

@@ -19,7 +19,7 @@
 using AlibabaCloud::Actiontrail::Model::CreateTrailRequest;
 
 CreateTrailRequest::CreateTrailRequest() :
-	RpcServiceRequest("actiontrail", "2017-12-04", "CreateTrail")
+	RpcServiceRequest("actiontrail", "2020-07-06", "CreateTrail")
 {
 	setMethod(HttpRequest::Method::Post);
 }
@@ -38,17 +38,6 @@ void CreateTrailRequest::setSlsProjectArn(const std::string& slsProjectArn)
 	setParameter("SlsProjectArn", slsProjectArn);
 }
 
-std::string CreateTrailRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void CreateTrailRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
 std::string CreateTrailRequest::getSlsWriteRoleArn()const
 {
 	return slsWriteRoleArn_;
@@ -82,26 +71,15 @@ void CreateTrailRequest::setOssKeyPrefix(const std::string& ossKeyPrefix)
 	setParameter("OssKeyPrefix", ossKeyPrefix);
 }
 
-std::string CreateTrailRequest::getMnsTopicArn()const
+std::string CreateTrailRequest::getOssWriteRoleArn()const
 {
-	return mnsTopicArn_;
+	return ossWriteRoleArn_;
 }
 
-void CreateTrailRequest::setMnsTopicArn(const std::string& mnsTopicArn)
+void CreateTrailRequest::setOssWriteRoleArn(const std::string& ossWriteRoleArn)
 {
-	mnsTopicArn_ = mnsTopicArn;
-	setParameter("MnsTopicArn", mnsTopicArn);
-}
-
-std::string CreateTrailRequest::getRoleName()const
-{
-	return roleName_;
-}
-
-void CreateTrailRequest::setRoleName(const std::string& roleName)
-{
-	roleName_ = roleName;
-	setParameter("RoleName", roleName);
+	ossWriteRoleArn_ = ossWriteRoleArn;
+	setParameter("OssWriteRoleArn", ossWriteRoleArn);
 }
 
 std::string CreateTrailRequest::getEventRW()const

actiontrail/src/model/CreateTrailResult.cc

@@ -39,26 +39,24 @@ void CreateTrailResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	if(!value["Name"].isNull())
-		name_ = value["Name"].asString();
-	if(!value["HomeRegion"].isNull())
-		homeRegion_ = value["HomeRegion"].asString();
-	if(!value["OssBucketName"].isNull())
-		ossBucketName_ = value["OssBucketName"].asString();
-	if(!value["OssKeyPrefix"].isNull())
-		ossKeyPrefix_ = value["OssKeyPrefix"].asString();
-	if(!value["RoleName"].isNull())
-		roleName_ = value["RoleName"].asString();
 	if(!value["SlsProjectArn"].isNull())
 		slsProjectArn_ = value["SlsProjectArn"].asString();
-	if(!value["SlsWriteRoleArn"].isNull())
-		slsWriteRoleArn_ = value["SlsWriteRoleArn"].asString();
 	if(!value["EventRW"].isNull())
 		eventRW_ = value["EventRW"].asString();
+	if(!value["HomeRegion"].isNull())
+		homeRegion_ = value["HomeRegion"].asString();
+	if(!value["OssKeyPrefix"].isNull())
+		ossKeyPrefix_ = value["OssKeyPrefix"].asString();
+	if(!value["OssBucketName"].isNull())
+		ossBucketName_ = value["OssBucketName"].asString();
+	if(!value["SlsWriteRoleArn"].isNull())
+		slsWriteRoleArn_ = value["SlsWriteRoleArn"].asString();
+	if(!value["OssWriteRoleArn"].isNull())
+		ossWriteRoleArn_ = value["OssWriteRoleArn"].asString();
 	if(!value["TrailRegion"].isNull())
 		trailRegion_ = value["TrailRegion"].asString();
-	if(!value["MnsTopicArn"].isNull())
-		mnsTopicArn_ = value["MnsTopicArn"].asString();
+	if(!value["Name"].isNull())
+		name_ = value["Name"].asString();
 
 }
 
@@ -67,16 +65,6 @@ std::string CreateTrailResult::getSlsProjectArn()const
 	return slsProjectArn_;
 }
 
-std::string CreateTrailResult::getMnsTopicArn()const
-{
-	return mnsTopicArn_;
-}
-
-std::string CreateTrailResult::getRoleName()const
-{
-	return roleName_;
-}
-
 std::string CreateTrailResult::getEventRW()const
 {
 	return eventRW_;
@@ -102,6 +90,11 @@ std::string CreateTrailResult::getSlsWriteRoleArn()const
 	return slsWriteRoleArn_;
 }
 
+std::string CreateTrailResult::getOssWriteRoleArn()const
+{
+	return ossWriteRoleArn_;
+}
+
 std::string CreateTrailResult::getTrailRegion()const
 {
 	return trailRegion_;

actiontrail/src/model/DeleteTrailRequest.cc

@@ -19,7 +19,7 @@
 using AlibabaCloud::Actiontrail::Model::DeleteTrailRequest;
 
 DeleteTrailRequest::DeleteTrailRequest() :
-	RpcServiceRequest("actiontrail", "2017-12-04", "DeleteTrail")
+	RpcServiceRequest("actiontrail", "2020-07-06", "DeleteTrail")
 {
 	setMethod(HttpRequest::Method::Post);
 }
@@ -27,17 +27,6 @@ DeleteTrailRequest::DeleteTrailRequest() :
 DeleteTrailRequest::~DeleteTrailRequest()
 {}
 
-std::string DeleteTrailRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void DeleteTrailRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
 std::string DeleteTrailRequest::getName()const
 {
 	return name_;

actiontrail/src/model/DescribeRegionsRequest.cc

@@ -19,7 +19,7 @@
 using AlibabaCloud::Actiontrail::Model::DescribeRegionsRequest;
 
 DescribeRegionsRequest::DescribeRegionsRequest() :
-	RpcServiceRequest("actiontrail", "2017-12-04", "DescribeRegions")
+	RpcServiceRequest("actiontrail", "2020-07-06", "DescribeRegions")
 {
 	setMethod(HttpRequest::Method::Post);
 }
@@ -27,14 +27,14 @@ DescribeRegionsRequest::DescribeRegionsRequest() :
 DescribeRegionsRequest::~DescribeRegionsRequest()
 {}
 
-std::string DescribeRegionsRequest::getAccessKeyId()const
+std::string DescribeRegionsRequest::getAcceptLanguage()const
 {
-	return accessKeyId_;
+	return acceptLanguage_;
 }
 
-void DescribeRegionsRequest::setAccessKeyId(const std::string& accessKeyId)
+void DescribeRegionsRequest::setAcceptLanguage(const std::string& acceptLanguage)
 {
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
+	acceptLanguage_ = acceptLanguage;
+	setParameter("AcceptLanguage", acceptLanguage);
 }
 

actiontrail/src/model/DescribeRegionsResult.cc

@@ -39,19 +39,22 @@ void DescribeRegionsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto regionsNode = value["Regions"];
-	auto allRegionNode = regionsNode["Region"]["RegionItem"];
-	for (auto regionsNodeRegionRegionItem : allRegionNode)
+	auto allRegionsNode = value["Regions"]["Region"];
+	for (auto valueRegionsRegion : allRegionsNode)
 	{
-		Regions::RegionItem regionItemObject;
-		if(!regionsNodeRegionRegionItem["RegionId"].isNull())
-			regionItemObject.regionId = regionsNodeRegionRegionItem["RegionId"].asString();
-		regions_.region.push_back(regionItemObject);
+		Region regionsObject;
+		if(!valueRegionsRegion["RegionId"].isNull())
+			regionsObject.regionId = valueRegionsRegion["RegionId"].asString();
+		if(!valueRegionsRegion["RegionEndpoint"].isNull())
+			regionsObject.regionEndpoint = valueRegionsRegion["RegionEndpoint"].asString();
+		if(!valueRegionsRegion["LocalName"].isNull())
+			regionsObject.localName = valueRegionsRegion["LocalName"].asString();
+		regions_.push_back(regionsObject);
 	}
 
 }
 
-DescribeRegionsResult::Regions DescribeRegionsResult::getRegions()const
+std::vector<DescribeRegionsResult::Region> DescribeRegionsResult::getRegions()const
 {
 	return regions_;
 }

actiontrail/src/model/DescribeTrailsRequest.cc

@@ -19,7 +19,7 @@
 using AlibabaCloud::Actiontrail::Model::DescribeTrailsRequest;
 
 DescribeTrailsRequest::DescribeTrailsRequest() :
-	RpcServiceRequest("actiontrail", "2017-12-04", "DescribeTrails")
+	RpcServiceRequest("actiontrail", "2020-07-06", "DescribeTrails")
 {
 	setMethod(HttpRequest::Method::Post);
 }
@@ -27,6 +27,17 @@ DescribeTrailsRequest::DescribeTrailsRequest() :
 DescribeTrailsRequest::~DescribeTrailsRequest()
 {}
 
+bool DescribeTrailsRequest::getIncludeOrganizationTrail()const
+{
+	return includeOrganizationTrail_;
+}
+
+void DescribeTrailsRequest::setIncludeOrganizationTrail(bool includeOrganizationTrail)
+{
+	includeOrganizationTrail_ = includeOrganizationTrail;
+	setParameter("IncludeOrganizationTrail", includeOrganizationTrail ? "true" : "false");
+}
+
 bool DescribeTrailsRequest::getIncludeShadowTrails()const
 {
 	return includeShadowTrails_;
@@ -38,17 +49,6 @@ void DescribeTrailsRequest::setIncludeShadowTrails(bool includeShadowTrails)
 	setParameter("IncludeShadowTrails", includeShadowTrails ? "true" : "false");
 }
 
-std::string DescribeTrailsRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void DescribeTrailsRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
 std::string DescribeTrailsRequest::getNameList()const
 {
 	return nameList_;

actiontrail/src/model/DescribeTrailsResult.cc

@@ -39,48 +39,54 @@ void DescribeTrailsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allTrailListNode = value["TrailList"]["TrailListItem"];
-	for (auto valueTrailListTrailListItem : allTrailListNode)
+	auto allTrailListNode = value["TrailList"]["Trail"];
+	for (auto valueTrailListTrail : allTrailListNode)
 	{
-		TrailListItem trailListObject;
-		if(!valueTrailListTrailListItem["Name"].isNull())
-			trailListObject.name = valueTrailListTrailListItem["Name"].asString();
-		if(!valueTrailListTrailListItem["HomeRegion"].isNull())
-			trailListObject.homeRegion = valueTrailListTrailListItem["HomeRegion"].asString();
-		if(!valueTrailListTrailListItem["RoleName"].isNull())
-			trailListObject.roleName = valueTrailListTrailListItem["RoleName"].asString();
-		if(!valueTrailListTrailListItem["OssBucketName"].isNull())
-			trailListObject.ossBucketName = valueTrailListTrailListItem["OssBucketName"].asString();
-		if(!valueTrailListTrailListItem["OssKeyPrefix"].isNull())
-			trailListObject.ossKeyPrefix = valueTrailListTrailListItem["OssKeyPrefix"].asString();
-		if(!valueTrailListTrailListItem["EventRW"].isNull())
-			trailListObject.eventRW = valueTrailListTrailListItem["EventRW"].asString();
-		if(!valueTrailListTrailListItem["SlsWriteRoleArn"].isNull())
-			trailListObject.slsWriteRoleArn = valueTrailListTrailListItem["SlsWriteRoleArn"].asString();
-		if(!valueTrailListTrailListItem["SlsProjectArn"].isNull())
-			trailListObject.slsProjectArn = valueTrailListTrailListItem["SlsProjectArn"].asString();
-		if(!valueTrailListTrailListItem["Status"].isNull())
-			trailListObject.status = valueTrailListTrailListItem["Status"].asString();
-		if(!valueTrailListTrailListItem["TrailRegion"].isNull())
-			trailListObject.trailRegion = valueTrailListTrailListItem["TrailRegion"].asString();
-		if(!valueTrailListTrailListItem["CreateTime"].isNull())
-			trailListObject.createTime = valueTrailListTrailListItem["CreateTime"].asString();
-		if(!valueTrailListTrailListItem["UpdateTime"].isNull())
-			trailListObject.updateTime = valueTrailListTrailListItem["UpdateTime"].asString();
-		if(!valueTrailListTrailListItem["StartLoggingTime"].isNull())
-			trailListObject.startLoggingTime = valueTrailListTrailListItem["StartLoggingTime"].asString();
-		if(!valueTrailListTrailListItem["StopLoggingTime"].isNull())
-			trailListObject.stopLoggingTime = valueTrailListTrailListItem["StopLoggingTime"].asString();
-		if(!valueTrailListTrailListItem["MnsTopicArn"].isNull())
-			trailListObject.mnsTopicArn = valueTrailListTrailListItem["MnsTopicArn"].asString();
-		if(!valueTrailListTrailListItem["IsOrganizationTrail"].isNull())
-			trailListObject.isOrganizationTrail = valueTrailListTrailListItem["IsOrganizationTrail"].asString() == "true";
+		Trail trailListObject;
+		if(!valueTrailListTrail["Status"].isNull())
+			trailListObject.status = valueTrailListTrail["Status"].asString();
+		if(!valueTrailListTrail["HomeRegion"].isNull())
+			trailListObject.homeRegion = valueTrailListTrail["HomeRegion"].asString();
+		if(!valueTrailListTrail["StartLoggingTime"].isNull())
+			trailListObject.startLoggingTime = valueTrailListTrail["StartLoggingTime"].asString();
+		if(!valueTrailListTrail["CreateTime"].isNull())
+			trailListObject.createTime = valueTrailListTrail["CreateTime"].asString();
+		if(!valueTrailListTrail["StopLoggingTime"].isNull())
+			trailListObject.stopLoggingTime = valueTrailListTrail["StopLoggingTime"].asString();
+		if(!valueTrailListTrail["OrganizationId"].isNull())
+			trailListObject.organizationId = valueTrailListTrail["OrganizationId"].asString();
+		if(!valueTrailListTrail["SlsWriteRoleArn"].isNull())
+			trailListObject.slsWriteRoleArn = valueTrailListTrail["SlsWriteRoleArn"].asString();
+		if(!valueTrailListTrail["OssBucketLocation"].isNull())
+			trailListObject.ossBucketLocation = valueTrailListTrail["OssBucketLocation"].asString();
+		if(!valueTrailListTrail["TrailRegion"].isNull())
+			trailListObject.trailRegion = valueTrailListTrail["TrailRegion"].asString();
+		if(!valueTrailListTrail["Name"].isNull())
+			trailListObject.name = valueTrailListTrail["Name"].asString();
+		if(!valueTrailListTrail["IsOrganizationTrail"].isNull())
+			trailListObject.isOrganizationTrail = valueTrailListTrail["IsOrganizationTrail"].asString() == "true";
+		if(!valueTrailListTrail["SlsProjectArn"].isNull())
+			trailListObject.slsProjectArn = valueTrailListTrail["SlsProjectArn"].asString();
+		if(!valueTrailListTrail["EventRW"].isNull())
+			trailListObject.eventRW = valueTrailListTrail["EventRW"].asString();
+		if(!valueTrailListTrail["OssKeyPrefix"].isNull())
+			trailListObject.ossKeyPrefix = valueTrailListTrail["OssKeyPrefix"].asString();
+		if(!valueTrailListTrail["UpdateTime"].isNull())
+			trailListObject.updateTime = valueTrailListTrail["UpdateTime"].asString();
+		if(!valueTrailListTrail["Region"].isNull())
+			trailListObject.region = valueTrailListTrail["Region"].asString();
+		if(!valueTrailListTrail["OssBucketName"].isNull())
+			trailListObject.ossBucketName = valueTrailListTrail["OssBucketName"].asString();
+		if(!valueTrailListTrail["OssWriteRoleArn"].isNull())
+			trailListObject.ossWriteRoleArn = valueTrailListTrail["OssWriteRoleArn"].asString();
+		if(!valueTrailListTrail["IsShadowTrail"].isNull())
+			trailListObject.isShadowTrail = std::stol(valueTrailListTrail["IsShadowTrail"].asString());
 		trailList_.push_back(trailListObject);
 	}
 
 }
 
-std::vector<DescribeTrailsResult::TrailListItem> DescribeTrailsResult::getTrailList()const
+std::vector<DescribeTrailsResult::Trail> DescribeTrailsResult::getTrailList()const
 {
 	return trailList_;
 }

actiontrail/src/model/GetTrailStatusRequest.cc

@@ -19,7 +19,7 @@
 using AlibabaCloud::Actiontrail::Model::GetTrailStatusRequest;
 
 GetTrailStatusRequest::GetTrailStatusRequest() :
-	RpcServiceRequest("actiontrail", "2017-12-04", "GetTrailStatus")
+	RpcServiceRequest("actiontrail", "2020-07-06", "GetTrailStatus")
 {
 	setMethod(HttpRequest::Method::Post);
 }
@@ -27,17 +27,6 @@ GetTrailStatusRequest::GetTrailStatusRequest() :
 GetTrailStatusRequest::~GetTrailStatusRequest()
 {}
 
-std::string GetTrailStatusRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void GetTrailStatusRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
 std::string GetTrailStatusRequest::getName()const
 {
 	return name_;

actiontrail/src/model/GetTrailStatusResult.cc

@@ -39,24 +39,47 @@ void GetTrailStatusResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	if(!value["IsLogging"].isNull())
-		isLogging_ = value["IsLogging"].asString() == "true";
-	if(!value["LatestDeliveryError"].isNull())
-		latestDeliveryError_ = value["LatestDeliveryError"].asString();
-	if(!value["LatestDeliveryTime"].isNull())
-		latestDeliveryTime_ = value["LatestDeliveryTime"].asString();
+	if(!value["LatestDeliveryLogServiceTime"].isNull())
+		latestDeliveryLogServiceTime_ = value["LatestDeliveryLogServiceTime"].asString();
+	if(!value["LatestDeliveryLogServiceError"].isNull())
+		latestDeliveryLogServiceError_ = value["LatestDeliveryLogServiceError"].asString();
 	if(!value["StartLoggingTime"].isNull())
 		startLoggingTime_ = value["StartLoggingTime"].asString();
+	if(!value["OssBucketStatus"].isNull())
+		ossBucketStatus_ = value["OssBucketStatus"].asString() == "true";
+	if(!value["LatestDeliveryError"].isNull())
+		latestDeliveryError_ = value["LatestDeliveryError"].asString();
 	if(!value["StopLoggingTime"].isNull())
 		stopLoggingTime_ = value["StopLoggingTime"].asString();
+	if(!value["SlsLogStoreStatus"].isNull())
+		slsLogStoreStatus_ = value["SlsLogStoreStatus"].asString() == "true";
+	if(!value["LatestDeliveryTime"].isNull())
+		latestDeliveryTime_ = value["LatestDeliveryTime"].asString();
+	if(!value["IsLogging"].isNull())
+		isLogging_ = value["IsLogging"].asString() == "true";
 
 }
 
+std::string GetTrailStatusResult::getLatestDeliveryLogServiceTime()const
+{
+	return latestDeliveryLogServiceTime_;
+}
+
+std::string GetTrailStatusResult::getLatestDeliveryLogServiceError()const
+{
+	return latestDeliveryLogServiceError_;
+}
+
 std::string GetTrailStatusResult::getStartLoggingTime()const
 {
 	return startLoggingTime_;
 }
 
+bool GetTrailStatusResult::getOssBucketStatus()const
+{
+	return ossBucketStatus_;
+}
+
 std::string GetTrailStatusResult::getLatestDeliveryError()const
 {
 	return latestDeliveryError_;
@@ -67,9 +90,9 @@ std::string GetTrailStatusResult::getStopLoggingTime()const
 	return stopLoggingTime_;
 }
 
-bool GetTrailStatusResult::getIsLogging()const
+bool GetTrailStatusResult::getSlsLogStoreStatus()const
 {
-	return isLogging_;
+	return slsLogStoreStatus_;
 }
 
 std::string GetTrailStatusResult::getLatestDeliveryTime()const
@@ -77,3 +100,8 @@ std::string GetTrailStatusResult::getLatestDeliveryTime()const
 	return latestDeliveryTime_;
 }
 
+bool GetTrailStatusResult::getIsLogging()const
+{
+	return isLogging_;
+}
+

actiontrail/src/model/LookupEventsRequest.cc

@@ -19,7 +19,7 @@
 using AlibabaCloud::Actiontrail::Model::LookupEventsRequest;
 
 LookupEventsRequest::LookupEventsRequest() :
-	RpcServiceRequest("actiontrail", "2017-12-04", "LookupEvents")
+	RpcServiceRequest("actiontrail", "2020-07-06", "LookupEvents")
 {
 	setMethod(HttpRequest::Method::Post);
 }
@@ -27,15 +27,15 @@ LookupEventsRequest::LookupEventsRequest() :
 LookupEventsRequest::~LookupEventsRequest()
 {}
 
-std::string LookupEventsRequest::getRequest()const
+std::string LookupEventsRequest::getEndTime()const
 {
-	return request_;
+	return endTime_;
 }
 
-void LookupEventsRequest::setRequest(const std::string& request)
+void LookupEventsRequest::setEndTime(const std::string& endTime)
 {
-	request_ = request;
-	setParameter("Request", request);
+	endTime_ = endTime;
+	setParameter("EndTime", endTime);
 }
 
 std::string LookupEventsRequest::getStartTime()const
@@ -49,28 +49,6 @@ void LookupEventsRequest::setStartTime(const std::string& startTime)
 	setParameter("StartTime", startTime);
 }
 
-std::string LookupEventsRequest::getEventName()const
-{
-	return eventName_;
-}
-
-void LookupEventsRequest::setEventName(const std::string& eventName)
-{
-	eventName_ = eventName;
-	setParameter("EventName", eventName);
-}
-
-std::string LookupEventsRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void LookupEventsRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
 std::string LookupEventsRequest::getNextToken()const
 {
 	return nextToken_;
@@ -82,70 +60,20 @@ void LookupEventsRequest::setNextToken(const std::string& nextToken)
 	setParameter("NextToken", nextToken);
 }
 
-std::string LookupEventsRequest::getServiceName()const
+std::vector<LookupEventsRequest::LookupAttribute> LookupEventsRequest::getLookupAttribute()const
 {
-	return serviceName_;
+	return lookupAttribute_;
 }
 
-void LookupEventsRequest::setServiceName(const std::string& serviceName)
+void LookupEventsRequest::setLookupAttribute(const std::vector<LookupAttribute>& lookupAttribute)
 {
-	serviceName_ = serviceName;
-	setParameter("ServiceName", serviceName);
-}
-
-std::string LookupEventsRequest::getEvent()const
-{
-	return event_;
-}
-
-void LookupEventsRequest::setEvent(const std::string& event)
-{
-	event_ = event;
-	setParameter("Event", event);
-}
-
-std::string LookupEventsRequest::getEventAccessKeyId()const
-{
-	return eventAccessKeyId_;
-}
-
-void LookupEventsRequest::setEventAccessKeyId(const std::string& eventAccessKeyId)
-{
-	eventAccessKeyId_ = eventAccessKeyId;
-	setParameter("EventAccessKeyId", eventAccessKeyId);
-}
-
-std::string LookupEventsRequest::getEndTime()const
-{
-	return endTime_;
-}
-
-void LookupEventsRequest::setEndTime(const std::string& endTime)
-{
-	endTime_ = endTime;
-	setParameter("EndTime", endTime);
-}
-
-std::string LookupEventsRequest::getEventRW()const
-{
-	return eventRW_;
-}
-
-void LookupEventsRequest::setEventRW(const std::string& eventRW)
-{
-	eventRW_ = eventRW;
-	setParameter("EventRW", eventRW);
-}
-
-std::string LookupEventsRequest::getResourceType()const
-{
-	return resourceType_;
-}
-
-void LookupEventsRequest::setResourceType(const std::string& resourceType)
-{
-	resourceType_ = resourceType;
-	setParameter("ResourceType", resourceType);
+	lookupAttribute_ = lookupAttribute;
+	for(int dep1 = 0; dep1!= lookupAttribute.size(); dep1++) {
+		auto lookupAttributeObj = lookupAttribute.at(dep1);
+		std::string lookupAttributeObjStr = "LookupAttribute." + std::to_string(dep1 + 1);
+		setParameter(lookupAttributeObjStr + ".Value", lookupAttributeObj.value);
+		setParameter(lookupAttributeObjStr + ".Key", lookupAttributeObj.key);
+	}
 }
 
 std::string LookupEventsRequest::getMaxResults()const
@@ -159,36 +87,14 @@ void LookupEventsRequest::setMaxResults(const std::string& maxResults)
 	setParameter("MaxResults", maxResults);
 }
 
-std::string LookupEventsRequest::getEventType()const
+std::string LookupEventsRequest::getDirection()const
 {
-	return eventType_;
+	return direction_;
 }
 
-void LookupEventsRequest::setEventType(const std::string& eventType)
+void LookupEventsRequest::setDirection(const std::string& direction)
 {
-	eventType_ = eventType;
-	setParameter("EventType", eventType);
-}
-
-std::string LookupEventsRequest::getResourceName()const
-{
-	return resourceName_;
-}
-
-void LookupEventsRequest::setResourceName(const std::string& resourceName)
-{
-	resourceName_ = resourceName;
-	setParameter("ResourceName", resourceName);
-}
-
-std::string LookupEventsRequest::getUser()const
-{
-	return user_;
-}
-
-void LookupEventsRequest::setUser(const std::string& user)
-{
-	user_ = user;
-	setParameter("User", user);
+	direction_ = direction;
+	setParameter("Direction", direction);
 }
 

actiontrail/src/model/LookupEventsResult.cc

@@ -42,25 +42,25 @@ void LookupEventsResult::parse(const std::string &payload)
 	auto allEvents = value["Events"]["Events"];
 	for (const auto &item : allEvents)
 		events_.push_back(item.asString());
+	if(!value["EndTime"].isNull())
+		endTime_ = value["EndTime"].asString();
 	if(!value["NextToken"].isNull())
 		nextToken_ = value["NextToken"].asString();
 	if(!value["StartTime"].isNull())
 		startTime_ = value["StartTime"].asString();
-	if(!value["EndTime"].isNull())
-		endTime_ = value["EndTime"].asString();
 
 }
 
-std::string LookupEventsResult::getNextToken()const
-{
-	return nextToken_;
-}
-
 std::string LookupEventsResult::getEndTime()const
 {
 	return endTime_;
 }
 
+std::string LookupEventsResult::getNextToken()const
+{
+	return nextToken_;
+}
+
 std::vector<std::string> LookupEventsResult::getEvents()const
 {
 	return events_;

actiontrail/src/model/StartLoggingRequest.cc

@@ -19,25 +19,14 @@
 using AlibabaCloud::Actiontrail::Model::StartLoggingRequest;
 
 StartLoggingRequest::StartLoggingRequest() :
-	RpcServiceRequest("actiontrail", "2017-12-04", "StartLogging")
+	RpcServiceRequest("actiontrail", "2020-07-06", "StartLogging")
 {
-	setMethod(HttpRequest::Method::Get);
+	setMethod(HttpRequest::Method::Post);
 }
 
 StartLoggingRequest::~StartLoggingRequest()
 {}
 
-std::string StartLoggingRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void StartLoggingRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
 std::string StartLoggingRequest::getName()const
 {
 	return name_;

actiontrail/src/model/StartLoggingResult.cc

@@ -39,20 +39,6 @@ void StartLoggingResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	if(!value["Param"].isNull())
-		param_ = value["Param"].asString();
-	if(!value["Result"].isNull())
-		result_ = value["Result"].asString();
 
 }
 
-std::string StartLoggingResult::getParam()const
-{
-	return param_;
-}
-
-std::string StartLoggingResult::getResult()const
-{
-	return result_;
-}
-

actiontrail/src/model/StopLoggingRequest.cc

@@ -19,7 +19,7 @@
 using AlibabaCloud::Actiontrail::Model::StopLoggingRequest;
 
 StopLoggingRequest::StopLoggingRequest() :
-	RpcServiceRequest("actiontrail", "2017-12-04", "StopLogging")
+	RpcServiceRequest("actiontrail", "2020-07-06", "StopLogging")
 {
 	setMethod(HttpRequest::Method::Get);
 }
@@ -27,17 +27,6 @@ StopLoggingRequest::StopLoggingRequest() :
 StopLoggingRequest::~StopLoggingRequest()
 {}
 
-std::string StopLoggingRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void StopLoggingRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
 std::string StopLoggingRequest::getName()const
 {
 	return name_;

actiontrail/src/model/UpdateTrailRequest.cc

@@ -19,7 +19,7 @@
 using AlibabaCloud::Actiontrail::Model::UpdateTrailRequest;
 
 UpdateTrailRequest::UpdateTrailRequest() :
-	RpcServiceRequest("actiontrail", "2017-12-04", "UpdateTrail")
+	RpcServiceRequest("actiontrail", "2020-07-06", "UpdateTrail")
 {
 	setMethod(HttpRequest::Method::Post);
 }
@@ -38,17 +38,6 @@ void UpdateTrailRequest::setSlsProjectArn(const std::string& slsProjectArn)
 	setParameter("SlsProjectArn", slsProjectArn);
 }
 
-std::string UpdateTrailRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void UpdateTrailRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
 std::string UpdateTrailRequest::getSlsWriteRoleArn()const
 {
 	return slsWriteRoleArn_;
@@ -71,26 +60,15 @@ void UpdateTrailRequest::setOssKeyPrefix(const std::string& ossKeyPrefix)
 	setParameter("OssKeyPrefix", ossKeyPrefix);
 }
 
-std::string UpdateTrailRequest::getMnsTopicArn()const
+std::string UpdateTrailRequest::getOssWriteRoleArn()const
 {
-	return mnsTopicArn_;
+	return ossWriteRoleArn_;
 }
 
-void UpdateTrailRequest::setMnsTopicArn(const std::string& mnsTopicArn)
+void UpdateTrailRequest::setOssWriteRoleArn(const std::string& ossWriteRoleArn)
 {
-	mnsTopicArn_ = mnsTopicArn;
-	setParameter("MnsTopicArn", mnsTopicArn);
-}
-
-std::string UpdateTrailRequest::getRoleName()const
-{
-	return roleName_;
-}
-
-void UpdateTrailRequest::setRoleName(const std::string& roleName)
-{
-	roleName_ = roleName;
-	setParameter("RoleName", roleName);
+	ossWriteRoleArn_ = ossWriteRoleArn;
+	setParameter("OssWriteRoleArn", ossWriteRoleArn);
 }
 
 std::string UpdateTrailRequest::getEventRW()const

actiontrail/src/model/UpdateTrailResult.cc

@@ -39,26 +39,24 @@ void UpdateTrailResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	if(!value["Name"].isNull())
-		name_ = value["Name"].asString();
-	if(!value["HomeRegion"].isNull())
-		homeRegion_ = value["HomeRegion"].asString();
-	if(!value["OssBucketName"].isNull())
-		ossBucketName_ = value["OssBucketName"].asString();
-	if(!value["OssKeyPrefix"].isNull())
-		ossKeyPrefix_ = value["OssKeyPrefix"].asString();
-	if(!value["RoleName"].isNull())
-		roleName_ = value["RoleName"].asString();
 	if(!value["SlsProjectArn"].isNull())
 		slsProjectArn_ = value["SlsProjectArn"].asString();
-	if(!value["SlsWriteRoleArn"].isNull())
-		slsWriteRoleArn_ = value["SlsWriteRoleArn"].asString();
 	if(!value["EventRW"].isNull())
 		eventRW_ = value["EventRW"].asString();
+	if(!value["HomeRegion"].isNull())
+		homeRegion_ = value["HomeRegion"].asString();
+	if(!value["OssKeyPrefix"].isNull())
+		ossKeyPrefix_ = value["OssKeyPrefix"].asString();
+	if(!value["OssBucketName"].isNull())
+		ossBucketName_ = value["OssBucketName"].asString();
+	if(!value["SlsWriteRoleArn"].isNull())
+		slsWriteRoleArn_ = value["SlsWriteRoleArn"].asString();
+	if(!value["OssWriteRoleArn"].isNull())
+		ossWriteRoleArn_ = value["OssWriteRoleArn"].asString();
 	if(!value["TrailRegion"].isNull())
 		trailRegion_ = value["TrailRegion"].asString();
-	if(!value["MnsTopicArn"].isNull())
-		mnsTopicArn_ = value["MnsTopicArn"].asString();
+	if(!value["Name"].isNull())
+		name_ = value["Name"].asString();
 
 }
 
@@ -67,16 +65,6 @@ std::string UpdateTrailResult::getSlsProjectArn()const
 	return slsProjectArn_;
 }
 
-std::string UpdateTrailResult::getMnsTopicArn()const
-{
-	return mnsTopicArn_;
-}
-
-std::string UpdateTrailResult::getRoleName()const
-{
-	return roleName_;
-}
-
 std::string UpdateTrailResult::getEventRW()const
 {
 	return eventRW_;
@@ -102,6 +90,11 @@ std::string UpdateTrailResult::getSlsWriteRoleArn()const
 	return slsWriteRoleArn_;
 }
 
+std::string UpdateTrailResult::getOssWriteRoleArn()const
+{
+	return ossWriteRoleArn_;
+}
+
 std::string UpdateTrailResult::getTrailRegion()const
 {
 	return trailRegion_;

adb/CMakeLists.txt

@@ -23,12 +23,16 @@ set(adb_public_header
 set(adb_public_header_model 
 	include/alibabacloud/adb/model/AllocateClusterPublicConnectionRequest.h
 	include/alibabacloud/adb/model/AllocateClusterPublicConnectionResult.h
+	include/alibabacloud/adb/model/BindDBResourceGroupWithUserRequest.h
+	include/alibabacloud/adb/model/BindDBResourceGroupWithUserResult.h
 	include/alibabacloud/adb/model/BindDBResourcePoolWithUserRequest.h
 	include/alibabacloud/adb/model/BindDBResourcePoolWithUserResult.h
 	include/alibabacloud/adb/model/CreateAccountRequest.h
 	include/alibabacloud/adb/model/CreateAccountResult.h
 	include/alibabacloud/adb/model/CreateDBClusterRequest.h
 	include/alibabacloud/adb/model/CreateDBClusterResult.h
+	include/alibabacloud/adb/model/CreateDBResourceGroupRequest.h
+	include/alibabacloud/adb/model/CreateDBResourceGroupResult.h
 	include/alibabacloud/adb/model/CreateDBResourcePoolRequest.h
 	include/alibabacloud/adb/model/CreateDBResourcePoolResult.h
 	include/alibabacloud/adb/model/CreateElasticPlanRequest.h
@@ -37,6 +41,8 @@ set(adb_public_header_model
 	include/alibabacloud/adb/model/DeleteAccountResult.h
 	include/alibabacloud/adb/model/DeleteDBClusterRequest.h
 	include/alibabacloud/adb/model/DeleteDBClusterResult.h
+	include/alibabacloud/adb/model/DeleteDBResourceGroupRequest.h
+	include/alibabacloud/adb/model/DeleteDBResourceGroupResult.h
 	include/alibabacloud/adb/model/DeleteDBResourcePoolRequest.h
 	include/alibabacloud/adb/model/DeleteDBResourcePoolResult.h
 	include/alibabacloud/adb/model/DeleteElasticPlanRequest.h
@@ -67,6 +73,10 @@ set(adb_public_header_model
 	include/alibabacloud/adb/model/DescribeDBClusterAccessWhiteListResult.h
 	include/alibabacloud/adb/model/DescribeDBClusterAttributeRequest.h
 	include/alibabacloud/adb/model/DescribeDBClusterAttributeResult.h
+	include/alibabacloud/adb/model/DescribeDBClusterForecastRequest.h
+	include/alibabacloud/adb/model/DescribeDBClusterForecastResult.h
+	include/alibabacloud/adb/model/DescribeDBClusterHealthReportRequest.h
+	include/alibabacloud/adb/model/DescribeDBClusterHealthReportResult.h
 	include/alibabacloud/adb/model/DescribeDBClusterNetInfoRequest.h
 	include/alibabacloud/adb/model/DescribeDBClusterNetInfoResult.h
 	include/alibabacloud/adb/model/DescribeDBClusterPerformanceRequest.h
@@ -75,8 +85,16 @@ set(adb_public_header_model
 	include/alibabacloud/adb/model/DescribeDBClusterResourcePoolPerformanceResult.h
 	include/alibabacloud/adb/model/DescribeDBClustersRequest.h
 	include/alibabacloud/adb/model/DescribeDBClustersResult.h
+	include/alibabacloud/adb/model/DescribeDBResourceGroupRequest.h
+	include/alibabacloud/adb/model/DescribeDBResourceGroupResult.h
 	include/alibabacloud/adb/model/DescribeDBResourcePoolRequest.h
 	include/alibabacloud/adb/model/DescribeDBResourcePoolResult.h
+	include/alibabacloud/adb/model/DescribeDiagnosisDimensionsRequest.h
+	include/alibabacloud/adb/model/DescribeDiagnosisDimensionsResult.h
+	include/alibabacloud/adb/model/DescribeDiagnosisRecordsRequest.h
+	include/alibabacloud/adb/model/DescribeDiagnosisRecordsResult.h
+	include/alibabacloud/adb/model/DescribeDownloadRecordsRequest.h
+	include/alibabacloud/adb/model/DescribeDownloadRecordsResult.h
 	include/alibabacloud/adb/model/DescribeElasticDailyPlanRequest.h
 	include/alibabacloud/adb/model/DescribeElasticDailyPlanResult.h
 	include/alibabacloud/adb/model/DescribeElasticPlanRequest.h
@@ -85,12 +103,20 @@ set(adb_public_header_model
 	include/alibabacloud/adb/model/DescribeInclinedTablesResult.h
 	include/alibabacloud/adb/model/DescribeLoadTasksRecordsRequest.h
 	include/alibabacloud/adb/model/DescribeLoadTasksRecordsResult.h
+	include/alibabacloud/adb/model/DescribeMaintenanceActionRequest.h
+	include/alibabacloud/adb/model/DescribeMaintenanceActionResult.h
 	include/alibabacloud/adb/model/DescribeOperatorPermissionRequest.h
 	include/alibabacloud/adb/model/DescribeOperatorPermissionResult.h
+	include/alibabacloud/adb/model/DescribePatternPerformanceRequest.h
+	include/alibabacloud/adb/model/DescribePatternPerformanceResult.h
 	include/alibabacloud/adb/model/DescribeProcessListRequest.h
 	include/alibabacloud/adb/model/DescribeProcessListResult.h
 	include/alibabacloud/adb/model/DescribeRegionsRequest.h
 	include/alibabacloud/adb/model/DescribeRegionsResult.h
+	include/alibabacloud/adb/model/DescribeSQLPatternAttributeRequest.h
+	include/alibabacloud/adb/model/DescribeSQLPatternAttributeResult.h
+	include/alibabacloud/adb/model/DescribeSQLPatternsRequest.h
+	include/alibabacloud/adb/model/DescribeSQLPatternsResult.h
 	include/alibabacloud/adb/model/DescribeSQLPlanRequest.h
 	include/alibabacloud/adb/model/DescribeSQLPlanResult.h
 	include/alibabacloud/adb/model/DescribeSQLPlanTaskRequest.h
@@ -101,6 +127,10 @@ set(adb_public_header_model
 	include/alibabacloud/adb/model/DescribeSlowLogRecordsResult.h
 	include/alibabacloud/adb/model/DescribeSlowLogTrendRequest.h
 	include/alibabacloud/adb/model/DescribeSlowLogTrendResult.h
+	include/alibabacloud/adb/model/DescribeSqlPatternRequest.h
+	include/alibabacloud/adb/model/DescribeSqlPatternResult.h
+	include/alibabacloud/adb/model/DescribeTableAccessCountRequest.h
+	include/alibabacloud/adb/model/DescribeTableAccessCountResult.h
 	include/alibabacloud/adb/model/DescribeTableDetailRequest.h
 	include/alibabacloud/adb/model/DescribeTableDetailResult.h
 	include/alibabacloud/adb/model/DescribeTablePartitionDiagnoseRequest.h
@@ -111,6 +141,8 @@ set(adb_public_header_model
 	include/alibabacloud/adb/model/DescribeTablesResult.h
 	include/alibabacloud/adb/model/DescribeTaskInfoRequest.h
 	include/alibabacloud/adb/model/DescribeTaskInfoResult.h
+	include/alibabacloud/adb/model/DownloadDiagnosisRecordsRequest.h
+	include/alibabacloud/adb/model/DownloadDiagnosisRecordsResult.h
 	include/alibabacloud/adb/model/GrantOperatorPermissionRequest.h
 	include/alibabacloud/adb/model/GrantOperatorPermissionResult.h
 	include/alibabacloud/adb/model/KillProcessRequest.h
@@ -135,14 +167,20 @@ set(adb_public_header_model
 	include/alibabacloud/adb/model/ModifyDBClusterDescriptionResult.h
 	include/alibabacloud/adb/model/ModifyDBClusterMaintainTimeRequest.h
 	include/alibabacloud/adb/model/ModifyDBClusterMaintainTimeResult.h
+	include/alibabacloud/adb/model/ModifyDBClusterPayTypeRequest.h
+	include/alibabacloud/adb/model/ModifyDBClusterPayTypeResult.h
 	include/alibabacloud/adb/model/ModifyDBClusterResourceGroupRequest.h
 	include/alibabacloud/adb/model/ModifyDBClusterResourceGroupResult.h
+	include/alibabacloud/adb/model/ModifyDBResourceGroupRequest.h
+	include/alibabacloud/adb/model/ModifyDBResourceGroupResult.h
 	include/alibabacloud/adb/model/ModifyDBResourcePoolRequest.h
 	include/alibabacloud/adb/model/ModifyDBResourcePoolResult.h
 	include/alibabacloud/adb/model/ModifyElasticPlanRequest.h
 	include/alibabacloud/adb/model/ModifyElasticPlanResult.h
 	include/alibabacloud/adb/model/ModifyLogBackupPolicyRequest.h
 	include/alibabacloud/adb/model/ModifyLogBackupPolicyResult.h
+	include/alibabacloud/adb/model/ModifyMaintenanceActionRequest.h
+	include/alibabacloud/adb/model/ModifyMaintenanceActionResult.h
 	include/alibabacloud/adb/model/ReleaseClusterPublicConnectionRequest.h
 	include/alibabacloud/adb/model/ReleaseClusterPublicConnectionResult.h
 	include/alibabacloud/adb/model/ResetAccountPasswordRequest.h
@@ -151,6 +189,8 @@ set(adb_public_header_model
 	include/alibabacloud/adb/model/RevokeOperatorPermissionResult.h
 	include/alibabacloud/adb/model/TagResourcesRequest.h
 	include/alibabacloud/adb/model/TagResourcesResult.h
+	include/alibabacloud/adb/model/UnbindDBResourceGroupWithUserRequest.h
+	include/alibabacloud/adb/model/UnbindDBResourceGroupWithUserResult.h
 	include/alibabacloud/adb/model/UnbindDBResourcePoolWithUserRequest.h
 	include/alibabacloud/adb/model/UnbindDBResourcePoolWithUserResult.h
 	include/alibabacloud/adb/model/UntagResourcesRequest.h
@@ -160,12 +200,16 @@ set(adb_src
 	src/AdbClient.cc
 	src/model/AllocateClusterPublicConnectionRequest.cc
 	src/model/AllocateClusterPublicConnectionResult.cc
+	src/model/BindDBResourceGroupWithUserRequest.cc
+	src/model/BindDBResourceGroupWithUserResult.cc
 	src/model/BindDBResourcePoolWithUserRequest.cc
 	src/model/BindDBResourcePoolWithUserResult.cc
 	src/model/CreateAccountRequest.cc
 	src/model/CreateAccountResult.cc
 	src/model/CreateDBClusterRequest.cc
 	src/model/CreateDBClusterResult.cc
+	src/model/CreateDBResourceGroupRequest.cc
+	src/model/CreateDBResourceGroupResult.cc
 	src/model/CreateDBResourcePoolRequest.cc
 	src/model/CreateDBResourcePoolResult.cc
 	src/model/CreateElasticPlanRequest.cc
@@ -174,6 +218,8 @@ set(adb_src
 	src/model/DeleteAccountResult.cc
 	src/model/DeleteDBClusterRequest.cc
 	src/model/DeleteDBClusterResult.cc
+	src/model/DeleteDBResourceGroupRequest.cc
+	src/model/DeleteDBResourceGroupResult.cc
 	src/model/DeleteDBResourcePoolRequest.cc
 	src/model/DeleteDBResourcePoolResult.cc
 	src/model/DeleteElasticPlanRequest.cc
@@ -204,6 +250,10 @@ set(adb_src
 	src/model/DescribeDBClusterAccessWhiteListResult.cc
 	src/model/DescribeDBClusterAttributeRequest.cc
 	src/model/DescribeDBClusterAttributeResult.cc
+	src/model/DescribeDBClusterForecastRequest.cc
+	src/model/DescribeDBClusterForecastResult.cc
+	src/model/DescribeDBClusterHealthReportRequest.cc
+	src/model/DescribeDBClusterHealthReportResult.cc
 	src/model/DescribeDBClusterNetInfoRequest.cc
 	src/model/DescribeDBClusterNetInfoResult.cc
 	src/model/DescribeDBClusterPerformanceRequest.cc
@@ -212,8 +262,16 @@ set(adb_src
 	src/model/DescribeDBClusterResourcePoolPerformanceResult.cc
 	src/model/DescribeDBClustersRequest.cc
 	src/model/DescribeDBClustersResult.cc
+	src/model/DescribeDBResourceGroupRequest.cc
+	src/model/DescribeDBResourceGroupResult.cc
 	src/model/DescribeDBResourcePoolRequest.cc
 	src/model/DescribeDBResourcePoolResult.cc
+	src/model/DescribeDiagnosisDimensionsRequest.cc
+	src/model/DescribeDiagnosisDimensionsResult.cc
+	src/model/DescribeDiagnosisRecordsRequest.cc
+	src/model/DescribeDiagnosisRecordsResult.cc
+	src/model/DescribeDownloadRecordsRequest.cc
+	src/model/DescribeDownloadRecordsResult.cc
 	src/model/DescribeElasticDailyPlanRequest.cc
 	src/model/DescribeElasticDailyPlanResult.cc
 	src/model/DescribeElasticPlanRequest.cc
@@ -222,12 +280,20 @@ set(adb_src
 	src/model/DescribeInclinedTablesResult.cc
 	src/model/DescribeLoadTasksRecordsRequest.cc
 	src/model/DescribeLoadTasksRecordsResult.cc
+	src/model/DescribeMaintenanceActionRequest.cc
+	src/model/DescribeMaintenanceActionResult.cc
 	src/model/DescribeOperatorPermissionRequest.cc
 	src/model/DescribeOperatorPermissionResult.cc
+	src/model/DescribePatternPerformanceRequest.cc
+	src/model/DescribePatternPerformanceResult.cc
 	src/model/DescribeProcessListRequest.cc
 	src/model/DescribeProcessListResult.cc
 	src/model/DescribeRegionsRequest.cc
 	src/model/DescribeRegionsResult.cc
+	src/model/DescribeSQLPatternAttributeRequest.cc
+	src/model/DescribeSQLPatternAttributeResult.cc
+	src/model/DescribeSQLPatternsRequest.cc
+	src/model/DescribeSQLPatternsResult.cc
 	src/model/DescribeSQLPlanRequest.cc
 	src/model/DescribeSQLPlanResult.cc
 	src/model/DescribeSQLPlanTaskRequest.cc
@@ -238,6 +304,10 @@ set(adb_src
 	src/model/DescribeSlowLogRecordsResult.cc
 	src/model/DescribeSlowLogTrendRequest.cc
 	src/model/DescribeSlowLogTrendResult.cc
+	src/model/DescribeSqlPatternRequest.cc
+	src/model/DescribeSqlPatternResult.cc
+	src/model/DescribeTableAccessCountRequest.cc
+	src/model/DescribeTableAccessCountResult.cc
 	src/model/DescribeTableDetailRequest.cc
 	src/model/DescribeTableDetailResult.cc
 	src/model/DescribeTablePartitionDiagnoseRequest.cc
@@ -248,6 +318,8 @@ set(adb_src
 	src/model/DescribeTablesResult.cc
 	src/model/DescribeTaskInfoRequest.cc
 	src/model/DescribeTaskInfoResult.cc
+	src/model/DownloadDiagnosisRecordsRequest.cc
+	src/model/DownloadDiagnosisRecordsResult.cc
 	src/model/GrantOperatorPermissionRequest.cc
 	src/model/GrantOperatorPermissionResult.cc
 	src/model/KillProcessRequest.cc
@@ -272,14 +344,20 @@ set(adb_src
 	src/model/ModifyDBClusterDescriptionResult.cc
 	src/model/ModifyDBClusterMaintainTimeRequest.cc
 	src/model/ModifyDBClusterMaintainTimeResult.cc
+	src/model/ModifyDBClusterPayTypeRequest.cc
+	src/model/ModifyDBClusterPayTypeResult.cc
 	src/model/ModifyDBClusterResourceGroupRequest.cc
 	src/model/ModifyDBClusterResourceGroupResult.cc
+	src/model/ModifyDBResourceGroupRequest.cc
+	src/model/ModifyDBResourceGroupResult.cc
 	src/model/ModifyDBResourcePoolRequest.cc
 	src/model/ModifyDBResourcePoolResult.cc
 	src/model/ModifyElasticPlanRequest.cc
 	src/model/ModifyElasticPlanResult.cc
 	src/model/ModifyLogBackupPolicyRequest.cc
 	src/model/ModifyLogBackupPolicyResult.cc
+	src/model/ModifyMaintenanceActionRequest.cc
+	src/model/ModifyMaintenanceActionResult.cc
 	src/model/ReleaseClusterPublicConnectionRequest.cc
 	src/model/ReleaseClusterPublicConnectionResult.cc
 	src/model/ResetAccountPasswordRequest.cc
@@ -288,6 +366,8 @@ set(adb_src
 	src/model/RevokeOperatorPermissionResult.cc
 	src/model/TagResourcesRequest.cc
 	src/model/TagResourcesResult.cc
+	src/model/UnbindDBResourceGroupWithUserRequest.cc
+	src/model/UnbindDBResourceGroupWithUserResult.cc
 	src/model/UnbindDBResourcePoolWithUserRequest.cc
 	src/model/UnbindDBResourcePoolWithUserResult.cc
 	src/model/UntagResourcesRequest.cc

adb/include/alibabacloud/adb/AdbClient.h

@@ -24,12 +24,16 @@
 #include "AdbExport.h"
 #include "model/AllocateClusterPublicConnectionRequest.h"
 #include "model/AllocateClusterPublicConnectionResult.h"
+#include "model/BindDBResourceGroupWithUserRequest.h"
+#include "model/BindDBResourceGroupWithUserResult.h"
 #include "model/BindDBResourcePoolWithUserRequest.h"
 #include "model/BindDBResourcePoolWithUserResult.h"
 #include "model/CreateAccountRequest.h"
 #include "model/CreateAccountResult.h"
 #include "model/CreateDBClusterRequest.h"
 #include "model/CreateDBClusterResult.h"
+#include "model/CreateDBResourceGroupRequest.h"
+#include "model/CreateDBResourceGroupResult.h"
 #include "model/CreateDBResourcePoolRequest.h"
 #include "model/CreateDBResourcePoolResult.h"
 #include "model/CreateElasticPlanRequest.h"
@@ -38,6 +42,8 @@
 #include "model/DeleteAccountResult.h"
 #include "model/DeleteDBClusterRequest.h"
 #include "model/DeleteDBClusterResult.h"
+#include "model/DeleteDBResourceGroupRequest.h"
+#include "model/DeleteDBResourceGroupResult.h"
 #include "model/DeleteDBResourcePoolRequest.h"
 #include "model/DeleteDBResourcePoolResult.h"
 #include "model/DeleteElasticPlanRequest.h"
@@ -68,6 +74,10 @@
 #include "model/DescribeDBClusterAccessWhiteListResult.h"
 #include "model/DescribeDBClusterAttributeRequest.h"
 #include "model/DescribeDBClusterAttributeResult.h"
+#include "model/DescribeDBClusterForecastRequest.h"
+#include "model/DescribeDBClusterForecastResult.h"
+#include "model/DescribeDBClusterHealthReportRequest.h"
+#include "model/DescribeDBClusterHealthReportResult.h"
 #include "model/DescribeDBClusterNetInfoRequest.h"
 #include "model/DescribeDBClusterNetInfoResult.h"
 #include "model/DescribeDBClusterPerformanceRequest.h"
@@ -76,8 +86,16 @@
 #include "model/DescribeDBClusterResourcePoolPerformanceResult.h"
 #include "model/DescribeDBClustersRequest.h"
 #include "model/DescribeDBClustersResult.h"
+#include "model/DescribeDBResourceGroupRequest.h"
+#include "model/DescribeDBResourceGroupResult.h"
 #include "model/DescribeDBResourcePoolRequest.h"
 #include "model/DescribeDBResourcePoolResult.h"
+#include "model/DescribeDiagnosisDimensionsRequest.h"
+#include "model/DescribeDiagnosisDimensionsResult.h"
+#include "model/DescribeDiagnosisRecordsRequest.h"
+#include "model/DescribeDiagnosisRecordsResult.h"
+#include "model/DescribeDownloadRecordsRequest.h"
+#include "model/DescribeDownloadRecordsResult.h"
 #include "model/DescribeElasticDailyPlanRequest.h"
 #include "model/DescribeElasticDailyPlanResult.h"
 #include "model/DescribeElasticPlanRequest.h"
@@ -86,12 +104,20 @@
 #include "model/DescribeInclinedTablesResult.h"
 #include "model/DescribeLoadTasksRecordsRequest.h"
 #include "model/DescribeLoadTasksRecordsResult.h"
+#include "model/DescribeMaintenanceActionRequest.h"
+#include "model/DescribeMaintenanceActionResult.h"
 #include "model/DescribeOperatorPermissionRequest.h"
 #include "model/DescribeOperatorPermissionResult.h"
+#include "model/DescribePatternPerformanceRequest.h"
+#include "model/DescribePatternPerformanceResult.h"
 #include "model/DescribeProcessListRequest.h"
 #include "model/DescribeProcessListResult.h"
 #include "model/DescribeRegionsRequest.h"
 #include "model/DescribeRegionsResult.h"
+#include "model/DescribeSQLPatternAttributeRequest.h"
+#include "model/DescribeSQLPatternAttributeResult.h"
+#include "model/DescribeSQLPatternsRequest.h"
+#include "model/DescribeSQLPatternsResult.h"
 #include "model/DescribeSQLPlanRequest.h"
 #include "model/DescribeSQLPlanResult.h"
 #include "model/DescribeSQLPlanTaskRequest.h"
@@ -102,6 +128,10 @@
 #include "model/DescribeSlowLogRecordsResult.h"
 #include "model/DescribeSlowLogTrendRequest.h"
 #include "model/DescribeSlowLogTrendResult.h"
+#include "model/DescribeSqlPatternRequest.h"
+#include "model/DescribeSqlPatternResult.h"
+#include "model/DescribeTableAccessCountRequest.h"
+#include "model/DescribeTableAccessCountResult.h"
 #include "model/DescribeTableDetailRequest.h"
 #include "model/DescribeTableDetailResult.h"
 #include "model/DescribeTablePartitionDiagnoseRequest.h"
@@ -112,6 +142,8 @@
 #include "model/DescribeTablesResult.h"
 #include "model/DescribeTaskInfoRequest.h"
 #include "model/DescribeTaskInfoResult.h"
+#include "model/DownloadDiagnosisRecordsRequest.h"
+#include "model/DownloadDiagnosisRecordsResult.h"
 #include "model/GrantOperatorPermissionRequest.h"
 #include "model/GrantOperatorPermissionResult.h"
 #include "model/KillProcessRequest.h"
@@ -136,14 +168,20 @@
 #include "model/ModifyDBClusterDescriptionResult.h"
 #include "model/ModifyDBClusterMaintainTimeRequest.h"
 #include "model/ModifyDBClusterMaintainTimeResult.h"
+#include "model/ModifyDBClusterPayTypeRequest.h"
+#include "model/ModifyDBClusterPayTypeResult.h"
 #include "model/ModifyDBClusterResourceGroupRequest.h"
 #include "model/ModifyDBClusterResourceGroupResult.h"
+#include "model/ModifyDBResourceGroupRequest.h"
+#include "model/ModifyDBResourceGroupResult.h"
 #include "model/ModifyDBResourcePoolRequest.h"
 #include "model/ModifyDBResourcePoolResult.h"
 #include "model/ModifyElasticPlanRequest.h"
 #include "model/ModifyElasticPlanResult.h"
 #include "model/ModifyLogBackupPolicyRequest.h"
 #include "model/ModifyLogBackupPolicyResult.h"
+#include "model/ModifyMaintenanceActionRequest.h"
+#include "model/ModifyMaintenanceActionResult.h"
 #include "model/ReleaseClusterPublicConnectionRequest.h"
 #include "model/ReleaseClusterPublicConnectionResult.h"
 #include "model/ResetAccountPasswordRequest.h"
@@ -152,6 +190,8 @@
 #include "model/RevokeOperatorPermissionResult.h"
 #include "model/TagResourcesRequest.h"
 #include "model/TagResourcesResult.h"
+#include "model/UnbindDBResourceGroupWithUserRequest.h"
+#include "model/UnbindDBResourceGroupWithUserResult.h"
 #include "model/UnbindDBResourcePoolWithUserRequest.h"
 #include "model/UnbindDBResourcePoolWithUserResult.h"
 #include "model/UntagResourcesRequest.h"
@@ -168,6 +208,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::AllocateClusterPublicConnectionResult> AllocateClusterPublicConnectionOutcome;
 			typedef std::future<AllocateClusterPublicConnectionOutcome> AllocateClusterPublicConnectionOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::AllocateClusterPublicConnectionRequest&, const AllocateClusterPublicConnectionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> AllocateClusterPublicConnectionAsyncHandler;
+			typedef Outcome<Error, Model::BindDBResourceGroupWithUserResult> BindDBResourceGroupWithUserOutcome;
+			typedef std::future<BindDBResourceGroupWithUserOutcome> BindDBResourceGroupWithUserOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::BindDBResourceGroupWithUserRequest&, const BindDBResourceGroupWithUserOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> BindDBResourceGroupWithUserAsyncHandler;
 			typedef Outcome<Error, Model::BindDBResourcePoolWithUserResult> BindDBResourcePoolWithUserOutcome;
 			typedef std::future<BindDBResourcePoolWithUserOutcome> BindDBResourcePoolWithUserOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::BindDBResourcePoolWithUserRequest&, const BindDBResourcePoolWithUserOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> BindDBResourcePoolWithUserAsyncHandler;
@@ -177,6 +220,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreateDBClusterResult> CreateDBClusterOutcome;
 			typedef std::future<CreateDBClusterOutcome> CreateDBClusterOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::CreateDBClusterRequest&, const CreateDBClusterOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateDBClusterAsyncHandler;
+			typedef Outcome<Error, Model::CreateDBResourceGroupResult> CreateDBResourceGroupOutcome;
+			typedef std::future<CreateDBResourceGroupOutcome> CreateDBResourceGroupOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::CreateDBResourceGroupRequest&, const CreateDBResourceGroupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateDBResourceGroupAsyncHandler;
 			typedef Outcome<Error, Model::CreateDBResourcePoolResult> CreateDBResourcePoolOutcome;
 			typedef std::future<CreateDBResourcePoolOutcome> CreateDBResourcePoolOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::CreateDBResourcePoolRequest&, const CreateDBResourcePoolOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateDBResourcePoolAsyncHandler;
@@ -189,6 +235,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DeleteDBClusterResult> DeleteDBClusterOutcome;
 			typedef std::future<DeleteDBClusterOutcome> DeleteDBClusterOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DeleteDBClusterRequest&, const DeleteDBClusterOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteDBClusterAsyncHandler;
+			typedef Outcome<Error, Model::DeleteDBResourceGroupResult> DeleteDBResourceGroupOutcome;
+			typedef std::future<DeleteDBResourceGroupOutcome> DeleteDBResourceGroupOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::DeleteDBResourceGroupRequest&, const DeleteDBResourceGroupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteDBResourceGroupAsyncHandler;
 			typedef Outcome<Error, Model::DeleteDBResourcePoolResult> DeleteDBResourcePoolOutcome;
 			typedef std::future<DeleteDBResourcePoolOutcome> DeleteDBResourcePoolOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DeleteDBResourcePoolRequest&, const DeleteDBResourcePoolOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteDBResourcePoolAsyncHandler;
@@ -234,6 +283,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDBClusterAttributeResult> DescribeDBClusterAttributeOutcome;
 			typedef std::future<DescribeDBClusterAttributeOutcome> DescribeDBClusterAttributeOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DescribeDBClusterAttributeRequest&, const DescribeDBClusterAttributeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBClusterAttributeAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDBClusterForecastResult> DescribeDBClusterForecastOutcome;
+			typedef std::future<DescribeDBClusterForecastOutcome> DescribeDBClusterForecastOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::DescribeDBClusterForecastRequest&, const DescribeDBClusterForecastOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBClusterForecastAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDBClusterHealthReportResult> DescribeDBClusterHealthReportOutcome;
+			typedef std::future<DescribeDBClusterHealthReportOutcome> DescribeDBClusterHealthReportOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::DescribeDBClusterHealthReportRequest&, const DescribeDBClusterHealthReportOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBClusterHealthReportAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDBClusterNetInfoResult> DescribeDBClusterNetInfoOutcome;
 			typedef std::future<DescribeDBClusterNetInfoOutcome> DescribeDBClusterNetInfoOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DescribeDBClusterNetInfoRequest&, const DescribeDBClusterNetInfoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBClusterNetInfoAsyncHandler;
@@ -246,9 +301,21 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDBClustersResult> DescribeDBClustersOutcome;
 			typedef std::future<DescribeDBClustersOutcome> DescribeDBClustersOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DescribeDBClustersRequest&, const DescribeDBClustersOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBClustersAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDBResourceGroupResult> DescribeDBResourceGroupOutcome;
+			typedef std::future<DescribeDBResourceGroupOutcome> DescribeDBResourceGroupOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::DescribeDBResourceGroupRequest&, const DescribeDBResourceGroupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBResourceGroupAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDBResourcePoolResult> DescribeDBResourcePoolOutcome;
 			typedef std::future<DescribeDBResourcePoolOutcome> DescribeDBResourcePoolOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DescribeDBResourcePoolRequest&, const DescribeDBResourcePoolOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBResourcePoolAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDiagnosisDimensionsResult> DescribeDiagnosisDimensionsOutcome;
+			typedef std::future<DescribeDiagnosisDimensionsOutcome> DescribeDiagnosisDimensionsOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::DescribeDiagnosisDimensionsRequest&, const DescribeDiagnosisDimensionsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDiagnosisDimensionsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDiagnosisRecordsResult> DescribeDiagnosisRecordsOutcome;
+			typedef std::future<DescribeDiagnosisRecordsOutcome> DescribeDiagnosisRecordsOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::DescribeDiagnosisRecordsRequest&, const DescribeDiagnosisRecordsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDiagnosisRecordsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDownloadRecordsResult> DescribeDownloadRecordsOutcome;
+			typedef std::future<DescribeDownloadRecordsOutcome> DescribeDownloadRecordsOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::DescribeDownloadRecordsRequest&, const DescribeDownloadRecordsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDownloadRecordsAsyncHandler;
 			typedef Outcome<Error, Model::DescribeElasticDailyPlanResult> DescribeElasticDailyPlanOutcome;
 			typedef std::future<DescribeElasticDailyPlanOutcome> DescribeElasticDailyPlanOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DescribeElasticDailyPlanRequest&, const DescribeElasticDailyPlanOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeElasticDailyPlanAsyncHandler;
@@ -261,15 +328,27 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeLoadTasksRecordsResult> DescribeLoadTasksRecordsOutcome;
 			typedef std::future<DescribeLoadTasksRecordsOutcome> DescribeLoadTasksRecordsOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DescribeLoadTasksRecordsRequest&, const DescribeLoadTasksRecordsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeLoadTasksRecordsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeMaintenanceActionResult> DescribeMaintenanceActionOutcome;
+			typedef std::future<DescribeMaintenanceActionOutcome> DescribeMaintenanceActionOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::DescribeMaintenanceActionRequest&, const DescribeMaintenanceActionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeMaintenanceActionAsyncHandler;
 			typedef Outcome<Error, Model::DescribeOperatorPermissionResult> DescribeOperatorPermissionOutcome;
 			typedef std::future<DescribeOperatorPermissionOutcome> DescribeOperatorPermissionOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DescribeOperatorPermissionRequest&, const DescribeOperatorPermissionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeOperatorPermissionAsyncHandler;
+			typedef Outcome<Error, Model::DescribePatternPerformanceResult> DescribePatternPerformanceOutcome;
+			typedef std::future<DescribePatternPerformanceOutcome> DescribePatternPerformanceOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::DescribePatternPerformanceRequest&, const DescribePatternPerformanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribePatternPerformanceAsyncHandler;
 			typedef Outcome<Error, Model::DescribeProcessListResult> DescribeProcessListOutcome;
 			typedef std::future<DescribeProcessListOutcome> DescribeProcessListOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DescribeProcessListRequest&, const DescribeProcessListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeProcessListAsyncHandler;
 			typedef Outcome<Error, Model::DescribeRegionsResult> DescribeRegionsOutcome;
 			typedef std::future<DescribeRegionsOutcome> DescribeRegionsOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DescribeRegionsRequest&, const DescribeRegionsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeRegionsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeSQLPatternAttributeResult> DescribeSQLPatternAttributeOutcome;
+			typedef std::future<DescribeSQLPatternAttributeOutcome> DescribeSQLPatternAttributeOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::DescribeSQLPatternAttributeRequest&, const DescribeSQLPatternAttributeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSQLPatternAttributeAsyncHandler;
+			typedef Outcome<Error, Model::DescribeSQLPatternsResult> DescribeSQLPatternsOutcome;
+			typedef std::future<DescribeSQLPatternsOutcome> DescribeSQLPatternsOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::DescribeSQLPatternsRequest&, const DescribeSQLPatternsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSQLPatternsAsyncHandler;
 			typedef Outcome<Error, Model::DescribeSQLPlanResult> DescribeSQLPlanOutcome;
 			typedef std::future<DescribeSQLPlanOutcome> DescribeSQLPlanOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DescribeSQLPlanRequest&, const DescribeSQLPlanOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSQLPlanAsyncHandler;
@@ -285,6 +364,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeSlowLogTrendResult> DescribeSlowLogTrendOutcome;
 			typedef std::future<DescribeSlowLogTrendOutcome> DescribeSlowLogTrendOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DescribeSlowLogTrendRequest&, const DescribeSlowLogTrendOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSlowLogTrendAsyncHandler;
+			typedef Outcome<Error, Model::DescribeSqlPatternResult> DescribeSqlPatternOutcome;
+			typedef std::future<DescribeSqlPatternOutcome> DescribeSqlPatternOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::DescribeSqlPatternRequest&, const DescribeSqlPatternOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSqlPatternAsyncHandler;
+			typedef Outcome<Error, Model::DescribeTableAccessCountResult> DescribeTableAccessCountOutcome;
+			typedef std::future<DescribeTableAccessCountOutcome> DescribeTableAccessCountOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::DescribeTableAccessCountRequest&, const DescribeTableAccessCountOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeTableAccessCountAsyncHandler;
 			typedef Outcome<Error, Model::DescribeTableDetailResult> DescribeTableDetailOutcome;
 			typedef std::future<DescribeTableDetailOutcome> DescribeTableDetailOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DescribeTableDetailRequest&, const DescribeTableDetailOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeTableDetailAsyncHandler;
@@ -300,6 +385,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeTaskInfoResult> DescribeTaskInfoOutcome;
 			typedef std::future<DescribeTaskInfoOutcome> DescribeTaskInfoOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::DescribeTaskInfoRequest&, const DescribeTaskInfoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeTaskInfoAsyncHandler;
+			typedef Outcome<Error, Model::DownloadDiagnosisRecordsResult> DownloadDiagnosisRecordsOutcome;
+			typedef std::future<DownloadDiagnosisRecordsOutcome> DownloadDiagnosisRecordsOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::DownloadDiagnosisRecordsRequest&, const DownloadDiagnosisRecordsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DownloadDiagnosisRecordsAsyncHandler;
 			typedef Outcome<Error, Model::GrantOperatorPermissionResult> GrantOperatorPermissionOutcome;
 			typedef std::future<GrantOperatorPermissionOutcome> GrantOperatorPermissionOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::GrantOperatorPermissionRequest&, const GrantOperatorPermissionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GrantOperatorPermissionAsyncHandler;
@@ -336,9 +424,15 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ModifyDBClusterMaintainTimeResult> ModifyDBClusterMaintainTimeOutcome;
 			typedef std::future<ModifyDBClusterMaintainTimeOutcome> ModifyDBClusterMaintainTimeOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::ModifyDBClusterMaintainTimeRequest&, const ModifyDBClusterMaintainTimeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDBClusterMaintainTimeAsyncHandler;
+			typedef Outcome<Error, Model::ModifyDBClusterPayTypeResult> ModifyDBClusterPayTypeOutcome;
+			typedef std::future<ModifyDBClusterPayTypeOutcome> ModifyDBClusterPayTypeOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::ModifyDBClusterPayTypeRequest&, const ModifyDBClusterPayTypeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDBClusterPayTypeAsyncHandler;
 			typedef Outcome<Error, Model::ModifyDBClusterResourceGroupResult> ModifyDBClusterResourceGroupOutcome;
 			typedef std::future<ModifyDBClusterResourceGroupOutcome> ModifyDBClusterResourceGroupOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::ModifyDBClusterResourceGroupRequest&, const ModifyDBClusterResourceGroupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDBClusterResourceGroupAsyncHandler;
+			typedef Outcome<Error, Model::ModifyDBResourceGroupResult> ModifyDBResourceGroupOutcome;
+			typedef std::future<ModifyDBResourceGroupOutcome> ModifyDBResourceGroupOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::ModifyDBResourceGroupRequest&, const ModifyDBResourceGroupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDBResourceGroupAsyncHandler;
 			typedef Outcome<Error, Model::ModifyDBResourcePoolResult> ModifyDBResourcePoolOutcome;
 			typedef std::future<ModifyDBResourcePoolOutcome> ModifyDBResourcePoolOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::ModifyDBResourcePoolRequest&, const ModifyDBResourcePoolOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDBResourcePoolAsyncHandler;
@@ -348,6 +442,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ModifyLogBackupPolicyResult> ModifyLogBackupPolicyOutcome;
 			typedef std::future<ModifyLogBackupPolicyOutcome> ModifyLogBackupPolicyOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::ModifyLogBackupPolicyRequest&, const ModifyLogBackupPolicyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyLogBackupPolicyAsyncHandler;
+			typedef Outcome<Error, Model::ModifyMaintenanceActionResult> ModifyMaintenanceActionOutcome;
+			typedef std::future<ModifyMaintenanceActionOutcome> ModifyMaintenanceActionOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::ModifyMaintenanceActionRequest&, const ModifyMaintenanceActionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyMaintenanceActionAsyncHandler;
 			typedef Outcome<Error, Model::ReleaseClusterPublicConnectionResult> ReleaseClusterPublicConnectionOutcome;
 			typedef std::future<ReleaseClusterPublicConnectionOutcome> ReleaseClusterPublicConnectionOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::ReleaseClusterPublicConnectionRequest&, const ReleaseClusterPublicConnectionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ReleaseClusterPublicConnectionAsyncHandler;
@@ -360,6 +457,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::TagResourcesResult> TagResourcesOutcome;
 			typedef std::future<TagResourcesOutcome> TagResourcesOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::TagResourcesRequest&, const TagResourcesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> TagResourcesAsyncHandler;
+			typedef Outcome<Error, Model::UnbindDBResourceGroupWithUserResult> UnbindDBResourceGroupWithUserOutcome;
+			typedef std::future<UnbindDBResourceGroupWithUserOutcome> UnbindDBResourceGroupWithUserOutcomeCallable;
+			typedef std::function<void(const AdbClient*, const Model::UnbindDBResourceGroupWithUserRequest&, const UnbindDBResourceGroupWithUserOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UnbindDBResourceGroupWithUserAsyncHandler;
 			typedef Outcome<Error, Model::UnbindDBResourcePoolWithUserResult> UnbindDBResourcePoolWithUserOutcome;
 			typedef std::future<UnbindDBResourcePoolWithUserOutcome> UnbindDBResourcePoolWithUserOutcomeCallable;
 			typedef std::function<void(const AdbClient*, const Model::UnbindDBResourcePoolWithUserRequest&, const UnbindDBResourcePoolWithUserOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UnbindDBResourcePoolWithUserAsyncHandler;
@@ -374,6 +474,9 @@ namespace AlibabaCloud
 			AllocateClusterPublicConnectionOutcome allocateClusterPublicConnection(const Model::AllocateClusterPublicConnectionRequest &request)const;
 			void allocateClusterPublicConnectionAsync(const Model::AllocateClusterPublicConnectionRequest& request, const AllocateClusterPublicConnectionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			AllocateClusterPublicConnectionOutcomeCallable allocateClusterPublicConnectionCallable(const Model::AllocateClusterPublicConnectionRequest& request) const;
+			BindDBResourceGroupWithUserOutcome bindDBResourceGroupWithUser(const Model::BindDBResourceGroupWithUserRequest &request)const;
+			void bindDBResourceGroupWithUserAsync(const Model::BindDBResourceGroupWithUserRequest& request, const BindDBResourceGroupWithUserAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			BindDBResourceGroupWithUserOutcomeCallable bindDBResourceGroupWithUserCallable(const Model::BindDBResourceGroupWithUserRequest& request) const;
 			BindDBResourcePoolWithUserOutcome bindDBResourcePoolWithUser(const Model::BindDBResourcePoolWithUserRequest &request)const;
 			void bindDBResourcePoolWithUserAsync(const Model::BindDBResourcePoolWithUserRequest& request, const BindDBResourcePoolWithUserAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			BindDBResourcePoolWithUserOutcomeCallable bindDBResourcePoolWithUserCallable(const Model::BindDBResourcePoolWithUserRequest& request) const;
@@ -383,6 +486,9 @@ namespace AlibabaCloud
 			CreateDBClusterOutcome createDBCluster(const Model::CreateDBClusterRequest &request)const;
 			void createDBClusterAsync(const Model::CreateDBClusterRequest& request, const CreateDBClusterAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateDBClusterOutcomeCallable createDBClusterCallable(const Model::CreateDBClusterRequest& request) const;
+			CreateDBResourceGroupOutcome createDBResourceGroup(const Model::CreateDBResourceGroupRequest &request)const;
+			void createDBResourceGroupAsync(const Model::CreateDBResourceGroupRequest& request, const CreateDBResourceGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CreateDBResourceGroupOutcomeCallable createDBResourceGroupCallable(const Model::CreateDBResourceGroupRequest& request) const;
 			CreateDBResourcePoolOutcome createDBResourcePool(const Model::CreateDBResourcePoolRequest &request)const;
 			void createDBResourcePoolAsync(const Model::CreateDBResourcePoolRequest& request, const CreateDBResourcePoolAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateDBResourcePoolOutcomeCallable createDBResourcePoolCallable(const Model::CreateDBResourcePoolRequest& request) const;
@@ -395,6 +501,9 @@ namespace AlibabaCloud
 			DeleteDBClusterOutcome deleteDBCluster(const Model::DeleteDBClusterRequest &request)const;
 			void deleteDBClusterAsync(const Model::DeleteDBClusterRequest& request, const DeleteDBClusterAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteDBClusterOutcomeCallable deleteDBClusterCallable(const Model::DeleteDBClusterRequest& request) const;
+			DeleteDBResourceGroupOutcome deleteDBResourceGroup(const Model::DeleteDBResourceGroupRequest &request)const;
+			void deleteDBResourceGroupAsync(const Model::DeleteDBResourceGroupRequest& request, const DeleteDBResourceGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DeleteDBResourceGroupOutcomeCallable deleteDBResourceGroupCallable(const Model::DeleteDBResourceGroupRequest& request) const;
 			DeleteDBResourcePoolOutcome deleteDBResourcePool(const Model::DeleteDBResourcePoolRequest &request)const;
 			void deleteDBResourcePoolAsync(const Model::DeleteDBResourcePoolRequest& request, const DeleteDBResourcePoolAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteDBResourcePoolOutcomeCallable deleteDBResourcePoolCallable(const Model::DeleteDBResourcePoolRequest& request) const;
@@ -440,6 +549,12 @@ namespace AlibabaCloud
 			DescribeDBClusterAttributeOutcome describeDBClusterAttribute(const Model::DescribeDBClusterAttributeRequest &request)const;
 			void describeDBClusterAttributeAsync(const Model::DescribeDBClusterAttributeRequest& request, const DescribeDBClusterAttributeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDBClusterAttributeOutcomeCallable describeDBClusterAttributeCallable(const Model::DescribeDBClusterAttributeRequest& request) const;
+			DescribeDBClusterForecastOutcome describeDBClusterForecast(const Model::DescribeDBClusterForecastRequest &request)const;
+			void describeDBClusterForecastAsync(const Model::DescribeDBClusterForecastRequest& request, const DescribeDBClusterForecastAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDBClusterForecastOutcomeCallable describeDBClusterForecastCallable(const Model::DescribeDBClusterForecastRequest& request) const;
+			DescribeDBClusterHealthReportOutcome describeDBClusterHealthReport(const Model::DescribeDBClusterHealthReportRequest &request)const;
+			void describeDBClusterHealthReportAsync(const Model::DescribeDBClusterHealthReportRequest& request, const DescribeDBClusterHealthReportAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDBClusterHealthReportOutcomeCallable describeDBClusterHealthReportCallable(const Model::DescribeDBClusterHealthReportRequest& request) const;
 			DescribeDBClusterNetInfoOutcome describeDBClusterNetInfo(const Model::DescribeDBClusterNetInfoRequest &request)const;
 			void describeDBClusterNetInfoAsync(const Model::DescribeDBClusterNetInfoRequest& request, const DescribeDBClusterNetInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDBClusterNetInfoOutcomeCallable describeDBClusterNetInfoCallable(const Model::DescribeDBClusterNetInfoRequest& request) const;
@@ -452,9 +567,21 @@ namespace AlibabaCloud
 			DescribeDBClustersOutcome describeDBClusters(const Model::DescribeDBClustersRequest &request)const;
 			void describeDBClustersAsync(const Model::DescribeDBClustersRequest& request, const DescribeDBClustersAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDBClustersOutcomeCallable describeDBClustersCallable(const Model::DescribeDBClustersRequest& request) const;
+			DescribeDBResourceGroupOutcome describeDBResourceGroup(const Model::DescribeDBResourceGroupRequest &request)const;
+			void describeDBResourceGroupAsync(const Model::DescribeDBResourceGroupRequest& request, const DescribeDBResourceGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDBResourceGroupOutcomeCallable describeDBResourceGroupCallable(const Model::DescribeDBResourceGroupRequest& request) const;
 			DescribeDBResourcePoolOutcome describeDBResourcePool(const Model::DescribeDBResourcePoolRequest &request)const;
 			void describeDBResourcePoolAsync(const Model::DescribeDBResourcePoolRequest& request, const DescribeDBResourcePoolAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDBResourcePoolOutcomeCallable describeDBResourcePoolCallable(const Model::DescribeDBResourcePoolRequest& request) const;
+			DescribeDiagnosisDimensionsOutcome describeDiagnosisDimensions(const Model::DescribeDiagnosisDimensionsRequest &request)const;
+			void describeDiagnosisDimensionsAsync(const Model::DescribeDiagnosisDimensionsRequest& request, const DescribeDiagnosisDimensionsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDiagnosisDimensionsOutcomeCallable describeDiagnosisDimensionsCallable(const Model::DescribeDiagnosisDimensionsRequest& request) const;
+			DescribeDiagnosisRecordsOutcome describeDiagnosisRecords(const Model::DescribeDiagnosisRecordsRequest &request)const;
+			void describeDiagnosisRecordsAsync(const Model::DescribeDiagnosisRecordsRequest& request, const DescribeDiagnosisRecordsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDiagnosisRecordsOutcomeCallable describeDiagnosisRecordsCallable(const Model::DescribeDiagnosisRecordsRequest& request) const;
+			DescribeDownloadRecordsOutcome describeDownloadRecords(const Model::DescribeDownloadRecordsRequest &request)const;
+			void describeDownloadRecordsAsync(const Model::DescribeDownloadRecordsRequest& request, const DescribeDownloadRecordsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDownloadRecordsOutcomeCallable describeDownloadRecordsCallable(const Model::DescribeDownloadRecordsRequest& request) const;
 			DescribeElasticDailyPlanOutcome describeElasticDailyPlan(const Model::DescribeElasticDailyPlanRequest &request)const;
 			void describeElasticDailyPlanAsync(const Model::DescribeElasticDailyPlanRequest& request, const DescribeElasticDailyPlanAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeElasticDailyPlanOutcomeCallable describeElasticDailyPlanCallable(const Model::DescribeElasticDailyPlanRequest& request) const;
@@ -467,15 +594,27 @@ namespace AlibabaCloud
 			DescribeLoadTasksRecordsOutcome describeLoadTasksRecords(const Model::DescribeLoadTasksRecordsRequest &request)const;
 			void describeLoadTasksRecordsAsync(const Model::DescribeLoadTasksRecordsRequest& request, const DescribeLoadTasksRecordsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeLoadTasksRecordsOutcomeCallable describeLoadTasksRecordsCallable(const Model::DescribeLoadTasksRecordsRequest& request) const;
+			DescribeMaintenanceActionOutcome describeMaintenanceAction(const Model::DescribeMaintenanceActionRequest &request)const;
+			void describeMaintenanceActionAsync(const Model::DescribeMaintenanceActionRequest& request, const DescribeMaintenanceActionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeMaintenanceActionOutcomeCallable describeMaintenanceActionCallable(const Model::DescribeMaintenanceActionRequest& request) const;
 			DescribeOperatorPermissionOutcome describeOperatorPermission(const Model::DescribeOperatorPermissionRequest &request)const;
 			void describeOperatorPermissionAsync(const Model::DescribeOperatorPermissionRequest& request, const DescribeOperatorPermissionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeOperatorPermissionOutcomeCallable describeOperatorPermissionCallable(const Model::DescribeOperatorPermissionRequest& request) const;
+			DescribePatternPerformanceOutcome describePatternPerformance(const Model::DescribePatternPerformanceRequest &request)const;
+			void describePatternPerformanceAsync(const Model::DescribePatternPerformanceRequest& request, const DescribePatternPerformanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribePatternPerformanceOutcomeCallable describePatternPerformanceCallable(const Model::DescribePatternPerformanceRequest& request) const;
 			DescribeProcessListOutcome describeProcessList(const Model::DescribeProcessListRequest &request)const;
 			void describeProcessListAsync(const Model::DescribeProcessListRequest& request, const DescribeProcessListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeProcessListOutcomeCallable describeProcessListCallable(const Model::DescribeProcessListRequest& request) const;
 			DescribeRegionsOutcome describeRegions(const Model::DescribeRegionsRequest &request)const;
 			void describeRegionsAsync(const Model::DescribeRegionsRequest& request, const DescribeRegionsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeRegionsOutcomeCallable describeRegionsCallable(const Model::DescribeRegionsRequest& request) const;
+			DescribeSQLPatternAttributeOutcome describeSQLPatternAttribute(const Model::DescribeSQLPatternAttributeRequest &request)const;
+			void describeSQLPatternAttributeAsync(const Model::DescribeSQLPatternAttributeRequest& request, const DescribeSQLPatternAttributeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeSQLPatternAttributeOutcomeCallable describeSQLPatternAttributeCallable(const Model::DescribeSQLPatternAttributeRequest& request) const;
+			DescribeSQLPatternsOutcome describeSQLPatterns(const Model::DescribeSQLPatternsRequest &request)const;
+			void describeSQLPatternsAsync(const Model::DescribeSQLPatternsRequest& request, const DescribeSQLPatternsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeSQLPatternsOutcomeCallable describeSQLPatternsCallable(const Model::DescribeSQLPatternsRequest& request) const;
 			DescribeSQLPlanOutcome describeSQLPlan(const Model::DescribeSQLPlanRequest &request)const;
 			void describeSQLPlanAsync(const Model::DescribeSQLPlanRequest& request, const DescribeSQLPlanAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeSQLPlanOutcomeCallable describeSQLPlanCallable(const Model::DescribeSQLPlanRequest& request) const;
@@ -491,6 +630,12 @@ namespace AlibabaCloud
 			DescribeSlowLogTrendOutcome describeSlowLogTrend(const Model::DescribeSlowLogTrendRequest &request)const;
 			void describeSlowLogTrendAsync(const Model::DescribeSlowLogTrendRequest& request, const DescribeSlowLogTrendAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeSlowLogTrendOutcomeCallable describeSlowLogTrendCallable(const Model::DescribeSlowLogTrendRequest& request) const;
+			DescribeSqlPatternOutcome describeSqlPattern(const Model::DescribeSqlPatternRequest &request)const;
+			void describeSqlPatternAsync(const Model::DescribeSqlPatternRequest& request, const DescribeSqlPatternAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeSqlPatternOutcomeCallable describeSqlPatternCallable(const Model::DescribeSqlPatternRequest& request) const;
+			DescribeTableAccessCountOutcome describeTableAccessCount(const Model::DescribeTableAccessCountRequest &request)const;
+			void describeTableAccessCountAsync(const Model::DescribeTableAccessCountRequest& request, const DescribeTableAccessCountAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeTableAccessCountOutcomeCallable describeTableAccessCountCallable(const Model::DescribeTableAccessCountRequest& request) const;
 			DescribeTableDetailOutcome describeTableDetail(const Model::DescribeTableDetailRequest &request)const;
 			void describeTableDetailAsync(const Model::DescribeTableDetailRequest& request, const DescribeTableDetailAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeTableDetailOutcomeCallable describeTableDetailCallable(const Model::DescribeTableDetailRequest& request) const;
@@ -506,6 +651,9 @@ namespace AlibabaCloud
 			DescribeTaskInfoOutcome describeTaskInfo(const Model::DescribeTaskInfoRequest &request)const;
 			void describeTaskInfoAsync(const Model::DescribeTaskInfoRequest& request, const DescribeTaskInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeTaskInfoOutcomeCallable describeTaskInfoCallable(const Model::DescribeTaskInfoRequest& request) const;
+			DownloadDiagnosisRecordsOutcome downloadDiagnosisRecords(const Model::DownloadDiagnosisRecordsRequest &request)const;
+			void downloadDiagnosisRecordsAsync(const Model::DownloadDiagnosisRecordsRequest& request, const DownloadDiagnosisRecordsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DownloadDiagnosisRecordsOutcomeCallable downloadDiagnosisRecordsCallable(const Model::DownloadDiagnosisRecordsRequest& request) const;
 			GrantOperatorPermissionOutcome grantOperatorPermission(const Model::GrantOperatorPermissionRequest &request)const;
 			void grantOperatorPermissionAsync(const Model::GrantOperatorPermissionRequest& request, const GrantOperatorPermissionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			GrantOperatorPermissionOutcomeCallable grantOperatorPermissionCallable(const Model::GrantOperatorPermissionRequest& request) const;
@@ -542,9 +690,15 @@ namespace AlibabaCloud
 			ModifyDBClusterMaintainTimeOutcome modifyDBClusterMaintainTime(const Model::ModifyDBClusterMaintainTimeRequest &request)const;
 			void modifyDBClusterMaintainTimeAsync(const Model::ModifyDBClusterMaintainTimeRequest& request, const ModifyDBClusterMaintainTimeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyDBClusterMaintainTimeOutcomeCallable modifyDBClusterMaintainTimeCallable(const Model::ModifyDBClusterMaintainTimeRequest& request) const;
+			ModifyDBClusterPayTypeOutcome modifyDBClusterPayType(const Model::ModifyDBClusterPayTypeRequest &request)const;
+			void modifyDBClusterPayTypeAsync(const Model::ModifyDBClusterPayTypeRequest& request, const ModifyDBClusterPayTypeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ModifyDBClusterPayTypeOutcomeCallable modifyDBClusterPayTypeCallable(const Model::ModifyDBClusterPayTypeRequest& request) const;
 			ModifyDBClusterResourceGroupOutcome modifyDBClusterResourceGroup(const Model::ModifyDBClusterResourceGroupRequest &request)const;
 			void modifyDBClusterResourceGroupAsync(const Model::ModifyDBClusterResourceGroupRequest& request, const ModifyDBClusterResourceGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyDBClusterResourceGroupOutcomeCallable modifyDBClusterResourceGroupCallable(const Model::ModifyDBClusterResourceGroupRequest& request) const;
+			ModifyDBResourceGroupOutcome modifyDBResourceGroup(const Model::ModifyDBResourceGroupRequest &request)const;
+			void modifyDBResourceGroupAsync(const Model::ModifyDBResourceGroupRequest& request, const ModifyDBResourceGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ModifyDBResourceGroupOutcomeCallable modifyDBResourceGroupCallable(const Model::ModifyDBResourceGroupRequest& request) const;
 			ModifyDBResourcePoolOutcome modifyDBResourcePool(const Model::ModifyDBResourcePoolRequest &request)const;
 			void modifyDBResourcePoolAsync(const Model::ModifyDBResourcePoolRequest& request, const ModifyDBResourcePoolAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyDBResourcePoolOutcomeCallable modifyDBResourcePoolCallable(const Model::ModifyDBResourcePoolRequest& request) const;
@@ -554,6 +708,9 @@ namespace AlibabaCloud
 			ModifyLogBackupPolicyOutcome modifyLogBackupPolicy(const Model::ModifyLogBackupPolicyRequest &request)const;
 			void modifyLogBackupPolicyAsync(const Model::ModifyLogBackupPolicyRequest& request, const ModifyLogBackupPolicyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyLogBackupPolicyOutcomeCallable modifyLogBackupPolicyCallable(const Model::ModifyLogBackupPolicyRequest& request) const;
+			ModifyMaintenanceActionOutcome modifyMaintenanceAction(const Model::ModifyMaintenanceActionRequest &request)const;
+			void modifyMaintenanceActionAsync(const Model::ModifyMaintenanceActionRequest& request, const ModifyMaintenanceActionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ModifyMaintenanceActionOutcomeCallable modifyMaintenanceActionCallable(const Model::ModifyMaintenanceActionRequest& request) const;
 			ReleaseClusterPublicConnectionOutcome releaseClusterPublicConnection(const Model::ReleaseClusterPublicConnectionRequest &request)const;
 			void releaseClusterPublicConnectionAsync(const Model::ReleaseClusterPublicConnectionRequest& request, const ReleaseClusterPublicConnectionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ReleaseClusterPublicConnectionOutcomeCallable releaseClusterPublicConnectionCallable(const Model::ReleaseClusterPublicConnectionRequest& request) const;
@@ -566,6 +723,9 @@ namespace AlibabaCloud
 			TagResourcesOutcome tagResources(const Model::TagResourcesRequest &request)const;
 			void tagResourcesAsync(const Model::TagResourcesRequest& request, const TagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			TagResourcesOutcomeCallable tagResourcesCallable(const Model::TagResourcesRequest& request) const;
+			UnbindDBResourceGroupWithUserOutcome unbindDBResourceGroupWithUser(const Model::UnbindDBResourceGroupWithUserRequest &request)const;
+			void unbindDBResourceGroupWithUserAsync(const Model::UnbindDBResourceGroupWithUserRequest& request, const UnbindDBResourceGroupWithUserAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			UnbindDBResourceGroupWithUserOutcomeCallable unbindDBResourceGroupWithUserCallable(const Model::UnbindDBResourceGroupWithUserRequest& request) const;
 			UnbindDBResourcePoolWithUserOutcome unbindDBResourcePoolWithUser(const Model::UnbindDBResourcePoolWithUserRequest &request)const;
 			void unbindDBResourcePoolWithUserAsync(const Model::UnbindDBResourcePoolWithUserRequest& request, const UnbindDBResourcePoolWithUserAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			UnbindDBResourcePoolWithUserOutcomeCallable unbindDBResourcePoolWithUserCallable(const Model::UnbindDBResourcePoolWithUserRequest& request) const;

adb/include/alibabacloud/adb/model/AllocateClusterPublicConnectionRequest.h

@@ -1,66 +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_ADB_MODEL_ALLOCATECLUSTERPUBLICCONNECTIONREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_ALLOCATECLUSTERPUBLICCONNECTIONREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT AllocateClusterPublicConnectionRequest : public RpcServiceRequest
-			{
-
-			public:
-				AllocateClusterPublicConnectionRequest();
-				~AllocateClusterPublicConnectionRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getConnectionStringPrefix()const;
-				void setConnectionStringPrefix(const std::string& connectionStringPrefix);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string connectionStringPrefix_;
-				std::string accessKeyId_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_ALLOCATECLUSTERPUBLICCONNECTIONREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_ALLOCATECLUSTERPUBLICCONNECTIONREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_ALLOCATECLUSTERPUBLICCONNECTIONREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT AllocateClusterPublicConnectionRequest : public RpcServiceRequest {
+public:
+	AllocateClusterPublicConnectionRequest();
+	~AllocateClusterPublicConnectionRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getConnectionStringPrefix() const;
+	void setConnectionStringPrefix(const std::string &connectionStringPrefix);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string connectionStringPrefix_;
+	std::string accessKeyId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_ALLOCATECLUSTERPUBLICCONNECTIONREQUEST_H_

adb/include/alibabacloud/adb/model/BindDBResourceGroupWithUserRequest.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_ADB_MODEL_BINDDBRESOURCEGROUPWITHUSERREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_BINDDBRESOURCEGROUPWITHUSERREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT BindDBResourceGroupWithUserRequest : public RpcServiceRequest {
+public:
+	BindDBResourceGroupWithUserRequest();
+	~BindDBResourceGroupWithUserRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getGroupUser() const;
+	void setGroupUser(const std::string &groupUser);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getGroupName() const;
+	void setGroupName(const std::string &groupName);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string groupUser_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string groupName_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_BINDDBRESOURCEGROUPWITHUSERREQUEST_H_

adb/include/alibabacloud/adb/model/BindDBResourceGroupWithUserResult.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_ADB_MODEL_BINDDBRESOURCEGROUPWITHUSERRESULT_H_
+#define ALIBABACLOUD_ADB_MODEL_BINDDBRESOURCEGROUPWITHUSERRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/adb/AdbExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Adb
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ADB_EXPORT BindDBResourceGroupWithUserResult : public ServiceResult
+			{
+			public:
+
+
+				BindDBResourceGroupWithUserResult();
+				explicit BindDBResourceGroupWithUserResult(const std::string &payload);
+				~BindDBResourceGroupWithUserResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ADB_MODEL_BINDDBRESOURCEGROUPWITHUSERRESULT_H_

adb/include/alibabacloud/adb/model/BindDBResourcePoolWithUserRequest.h

@@ -1,69 +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_ADB_MODEL_BINDDBRESOURCEPOOLWITHUSERREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_BINDDBRESOURCEPOOLWITHUSERREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT BindDBResourcePoolWithUserRequest : public RpcServiceRequest
-			{
-
-			public:
-				BindDBResourcePoolWithUserRequest();
-				~BindDBResourcePoolWithUserRequest();
-
-				std::string getPoolName()const;
-				void setPoolName(const std::string& poolName);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getPoolUser()const;
-				void setPoolUser(const std::string& poolUser);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				std::string poolName_;
-				long resourceOwnerId_;
-				std::string poolUser_;
-				std::string accessKeyId_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_BINDDBRESOURCEPOOLWITHUSERREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_BINDDBRESOURCEPOOLWITHUSERREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_BINDDBRESOURCEPOOLWITHUSERREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT BindDBResourcePoolWithUserRequest : public RpcServiceRequest {
+public:
+	BindDBResourcePoolWithUserRequest();
+	~BindDBResourcePoolWithUserRequest();
+	std::string getPoolName() const;
+	void setPoolName(const std::string &poolName);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getPoolUser() const;
+	void setPoolUser(const std::string &poolUser);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	std::string poolName_;
+	long resourceOwnerId_;
+	std::string poolUser_;
+	std::string accessKeyId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_BINDDBRESOURCEPOOLWITHUSERREQUEST_H_

adb/include/alibabacloud/adb/model/CreateAccountRequest.h

@@ -1,75 +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_ADB_MODEL_CREATEACCOUNTREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_CREATEACCOUNTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT CreateAccountRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateAccountRequest();
-				~CreateAccountRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccountType()const;
-				void setAccountType(const std::string& accountType);
-				std::string getAccountDescription()const;
-				void setAccountDescription(const std::string& accountDescription);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getAccountName()const;
-				void setAccountName(const std::string& accountName);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getAccountPassword()const;
-				void setAccountPassword(const std::string& accountPassword);
-
-            private:
-				long resourceOwnerId_;
-				std::string accountType_;
-				std::string accountDescription_;
-				std::string accessKeyId_;
-				std::string accountName_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string accountPassword_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_CREATEACCOUNTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_CREATEACCOUNTREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_CREATEACCOUNTREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT CreateAccountRequest : public RpcServiceRequest {
+public:
+	CreateAccountRequest();
+	~CreateAccountRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccountType() const;
+	void setAccountType(const std::string &accountType);
+	std::string getAccountDescription() const;
+	void setAccountDescription(const std::string &accountDescription);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getAccountName() const;
+	void setAccountName(const std::string &accountName);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getAccountPassword() const;
+	void setAccountPassword(const std::string &accountPassword);
+
+private:
+	long resourceOwnerId_;
+	std::string accountType_;
+	std::string accountDescription_;
+	std::string accessKeyId_;
+	std::string accountName_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string accountPassword_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_CREATEACCOUNTREQUEST_H_

adb/include/alibabacloud/adb/model/CreateDBClusterRequest.h

@@ -1,135 +1,132 @@
 /*
  * 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_ADB_MODEL_CREATEDBCLUSTERREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_CREATEDBCLUSTERREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT CreateDBClusterRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateDBClusterRequest();
-				~CreateDBClusterRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getDBClusterDescription()const;
-				void setDBClusterDescription(const std::string& dBClusterDescription);
-				std::string getStorageType()const;
-				void setStorageType(const std::string& storageType);
-				std::string getMode()const;
-				void setMode(const std::string& mode);
-				std::string getResourceGroupId()const;
-				void setResourceGroupId(const std::string& resourceGroupId);
-				std::string getPeriod()const;
-				void setPeriod(const std::string& period);
-				std::string getBackupSetID()const;
-				void setBackupSetID(const std::string& backupSetID);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getDBNodeGroupCount()const;
-				void setDBNodeGroupCount(const std::string& dBNodeGroupCount);
-				std::string getVSwitchId()const;
-				void setVSwitchId(const std::string& vSwitchId);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-				std::string getComputeResource()const;
-				void setComputeResource(const std::string& computeResource);
-				std::string getSourceDBInstanceName()const;
-				void setSourceDBInstanceName(const std::string& sourceDBInstanceName);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getStorageResource()const;
-				void setStorageResource(const std::string& storageResource);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getDBClusterCategory()const;
-				void setDBClusterCategory(const std::string& dBClusterCategory);
-				std::string getDBClusterNetworkType()const;
-				void setDBClusterNetworkType(const std::string& dBClusterNetworkType);
-				std::string getRestoreTime()const;
-				void setRestoreTime(const std::string& restoreTime);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getDBClusterVersion()const;
-				void setDBClusterVersion(const std::string& dBClusterVersion);
-				std::string getDBClusterClass()const;
-				void setDBClusterClass(const std::string& dBClusterClass);
-				std::string getUsedTime()const;
-				void setUsedTime(const std::string& usedTime);
-				std::string getRestoreType()const;
-				void setRestoreType(const std::string& restoreType);
-				std::string getDBNodeStorage()const;
-				void setDBNodeStorage(const std::string& dBNodeStorage);
-				std::string getExecutorCount()const;
-				void setExecutorCount(const std::string& executorCount);
-				std::string getVPCId()const;
-				void setVPCId(const std::string& vPCId);
-				std::string getPayType()const;
-				void setPayType(const std::string& payType);
-
-            private:
-				long resourceOwnerId_;
-				std::string dBClusterDescription_;
-				std::string storageType_;
-				std::string mode_;
-				std::string resourceGroupId_;
-				std::string period_;
-				std::string backupSetID_;
-				long ownerId_;
-				std::string dBNodeGroupCount_;
-				std::string vSwitchId_;
-				std::string zoneId_;
-				std::string computeResource_;
-				std::string sourceDBInstanceName_;
-				std::string clientToken_;
-				std::string accessKeyId_;
-				std::string storageResource_;
-				std::string regionId_;
-				std::string dBClusterCategory_;
-				std::string dBClusterNetworkType_;
-				std::string restoreTime_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				std::string dBClusterVersion_;
-				std::string dBClusterClass_;
-				std::string usedTime_;
-				std::string restoreType_;
-				std::string dBNodeStorage_;
-				std::string executorCount_;
-				std::string vPCId_;
-				std::string payType_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_CREATEDBCLUSTERREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_CREATEDBCLUSTERREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_CREATEDBCLUSTERREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT CreateDBClusterRequest : public RpcServiceRequest {
+public:
+	CreateDBClusterRequest();
+	~CreateDBClusterRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getDBClusterDescription() const;
+	void setDBClusterDescription(const std::string &dBClusterDescription);
+	std::string getStorageType() const;
+	void setStorageType(const std::string &storageType);
+	std::string getMode() const;
+	void setMode(const std::string &mode);
+	std::string getResourceGroupId() const;
+	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getPeriod() const;
+	void setPeriod(const std::string &period);
+	std::string getBackupSetID() const;
+	void setBackupSetID(const std::string &backupSetID);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getDBNodeGroupCount() const;
+	void setDBNodeGroupCount(const std::string &dBNodeGroupCount);
+	std::string getVSwitchId() const;
+	void setVSwitchId(const std::string &vSwitchId);
+	std::string getZoneId() const;
+	void setZoneId(const std::string &zoneId);
+	std::string getComputeResource() const;
+	void setComputeResource(const std::string &computeResource);
+	std::string getElasticIOResource() const;
+	void setElasticIOResource(const std::string &elasticIOResource);
+	std::string getSourceDBInstanceName() const;
+	void setSourceDBInstanceName(const std::string &sourceDBInstanceName);
+	std::string getClientToken() const;
+	void setClientToken(const std::string &clientToken);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getStorageResource() const;
+	void setStorageResource(const std::string &storageResource);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getDBClusterCategory() const;
+	void setDBClusterCategory(const std::string &dBClusterCategory);
+	std::string getDBClusterNetworkType() const;
+	void setDBClusterNetworkType(const std::string &dBClusterNetworkType);
+	std::string getRestoreTime() const;
+	void setRestoreTime(const std::string &restoreTime);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	std::string getDBClusterVersion() const;
+	void setDBClusterVersion(const std::string &dBClusterVersion);
+	std::string getDBClusterClass() const;
+	void setDBClusterClass(const std::string &dBClusterClass);
+	std::string getUsedTime() const;
+	void setUsedTime(const std::string &usedTime);
+	std::string getRestoreType() const;
+	void setRestoreType(const std::string &restoreType);
+	std::string getDBNodeStorage() const;
+	void setDBNodeStorage(const std::string &dBNodeStorage);
+	std::string getExecutorCount() const;
+	void setExecutorCount(const std::string &executorCount);
+	std::string getVPCId() const;
+	void setVPCId(const std::string &vPCId);
+	std::string getPayType() const;
+	void setPayType(const std::string &payType);
+
+private:
+	long resourceOwnerId_;
+	std::string dBClusterDescription_;
+	std::string storageType_;
+	std::string mode_;
+	std::string resourceGroupId_;
+	std::string period_;
+	std::string backupSetID_;
+	long ownerId_;
+	std::string dBNodeGroupCount_;
+	std::string vSwitchId_;
+	std::string zoneId_;
+	std::string computeResource_;
+	std::string elasticIOResource_;
+	std::string sourceDBInstanceName_;
+	std::string clientToken_;
+	std::string accessKeyId_;
+	std::string storageResource_;
+	std::string regionId_;
+	std::string dBClusterCategory_;
+	std::string dBClusterNetworkType_;
+	std::string restoreTime_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	std::string dBClusterVersion_;
+	std::string dBClusterClass_;
+	std::string usedTime_;
+	std::string restoreType_;
+	std::string dBNodeStorage_;
+	std::string executorCount_;
+	std::string vPCId_;
+	std::string payType_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_CREATEDBCLUSTERREQUEST_H_

adb/include/alibabacloud/adb/model/CreateDBResourceGroupRequest.h

@@ -0,0 +1,66 @@
+/*
+ * 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_ADB_MODEL_CREATEDBRESOURCEGROUPREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_CREATEDBRESOURCEGROUPREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT CreateDBResourceGroupRequest : public RpcServiceRequest {
+public:
+	CreateDBResourceGroupRequest();
+	~CreateDBResourceGroupRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	int getNodeNum() const;
+	void setNodeNum(int nodeNum);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getGroupType() const;
+	void setGroupType(const std::string &groupType);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getGroupName() const;
+	void setGroupName(const std::string &groupName);
+
+private:
+	long resourceOwnerId_;
+	int nodeNum_;
+	std::string accessKeyId_;
+	std::string groupType_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string groupName_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_CREATEDBRESOURCEGROUPREQUEST_H_

adb/include/alibabacloud/adb/model/CreateDBResourceGroupResult.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_ADB_MODEL_CREATEDBRESOURCEGROUPRESULT_H_
+#define ALIBABACLOUD_ADB_MODEL_CREATEDBRESOURCEGROUPRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/adb/AdbExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Adb
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ADB_EXPORT CreateDBResourceGroupResult : public ServiceResult
+			{
+			public:
+
+
+				CreateDBResourceGroupResult();
+				explicit CreateDBResourceGroupResult(const std::string &payload);
+				~CreateDBResourceGroupResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ADB_MODEL_CREATEDBRESOURCEGROUPRESULT_H_

adb/include/alibabacloud/adb/model/CreateDBResourcePoolRequest.h

@@ -1,72 +1,66 @@
 /*
  * 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_ADB_MODEL_CREATEDBRESOURCEPOOLREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_CREATEDBRESOURCEPOOLREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT CreateDBResourcePoolRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateDBResourcePoolRequest();
-				~CreateDBResourcePoolRequest();
-
-				std::string getPoolName()const;
-				void setPoolName(const std::string& poolName);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				int getNodeNum()const;
-				void setNodeNum(int nodeNum);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getQueryType()const;
-				void setQueryType(const std::string& queryType);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				std::string poolName_;
-				long resourceOwnerId_;
-				int nodeNum_;
-				std::string accessKeyId_;
-				std::string queryType_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_CREATEDBRESOURCEPOOLREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_CREATEDBRESOURCEPOOLREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_CREATEDBRESOURCEPOOLREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT CreateDBResourcePoolRequest : public RpcServiceRequest {
+public:
+	CreateDBResourcePoolRequest();
+	~CreateDBResourcePoolRequest();
+	std::string getPoolName() const;
+	void setPoolName(const std::string &poolName);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	int getNodeNum() const;
+	void setNodeNum(int nodeNum);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getQueryType() const;
+	void setQueryType(const std::string &queryType);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	std::string poolName_;
+	long resourceOwnerId_;
+	int nodeNum_;
+	std::string accessKeyId_;
+	std::string queryType_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_CREATEDBRESOURCEPOOLREQUEST_H_

adb/include/alibabacloud/adb/model/CreateElasticPlanRequest.h

@@ -1,90 +1,84 @@
 /*
  * 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_ADB_MODEL_CREATEELASTICPLANREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_CREATEELASTICPLANREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT CreateElasticPlanRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateElasticPlanRequest();
-				~CreateElasticPlanRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getElasticPlanTimeStart()const;
-				void setElasticPlanTimeStart(const std::string& elasticPlanTimeStart);
-				std::string getElasticPlanEndDay()const;
-				void setElasticPlanEndDay(const std::string& elasticPlanEndDay);
-				std::string getElasticPlanWeeklyRepeat()const;
-				void setElasticPlanWeeklyRepeat(const std::string& elasticPlanWeeklyRepeat);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				bool getElasticPlanEnable()const;
-				void setElasticPlanEnable(bool elasticPlanEnable);
-				std::string getElasticPlanTimeEnd()const;
-				void setElasticPlanTimeEnd(const std::string& elasticPlanTimeEnd);
-				std::string getElasticPlanStartDay()const;
-				void setElasticPlanStartDay(const std::string& elasticPlanStartDay);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getElasticPlanName()const;
-				void setElasticPlanName(const std::string& elasticPlanName);
-				std::string getResourcePoolName()const;
-				void setResourcePoolName(const std::string& resourcePoolName);
-				int getElasticPlanNodeNum()const;
-				void setElasticPlanNodeNum(int elasticPlanNodeNum);
-
-            private:
-				long resourceOwnerId_;
-				std::string elasticPlanTimeStart_;
-				std::string elasticPlanEndDay_;
-				std::string elasticPlanWeeklyRepeat_;
-				std::string accessKeyId_;
-				bool elasticPlanEnable_;
-				std::string elasticPlanTimeEnd_;
-				std::string elasticPlanStartDay_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string elasticPlanName_;
-				std::string resourcePoolName_;
-				int elasticPlanNodeNum_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_CREATEELASTICPLANREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_CREATEELASTICPLANREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_CREATEELASTICPLANREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT CreateElasticPlanRequest : public RpcServiceRequest {
+public:
+	CreateElasticPlanRequest();
+	~CreateElasticPlanRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getElasticPlanTimeStart() const;
+	void setElasticPlanTimeStart(const std::string &elasticPlanTimeStart);
+	std::string getElasticPlanEndDay() const;
+	void setElasticPlanEndDay(const std::string &elasticPlanEndDay);
+	std::string getElasticPlanWeeklyRepeat() const;
+	void setElasticPlanWeeklyRepeat(const std::string &elasticPlanWeeklyRepeat);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	bool getElasticPlanEnable() const;
+	void setElasticPlanEnable(bool elasticPlanEnable);
+	std::string getElasticPlanTimeEnd() const;
+	void setElasticPlanTimeEnd(const std::string &elasticPlanTimeEnd);
+	std::string getElasticPlanStartDay() const;
+	void setElasticPlanStartDay(const std::string &elasticPlanStartDay);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getElasticPlanName() const;
+	void setElasticPlanName(const std::string &elasticPlanName);
+	std::string getResourcePoolName() const;
+	void setResourcePoolName(const std::string &resourcePoolName);
+	int getElasticPlanNodeNum() const;
+	void setElasticPlanNodeNum(int elasticPlanNodeNum);
+
+private:
+	long resourceOwnerId_;
+	std::string elasticPlanTimeStart_;
+	std::string elasticPlanEndDay_;
+	std::string elasticPlanWeeklyRepeat_;
+	std::string accessKeyId_;
+	bool elasticPlanEnable_;
+	std::string elasticPlanTimeEnd_;
+	std::string elasticPlanStartDay_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string elasticPlanName_;
+	std::string resourcePoolName_;
+	int elasticPlanNodeNum_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_CREATEELASTICPLANREQUEST_H_

adb/include/alibabacloud/adb/model/DeleteAccountRequest.h

@@ -1,69 +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_ADB_MODEL_DELETEACCOUNTREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DELETEACCOUNTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DeleteAccountRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteAccountRequest();
-				~DeleteAccountRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccountType()const;
-				void setAccountType(const std::string& accountType);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getAccountName()const;
-				void setAccountName(const std::string& accountName);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string accountType_;
-				std::string accessKeyId_;
-				std::string accountName_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DELETEACCOUNTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DELETEACCOUNTREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DELETEACCOUNTREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DeleteAccountRequest : public RpcServiceRequest {
+public:
+	DeleteAccountRequest();
+	~DeleteAccountRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccountType() const;
+	void setAccountType(const std::string &accountType);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getAccountName() const;
+	void setAccountName(const std::string &accountName);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string accountType_;
+	std::string accessKeyId_;
+	std::string accountName_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DELETEACCOUNTREQUEST_H_

adb/include/alibabacloud/adb/model/DeleteDBClusterRequest.h

@@ -1,63 +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_ADB_MODEL_DELETEDBCLUSTERREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DELETEDBCLUSTERREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DeleteDBClusterRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteDBClusterRequest();
-				~DeleteDBClusterRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DELETEDBCLUSTERREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DELETEDBCLUSTERREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DELETEDBCLUSTERREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DeleteDBClusterRequest : public RpcServiceRequest {
+public:
+	DeleteDBClusterRequest();
+	~DeleteDBClusterRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DELETEDBCLUSTERREQUEST_H_

adb/include/alibabacloud/adb/model/DeleteDBResourceGroupRequest.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_ADB_MODEL_DELETEDBRESOURCEGROUPREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DELETEDBRESOURCEGROUPREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DeleteDBResourceGroupRequest : public RpcServiceRequest {
+public:
+	DeleteDBResourceGroupRequest();
+	~DeleteDBResourceGroupRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getGroupName() const;
+	void setGroupName(const std::string &groupName);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string groupName_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DELETEDBRESOURCEGROUPREQUEST_H_

adb/include/alibabacloud/adb/model/DeleteDBResourceGroupResult.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_ADB_MODEL_DELETEDBRESOURCEGROUPRESULT_H_
+#define ALIBABACLOUD_ADB_MODEL_DELETEDBRESOURCEGROUPRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/adb/AdbExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Adb
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ADB_EXPORT DeleteDBResourceGroupResult : public ServiceResult
+			{
+			public:
+
+
+				DeleteDBResourceGroupResult();
+				explicit DeleteDBResourceGroupResult(const std::string &payload);
+				~DeleteDBResourceGroupResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ADB_MODEL_DELETEDBRESOURCEGROUPRESULT_H_

adb/include/alibabacloud/adb/model/DeleteDBResourcePoolRequest.h

@@ -1,66 +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_ADB_MODEL_DELETEDBRESOURCEPOOLREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DELETEDBRESOURCEPOOLREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DeleteDBResourcePoolRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteDBResourcePoolRequest();
-				~DeleteDBResourcePoolRequest();
-
-				std::string getPoolName()const;
-				void setPoolName(const std::string& poolName);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				std::string poolName_;
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DELETEDBRESOURCEPOOLREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DELETEDBRESOURCEPOOLREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DELETEDBRESOURCEPOOLREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DeleteDBResourcePoolRequest : public RpcServiceRequest {
+public:
+	DeleteDBResourcePoolRequest();
+	~DeleteDBResourcePoolRequest();
+	std::string getPoolName() const;
+	void setPoolName(const std::string &poolName);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	std::string poolName_;
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DELETEDBRESOURCEPOOLREQUEST_H_

adb/include/alibabacloud/adb/model/DeleteElasticPlanRequest.h

@@ -1,66 +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_ADB_MODEL_DELETEELASTICPLANREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DELETEELASTICPLANREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DeleteElasticPlanRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteElasticPlanRequest();
-				~DeleteElasticPlanRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getElasticPlanName()const;
-				void setElasticPlanName(const std::string& elasticPlanName);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string elasticPlanName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DELETEELASTICPLANREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DELETEELASTICPLANREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DELETEELASTICPLANREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DeleteElasticPlanRequest : public RpcServiceRequest {
+public:
+	DeleteElasticPlanRequest();
+	~DeleteElasticPlanRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getElasticPlanName() const;
+	void setElasticPlanName(const std::string &elasticPlanName);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string elasticPlanName_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DELETEELASTICPLANREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeAccountsRequest.h

@@ -1,69 +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_ADB_MODEL_DESCRIBEACCOUNTSREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEACCOUNTSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeAccountsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAccountsRequest();
-				~DescribeAccountsRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccountType()const;
-				void setAccountType(const std::string& accountType);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getAccountName()const;
-				void setAccountName(const std::string& accountName);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string accountType_;
-				std::string accessKeyId_;
-				std::string accountName_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEACCOUNTSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEACCOUNTSREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEACCOUNTSREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeAccountsRequest : public RpcServiceRequest {
+public:
+	DescribeAccountsRequest();
+	~DescribeAccountsRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccountType() const;
+	void setAccountType(const std::string &accountType);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getAccountName() const;
+	void setAccountName(const std::string &accountName);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string accountType_;
+	std::string accessKeyId_;
+	std::string accountName_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEACCOUNTSREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeAllAccountsRequest.h

@@ -1,63 +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_ADB_MODEL_DESCRIBEALLACCOUNTSREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEALLACCOUNTSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeAllAccountsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAllAccountsRequest();
-				~DescribeAllAccountsRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEALLACCOUNTSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEALLACCOUNTSREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEALLACCOUNTSREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeAllAccountsRequest : public RpcServiceRequest {
+public:
+	DescribeAllAccountsRequest();
+	~DescribeAllAccountsRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEALLACCOUNTSREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeAllDataSourceRequest.h

@@ -1,69 +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_ADB_MODEL_DESCRIBEALLDATASOURCEREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEALLDATASOURCEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeAllDataSourceRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAllDataSourceRequest();
-				~DescribeAllDataSourceRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getTableName()const;
-				void setTableName(const std::string& tableName);
-				std::string getSchemaName()const;
-				void setSchemaName(const std::string& schemaName);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string tableName_;
-				std::string schemaName_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEALLDATASOURCEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEALLDATASOURCEREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEALLDATASOURCEREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeAllDataSourceRequest : public RpcServiceRequest {
+public:
+	DescribeAllDataSourceRequest();
+	~DescribeAllDataSourceRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getTableName() const;
+	void setTableName(const std::string &tableName);
+	std::string getSchemaName() const;
+	void setSchemaName(const std::string &schemaName);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string tableName_;
+	std::string schemaName_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEALLDATASOURCEREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeAllDataSourceResult.h

@@ -32,11 +32,6 @@ namespace AlibabaCloud
 			class ALIBABACLOUD_ADB_EXPORT DescribeAllDataSourceResult : public ServiceResult
 			{
 			public:
-				struct Schema
-				{
-					std::string dBClusterId;
-					std::string schemaName;
-				};
 				struct Table
 				{
 					std::string tableName;
@@ -45,14 +40,19 @@ namespace AlibabaCloud
 				};
 				struct Column
 				{
-					std::string tableName;
 					std::string columnName;
+					std::string tableName;
 					std::string type;
 					bool autoIncrementColumn;
 					std::string dBClusterId;
 					bool primaryKey;
 					std::string schemaName;
 				};
+				struct Schema
+				{
+					std::string dBClusterId;
+					std::string schemaName;
+				};
 
 
 				DescribeAllDataSourceResult();

adb/include/alibabacloud/adb/model/DescribeAuditLogConfigRequest.h

@@ -1,66 +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_ADB_MODEL_DESCRIBEAUDITLOGCONFIGREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEAUDITLOGCONFIGREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeAuditLogConfigRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAuditLogConfigRequest();
-				~DescribeAuditLogConfigRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEAUDITLOGCONFIGREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEAUDITLOGCONFIGREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEAUDITLOGCONFIGREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeAuditLogConfigRequest : public RpcServiceRequest {
+public:
+	DescribeAuditLogConfigRequest();
+	~DescribeAuditLogConfigRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+
+private:
+	long resourceOwnerId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string accessKeyId_;
+	std::string regionId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEAUDITLOGCONFIGREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeAuditLogRecordsRequest.h

@@ -1,99 +1,96 @@
 /*
  * 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_ADB_MODEL_DESCRIBEAUDITLOGRECORDSREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEAUDITLOGRECORDSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeAuditLogRecordsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAuditLogRecordsRequest();
-				~DescribeAuditLogRecordsRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getStartTime()const;
-				void setStartTime(const std::string& startTime);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getHostAddress()const;
-				void setHostAddress(const std::string& hostAddress);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getSqlType()const;
-				void setSqlType(const std::string& sqlType);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getQueryKeyword()const;
-				void setQueryKeyword(const std::string& queryKeyword);
-				std::string getEndTime()const;
-				void setEndTime(const std::string& endTime);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getDBName()const;
-				void setDBName(const std::string& dBName);
-				std::string getSucceed()const;
-				void setSucceed(const std::string& succeed);
-				std::string getUser()const;
-				void setUser(const std::string& user);
-				std::string getOrderType()const;
-				void setOrderType(const std::string& orderType);
-
-            private:
-				long resourceOwnerId_;
-				std::string startTime_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				std::string hostAddress_;
-				std::string regionId_;
-				int pageSize_;
-				std::string sqlType_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				std::string queryKeyword_;
-				std::string endTime_;
-				long ownerId_;
-				std::string dBName_;
-				std::string succeed_;
-				std::string user_;
-				std::string orderType_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEAUDITLOGRECORDSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEAUDITLOGRECORDSREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEAUDITLOGRECORDSREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeAuditLogRecordsRequest : public RpcServiceRequest {
+public:
+	DescribeAuditLogRecordsRequest();
+	~DescribeAuditLogRecordsRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getStartTime() const;
+	void setStartTime(const std::string &startTime);
+	int getPageNumber() const;
+	void setPageNumber(int pageNumber);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getHostAddress() const;
+	void setHostAddress(const std::string &hostAddress);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getOrder() const;
+	void setOrder(const std::string &order);
+	std::string getSqlType() const;
+	void setSqlType(const std::string &sqlType);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getQueryKeyword() const;
+	void setQueryKeyword(const std::string &queryKeyword);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	std::string getEndTime() const;
+	void setEndTime(const std::string &endTime);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getDBName() const;
+	void setDBName(const std::string &dBName);
+	std::string getSucceed() const;
+	void setSucceed(const std::string &succeed);
+	std::string getUser() const;
+	void setUser(const std::string &user);
+	std::string getOrderType() const;
+	void setOrderType(const std::string &orderType);
+
+private:
+	long resourceOwnerId_;
+	std::string startTime_;
+	int pageNumber_;
+	std::string accessKeyId_;
+	std::string hostAddress_;
+	std::string regionId_;
+	int pageSize_;
+	std::string order_;
+	std::string sqlType_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string queryKeyword_;
+	std::string ownerAccount_;
+	std::string endTime_;
+	long ownerId_;
+	std::string dBName_;
+	std::string succeed_;
+	std::string user_;
+	std::string orderType_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEAUDITLOGRECORDSREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeAuditLogRecordsResult.h

@@ -35,14 +35,15 @@ namespace AlibabaCloud
 				struct SlowLogRecord
 				{
 					std::string connId;
+					std::string user;
 					std::string executeTime;
 					std::string totalTime;
 					std::string dBName;
 					std::string processID;
 					std::string hostAddress;
 					std::string sQLType;
-					std::string sQLText;
 					std::string succeed;
+					std::string sQLText;
 				};
 
 

adb/include/alibabacloud/adb/model/DescribeAutoRenewAttributeRequest.h

@@ -1,75 +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_ADB_MODEL_DESCRIBEAUTORENEWATTRIBUTEREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEAUTORENEWATTRIBUTEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeAutoRenewAttributeRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAutoRenewAttributeRequest();
-				~DescribeAutoRenewAttributeRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				int getPageNumber()const;
-				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 getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getDBClusterIds()const;
-				void setDBClusterIds(const std::string& dBClusterIds);
-
-            private:
-				long resourceOwnerId_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				std::string resourceGroupId_;
-				std::string regionId_;
-				int pageSize_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string dBClusterIds_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEAUTORENEWATTRIBUTEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEAUTORENEWATTRIBUTEREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEAUTORENEWATTRIBUTEREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeAutoRenewAttributeRequest : public RpcServiceRequest {
+public:
+	DescribeAutoRenewAttributeRequest();
+	~DescribeAutoRenewAttributeRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	int getPageNumber() const;
+	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 getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getDBClusterIds() const;
+	void setDBClusterIds(const std::string &dBClusterIds);
+
+private:
+	long resourceOwnerId_;
+	int pageNumber_;
+	std::string accessKeyId_;
+	std::string resourceGroupId_;
+	std::string regionId_;
+	int pageSize_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string dBClusterIds_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEAUTORENEWATTRIBUTEREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeAvailableResourceRequest.h

@@ -1,72 +1,66 @@
 /*
  * 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_ADB_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeAvailableResourceRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAvailableResourceRequest();
-				~DescribeAvailableResourceRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getAcceptLanguage()const;
-				void setAcceptLanguage(const std::string& acceptLanguage);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-				std::string getChargeType()const;
-				void setChargeType(const std::string& chargeType);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string acceptLanguage_;
-				std::string zoneId_;
-				std::string chargeType_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeAvailableResourceRequest : public RpcServiceRequest {
+public:
+	DescribeAvailableResourceRequest();
+	~DescribeAvailableResourceRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getAcceptLanguage() const;
+	void setAcceptLanguage(const std::string &acceptLanguage);
+	std::string getZoneId() const;
+	void setZoneId(const std::string &zoneId);
+	std::string getChargeType() const;
+	void setChargeType(const std::string &chargeType);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string regionId_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string acceptLanguage_;
+	std::string zoneId_;
+	std::string chargeType_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeAvailableResourceResult.h

@@ -42,8 +42,8 @@ namespace AlibabaCloud
 							{
 								struct SupportedElasticIOResource
 								{
-									std::string maxCount;
 									std::string step;
+									std::string maxCount;
 									std::string minCount;
 								};
 								std::string storageType;
@@ -57,8 +57,8 @@ namespace AlibabaCloud
 								{
 									struct NodeCount
 									{
-										std::string maxCount;
 										std::string step;
+										std::string maxCount;
 										std::string minCount;
 									};
 									NodeCount nodeCount;
@@ -68,8 +68,8 @@ namespace AlibabaCloud
 								{
 									struct NodeCount1
 									{
-										std::string maxCount;
 										std::string step;
+										std::string maxCount;
 										std::string minCount;
 									};
 									NodeCount1 nodeCount1;

adb/include/alibabacloud/adb/model/DescribeBackupPolicyRequest.h

@@ -1,63 +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_ADB_MODEL_DESCRIBEBACKUPPOLICYREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEBACKUPPOLICYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeBackupPolicyRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeBackupPolicyRequest();
-				~DescribeBackupPolicyRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEBACKUPPOLICYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEBACKUPPOLICYREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEBACKUPPOLICYREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeBackupPolicyRequest : public RpcServiceRequest {
+public:
+	DescribeBackupPolicyRequest();
+	~DescribeBackupPolicyRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEBACKUPPOLICYREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeBackupsRequest.h

@@ -1,78 +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_ADB_MODEL_DESCRIBEBACKUPSREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEBACKUPSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeBackupsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeBackupsRequest();
-				~DescribeBackupsRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getStartTime()const;
-				void setStartTime(const std::string& startTime);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getBackupId()const;
-				void setBackupId(const std::string& backupId);
-				std::string getEndTime()const;
-				void setEndTime(const std::string& endTime);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string startTime_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				int pageSize_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				std::string backupId_;
-				std::string endTime_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEBACKUPSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEBACKUPSREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEBACKUPSREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeBackupsRequest : public RpcServiceRequest {
+public:
+	DescribeBackupsRequest();
+	~DescribeBackupsRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getStartTime() const;
+	void setStartTime(const std::string &startTime);
+	int getPageNumber() const;
+	void setPageNumber(int pageNumber);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	std::string getBackupId() const;
+	void setBackupId(const std::string &backupId);
+	std::string getEndTime() const;
+	void setEndTime(const std::string &endTime);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string startTime_;
+	int pageNumber_;
+	std::string accessKeyId_;
+	int pageSize_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	std::string backupId_;
+	std::string endTime_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEBACKUPSREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeBackupsResult.h

@@ -35,12 +35,12 @@ namespace AlibabaCloud
 				struct Backup
 				{
 					std::string backupMethod;
-					std::string backupEndTime;
 					int backupSize;
+					std::string backupEndTime;
 					std::string dBClusterId;
 					std::string backupStartTime;
-					std::string backupId;
 					std::string backupType;
+					std::string backupId;
 				};
 
 

adb/include/alibabacloud/adb/model/DescribeColumnsRequest.h

@@ -1,69 +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_ADB_MODEL_DESCRIBECOLUMNSREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBECOLUMNSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeColumnsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeColumnsRequest();
-				~DescribeColumnsRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getTableName()const;
-				void setTableName(const std::string& tableName);
-				std::string getSchemaName()const;
-				void setSchemaName(const std::string& schemaName);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string tableName_;
-				std::string schemaName_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBECOLUMNSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBECOLUMNSREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBECOLUMNSREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeColumnsRequest : public RpcServiceRequest {
+public:
+	DescribeColumnsRequest();
+	~DescribeColumnsRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getTableName() const;
+	void setTableName(const std::string &tableName);
+	std::string getSchemaName() const;
+	void setSchemaName(const std::string &schemaName);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string tableName_;
+	std::string schemaName_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBECOLUMNSREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeColumnsResult.h

@@ -34,8 +34,8 @@ namespace AlibabaCloud
 			public:
 				struct Column
 				{
-					std::string tableName;
 					std::string columnName;
+					std::string tableName;
 					std::string type;
 					bool autoIncrementColumn;
 					std::string dBClusterId;

adb/include/alibabacloud/adb/model/DescribeConnectionCountRecordsRequest.h

@@ -1,63 +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_ADB_MODEL_DESCRIBECONNECTIONCOUNTRECORDSREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBECONNECTIONCOUNTRECORDSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeConnectionCountRecordsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeConnectionCountRecordsRequest();
-				~DescribeConnectionCountRecordsRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBECONNECTIONCOUNTRECORDSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBECONNECTIONCOUNTRECORDSREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBECONNECTIONCOUNTRECORDSREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeConnectionCountRecordsRequest : public RpcServiceRequest {
+public:
+	DescribeConnectionCountRecordsRequest();
+	~DescribeConnectionCountRecordsRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBECONNECTIONCOUNTRECORDSREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeConnectionCountRecordsResult.h

@@ -32,16 +32,16 @@ namespace AlibabaCloud
 			class ALIBABACLOUD_ADB_EXPORT DescribeConnectionCountRecordsResult : public ServiceResult
 			{
 			public:
-				struct Users
-				{
-					std::string user;
-					long count;
-				};
 				struct AccessIps
 				{
 					std::string accessIp;
 					long count;
 				};
+				struct Users
+				{
+					std::string user;
+					long count;
+				};
 
 
 				DescribeConnectionCountRecordsResult();

adb/include/alibabacloud/adb/model/DescribeDBClusterAccessWhiteListRequest.h

@@ -1,63 +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_ADB_MODEL_DESCRIBEDBCLUSTERACCESSWHITELISTREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERACCESSWHITELISTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeDBClusterAccessWhiteListRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeDBClusterAccessWhiteListRequest();
-				~DescribeDBClusterAccessWhiteListRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERACCESSWHITELISTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERACCESSWHITELISTREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERACCESSWHITELISTREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeDBClusterAccessWhiteListRequest : public RpcServiceRequest {
+public:
+	DescribeDBClusterAccessWhiteListRequest();
+	~DescribeDBClusterAccessWhiteListRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERACCESSWHITELISTREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeDBClusterAccessWhiteListResult.h

@@ -34,8 +34,8 @@ namespace AlibabaCloud
 			public:
 				struct IPArray
 				{
-					std::string dBClusterIPArrayName;
 					std::string securityIPList;
+					std::string dBClusterIPArrayName;
 					std::string dBClusterIPArrayAttribute;
 				};
 

adb/include/alibabacloud/adb/model/DescribeDBClusterAttributeRequest.h

@@ -1,63 +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_ADB_MODEL_DESCRIBEDBCLUSTERATTRIBUTEREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERATTRIBUTEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeDBClusterAttributeRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeDBClusterAttributeRequest();
-				~DescribeDBClusterAttributeRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERATTRIBUTEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERATTRIBUTEREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERATTRIBUTEREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeDBClusterAttributeRequest : public RpcServiceRequest {
+public:
+	DescribeDBClusterAttributeRequest();
+	~DescribeDBClusterAttributeRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERATTRIBUTEREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeDBClusterAttributeResult.h

@@ -63,21 +63,22 @@ namespace AlibabaCloud
 					std::string zoneId;
 					std::string vPCId;
 					std::string dBClusterStatus;
-					std::string vSwitchId;
 					std::string mode;
+					std::string vSwitchId;
 					std::string dBClusterDescription;
 					std::string computeResource;
 					std::string expired;
-					std::string lockMode;
 					std::string payType;
+					std::string lockMode;
 					bool enableAirflow;
-					std::string dBNodeClass;
 					bool enableSpark;
+					std::string dBNodeClass;
 					std::string vPCCloudInstanceId;
 					std::string creationTime;
+					std::string kmsId;
 					std::string regionId;
-					std::string expireTime;
 					std::string connectionString;
+					std::string expireTime;
 					std::string rdsInstanceId;
 				};
 

adb/include/alibabacloud/adb/model/DescribeDBClusterForecastRequest.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_ADB_MODEL_DESCRIBEDBCLUSTERFORECASTREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERFORECASTREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeDBClusterForecastRequest : public RpcServiceRequest {
+public:
+	DescribeDBClusterForecastRequest();
+	~DescribeDBClusterForecastRequest();
+	std::string getMetricType() const;
+	void setMetricType(const std::string &metricType);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getStartTime() const;
+	void setStartTime(const std::string &startTime);
+
+private:
+	std::string metricType_;
+	std::string regionId_;
+	std::string dBClusterId_;
+	std::string startTime_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERFORECASTREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeDBClusterForecastResult.h

@@ -0,0 +1,62 @@
+/*
+ * 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_ADB_MODEL_DESCRIBEDBCLUSTERFORECASTRESULT_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERFORECASTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/adb/AdbExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Adb
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ADB_EXPORT DescribeDBClusterForecastResult : public ServiceResult
+			{
+			public:
+				struct PerformancesItem
+				{
+					struct SeriesItem
+					{
+						std::string values;
+						std::string name;
+					};
+					std::vector<PerformancesItem::SeriesItem> series;
+					std::string unit;
+					std::string key;
+				};
+
+
+				DescribeDBClusterForecastResult();
+				explicit DescribeDBClusterForecastResult(const std::string &payload);
+				~DescribeDBClusterForecastResult();
+				std::vector<PerformancesItem> getPerformances()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<PerformancesItem> performances_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERFORECASTRESULT_H_

adb/include/alibabacloud/adb/model/DescribeDBClusterHealthReportRequest.h

@@ -0,0 +1,48 @@
+/*
+ * 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_ADB_MODEL_DESCRIBEDBCLUSTERHEALTHREPORTREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERHEALTHREPORTREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeDBClusterHealthReportRequest : public RpcServiceRequest {
+public:
+	DescribeDBClusterHealthReportRequest();
+	~DescribeDBClusterHealthReportRequest();
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getStartTime() const;
+	void setStartTime(const std::string &startTime);
+
+private:
+	std::string regionId_;
+	std::string dBClusterId_;
+	std::string startTime_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERHEALTHREPORTREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeDBClusterHealthReportResult.h

@@ -0,0 +1,58 @@
+/*
+ * 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_ADB_MODEL_DESCRIBEDBCLUSTERHEALTHREPORTRESULT_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERHEALTHREPORTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/adb/AdbExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Adb
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ADB_EXPORT DescribeDBClusterHealthReportResult : public ServiceResult
+			{
+			public:
+				struct ItemsItem
+				{
+					std::string avg;
+					std::string max;
+					std::string key;
+					std::string name;
+				};
+
+
+				DescribeDBClusterHealthReportResult();
+				explicit DescribeDBClusterHealthReportResult(const std::string &payload);
+				~DescribeDBClusterHealthReportResult();
+				std::vector<ItemsItem> getItems()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<ItemsItem> items_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERHEALTHREPORTRESULT_H_

adb/include/alibabacloud/adb/model/DescribeDBClusterNetInfoRequest.h

@@ -1,63 +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_ADB_MODEL_DESCRIBEDBCLUSTERNETINFOREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERNETINFOREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeDBClusterNetInfoRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeDBClusterNetInfoRequest();
-				~DescribeDBClusterNetInfoRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERNETINFOREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERNETINFOREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERNETINFOREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeDBClusterNetInfoRequest : public RpcServiceRequest {
+public:
+	DescribeDBClusterNetInfoRequest();
+	~DescribeDBClusterNetInfoRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERNETINFOREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeDBClusterNetInfoResult.h

@@ -35,11 +35,12 @@ namespace AlibabaCloud
 				struct Address
 				{
 					std::string vPCId;
-					std::string port;
 					std::string vSwitchId;
+					std::string port;
 					std::string connectionString;
 					std::string iPAddress;
 					std::string netType;
+					std::string connectionStringPrefix;
 				};
 
 

adb/include/alibabacloud/adb/model/DescribeDBClusterPerformanceRequest.h

@@ -1,72 +1,66 @@
 /*
  * 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_ADB_MODEL_DESCRIBEDBCLUSTERPERFORMANCEREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERPERFORMANCEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeDBClusterPerformanceRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeDBClusterPerformanceRequest();
-				~DescribeDBClusterPerformanceRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getStartTime()const;
-				void setStartTime(const std::string& startTime);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getKey()const;
-				void setKey(const std::string& key);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getEndTime()const;
-				void setEndTime(const std::string& endTime);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string startTime_;
-				std::string accessKeyId_;
-				std::string key_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				std::string endTime_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERPERFORMANCEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERPERFORMANCEREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERPERFORMANCEREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeDBClusterPerformanceRequest : public RpcServiceRequest {
+public:
+	DescribeDBClusterPerformanceRequest();
+	~DescribeDBClusterPerformanceRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getStartTime() const;
+	void setStartTime(const std::string &startTime);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getKey() const;
+	void setKey(const std::string &key);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	std::string getEndTime() const;
+	void setEndTime(const std::string &endTime);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string startTime_;
+	std::string accessKeyId_;
+	std::string key_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	std::string endTime_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERPERFORMANCEREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeDBClusterPerformanceResult.h

@@ -49,16 +49,16 @@ namespace AlibabaCloud
 				explicit DescribeDBClusterPerformanceResult(const std::string &payload);
 				~DescribeDBClusterPerformanceResult();
 				std::string getEndTime()const;
-				std::string getDBClusterId()const;
 				std::string getStartTime()const;
+				std::string getDBClusterId()const;
 				std::vector<PerformanceItem> getPerformances()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
 				std::string endTime_;
-				std::string dBClusterId_;
 				std::string startTime_;
+				std::string dBClusterId_;
 				std::vector<PerformanceItem> performances_;
 
 			};

adb/include/alibabacloud/adb/model/DescribeDBClusterResourcePoolPerformanceRequest.h

@@ -1,75 +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_ADB_MODEL_DESCRIBEDBCLUSTERRESOURCEPOOLPERFORMANCEREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERRESOURCEPOOLPERFORMANCEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeDBClusterResourcePoolPerformanceRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeDBClusterResourcePoolPerformanceRequest();
-				~DescribeDBClusterResourcePoolPerformanceRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getStartTime()const;
-				void setStartTime(const std::string& startTime);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourcePools()const;
-				void setResourcePools(const std::string& resourcePools);
-				std::string getKey()const;
-				void setKey(const std::string& key);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getEndTime()const;
-				void setEndTime(const std::string& endTime);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				long resourceOwnerId_;
-				std::string startTime_;
-				std::string accessKeyId_;
-				std::string resourcePools_;
-				std::string key_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				std::string endTime_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERRESOURCEPOOLPERFORMANCEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERRESOURCEPOOLPERFORMANCEREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERRESOURCEPOOLPERFORMANCEREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeDBClusterResourcePoolPerformanceRequest : public RpcServiceRequest {
+public:
+	DescribeDBClusterResourcePoolPerformanceRequest();
+	~DescribeDBClusterResourcePoolPerformanceRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getStartTime() const;
+	void setStartTime(const std::string &startTime);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourcePools() const;
+	void setResourcePools(const std::string &resourcePools);
+	std::string getKey() const;
+	void setKey(const std::string &key);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	std::string getEndTime() const;
+	void setEndTime(const std::string &endTime);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string startTime_;
+	std::string accessKeyId_;
+	std::string resourcePools_;
+	std::string key_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	std::string endTime_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERRESOURCEPOOLPERFORMANCEREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeDBClusterResourcePoolPerformanceResult.h

@@ -54,16 +54,16 @@ namespace AlibabaCloud
 				explicit DescribeDBClusterResourcePoolPerformanceResult(const std::string &payload);
 				~DescribeDBClusterResourcePoolPerformanceResult();
 				std::string getEndTime()const;
-				std::string getDBClusterId()const;
 				std::string getStartTime()const;
+				std::string getDBClusterId()const;
 				std::vector<PerformanceItem> getPerformances()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
 				std::string endTime_;
-				std::string dBClusterId_;
 				std::string startTime_;
+				std::string dBClusterId_;
 				std::vector<PerformanceItem> performances_;
 
 			};

adb/include/alibabacloud/adb/model/DescribeDBClustersRequest.h

@@ -1,90 +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.
- */
-
-#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERSREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeDBClustersRequest : public RpcServiceRequest
-			{
-			public:
-				struct Tag
-				{
-					std::string value;
-					std::string key;
-				};
-
-			public:
-				DescribeDBClustersRequest();
-				~DescribeDBClustersRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getDBClusterDescription()const;
-				void setDBClusterDescription(const std::string& dBClusterDescription);
-				std::string getDBClusterStatus()const;
-				void setDBClusterStatus(const std::string& dBClusterStatus);
-				int getPageNumber()const;
-				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 getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::vector<Tag> getTag()const;
-				void setTag(const std::vector<Tag>& tag);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getDBClusterIds()const;
-				void setDBClusterIds(const std::string& dBClusterIds);
-
-            private:
-				long resourceOwnerId_;
-				std::string dBClusterDescription_;
-				std::string dBClusterStatus_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				std::string resourceGroupId_;
-				std::string regionId_;
-				int pageSize_;
-				std::vector<Tag> tag_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string dBClusterIds_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERSREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERSREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeDBClustersRequest : public RpcServiceRequest {
+public:
+	struct Tag {
+		std::string value;
+		std::string key;
+	};
+	DescribeDBClustersRequest();
+	~DescribeDBClustersRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getDBClusterDescription() const;
+	void setDBClusterDescription(const std::string &dBClusterDescription);
+	std::string getDBClusterStatus() const;
+	void setDBClusterStatus(const std::string &dBClusterStatus);
+	int getPageNumber() const;
+	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 getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::vector<Tag> getTag() const;
+	void setTag(const std::vector<Tag> &tag);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getDBClusterIds() const;
+	void setDBClusterIds(const std::string &dBClusterIds);
+
+private:
+	long resourceOwnerId_;
+	std::string dBClusterDescription_;
+	std::string dBClusterStatus_;
+	int pageNumber_;
+	std::string accessKeyId_;
+	std::string resourceGroupId_;
+	std::string regionId_;
+	int pageSize_;
+	std::vector<Tag> tag_;
+	std::string resourceOwnerAccount_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string dBClusterIds_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBCLUSTERSREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeDBClustersResult.h

@@ -61,8 +61,8 @@ namespace AlibabaCloud
 					std::string vPCId;
 					std::string dBClusterStatus;
 					std::string createTime;
-					std::string vSwitchId;
 					std::string mode;
+					std::string vSwitchId;
 					std::string dBClusterDescription;
 					std::string computeResource;
 					std::string expired;
@@ -71,8 +71,8 @@ namespace AlibabaCloud
 					std::string dBNodeClass;
 					std::string vPCCloudInstanceId;
 					std::string regionId;
-					std::string expireTime;
 					std::string connectionString;
+					std::string expireTime;
 					std::string rdsInstanceId;
 				};
 

adb/include/alibabacloud/adb/model/DescribeDBResourceGroupRequest.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_ADB_MODEL_DESCRIBEDBRESOURCEGROUPREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBRESOURCEGROUPREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeDBResourceGroupRequest : public RpcServiceRequest {
+public:
+	DescribeDBResourceGroupRequest();
+	~DescribeDBResourceGroupRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getGroupName() const;
+	void setGroupName(const std::string &groupName);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string groupName_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBRESOURCEGROUPREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeDBResourceGroupResult.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_ADB_MODEL_DESCRIBEDBRESOURCEGROUPRESULT_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBRESOURCEGROUPRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/adb/AdbExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Adb
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ADB_EXPORT DescribeDBResourceGroupResult : public ServiceResult
+			{
+			public:
+				struct PoolInfo
+				{
+					std::string groupName;
+					std::string groupType;
+					int nodeNum;
+					std::string createTime;
+					std::string updateTime;
+					std::string groupUsers;
+				};
+
+
+				DescribeDBResourceGroupResult();
+				explicit DescribeDBResourceGroupResult(const std::string &payload);
+				~DescribeDBResourceGroupResult();
+				std::vector<PoolInfo> getGroupsInfo()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<PoolInfo> groupsInfo_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBRESOURCEGROUPRESULT_H_

adb/include/alibabacloud/adb/model/DescribeDBResourcePoolRequest.h

@@ -1,66 +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_ADB_MODEL_DESCRIBEDBRESOURCEPOOLREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBRESOURCEPOOLREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeDBResourcePoolRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeDBResourcePoolRequest();
-				~DescribeDBResourcePoolRequest();
-
-				std::string getPoolName()const;
-				void setPoolName(const std::string& poolName);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				std::string poolName_;
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBRESOURCEPOOLREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEDBRESOURCEPOOLREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDBRESOURCEPOOLREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeDBResourcePoolRequest : public RpcServiceRequest {
+public:
+	DescribeDBResourcePoolRequest();
+	~DescribeDBResourcePoolRequest();
+	std::string getPoolName() const;
+	void setPoolName(const std::string &poolName);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	std::string poolName_;
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDBRESOURCEPOOLREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeDiagnosisDimensionsRequest.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_ADB_MODEL_DESCRIBEDIAGNOSISDIMENSIONSREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDIAGNOSISDIMENSIONSREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeDiagnosisDimensionsRequest : public RpcServiceRequest {
+public:
+	DescribeDiagnosisDimensionsRequest();
+	~DescribeDiagnosisDimensionsRequest();
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getQueryCondition() const;
+	void setQueryCondition(const std::string &queryCondition);
+	std::string getEndTime() const;
+	void setEndTime(const std::string &endTime);
+	std::string getStartTime() const;
+	void setStartTime(const std::string &startTime);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getLang() const;
+	void setLang(const std::string &lang);
+
+private:
+	std::string dBClusterId_;
+	std::string queryCondition_;
+	std::string endTime_;
+	std::string startTime_;
+	std::string regionId_;
+	std::string lang_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDIAGNOSISDIMENSIONSREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeDiagnosisDimensionsResult.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_ADB_MODEL_DESCRIBEDIAGNOSISDIMENSIONSRESULT_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDIAGNOSISDIMENSIONSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/adb/AdbExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Adb
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ADB_EXPORT DescribeDiagnosisDimensionsResult : public ServiceResult
+			{
+			public:
+
+
+				DescribeDiagnosisDimensionsResult();
+				explicit DescribeDiagnosisDimensionsResult(const std::string &payload);
+				~DescribeDiagnosisDimensionsResult();
+				std::vector<std::string> getClientIps()const;
+				std::vector<std::string> getDatabases()const;
+				std::vector<std::string> getResourceGroups()const;
+				std::vector<std::string> getUserNames()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<std::string> clientIps_;
+				std::vector<std::string> databases_;
+				std::vector<std::string> resourceGroups_;
+				std::vector<std::string> userNames_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDIAGNOSISDIMENSIONSRESULT_H_

adb/include/alibabacloud/adb/model/DescribeDiagnosisRecordsRequest.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_ADB_MODEL_DESCRIBEDIAGNOSISRECORDSREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDIAGNOSISRECORDSREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeDiagnosisRecordsRequest : public RpcServiceRequest {
+public:
+	DescribeDiagnosisRecordsRequest();
+	~DescribeDiagnosisRecordsRequest();
+	std::string getQueryCondition() const;
+	void setQueryCondition(const std::string &queryCondition);
+	std::string getStartTime() const;
+	void setStartTime(const std::string &startTime);
+	std::string getRawStartTime() const;
+	void setRawStartTime(const std::string &rawStartTime);
+	int getPageNumber() const;
+	void setPageNumber(int pageNumber);
+	std::string getRawEndTime() const;
+	void setRawEndTime(const std::string &rawEndTime);
+	std::string getDatabase() const;
+	void setDatabase(const std::string &database);
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getClientIp() const;
+	void setClientIp(const std::string &clientIp);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getKeyword() const;
+	void setKeyword(const std::string &keyword);
+	std::string getLang() const;
+	void setLang(const std::string &lang);
+	std::string getOrder() const;
+	void setOrder(const std::string &order);
+	long getMaxScanSize() const;
+	void setMaxScanSize(long maxScanSize);
+	std::string getResourceGroup() const;
+	void setResourceGroup(const std::string &resourceGroup);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	long getPatternId() const;
+	void setPatternId(long patternId);
+	std::string getEndTime() const;
+	void setEndTime(const std::string &endTime);
+	long getMinPeakMemory() const;
+	void setMinPeakMemory(long minPeakMemory);
+	long getMinScanSize() const;
+	void setMinScanSize(long minScanSize);
+	long getMaxPeakMemory() const;
+	void setMaxPeakMemory(long maxPeakMemory);
+	std::string getUserName() const;
+	void setUserName(const std::string &userName);
+
+private:
+	std::string queryCondition_;
+	std::string startTime_;
+	std::string rawStartTime_;
+	int pageNumber_;
+	std::string rawEndTime_;
+	std::string database_;
+	std::string regionId_;
+	std::string clientIp_;
+	int pageSize_;
+	std::string keyword_;
+	std::string lang_;
+	std::string order_;
+	long maxScanSize_;
+	std::string resourceGroup_;
+	std::string dBClusterId_;
+	long patternId_;
+	std::string endTime_;
+	long minPeakMemory_;
+	long minScanSize_;
+	long maxPeakMemory_;
+	std::string userName_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDIAGNOSISRECORDSREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeDiagnosisRecordsResult.h

@@ -0,0 +1,83 @@
+/*
+ * 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_ADB_MODEL_DESCRIBEDIAGNOSISRECORDSRESULT_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDIAGNOSISRECORDSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/adb/AdbExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Adb
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ADB_EXPORT DescribeDiagnosisRecordsResult : public ServiceResult
+			{
+			public:
+				struct Items
+				{
+					std::string status;
+					std::string userName;
+					long totalPlanningTime;
+					long sQLTruncatedThreshold;
+					long peakMemory;
+					long etlWriteRows;
+					long startTime;
+					long cost;
+					std::string clientIp;
+					std::string sQL;
+					long executionTime;
+					long scanRows;
+					int totalStages;
+					int resourceCostRank;
+					std::string database;
+					long outputRows;
+					long queueTime;
+					std::string rcHost;
+					long scanSize;
+					std::string processId;
+					long outputDataSize;
+					bool sQLTruncated;
+					std::string resourceGroup;
+				};
+
+
+				DescribeDiagnosisRecordsResult();
+				explicit DescribeDiagnosisRecordsResult(const std::string &payload);
+				~DescribeDiagnosisRecordsResult();
+				int getTotalCount()const;
+				std::vector<Items> getQuerys()const;
+				int getPageSize()const;
+				int getPageNumber()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				int totalCount_;
+				std::vector<Items> querys_;
+				int pageSize_;
+				int pageNumber_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDIAGNOSISRECORDSRESULT_H_

adb/include/alibabacloud/adb/model/DescribeDownloadRecordsRequest.h

@@ -0,0 +1,48 @@
+/*
+ * 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_ADB_MODEL_DESCRIBEDOWNLOADRECORDSREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDOWNLOADRECORDSREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeDownloadRecordsRequest : public RpcServiceRequest {
+public:
+	DescribeDownloadRecordsRequest();
+	~DescribeDownloadRecordsRequest();
+	std::string getRegionId() const;
+	void setRegionId(const std::string &regionId);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getLang() const;
+	void setLang(const std::string &lang);
+
+private:
+	std::string regionId_;
+	std::string dBClusterId_;
+	std::string lang_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDOWNLOADRECORDSREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeDownloadRecordsResult.h

@@ -0,0 +1,59 @@
+/*
+ * 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_ADB_MODEL_DESCRIBEDOWNLOADRECORDSRESULT_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEDOWNLOADRECORDSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/adb/AdbExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Adb
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ADB_EXPORT DescribeDownloadRecordsResult : public ServiceResult
+			{
+			public:
+				struct Items
+				{
+					std::string status;
+					std::string fileName;
+					std::string exceptionMsg;
+					std::string url;
+					long downloadId;
+				};
+
+
+				DescribeDownloadRecordsResult();
+				explicit DescribeDownloadRecordsResult(const std::string &payload);
+				~DescribeDownloadRecordsResult();
+				std::vector<Items> getRecords()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<Items> records_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEDOWNLOADRECORDSRESULT_H_

adb/include/alibabacloud/adb/model/DescribeElasticDailyPlanRequest.h

@@ -1,75 +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_ADB_MODEL_DESCRIBEELASTICDAILYPLANREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEELASTICDAILYPLANREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeElasticDailyPlanRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeElasticDailyPlanRequest();
-				~DescribeElasticDailyPlanRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getElasticDailyPlanStatusList()const;
-				void setElasticDailyPlanStatusList(const std::string& elasticDailyPlanStatusList);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getElasticDailyPlanDay()const;
-				void setElasticDailyPlanDay(const std::string& elasticDailyPlanDay);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getElasticPlanName()const;
-				void setElasticPlanName(const std::string& elasticPlanName);
-				std::string getResourcePoolName()const;
-				void setResourcePoolName(const std::string& resourcePoolName);
-
-            private:
-				long resourceOwnerId_;
-				std::string elasticDailyPlanStatusList_;
-				std::string accessKeyId_;
-				std::string elasticDailyPlanDay_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string elasticPlanName_;
-				std::string resourcePoolName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEELASTICDAILYPLANREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEELASTICDAILYPLANREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEELASTICDAILYPLANREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeElasticDailyPlanRequest : public RpcServiceRequest {
+public:
+	DescribeElasticDailyPlanRequest();
+	~DescribeElasticDailyPlanRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getElasticDailyPlanStatusList() const;
+	void setElasticDailyPlanStatusList(const std::string &elasticDailyPlanStatusList);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getElasticDailyPlanDay() const;
+	void setElasticDailyPlanDay(const std::string &elasticDailyPlanDay);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getElasticPlanName() const;
+	void setElasticPlanName(const std::string &elasticPlanName);
+	std::string getResourcePoolName() const;
+	void setResourcePoolName(const std::string &resourcePoolName);
+
+private:
+	long resourceOwnerId_;
+	std::string elasticDailyPlanStatusList_;
+	std::string accessKeyId_;
+	std::string elasticDailyPlanDay_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string elasticPlanName_;
+	std::string resourcePoolName_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEELASTICDAILYPLANREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeElasticPlanRequest.h

@@ -1,72 +1,66 @@
 /*
  * 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_ADB_MODEL_DESCRIBEELASTICPLANREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEELASTICPLANREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeElasticPlanRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeElasticPlanRequest();
-				~DescribeElasticPlanRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				bool getElasticPlanEnable()const;
-				void setElasticPlanEnable(bool elasticPlanEnable);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getElasticPlanName()const;
-				void setElasticPlanName(const std::string& elasticPlanName);
-				std::string getResourcePoolName()const;
-				void setResourcePoolName(const std::string& resourcePoolName);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				bool elasticPlanEnable_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-				std::string elasticPlanName_;
-				std::string resourcePoolName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEELASTICPLANREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEELASTICPLANREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEELASTICPLANREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeElasticPlanRequest : public RpcServiceRequest {
+public:
+	DescribeElasticPlanRequest();
+	~DescribeElasticPlanRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	bool getElasticPlanEnable() const;
+	void setElasticPlanEnable(bool elasticPlanEnable);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getElasticPlanName() const;
+	void setElasticPlanName(const std::string &elasticPlanName);
+	std::string getResourcePoolName() const;
+	void setResourcePoolName(const std::string &resourcePoolName);
+
+private:
+	long resourceOwnerId_;
+	std::string accessKeyId_;
+	bool elasticPlanEnable_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+	std::string elasticPlanName_;
+	std::string resourcePoolName_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEELASTICPLANREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeElasticPlanResult.h

@@ -36,13 +36,13 @@ namespace AlibabaCloud
 				{
 					std::string weeklyRepeat;
 					std::string endTime;
-					int elasticNodeNum;
 					std::string startTime;
+					int elasticNodeNum;
 					std::string resourcePoolName;
 					bool enable;
 					std::string endDay;
-					std::string planName;
 					std::string startDay;
+					std::string planName;
 				};
 
 

adb/include/alibabacloud/adb/model/DescribeInclinedTablesRequest.h

@@ -1,75 +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_ADB_MODEL_DESCRIBEINCLINEDTABLESREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBEINCLINEDTABLESREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeInclinedTablesRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeInclinedTablesRequest();
-				~DescribeInclinedTablesRequest();
-
-				std::string getTableType()const;
-				void setTableType(const std::string& tableType);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getOrder()const;
-				void setOrder(const std::string& order);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				std::string tableType_;
-				long resourceOwnerId_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				int pageSize_;
-				std::string order_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEINCLINEDTABLESREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBEINCLINEDTABLESREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBEINCLINEDTABLESREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeInclinedTablesRequest : public RpcServiceRequest {
+public:
+	DescribeInclinedTablesRequest();
+	~DescribeInclinedTablesRequest();
+	std::string getTableType() const;
+	void setTableType(const std::string &tableType);
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	int getPageNumber() const;
+	void setPageNumber(int pageNumber);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getOrder() const;
+	void setOrder(const std::string &order);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	std::string tableType_;
+	long resourceOwnerId_;
+	int pageNumber_;
+	std::string accessKeyId_;
+	int pageSize_;
+	std::string order_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBEINCLINEDTABLESREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeLoadTasksRecordsRequest.h

@@ -1,87 +1,81 @@
 /*
  * 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_ADB_MODEL_DESCRIBELOADTASKSRECORDSREQUEST_H_
-#define ALIBABACLOUD_ADB_MODEL_DESCRIBELOADTASKSRECORDSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/adb/AdbExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Adb
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ADB_EXPORT DescribeLoadTasksRecordsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeLoadTasksRecordsRequest();
-				~DescribeLoadTasksRecordsRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRange()const;
-				void setRange(const std::string& range);
-				std::string getStartTime()const;
-				void setStartTime(const std::string& startTime);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getState()const;
-				void setState(const std::string& state);
-				std::string getOrder()const;
-				void setOrder(const std::string& order);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getDBClusterId()const;
-				void setDBClusterId(const std::string& dBClusterId);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getEndTime()const;
-				void setEndTime(const std::string& endTime);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getDBName()const;
-				void setDBName(const std::string& dBName);
-
-            private:
-				long resourceOwnerId_;
-				std::string range_;
-				std::string startTime_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				int pageSize_;
-				std::string state_;
-				std::string order_;
-				std::string resourceOwnerAccount_;
-				std::string dBClusterId_;
-				std::string ownerAccount_;
-				std::string endTime_;
-				long ownerId_;
-				std::string dBName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBELOADTASKSRECORDSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ADB_MODEL_DESCRIBELOADTASKSRECORDSREQUEST_H_
+#define ALIBABACLOUD_ADB_MODEL_DESCRIBELOADTASKSRECORDSREQUEST_H_
+
+#include <alibabacloud/adb/AdbExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Adb {
+namespace Model {
+class ALIBABACLOUD_ADB_EXPORT DescribeLoadTasksRecordsRequest : public RpcServiceRequest {
+public:
+	DescribeLoadTasksRecordsRequest();
+	~DescribeLoadTasksRecordsRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getRange() const;
+	void setRange(const std::string &range);
+	std::string getStartTime() const;
+	void setStartTime(const std::string &startTime);
+	int getPageNumber() const;
+	void setPageNumber(int pageNumber);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getState() const;
+	void setState(const std::string &state);
+	std::string getOrder() const;
+	void setOrder(const std::string &order);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	std::string getEndTime() const;
+	void setEndTime(const std::string &endTime);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getDBName() const;
+	void setDBName(const std::string &dBName);
+
+private:
+	long resourceOwnerId_;
+	std::string range_;
+	std::string startTime_;
+	int pageNumber_;
+	std::string accessKeyId_;
+	int pageSize_;
+	std::string state_;
+	std::string order_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	std::string endTime_;
+	long ownerId_;
+	std::string dBName_;
+};
+} // namespace Model
+} // namespace Adb
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBELOADTASKSRECORDSREQUEST_H_

adb/include/alibabacloud/adb/model/DescribeLoadTasksRecordsResult.h

@@ -37,8 +37,8 @@ namespace AlibabaCloud
 					long processRows;
 					std::string state;
 					std::string createTime;
-					std::string jobName;
 					std::string updateTime;
+					std::string jobName;
 					std::string dBName;
 					std::string processID;
 					std::string sql;