Add list live message interface.

VERSION

@@ -1 +1 @@
-1.36.799
+1.36.1376

actiontrail/CMakeLists.txt

@@ -33,6 +33,18 @@ set(actiontrail_public_header_model
 	include/alibabacloud/actiontrail/model/DescribeRegionsResult.h
 	include/alibabacloud/actiontrail/model/DescribeTrailsRequest.h
 	include/alibabacloud/actiontrail/model/DescribeTrailsResult.h
+	include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedEventsRequest.h
+	include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedEventsResult.h
+	include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedInfoRequest.h
+	include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedInfoResult.h
+	include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedIpsRequest.h
+	include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedIpsResult.h
+	include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedProductsRequest.h
+	include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedProductsResult.h
+	include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedResourcesRequest.h
+	include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedResourcesResult.h
+	include/alibabacloud/actiontrail/model/GetDeliveryHistoryJobRequest.h
+	include/alibabacloud/actiontrail/model/GetDeliveryHistoryJobResult.h
 	include/alibabacloud/actiontrail/model/GetTrailStatusRequest.h
 	include/alibabacloud/actiontrail/model/GetTrailStatusResult.h
 	include/alibabacloud/actiontrail/model/ListDeliveryHistoryJobsRequest.h
@@ -60,6 +72,18 @@ set(actiontrail_src
 	src/model/DescribeRegionsResult.cc
 	src/model/DescribeTrailsRequest.cc
 	src/model/DescribeTrailsResult.cc
+	src/model/GetAccessKeyLastUsedEventsRequest.cc
+	src/model/GetAccessKeyLastUsedEventsResult.cc
+	src/model/GetAccessKeyLastUsedInfoRequest.cc
+	src/model/GetAccessKeyLastUsedInfoResult.cc
+	src/model/GetAccessKeyLastUsedIpsRequest.cc
+	src/model/GetAccessKeyLastUsedIpsResult.cc
+	src/model/GetAccessKeyLastUsedProductsRequest.cc
+	src/model/GetAccessKeyLastUsedProductsResult.cc
+	src/model/GetAccessKeyLastUsedResourcesRequest.cc
+	src/model/GetAccessKeyLastUsedResourcesResult.cc
+	src/model/GetDeliveryHistoryJobRequest.cc
+	src/model/GetDeliveryHistoryJobResult.cc
 	src/model/GetTrailStatusRequest.cc
 	src/model/GetTrailStatusResult.cc
 	src/model/ListDeliveryHistoryJobsRequest.cc

actiontrail/include/alibabacloud/actiontrail/ActiontrailClient.h

@@ -34,6 +34,18 @@
 #include "model/DescribeRegionsResult.h"
 #include "model/DescribeTrailsRequest.h"
 #include "model/DescribeTrailsResult.h"
+#include "model/GetAccessKeyLastUsedEventsRequest.h"
+#include "model/GetAccessKeyLastUsedEventsResult.h"
+#include "model/GetAccessKeyLastUsedInfoRequest.h"
+#include "model/GetAccessKeyLastUsedInfoResult.h"
+#include "model/GetAccessKeyLastUsedIpsRequest.h"
+#include "model/GetAccessKeyLastUsedIpsResult.h"
+#include "model/GetAccessKeyLastUsedProductsRequest.h"
+#include "model/GetAccessKeyLastUsedProductsResult.h"
+#include "model/GetAccessKeyLastUsedResourcesRequest.h"
+#include "model/GetAccessKeyLastUsedResourcesResult.h"
+#include "model/GetDeliveryHistoryJobRequest.h"
+#include "model/GetDeliveryHistoryJobResult.h"
 #include "model/GetTrailStatusRequest.h"
 #include "model/GetTrailStatusResult.h"
 #include "model/ListDeliveryHistoryJobsRequest.h"
@@ -73,6 +85,24 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeTrailsResult> DescribeTrailsOutcome;
 			typedef std::future<DescribeTrailsOutcome> DescribeTrailsOutcomeCallable;
 			typedef std::function<void(const ActiontrailClient*, const Model::DescribeTrailsRequest&, const DescribeTrailsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeTrailsAsyncHandler;
+			typedef Outcome<Error, Model::GetAccessKeyLastUsedEventsResult> GetAccessKeyLastUsedEventsOutcome;
+			typedef std::future<GetAccessKeyLastUsedEventsOutcome> GetAccessKeyLastUsedEventsOutcomeCallable;
+			typedef std::function<void(const ActiontrailClient*, const Model::GetAccessKeyLastUsedEventsRequest&, const GetAccessKeyLastUsedEventsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetAccessKeyLastUsedEventsAsyncHandler;
+			typedef Outcome<Error, Model::GetAccessKeyLastUsedInfoResult> GetAccessKeyLastUsedInfoOutcome;
+			typedef std::future<GetAccessKeyLastUsedInfoOutcome> GetAccessKeyLastUsedInfoOutcomeCallable;
+			typedef std::function<void(const ActiontrailClient*, const Model::GetAccessKeyLastUsedInfoRequest&, const GetAccessKeyLastUsedInfoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetAccessKeyLastUsedInfoAsyncHandler;
+			typedef Outcome<Error, Model::GetAccessKeyLastUsedIpsResult> GetAccessKeyLastUsedIpsOutcome;
+			typedef std::future<GetAccessKeyLastUsedIpsOutcome> GetAccessKeyLastUsedIpsOutcomeCallable;
+			typedef std::function<void(const ActiontrailClient*, const Model::GetAccessKeyLastUsedIpsRequest&, const GetAccessKeyLastUsedIpsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetAccessKeyLastUsedIpsAsyncHandler;
+			typedef Outcome<Error, Model::GetAccessKeyLastUsedProductsResult> GetAccessKeyLastUsedProductsOutcome;
+			typedef std::future<GetAccessKeyLastUsedProductsOutcome> GetAccessKeyLastUsedProductsOutcomeCallable;
+			typedef std::function<void(const ActiontrailClient*, const Model::GetAccessKeyLastUsedProductsRequest&, const GetAccessKeyLastUsedProductsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetAccessKeyLastUsedProductsAsyncHandler;
+			typedef Outcome<Error, Model::GetAccessKeyLastUsedResourcesResult> GetAccessKeyLastUsedResourcesOutcome;
+			typedef std::future<GetAccessKeyLastUsedResourcesOutcome> GetAccessKeyLastUsedResourcesOutcomeCallable;
+			typedef std::function<void(const ActiontrailClient*, const Model::GetAccessKeyLastUsedResourcesRequest&, const GetAccessKeyLastUsedResourcesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetAccessKeyLastUsedResourcesAsyncHandler;
+			typedef Outcome<Error, Model::GetDeliveryHistoryJobResult> GetDeliveryHistoryJobOutcome;
+			typedef std::future<GetDeliveryHistoryJobOutcome> GetDeliveryHistoryJobOutcomeCallable;
+			typedef std::function<void(const ActiontrailClient*, const Model::GetDeliveryHistoryJobRequest&, const GetDeliveryHistoryJobOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetDeliveryHistoryJobAsyncHandler;
 			typedef Outcome<Error, Model::GetTrailStatusResult> GetTrailStatusOutcome;
 			typedef std::future<GetTrailStatusOutcome> GetTrailStatusOutcomeCallable;
 			typedef std::function<void(const ActiontrailClient*, const Model::GetTrailStatusRequest&, const GetTrailStatusOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetTrailStatusAsyncHandler;
@@ -114,6 +144,24 @@ namespace AlibabaCloud
 			DescribeTrailsOutcome describeTrails(const Model::DescribeTrailsRequest &request)const;
 			void describeTrailsAsync(const Model::DescribeTrailsRequest& request, const DescribeTrailsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeTrailsOutcomeCallable describeTrailsCallable(const Model::DescribeTrailsRequest& request) const;
+			GetAccessKeyLastUsedEventsOutcome getAccessKeyLastUsedEvents(const Model::GetAccessKeyLastUsedEventsRequest &request)const;
+			void getAccessKeyLastUsedEventsAsync(const Model::GetAccessKeyLastUsedEventsRequest& request, const GetAccessKeyLastUsedEventsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			GetAccessKeyLastUsedEventsOutcomeCallable getAccessKeyLastUsedEventsCallable(const Model::GetAccessKeyLastUsedEventsRequest& request) const;
+			GetAccessKeyLastUsedInfoOutcome getAccessKeyLastUsedInfo(const Model::GetAccessKeyLastUsedInfoRequest &request)const;
+			void getAccessKeyLastUsedInfoAsync(const Model::GetAccessKeyLastUsedInfoRequest& request, const GetAccessKeyLastUsedInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			GetAccessKeyLastUsedInfoOutcomeCallable getAccessKeyLastUsedInfoCallable(const Model::GetAccessKeyLastUsedInfoRequest& request) const;
+			GetAccessKeyLastUsedIpsOutcome getAccessKeyLastUsedIps(const Model::GetAccessKeyLastUsedIpsRequest &request)const;
+			void getAccessKeyLastUsedIpsAsync(const Model::GetAccessKeyLastUsedIpsRequest& request, const GetAccessKeyLastUsedIpsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			GetAccessKeyLastUsedIpsOutcomeCallable getAccessKeyLastUsedIpsCallable(const Model::GetAccessKeyLastUsedIpsRequest& request) const;
+			GetAccessKeyLastUsedProductsOutcome getAccessKeyLastUsedProducts(const Model::GetAccessKeyLastUsedProductsRequest &request)const;
+			void getAccessKeyLastUsedProductsAsync(const Model::GetAccessKeyLastUsedProductsRequest& request, const GetAccessKeyLastUsedProductsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			GetAccessKeyLastUsedProductsOutcomeCallable getAccessKeyLastUsedProductsCallable(const Model::GetAccessKeyLastUsedProductsRequest& request) const;
+			GetAccessKeyLastUsedResourcesOutcome getAccessKeyLastUsedResources(const Model::GetAccessKeyLastUsedResourcesRequest &request)const;
+			void getAccessKeyLastUsedResourcesAsync(const Model::GetAccessKeyLastUsedResourcesRequest& request, const GetAccessKeyLastUsedResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			GetAccessKeyLastUsedResourcesOutcomeCallable getAccessKeyLastUsedResourcesCallable(const Model::GetAccessKeyLastUsedResourcesRequest& request) const;
+			GetDeliveryHistoryJobOutcome getDeliveryHistoryJob(const Model::GetDeliveryHistoryJobRequest &request)const;
+			void getDeliveryHistoryJobAsync(const Model::GetDeliveryHistoryJobRequest& request, const GetDeliveryHistoryJobAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			GetDeliveryHistoryJobOutcomeCallable getDeliveryHistoryJobCallable(const Model::GetDeliveryHistoryJobRequest& request) const;
 			GetTrailStatusOutcome getTrailStatus(const Model::GetTrailStatusRequest &request)const;
 			void getTrailStatusAsync(const Model::GetTrailStatusRequest& request, const GetTrailStatusAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			GetTrailStatusOutcomeCallable getTrailStatusCallable(const Model::GetTrailStatusRequest& request) const;

actiontrail/include/alibabacloud/actiontrail/model/CreateDeliveryHistoryJobRequest.h

@@ -1,51 +1,45 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_CREATEDELIVERYHISTORYJOBREQUEST_H_
-#define ALIBABACLOUD_ACTIONTRAIL_MODEL_CREATEDELIVERYHISTORYJOBREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/actiontrail/ActiontrailExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Actiontrail
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ACTIONTRAIL_EXPORT CreateDeliveryHistoryJobRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateDeliveryHistoryJobRequest();
-				~CreateDeliveryHistoryJobRequest();
-
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				std::string getTrailName()const;
-				void setTrailName(const std::string& trailName);
-
-            private:
-				std::string clientToken_;
-				std::string trailName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_CREATEDELIVERYHISTORYJOBREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_CREATEDELIVERYHISTORYJOBREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_CREATEDELIVERYHISTORYJOBREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT CreateDeliveryHistoryJobRequest : public RpcServiceRequest {
+public:
+	CreateDeliveryHistoryJobRequest();
+	~CreateDeliveryHistoryJobRequest();
+	std::string getClientToken() const;
+	void setClientToken(const std::string &clientToken);
+	std::string getTrailName() const;
+	void setTrailName(const std::string &trailName);
+
+private:
+	std::string clientToken_;
+	std::string trailName_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_CREATEDELIVERYHISTORYJOBREQUEST_H_

actiontrail/include/alibabacloud/actiontrail/model/CreateTrailRequest.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_ACTIONTRAIL_MODEL_CREATETRAILREQUEST_H_
-#define ALIBABACLOUD_ACTIONTRAIL_MODEL_CREATETRAILREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/actiontrail/ActiontrailExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Actiontrail
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ACTIONTRAIL_EXPORT CreateTrailRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateTrailRequest();
-				~CreateTrailRequest();
-
-				std::string getSlsProjectArn()const;
-				void setSlsProjectArn(const std::string& slsProjectArn);
-				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 getOssWriteRoleArn()const;
-				void setOssWriteRoleArn(const std::string& ossWriteRoleArn);
-				std::string getEventRW()const;
-				void setEventRW(const std::string& eventRW);
-				std::string getName()const;
-				void setName(const std::string& name);
-				std::string getOssBucketName()const;
-				void setOssBucketName(const std::string& ossBucketName);
-				std::string getTrailRegion()const;
-				void setTrailRegion(const std::string& trailRegion);
-
-            private:
-				std::string slsProjectArn_;
-				std::string slsWriteRoleArn_;
-				bool isOrganizationTrail_;
-				std::string ossKeyPrefix_;
-				std::string ossWriteRoleArn_;
-				std::string eventRW_;
-				std::string name_;
-				std::string ossBucketName_;
-				std::string trailRegion_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_CREATETRAILREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_CREATETRAILREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_CREATETRAILREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT CreateTrailRequest : public RpcServiceRequest {
+public:
+	CreateTrailRequest();
+	~CreateTrailRequest();
+	std::string getSlsProjectArn() const;
+	void setSlsProjectArn(const std::string &slsProjectArn);
+	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 getOssWriteRoleArn() const;
+	void setOssWriteRoleArn(const std::string &ossWriteRoleArn);
+	std::string getEventRW() const;
+	void setEventRW(const std::string &eventRW);
+	std::string getName() const;
+	void setName(const std::string &name);
+	std::string getOssBucketName() const;
+	void setOssBucketName(const std::string &ossBucketName);
+	std::string getTrailRegion() const;
+	void setTrailRegion(const std::string &trailRegion);
+
+private:
+	std::string slsProjectArn_;
+	std::string slsWriteRoleArn_;
+	bool isOrganizationTrail_;
+	std::string ossKeyPrefix_;
+	std::string ossWriteRoleArn_;
+	std::string eventRW_;
+	std::string name_;
+	std::string ossBucketName_;
+	std::string trailRegion_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_CREATETRAILREQUEST_H_

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

@@ -42,8 +42,8 @@ namespace AlibabaCloud
 				std::string getHomeRegion()const;
 				std::string getOssKeyPrefix()const;
 				std::string getOssBucketName()const;
-				std::string getSlsWriteRoleArn()const;
 				std::string getOssWriteRoleArn()const;
+				std::string getSlsWriteRoleArn()const;
 				std::string getTrailRegion()const;
 				std::string getName()const;
 
@@ -55,8 +55,8 @@ namespace AlibabaCloud
 				std::string homeRegion_;
 				std::string ossKeyPrefix_;
 				std::string ossBucketName_;
-				std::string slsWriteRoleArn_;
 				std::string ossWriteRoleArn_;
+				std::string slsWriteRoleArn_;
 				std::string trailRegion_;
 				std::string name_;
 

actiontrail/include/alibabacloud/actiontrail/model/DeleteDeliveryHistoryJobRequest.h

@@ -1,48 +1,42 @@
 /*
  * 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_ACTIONTRAIL_MODEL_DELETEDELIVERYHISTORYJOBREQUEST_H_
-#define ALIBABACLOUD_ACTIONTRAIL_MODEL_DELETEDELIVERYHISTORYJOBREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/actiontrail/ActiontrailExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Actiontrail
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ACTIONTRAIL_EXPORT DeleteDeliveryHistoryJobRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteDeliveryHistoryJobRequest();
-				~DeleteDeliveryHistoryJobRequest();
-
-				int getJobId()const;
-				void setJobId(int jobId);
-
-            private:
-				int jobId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_DELETEDELIVERYHISTORYJOBREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_DELETEDELIVERYHISTORYJOBREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_DELETEDELIVERYHISTORYJOBREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT DeleteDeliveryHistoryJobRequest : public RpcServiceRequest {
+public:
+	DeleteDeliveryHistoryJobRequest();
+	~DeleteDeliveryHistoryJobRequest();
+	int getJobId() const;
+	void setJobId(int jobId);
+
+private:
+	int jobId_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_DELETEDELIVERYHISTORYJOBREQUEST_H_

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

@@ -1,48 +1,42 @@
 /*
  * 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_ACTIONTRAIL_MODEL_DELETETRAILREQUEST_H_
-#define ALIBABACLOUD_ACTIONTRAIL_MODEL_DELETETRAILREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/actiontrail/ActiontrailExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Actiontrail
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ACTIONTRAIL_EXPORT DeleteTrailRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteTrailRequest();
-				~DeleteTrailRequest();
-
-				std::string getName()const;
-				void setName(const std::string& name);
-
-            private:
-				std::string name_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_DELETETRAILREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_DELETETRAILREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_DELETETRAILREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT DeleteTrailRequest : public RpcServiceRequest {
+public:
+	DeleteTrailRequest();
+	~DeleteTrailRequest();
+	std::string getName() const;
+	void setName(const std::string &name);
+
+private:
+	std::string name_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_DELETETRAILREQUEST_H_

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

@@ -1,48 +1,42 @@
 /*
  * 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_ACTIONTRAIL_MODEL_DESCRIBEREGIONSREQUEST_H_
-#define ALIBABACLOUD_ACTIONTRAIL_MODEL_DESCRIBEREGIONSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/actiontrail/ActiontrailExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Actiontrail
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ACTIONTRAIL_EXPORT DescribeRegionsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeRegionsRequest();
-				~DescribeRegionsRequest();
-
-				std::string getAcceptLanguage()const;
-				void setAcceptLanguage(const std::string& acceptLanguage);
-
-            private:
-				std::string acceptLanguage_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_DESCRIBEREGIONSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_DESCRIBEREGIONSREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_DESCRIBEREGIONSREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT DescribeRegionsRequest : public RpcServiceRequest {
+public:
+	DescribeRegionsRequest();
+	~DescribeRegionsRequest();
+	std::string getAcceptLanguage() const;
+	void setAcceptLanguage(const std::string &acceptLanguage);
+
+private:
+	std::string acceptLanguage_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_DESCRIBEREGIONSREQUEST_H_

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

@@ -1,54 +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_ACTIONTRAIL_MODEL_DESCRIBETRAILSREQUEST_H_
-#define ALIBABACLOUD_ACTIONTRAIL_MODEL_DESCRIBETRAILSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/actiontrail/ActiontrailExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Actiontrail
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ACTIONTRAIL_EXPORT DescribeTrailsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeTrailsRequest();
-				~DescribeTrailsRequest();
-
-				bool getIncludeOrganizationTrail()const;
-				void setIncludeOrganizationTrail(bool includeOrganizationTrail);
-				bool getIncludeShadowTrails()const;
-				void setIncludeShadowTrails(bool includeShadowTrails);
-				std::string getNameList()const;
-				void setNameList(const std::string& nameList);
-
-            private:
-				bool includeOrganizationTrail_;
-				bool includeShadowTrails_;
-				std::string nameList_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_DESCRIBETRAILSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_DESCRIBETRAILSREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_DESCRIBETRAILSREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT DescribeTrailsRequest : public RpcServiceRequest {
+public:
+	DescribeTrailsRequest();
+	~DescribeTrailsRequest();
+	bool getIncludeOrganizationTrail() const;
+	void setIncludeOrganizationTrail(bool includeOrganizationTrail);
+	bool getIncludeShadowTrails() const;
+	void setIncludeShadowTrails(bool includeShadowTrails);
+	std::string getNameList() const;
+	void setNameList(const std::string &nameList);
+
+private:
+	bool includeOrganizationTrail_;
+	bool includeShadowTrails_;
+	std::string nameList_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_DESCRIBETRAILSREQUEST_H_

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

@@ -36,23 +36,24 @@ namespace AlibabaCloud
 				{
 					std::string status;
 					std::string homeRegion;
-					std::string startLoggingTime;
 					std::string createTime;
+					std::string startLoggingTime;
 					std::string stopLoggingTime;
-					std::string organizationId;
 					std::string slsWriteRoleArn;
-					std::string ossBucketLocation;
+					std::string organizationId;
 					std::string trailRegion;
-					std::string name;
+					std::string ossBucketLocation;
 					bool isOrganizationTrail;
+					std::string name;
 					std::string slsProjectArn;
 					std::string eventRW;
-					std::string ossKeyPrefix;
 					std::string updateTime;
+					std::string ossKeyPrefix;
 					std::string region;
 					std::string ossBucketName;
 					std::string ossWriteRoleArn;
 					long isShadowTrail;
+					std::string trailArn;
 				};
 
 

actiontrail/include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedEventsRequest.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_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDEVENTSREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDEVENTSREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT GetAccessKeyLastUsedEventsRequest : public RpcServiceRequest {
+public:
+	GetAccessKeyLastUsedEventsRequest();
+	~GetAccessKeyLastUsedEventsRequest();
+	std::string getAccessKey() const;
+	void setAccessKey(const std::string &accessKey);
+	std::string getNextToken() const;
+	void setNextToken(const std::string &nextToken);
+	std::string getPageSize() const;
+	void setPageSize(const std::string &pageSize);
+	std::string getServiceName() const;
+	void setServiceName(const std::string &serviceName);
+
+private:
+	std::string accessKey_;
+	std::string nextToken_;
+	std::string pageSize_;
+	std::string serviceName_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDEVENTSREQUEST_H_

actiontrail/include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedEventsResult.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_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDEVENTSRESULT_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDEVENTSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Actiontrail
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ACTIONTRAIL_EXPORT GetAccessKeyLastUsedEventsResult : public ServiceResult
+			{
+			public:
+				struct EventsItem
+				{
+					std::string eventName;
+					long usedTimestamp;
+					std::string detail;
+					std::string source;
+				};
+
+
+				GetAccessKeyLastUsedEventsResult();
+				explicit GetAccessKeyLastUsedEventsResult(const std::string &payload);
+				~GetAccessKeyLastUsedEventsResult();
+				std::string getNextToken()const;
+				std::vector<EventsItem> getEvents()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string nextToken_;
+				std::vector<EventsItem> events_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDEVENTSRESULT_H_

actiontrail/include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedInfoRequest.h

@@ -0,0 +1,42 @@
+/*
+ * 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_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDINFOREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDINFOREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT GetAccessKeyLastUsedInfoRequest : public RpcServiceRequest {
+public:
+	GetAccessKeyLastUsedInfoRequest();
+	~GetAccessKeyLastUsedInfoRequest();
+	std::string getAccessKey() const;
+	void setAccessKey(const std::string &accessKey);
+
+private:
+	std::string accessKey_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDINFOREQUEST_H_

actiontrail/include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedInfoResult.h

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDINFORESULT_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDINFORESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Actiontrail
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ACTIONTRAIL_EXPORT GetAccessKeyLastUsedInfoResult : public ServiceResult
+			{
+			public:
+
+
+				GetAccessKeyLastUsedInfoResult();
+				explicit GetAccessKeyLastUsedInfoResult(const std::string &payload);
+				~GetAccessKeyLastUsedInfoResult();
+				std::string getAccountId()const;
+				std::string getUserName()const;
+				std::string getOwnerId()const;
+				std::string getServiceName()const;
+				std::string getAccessKeyId()const;
+				std::string getServiceNameCn()const;
+				std::string getServiceNameEn()const;
+				std::string getAccountType()const;
+				long getUsedTimestamp()const;
+				std::string getDetail()const;
+				std::string getSource()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string accountId_;
+				std::string userName_;
+				std::string ownerId_;
+				std::string serviceName_;
+				std::string accessKeyId_;
+				std::string serviceNameCn_;
+				std::string serviceNameEn_;
+				std::string accountType_;
+				long usedTimestamp_;
+				std::string detail_;
+				std::string source_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDINFORESULT_H_

actiontrail/include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedIpsRequest.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_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDIPSREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDIPSREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT GetAccessKeyLastUsedIpsRequest : public RpcServiceRequest {
+public:
+	GetAccessKeyLastUsedIpsRequest();
+	~GetAccessKeyLastUsedIpsRequest();
+	std::string getAccessKey() const;
+	void setAccessKey(const std::string &accessKey);
+	std::string getNextToken() const;
+	void setNextToken(const std::string &nextToken);
+	std::string getPageSize() const;
+	void setPageSize(const std::string &pageSize);
+	std::string getServiceName() const;
+	void setServiceName(const std::string &serviceName);
+
+private:
+	std::string accessKey_;
+	std::string nextToken_;
+	std::string pageSize_;
+	std::string serviceName_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDIPSREQUEST_H_

actiontrail/include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedIpsResult.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_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDIPSRESULT_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDIPSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Actiontrail
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ACTIONTRAIL_EXPORT GetAccessKeyLastUsedIpsResult : public ServiceResult
+			{
+			public:
+				struct IpsItem
+				{
+					std::string ip;
+					long usedTimestamp;
+					std::string detail;
+					std::string source;
+				};
+
+
+				GetAccessKeyLastUsedIpsResult();
+				explicit GetAccessKeyLastUsedIpsResult(const std::string &payload);
+				~GetAccessKeyLastUsedIpsResult();
+				std::string getNextToken()const;
+				std::vector<IpsItem> getIps()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string nextToken_;
+				std::vector<IpsItem> ips_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDIPSRESULT_H_

actiontrail/include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedProductsRequest.h

@@ -0,0 +1,42 @@
+/*
+ * 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_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDPRODUCTSREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDPRODUCTSREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT GetAccessKeyLastUsedProductsRequest : public RpcServiceRequest {
+public:
+	GetAccessKeyLastUsedProductsRequest();
+	~GetAccessKeyLastUsedProductsRequest();
+	std::string getAccessKey() const;
+	void setAccessKey(const std::string &accessKey);
+
+private:
+	std::string accessKey_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDPRODUCTSREQUEST_H_

actiontrail/include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedProductsResult.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_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDPRODUCTSRESULT_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDPRODUCTSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Actiontrail
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ACTIONTRAIL_EXPORT GetAccessKeyLastUsedProductsResult : public ServiceResult
+			{
+			public:
+				struct ProductsItem
+				{
+					std::string serviceName;
+					std::string serviceNameCn;
+					std::string serviceNameEn;
+					long usedTimestamp;
+					std::string detail;
+					std::string source;
+				};
+
+
+				GetAccessKeyLastUsedProductsResult();
+				explicit GetAccessKeyLastUsedProductsResult(const std::string &payload);
+				~GetAccessKeyLastUsedProductsResult();
+				std::vector<ProductsItem> getProducts()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<ProductsItem> products_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDPRODUCTSRESULT_H_

actiontrail/include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedResourcesRequest.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_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDRESOURCESREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDRESOURCESREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT GetAccessKeyLastUsedResourcesRequest : public RpcServiceRequest {
+public:
+	GetAccessKeyLastUsedResourcesRequest();
+	~GetAccessKeyLastUsedResourcesRequest();
+	std::string getAccessKey() const;
+	void setAccessKey(const std::string &accessKey);
+	std::string getNextToken() const;
+	void setNextToken(const std::string &nextToken);
+	std::string getPageSize() const;
+	void setPageSize(const std::string &pageSize);
+	std::string getServiceName() const;
+	void setServiceName(const std::string &serviceName);
+
+private:
+	std::string accessKey_;
+	std::string nextToken_;
+	std::string pageSize_;
+	std::string serviceName_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDRESOURCESREQUEST_H_

actiontrail/include/alibabacloud/actiontrail/model/GetAccessKeyLastUsedResourcesResult.h

@@ -0,0 +1,61 @@
+/*
+ * 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_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDRESOURCESRESULT_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDRESOURCESRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Actiontrail
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ACTIONTRAIL_EXPORT GetAccessKeyLastUsedResourcesResult : public ServiceResult
+			{
+			public:
+				struct ResourcesItem
+				{
+					std::string resourceName;
+					std::string resourceType;
+					long usedTimestamp;
+					std::string detail;
+					std::string source;
+				};
+
+
+				GetAccessKeyLastUsedResourcesResult();
+				explicit GetAccessKeyLastUsedResourcesResult(const std::string &payload);
+				~GetAccessKeyLastUsedResourcesResult();
+				std::string getNextToken()const;
+				std::vector<ResourcesItem> getResources()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string nextToken_;
+				std::vector<ResourcesItem> resources_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_GETACCESSKEYLASTUSEDRESOURCESRESULT_H_

actiontrail/include/alibabacloud/actiontrail/model/GetDeliveryHistoryJobRequest.h

@@ -0,0 +1,42 @@
+/*
+ * 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_ACTIONTRAIL_MODEL_GETDELIVERYHISTORYJOBREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_GETDELIVERYHISTORYJOBREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT GetDeliveryHistoryJobRequest : public RpcServiceRequest {
+public:
+	GetDeliveryHistoryJobRequest();
+	~GetDeliveryHistoryJobRequest();
+	long getJobId() const;
+	void setJobId(long jobId);
+
+private:
+	long jobId_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_GETDELIVERYHISTORYJOBREQUEST_H_

actiontrail/include/alibabacloud/actiontrail/model/GetDeliveryHistoryJobResult.h

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_GETDELIVERYHISTORYJOBRESULT_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_GETDELIVERYHISTORYJOBRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Actiontrail
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ACTIONTRAIL_EXPORT GetDeliveryHistoryJobResult : public ServiceResult
+			{
+			public:
+				struct StatusItem
+				{
+					int status;
+					std::string region;
+				};
+
+
+				GetDeliveryHistoryJobResult();
+				explicit GetDeliveryHistoryJobResult(const std::string &payload);
+				~GetDeliveryHistoryJobResult();
+				std::vector<StatusItem> getStatus()const;
+				int getJobStatus()const;
+				std::string getCreatedTime()const;
+				std::string getEndTime()const;
+				std::string getHomeRegion()const;
+				std::string getStartTime()const;
+				std::string getTrailName()const;
+				std::string getUpdatedTime()const;
+				long getJobId()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<StatusItem> status_;
+				int jobStatus_;
+				std::string createdTime_;
+				std::string endTime_;
+				std::string homeRegion_;
+				std::string startTime_;
+				std::string trailName_;
+				std::string updatedTime_;
+				long jobId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_GETDELIVERYHISTORYJOBRESULT_H_

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

@@ -1,51 +1,45 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_GETTRAILSTATUSREQUEST_H_
-#define ALIBABACLOUD_ACTIONTRAIL_MODEL_GETTRAILSTATUSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/actiontrail/ActiontrailExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Actiontrail
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ACTIONTRAIL_EXPORT GetTrailStatusRequest : public RpcServiceRequest
-			{
-
-			public:
-				GetTrailStatusRequest();
-				~GetTrailStatusRequest();
-
-				std::string getName()const;
-				void setName(const std::string& name);
-				bool getIsOrganizationTrail()const;
-				void setIsOrganizationTrail(bool isOrganizationTrail);
-
-            private:
-				std::string name_;
-				bool isOrganizationTrail_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_GETTRAILSTATUSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_GETTRAILSTATUSREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_GETTRAILSTATUSREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT GetTrailStatusRequest : public RpcServiceRequest {
+public:
+	GetTrailStatusRequest();
+	~GetTrailStatusRequest();
+	std::string getName() const;
+	void setName(const std::string &name);
+	bool getIsOrganizationTrail() const;
+	void setIsOrganizationTrail(bool isOrganizationTrail);
+
+private:
+	std::string name_;
+	bool isOrganizationTrail_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_GETTRAILSTATUSREQUEST_H_

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

@@ -44,8 +44,8 @@ namespace AlibabaCloud
 				std::string getLatestDeliveryError()const;
 				std::string getStopLoggingTime()const;
 				bool getSlsLogStoreStatus()const;
-				std::string getLatestDeliveryTime()const;
 				bool getIsLogging()const;
+				std::string getLatestDeliveryTime()const;
 
 			protected:
 				void parse(const std::string &payload);
@@ -57,8 +57,8 @@ namespace AlibabaCloud
 				std::string latestDeliveryError_;
 				std::string stopLoggingTime_;
 				bool slsLogStoreStatus_;
-				std::string latestDeliveryTime_;
 				bool isLogging_;
+				std::string latestDeliveryTime_;
 
 			};
 		}

actiontrail/include/alibabacloud/actiontrail/model/ListDeliveryHistoryJobsRequest.h

@@ -1,51 +1,45 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_LISTDELIVERYHISTORYJOBSREQUEST_H_
-#define ALIBABACLOUD_ACTIONTRAIL_MODEL_LISTDELIVERYHISTORYJOBSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/actiontrail/ActiontrailExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Actiontrail
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ACTIONTRAIL_EXPORT ListDeliveryHistoryJobsRequest : public RpcServiceRequest
-			{
-
-			public:
-				ListDeliveryHistoryJobsRequest();
-				~ListDeliveryHistoryJobsRequest();
-
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-
-            private:
-				int pageNumber_;
-				int pageSize_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_LISTDELIVERYHISTORYJOBSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_LISTDELIVERYHISTORYJOBSREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_LISTDELIVERYHISTORYJOBSREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT ListDeliveryHistoryJobsRequest : public RpcServiceRequest {
+public:
+	ListDeliveryHistoryJobsRequest();
+	~ListDeliveryHistoryJobsRequest();
+	int getPageNumber() const;
+	void setPageNumber(int pageNumber);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+
+private:
+	int pageNumber_;
+	int pageSize_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_LISTDELIVERYHISTORYJOBSREQUEST_H_

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

@@ -1,69 +1,61 @@
 /*
  * 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_ACTIONTRAIL_MODEL_LOOKUPEVENTSREQUEST_H_
-#define ALIBABACLOUD_ACTIONTRAIL_MODEL_LOOKUPEVENTSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/actiontrail/ActiontrailExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Actiontrail
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ACTIONTRAIL_EXPORT LookupEventsRequest : public RpcServiceRequest
-			{
-			public:
-				struct LookupAttribute
-				{
-					std::string value;
-					std::string key;
-				};
-
-			public:
-				LookupEventsRequest();
-				~LookupEventsRequest();
-
-				std::string getEndTime()const;
-				void setEndTime(const std::string& endTime);
-				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 getDirection()const;
-				void setDirection(const std::string& direction);
-
-            private:
-				std::string endTime_;
-				std::string startTime_;
-				std::string nextToken_;
-				std::vector<LookupAttribute> lookupAttribute_;
-				std::string maxResults_;
-				std::string direction_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_LOOKUPEVENTSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_LOOKUPEVENTSREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_LOOKUPEVENTSREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT LookupEventsRequest : public RpcServiceRequest {
+public:
+	struct LookupAttribute {
+		std::string value;
+		std::string key;
+	};
+	LookupEventsRequest();
+	~LookupEventsRequest();
+	std::string getEndTime() const;
+	void setEndTime(const std::string &endTime);
+	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 getDirection() const;
+	void setDirection(const std::string &direction);
+
+private:
+	std::string endTime_;
+	std::string startTime_;
+	std::string nextToken_;
+	std::vector<LookupAttribute> lookupAttribute_;
+	std::string maxResults_;
+	std::string direction_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_LOOKUPEVENTSREQUEST_H_

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

@@ -1,48 +1,42 @@
 /*
  * 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_ACTIONTRAIL_MODEL_STARTLOGGINGREQUEST_H_
-#define ALIBABACLOUD_ACTIONTRAIL_MODEL_STARTLOGGINGREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/actiontrail/ActiontrailExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Actiontrail
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ACTIONTRAIL_EXPORT StartLoggingRequest : public RpcServiceRequest
-			{
-
-			public:
-				StartLoggingRequest();
-				~StartLoggingRequest();
-
-				std::string getName()const;
-				void setName(const std::string& name);
-
-            private:
-				std::string name_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_STARTLOGGINGREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_STARTLOGGINGREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_STARTLOGGINGREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT StartLoggingRequest : public RpcServiceRequest {
+public:
+	StartLoggingRequest();
+	~StartLoggingRequest();
+	std::string getName() const;
+	void setName(const std::string &name);
+
+private:
+	std::string name_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_STARTLOGGINGREQUEST_H_

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

@@ -1,48 +1,42 @@
 /*
  * 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_ACTIONTRAIL_MODEL_STOPLOGGINGREQUEST_H_
-#define ALIBABACLOUD_ACTIONTRAIL_MODEL_STOPLOGGINGREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/actiontrail/ActiontrailExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Actiontrail
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ACTIONTRAIL_EXPORT StopLoggingRequest : public RpcServiceRequest
-			{
-
-			public:
-				StopLoggingRequest();
-				~StopLoggingRequest();
-
-				std::string getName()const;
-				void setName(const std::string& name);
-
-            private:
-				std::string name_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_STOPLOGGINGREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_STOPLOGGINGREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_STOPLOGGINGREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT StopLoggingRequest : public RpcServiceRequest {
+public:
+	StopLoggingRequest();
+	~StopLoggingRequest();
+	std::string getName() const;
+	void setName(const std::string &name);
+
+private:
+	std::string name_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_STOPLOGGINGREQUEST_H_

actiontrail/include/alibabacloud/actiontrail/model/UpdateTrailRequest.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_ACTIONTRAIL_MODEL_UPDATETRAILREQUEST_H_
-#define ALIBABACLOUD_ACTIONTRAIL_MODEL_UPDATETRAILREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/actiontrail/ActiontrailExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Actiontrail
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ACTIONTRAIL_EXPORT UpdateTrailRequest : public RpcServiceRequest
-			{
-
-			public:
-				UpdateTrailRequest();
-				~UpdateTrailRequest();
-
-				std::string getSlsProjectArn()const;
-				void setSlsProjectArn(const std::string& slsProjectArn);
-				std::string getSlsWriteRoleArn()const;
-				void setSlsWriteRoleArn(const std::string& slsWriteRoleArn);
-				std::string getOssKeyPrefix()const;
-				void setOssKeyPrefix(const std::string& ossKeyPrefix);
-				std::string getOssWriteRoleArn()const;
-				void setOssWriteRoleArn(const std::string& ossWriteRoleArn);
-				std::string getEventRW()const;
-				void setEventRW(const std::string& eventRW);
-				std::string getName()const;
-				void setName(const std::string& name);
-				std::string getOssBucketName()const;
-				void setOssBucketName(const std::string& ossBucketName);
-				std::string getTrailRegion()const;
-				void setTrailRegion(const std::string& trailRegion);
-
-            private:
-				std::string slsProjectArn_;
-				std::string slsWriteRoleArn_;
-				std::string ossKeyPrefix_;
-				std::string ossWriteRoleArn_;
-				std::string eventRW_;
-				std::string name_;
-				std::string ossBucketName_;
-				std::string trailRegion_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_UPDATETRAILREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_ACTIONTRAIL_MODEL_UPDATETRAILREQUEST_H_
+#define ALIBABACLOUD_ACTIONTRAIL_MODEL_UPDATETRAILREQUEST_H_
+
+#include <alibabacloud/actiontrail/ActiontrailExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Actiontrail {
+namespace Model {
+class ALIBABACLOUD_ACTIONTRAIL_EXPORT UpdateTrailRequest : public RpcServiceRequest {
+public:
+	UpdateTrailRequest();
+	~UpdateTrailRequest();
+	std::string getSlsProjectArn() const;
+	void setSlsProjectArn(const std::string &slsProjectArn);
+	std::string getSlsWriteRoleArn() const;
+	void setSlsWriteRoleArn(const std::string &slsWriteRoleArn);
+	std::string getOssKeyPrefix() const;
+	void setOssKeyPrefix(const std::string &ossKeyPrefix);
+	std::string getOssWriteRoleArn() const;
+	void setOssWriteRoleArn(const std::string &ossWriteRoleArn);
+	std::string getEventRW() const;
+	void setEventRW(const std::string &eventRW);
+	std::string getName() const;
+	void setName(const std::string &name);
+	std::string getOssBucketName() const;
+	void setOssBucketName(const std::string &ossBucketName);
+	std::string getTrailRegion() const;
+	void setTrailRegion(const std::string &trailRegion);
+
+private:
+	std::string slsProjectArn_;
+	std::string slsWriteRoleArn_;
+	std::string ossKeyPrefix_;
+	std::string ossWriteRoleArn_;
+	std::string eventRW_;
+	std::string name_;
+	std::string ossBucketName_;
+	std::string trailRegion_;
+};
+} // namespace Model
+} // namespace Actiontrail
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_ACTIONTRAIL_MODEL_UPDATETRAILREQUEST_H_

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

@@ -42,8 +42,8 @@ namespace AlibabaCloud
 				std::string getHomeRegion()const;
 				std::string getOssKeyPrefix()const;
 				std::string getOssBucketName()const;
-				std::string getSlsWriteRoleArn()const;
 				std::string getOssWriteRoleArn()const;
+				std::string getSlsWriteRoleArn()const;
 				std::string getTrailRegion()const;
 				std::string getName()const;
 
@@ -55,8 +55,8 @@ namespace AlibabaCloud
 				std::string homeRegion_;
 				std::string ossKeyPrefix_;
 				std::string ossBucketName_;
-				std::string slsWriteRoleArn_;
 				std::string ossWriteRoleArn_;
+				std::string slsWriteRoleArn_;
 				std::string trailRegion_;
 				std::string name_;
 

actiontrail/src/ActiontrailClient.cc

@@ -31,21 +31,21 @@ ActiontrailClient::ActiontrailClient(const Credentials &credentials, const Clien
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "actiontrail");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 ActiontrailClient::ActiontrailClient(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "actiontrail");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 ActiontrailClient::ActiontrailClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "actiontrail");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 ActiontrailClient::~ActiontrailClient()
@@ -267,6 +267,222 @@ ActiontrailClient::DescribeTrailsOutcomeCallable ActiontrailClient::describeTrai
 	return task->get_future();
 }
 
+ActiontrailClient::GetAccessKeyLastUsedEventsOutcome ActiontrailClient::getAccessKeyLastUsedEvents(const GetAccessKeyLastUsedEventsRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return GetAccessKeyLastUsedEventsOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return GetAccessKeyLastUsedEventsOutcome(GetAccessKeyLastUsedEventsResult(outcome.result()));
+	else
+		return GetAccessKeyLastUsedEventsOutcome(outcome.error());
+}
+
+void ActiontrailClient::getAccessKeyLastUsedEventsAsync(const GetAccessKeyLastUsedEventsRequest& request, const GetAccessKeyLastUsedEventsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, getAccessKeyLastUsedEvents(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ActiontrailClient::GetAccessKeyLastUsedEventsOutcomeCallable ActiontrailClient::getAccessKeyLastUsedEventsCallable(const GetAccessKeyLastUsedEventsRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<GetAccessKeyLastUsedEventsOutcome()>>(
+			[this, request]()
+			{
+			return this->getAccessKeyLastUsedEvents(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+ActiontrailClient::GetAccessKeyLastUsedInfoOutcome ActiontrailClient::getAccessKeyLastUsedInfo(const GetAccessKeyLastUsedInfoRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return GetAccessKeyLastUsedInfoOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return GetAccessKeyLastUsedInfoOutcome(GetAccessKeyLastUsedInfoResult(outcome.result()));
+	else
+		return GetAccessKeyLastUsedInfoOutcome(outcome.error());
+}
+
+void ActiontrailClient::getAccessKeyLastUsedInfoAsync(const GetAccessKeyLastUsedInfoRequest& request, const GetAccessKeyLastUsedInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, getAccessKeyLastUsedInfo(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ActiontrailClient::GetAccessKeyLastUsedInfoOutcomeCallable ActiontrailClient::getAccessKeyLastUsedInfoCallable(const GetAccessKeyLastUsedInfoRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<GetAccessKeyLastUsedInfoOutcome()>>(
+			[this, request]()
+			{
+			return this->getAccessKeyLastUsedInfo(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+ActiontrailClient::GetAccessKeyLastUsedIpsOutcome ActiontrailClient::getAccessKeyLastUsedIps(const GetAccessKeyLastUsedIpsRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return GetAccessKeyLastUsedIpsOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return GetAccessKeyLastUsedIpsOutcome(GetAccessKeyLastUsedIpsResult(outcome.result()));
+	else
+		return GetAccessKeyLastUsedIpsOutcome(outcome.error());
+}
+
+void ActiontrailClient::getAccessKeyLastUsedIpsAsync(const GetAccessKeyLastUsedIpsRequest& request, const GetAccessKeyLastUsedIpsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, getAccessKeyLastUsedIps(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ActiontrailClient::GetAccessKeyLastUsedIpsOutcomeCallable ActiontrailClient::getAccessKeyLastUsedIpsCallable(const GetAccessKeyLastUsedIpsRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<GetAccessKeyLastUsedIpsOutcome()>>(
+			[this, request]()
+			{
+			return this->getAccessKeyLastUsedIps(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+ActiontrailClient::GetAccessKeyLastUsedProductsOutcome ActiontrailClient::getAccessKeyLastUsedProducts(const GetAccessKeyLastUsedProductsRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return GetAccessKeyLastUsedProductsOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return GetAccessKeyLastUsedProductsOutcome(GetAccessKeyLastUsedProductsResult(outcome.result()));
+	else
+		return GetAccessKeyLastUsedProductsOutcome(outcome.error());
+}
+
+void ActiontrailClient::getAccessKeyLastUsedProductsAsync(const GetAccessKeyLastUsedProductsRequest& request, const GetAccessKeyLastUsedProductsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, getAccessKeyLastUsedProducts(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ActiontrailClient::GetAccessKeyLastUsedProductsOutcomeCallable ActiontrailClient::getAccessKeyLastUsedProductsCallable(const GetAccessKeyLastUsedProductsRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<GetAccessKeyLastUsedProductsOutcome()>>(
+			[this, request]()
+			{
+			return this->getAccessKeyLastUsedProducts(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+ActiontrailClient::GetAccessKeyLastUsedResourcesOutcome ActiontrailClient::getAccessKeyLastUsedResources(const GetAccessKeyLastUsedResourcesRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return GetAccessKeyLastUsedResourcesOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return GetAccessKeyLastUsedResourcesOutcome(GetAccessKeyLastUsedResourcesResult(outcome.result()));
+	else
+		return GetAccessKeyLastUsedResourcesOutcome(outcome.error());
+}
+
+void ActiontrailClient::getAccessKeyLastUsedResourcesAsync(const GetAccessKeyLastUsedResourcesRequest& request, const GetAccessKeyLastUsedResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, getAccessKeyLastUsedResources(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ActiontrailClient::GetAccessKeyLastUsedResourcesOutcomeCallable ActiontrailClient::getAccessKeyLastUsedResourcesCallable(const GetAccessKeyLastUsedResourcesRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<GetAccessKeyLastUsedResourcesOutcome()>>(
+			[this, request]()
+			{
+			return this->getAccessKeyLastUsedResources(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+ActiontrailClient::GetDeliveryHistoryJobOutcome ActiontrailClient::getDeliveryHistoryJob(const GetDeliveryHistoryJobRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return GetDeliveryHistoryJobOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return GetDeliveryHistoryJobOutcome(GetDeliveryHistoryJobResult(outcome.result()));
+	else
+		return GetDeliveryHistoryJobOutcome(outcome.error());
+}
+
+void ActiontrailClient::getDeliveryHistoryJobAsync(const GetDeliveryHistoryJobRequest& request, const GetDeliveryHistoryJobAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, getDeliveryHistoryJob(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ActiontrailClient::GetDeliveryHistoryJobOutcomeCallable ActiontrailClient::getDeliveryHistoryJobCallable(const GetDeliveryHistoryJobRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<GetDeliveryHistoryJobOutcome()>>(
+			[this, request]()
+			{
+			return this->getDeliveryHistoryJob(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ActiontrailClient::GetTrailStatusOutcome ActiontrailClient::getTrailStatus(const GetTrailStatusRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

actiontrail/src/model/CreateDeliveryHistoryJobRequest.cc

@@ -1,51 +1,45 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#include <alibabacloud/actiontrail/model/CreateDeliveryHistoryJobRequest.h>
-
-using AlibabaCloud::Actiontrail::Model::CreateDeliveryHistoryJobRequest;
-
-CreateDeliveryHistoryJobRequest::CreateDeliveryHistoryJobRequest() :
-	RpcServiceRequest("actiontrail", "2020-07-06", "CreateDeliveryHistoryJob")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-CreateDeliveryHistoryJobRequest::~CreateDeliveryHistoryJobRequest()
-{}
-
-std::string CreateDeliveryHistoryJobRequest::getClientToken()const
-{
-	return clientToken_;
+ */
+
+#include <alibabacloud/actiontrail/model/CreateDeliveryHistoryJobRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::CreateDeliveryHistoryJobRequest;
+
+CreateDeliveryHistoryJobRequest::CreateDeliveryHistoryJobRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "CreateDeliveryHistoryJob") {
+  setMethod(HttpRequest::Method::Post);
 }
 
-void CreateDeliveryHistoryJobRequest::setClientToken(const std::string& clientToken)
-{
-	clientToken_ = clientToken;
-	setParameter("ClientToken", clientToken);
+CreateDeliveryHistoryJobRequest::~CreateDeliveryHistoryJobRequest() {}
+
+std::string CreateDeliveryHistoryJobRequest::getClientToken() const {
+  return clientToken_;
 }
 
-std::string CreateDeliveryHistoryJobRequest::getTrailName()const
-{
-	return trailName_;
+void CreateDeliveryHistoryJobRequest::setClientToken(const std::string &clientToken) {
+  clientToken_ = clientToken;
+  setParameter(std::string("ClientToken"), clientToken);
 }
 
-void CreateDeliveryHistoryJobRequest::setTrailName(const std::string& trailName)
-{
-	trailName_ = trailName;
-	setParameter("TrailName", trailName);
+std::string CreateDeliveryHistoryJobRequest::getTrailName() const {
+  return trailName_;
+}
+
+void CreateDeliveryHistoryJobRequest::setTrailName(const std::string &trailName) {
+  trailName_ = trailName;
+  setParameter(std::string("TrailName"), trailName);
 }
 

actiontrail/src/model/CreateTrailRequest.cc

@@ -1,128 +1,108 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#include <alibabacloud/actiontrail/model/CreateTrailRequest.h>
-
-using AlibabaCloud::Actiontrail::Model::CreateTrailRequest;
-
-CreateTrailRequest::CreateTrailRequest() :
-	RpcServiceRequest("actiontrail", "2020-07-06", "CreateTrail")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-CreateTrailRequest::~CreateTrailRequest()
-{}
-
-std::string CreateTrailRequest::getSlsProjectArn()const
-{
-	return slsProjectArn_;
+ */
+
+#include <alibabacloud/actiontrail/model/CreateTrailRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::CreateTrailRequest;
+
+CreateTrailRequest::CreateTrailRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "CreateTrail") {
+  setMethod(HttpRequest::Method::Post);
 }
 
-void CreateTrailRequest::setSlsProjectArn(const std::string& slsProjectArn)
-{
-	slsProjectArn_ = slsProjectArn;
-	setParameter("SlsProjectArn", slsProjectArn);
+CreateTrailRequest::~CreateTrailRequest() {}
+
+std::string CreateTrailRequest::getSlsProjectArn() const {
+  return slsProjectArn_;
 }
 
-std::string CreateTrailRequest::getSlsWriteRoleArn()const
-{
-	return slsWriteRoleArn_;
+void CreateTrailRequest::setSlsProjectArn(const std::string &slsProjectArn) {
+  slsProjectArn_ = slsProjectArn;
+  setParameter(std::string("SlsProjectArn"), slsProjectArn);
 }
 
-void CreateTrailRequest::setSlsWriteRoleArn(const std::string& slsWriteRoleArn)
-{
-	slsWriteRoleArn_ = slsWriteRoleArn;
-	setParameter("SlsWriteRoleArn", slsWriteRoleArn);
+std::string CreateTrailRequest::getSlsWriteRoleArn() const {
+  return slsWriteRoleArn_;
 }
 
-bool CreateTrailRequest::getIsOrganizationTrail()const
-{
-	return isOrganizationTrail_;
+void CreateTrailRequest::setSlsWriteRoleArn(const std::string &slsWriteRoleArn) {
+  slsWriteRoleArn_ = slsWriteRoleArn;
+  setParameter(std::string("SlsWriteRoleArn"), slsWriteRoleArn);
 }
 
-void CreateTrailRequest::setIsOrganizationTrail(bool isOrganizationTrail)
-{
-	isOrganizationTrail_ = isOrganizationTrail;
-	setParameter("IsOrganizationTrail", isOrganizationTrail ? "true" : "false");
+bool CreateTrailRequest::getIsOrganizationTrail() const {
+  return isOrganizationTrail_;
 }
 
-std::string CreateTrailRequest::getOssKeyPrefix()const
-{
-	return ossKeyPrefix_;
+void CreateTrailRequest::setIsOrganizationTrail(bool isOrganizationTrail) {
+  isOrganizationTrail_ = isOrganizationTrail;
+  setParameter(std::string("IsOrganizationTrail"), isOrganizationTrail ? "true" : "false");
 }
 
-void CreateTrailRequest::setOssKeyPrefix(const std::string& ossKeyPrefix)
-{
-	ossKeyPrefix_ = ossKeyPrefix;
-	setParameter("OssKeyPrefix", ossKeyPrefix);
+std::string CreateTrailRequest::getOssKeyPrefix() const {
+  return ossKeyPrefix_;
 }
 
-std::string CreateTrailRequest::getOssWriteRoleArn()const
-{
-	return ossWriteRoleArn_;
+void CreateTrailRequest::setOssKeyPrefix(const std::string &ossKeyPrefix) {
+  ossKeyPrefix_ = ossKeyPrefix;
+  setParameter(std::string("OssKeyPrefix"), ossKeyPrefix);
 }
 
-void CreateTrailRequest::setOssWriteRoleArn(const std::string& ossWriteRoleArn)
-{
-	ossWriteRoleArn_ = ossWriteRoleArn;
-	setParameter("OssWriteRoleArn", ossWriteRoleArn);
+std::string CreateTrailRequest::getOssWriteRoleArn() const {
+  return ossWriteRoleArn_;
 }
 
-std::string CreateTrailRequest::getEventRW()const
-{
-	return eventRW_;
+void CreateTrailRequest::setOssWriteRoleArn(const std::string &ossWriteRoleArn) {
+  ossWriteRoleArn_ = ossWriteRoleArn;
+  setParameter(std::string("OssWriteRoleArn"), ossWriteRoleArn);
 }
 
-void CreateTrailRequest::setEventRW(const std::string& eventRW)
-{
-	eventRW_ = eventRW;
-	setParameter("EventRW", eventRW);
+std::string CreateTrailRequest::getEventRW() const {
+  return eventRW_;
 }
 
-std::string CreateTrailRequest::getName()const
-{
-	return name_;
+void CreateTrailRequest::setEventRW(const std::string &eventRW) {
+  eventRW_ = eventRW;
+  setParameter(std::string("EventRW"), eventRW);
 }
 
-void CreateTrailRequest::setName(const std::string& name)
-{
-	name_ = name;
-	setParameter("Name", name);
+std::string CreateTrailRequest::getName() const {
+  return name_;
 }
 
-std::string CreateTrailRequest::getOssBucketName()const
-{
-	return ossBucketName_;
+void CreateTrailRequest::setName(const std::string &name) {
+  name_ = name;
+  setParameter(std::string("Name"), name);
 }
 
-void CreateTrailRequest::setOssBucketName(const std::string& ossBucketName)
-{
-	ossBucketName_ = ossBucketName;
-	setParameter("OssBucketName", ossBucketName);
+std::string CreateTrailRequest::getOssBucketName() const {
+  return ossBucketName_;
 }
 
-std::string CreateTrailRequest::getTrailRegion()const
-{
-	return trailRegion_;
+void CreateTrailRequest::setOssBucketName(const std::string &ossBucketName) {
+  ossBucketName_ = ossBucketName;
+  setParameter(std::string("OssBucketName"), ossBucketName);
 }
 
-void CreateTrailRequest::setTrailRegion(const std::string& trailRegion)
-{
-	trailRegion_ = trailRegion;
-	setParameter("TrailRegion", trailRegion);
+std::string CreateTrailRequest::getTrailRegion() const {
+  return trailRegion_;
+}
+
+void CreateTrailRequest::setTrailRegion(const std::string &trailRegion) {
+  trailRegion_ = trailRegion;
+  setParameter(std::string("TrailRegion"), trailRegion);
 }
 

actiontrail/src/model/CreateTrailResult.cc

@@ -41,6 +41,8 @@ void CreateTrailResult::parse(const std::string &payload)
 	setRequestId(value["RequestId"].asString());
 	if(!value["SlsProjectArn"].isNull())
 		slsProjectArn_ = value["SlsProjectArn"].asString();
+	if(!value["OssWriteRoleArn"].isNull())
+		ossWriteRoleArn_ = value["OssWriteRoleArn"].asString();
 	if(!value["EventRW"].isNull())
 		eventRW_ = value["EventRW"].asString();
 	if(!value["HomeRegion"].isNull())
@@ -51,8 +53,6 @@ void CreateTrailResult::parse(const std::string &payload)
 		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["Name"].isNull())
@@ -85,16 +85,16 @@ std::string CreateTrailResult::getOssBucketName()const
 	return ossBucketName_;
 }
 
-std::string CreateTrailResult::getSlsWriteRoleArn()const
-{
-	return slsWriteRoleArn_;
-}
-
 std::string CreateTrailResult::getOssWriteRoleArn()const
 {
 	return ossWriteRoleArn_;
 }
 
+std::string CreateTrailResult::getSlsWriteRoleArn()const
+{
+	return slsWriteRoleArn_;
+}
+
 std::string CreateTrailResult::getTrailRegion()const
 {
 	return trailRegion_;

actiontrail/src/model/DeleteDeliveryHistoryJobRequest.cc

@@ -1,40 +1,36 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#include <alibabacloud/actiontrail/model/DeleteDeliveryHistoryJobRequest.h>
-
-using AlibabaCloud::Actiontrail::Model::DeleteDeliveryHistoryJobRequest;
-
-DeleteDeliveryHistoryJobRequest::DeleteDeliveryHistoryJobRequest() :
-	RpcServiceRequest("actiontrail", "2020-07-06", "DeleteDeliveryHistoryJob")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-DeleteDeliveryHistoryJobRequest::~DeleteDeliveryHistoryJobRequest()
-{}
-
-int DeleteDeliveryHistoryJobRequest::getJobId()const
-{
-	return jobId_;
+ */
+
+#include <alibabacloud/actiontrail/model/DeleteDeliveryHistoryJobRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::DeleteDeliveryHistoryJobRequest;
+
+DeleteDeliveryHistoryJobRequest::DeleteDeliveryHistoryJobRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "DeleteDeliveryHistoryJob") {
+  setMethod(HttpRequest::Method::Post);
 }
 
-void DeleteDeliveryHistoryJobRequest::setJobId(int jobId)
-{
-	jobId_ = jobId;
-	setParameter("JobId", std::to_string(jobId));
+DeleteDeliveryHistoryJobRequest::~DeleteDeliveryHistoryJobRequest() {}
+
+int DeleteDeliveryHistoryJobRequest::getJobId() const {
+  return jobId_;
+}
+
+void DeleteDeliveryHistoryJobRequest::setJobId(int jobId) {
+  jobId_ = jobId;
+  setParameter(std::string("JobId"), std::to_string(jobId));
 }
 

actiontrail/src/model/DeleteTrailRequest.cc

@@ -1,40 +1,36 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#include <alibabacloud/actiontrail/model/DeleteTrailRequest.h>
-
-using AlibabaCloud::Actiontrail::Model::DeleteTrailRequest;
-
-DeleteTrailRequest::DeleteTrailRequest() :
-	RpcServiceRequest("actiontrail", "2020-07-06", "DeleteTrail")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-DeleteTrailRequest::~DeleteTrailRequest()
-{}
-
-std::string DeleteTrailRequest::getName()const
-{
-	return name_;
+ */
+
+#include <alibabacloud/actiontrail/model/DeleteTrailRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::DeleteTrailRequest;
+
+DeleteTrailRequest::DeleteTrailRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "DeleteTrail") {
+  setMethod(HttpRequest::Method::Post);
 }
 
-void DeleteTrailRequest::setName(const std::string& name)
-{
-	name_ = name;
-	setParameter("Name", name);
+DeleteTrailRequest::~DeleteTrailRequest() {}
+
+std::string DeleteTrailRequest::getName() const {
+  return name_;
+}
+
+void DeleteTrailRequest::setName(const std::string &name) {
+  name_ = name;
+  setParameter(std::string("Name"), name);
 }
 

actiontrail/src/model/DescribeRegionsRequest.cc

@@ -1,40 +1,36 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#include <alibabacloud/actiontrail/model/DescribeRegionsRequest.h>
-
-using AlibabaCloud::Actiontrail::Model::DescribeRegionsRequest;
-
-DescribeRegionsRequest::DescribeRegionsRequest() :
-	RpcServiceRequest("actiontrail", "2020-07-06", "DescribeRegions")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-DescribeRegionsRequest::~DescribeRegionsRequest()
-{}
-
-std::string DescribeRegionsRequest::getAcceptLanguage()const
-{
-	return acceptLanguage_;
+ */
+
+#include <alibabacloud/actiontrail/model/DescribeRegionsRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::DescribeRegionsRequest;
+
+DescribeRegionsRequest::DescribeRegionsRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "DescribeRegions") {
+  setMethod(HttpRequest::Method::Post);
 }
 
-void DescribeRegionsRequest::setAcceptLanguage(const std::string& acceptLanguage)
-{
-	acceptLanguage_ = acceptLanguage;
-	setParameter("AcceptLanguage", acceptLanguage);
+DescribeRegionsRequest::~DescribeRegionsRequest() {}
+
+std::string DescribeRegionsRequest::getAcceptLanguage() const {
+  return acceptLanguage_;
+}
+
+void DescribeRegionsRequest::setAcceptLanguage(const std::string &acceptLanguage) {
+  acceptLanguage_ = acceptLanguage;
+  setParameter(std::string("AcceptLanguage"), acceptLanguage);
 }
 

actiontrail/src/model/DescribeTrailsRequest.cc

@@ -1,62 +1,54 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#include <alibabacloud/actiontrail/model/DescribeTrailsRequest.h>
-
-using AlibabaCloud::Actiontrail::Model::DescribeTrailsRequest;
-
-DescribeTrailsRequest::DescribeTrailsRequest() :
-	RpcServiceRequest("actiontrail", "2020-07-06", "DescribeTrails")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-DescribeTrailsRequest::~DescribeTrailsRequest()
-{}
-
-bool DescribeTrailsRequest::getIncludeOrganizationTrail()const
-{
-	return includeOrganizationTrail_;
+ */
+
+#include <alibabacloud/actiontrail/model/DescribeTrailsRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::DescribeTrailsRequest;
+
+DescribeTrailsRequest::DescribeTrailsRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "DescribeTrails") {
+  setMethod(HttpRequest::Method::Post);
 }
 
-void DescribeTrailsRequest::setIncludeOrganizationTrail(bool includeOrganizationTrail)
-{
-	includeOrganizationTrail_ = includeOrganizationTrail;
-	setParameter("IncludeOrganizationTrail", includeOrganizationTrail ? "true" : "false");
+DescribeTrailsRequest::~DescribeTrailsRequest() {}
+
+bool DescribeTrailsRequest::getIncludeOrganizationTrail() const {
+  return includeOrganizationTrail_;
 }
 
-bool DescribeTrailsRequest::getIncludeShadowTrails()const
-{
-	return includeShadowTrails_;
+void DescribeTrailsRequest::setIncludeOrganizationTrail(bool includeOrganizationTrail) {
+  includeOrganizationTrail_ = includeOrganizationTrail;
+  setParameter(std::string("IncludeOrganizationTrail"), includeOrganizationTrail ? "true" : "false");
 }
 
-void DescribeTrailsRequest::setIncludeShadowTrails(bool includeShadowTrails)
-{
-	includeShadowTrails_ = includeShadowTrails;
-	setParameter("IncludeShadowTrails", includeShadowTrails ? "true" : "false");
+bool DescribeTrailsRequest::getIncludeShadowTrails() const {
+  return includeShadowTrails_;
 }
 
-std::string DescribeTrailsRequest::getNameList()const
-{
-	return nameList_;
+void DescribeTrailsRequest::setIncludeShadowTrails(bool includeShadowTrails) {
+  includeShadowTrails_ = includeShadowTrails;
+  setParameter(std::string("IncludeShadowTrails"), includeShadowTrails ? "true" : "false");
 }
 
-void DescribeTrailsRequest::setNameList(const std::string& nameList)
-{
-	nameList_ = nameList;
-	setParameter("NameList", nameList);
+std::string DescribeTrailsRequest::getNameList() const {
+  return nameList_;
+}
+
+void DescribeTrailsRequest::setNameList(const std::string &nameList) {
+  nameList_ = nameList;
+  setParameter(std::string("NameList"), nameList);
 }
 

actiontrail/src/model/DescribeTrailsResult.cc

@@ -43,44 +43,46 @@ void DescribeTrailsResult::parse(const std::string &payload)
 	for (auto valueTrailListTrail : allTrailListNode)
 	{
 		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["Status"].isNull())
+			trailListObject.status = valueTrailListTrail["Status"].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["HomeRegion"].isNull())
+			trailListObject.homeRegion = valueTrailListTrail["HomeRegion"].asString();
+		if(!valueTrailListTrail["CreateTime"].isNull())
+			trailListObject.createTime = valueTrailListTrail["CreateTime"].asString();
+		if(!valueTrailListTrail["OssKeyPrefix"].isNull())
+			trailListObject.ossKeyPrefix = valueTrailListTrail["OssKeyPrefix"].asString();
+		if(!valueTrailListTrail["EventRW"].isNull())
+			trailListObject.eventRW = valueTrailListTrail["EventRW"].asString();
+		if(!valueTrailListTrail["StartLoggingTime"].isNull())
+			trailListObject.startLoggingTime = valueTrailListTrail["StartLoggingTime"].asString();
 		if(!valueTrailListTrail["OssWriteRoleArn"].isNull())
 			trailListObject.ossWriteRoleArn = valueTrailListTrail["OssWriteRoleArn"].asString();
+		if(!valueTrailListTrail["SlsProjectArn"].isNull())
+			trailListObject.slsProjectArn = valueTrailListTrail["SlsProjectArn"].asString();
+		if(!valueTrailListTrail["IsOrganizationTrail"].isNull())
+			trailListObject.isOrganizationTrail = valueTrailListTrail["IsOrganizationTrail"].asString() == "true";
+		if(!valueTrailListTrail["SlsWriteRoleArn"].isNull())
+			trailListObject.slsWriteRoleArn = valueTrailListTrail["SlsWriteRoleArn"].asString();
+		if(!valueTrailListTrail["StopLoggingTime"].isNull())
+			trailListObject.stopLoggingTime = valueTrailListTrail["StopLoggingTime"].asString();
+		if(!valueTrailListTrail["Name"].isNull())
+			trailListObject.name = valueTrailListTrail["Name"].asString();
+		if(!valueTrailListTrail["OssBucketName"].isNull())
+			trailListObject.ossBucketName = valueTrailListTrail["OssBucketName"].asString();
+		if(!valueTrailListTrail["Region"].isNull())
+			trailListObject.region = valueTrailListTrail["Region"].asString();
+		if(!valueTrailListTrail["OrganizationId"].isNull())
+			trailListObject.organizationId = valueTrailListTrail["OrganizationId"].asString();
+		if(!valueTrailListTrail["OssBucketLocation"].isNull())
+			trailListObject.ossBucketLocation = valueTrailListTrail["OssBucketLocation"].asString();
 		if(!valueTrailListTrail["IsShadowTrail"].isNull())
 			trailListObject.isShadowTrail = std::stol(valueTrailListTrail["IsShadowTrail"].asString());
+		if(!valueTrailListTrail["TrailArn"].isNull())
+			trailListObject.trailArn = valueTrailListTrail["TrailArn"].asString();
 		trailList_.push_back(trailListObject);
 	}
 

actiontrail/src/model/GetAccessKeyLastUsedEventsRequest.cc

@@ -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.
+ */
+
+#include <alibabacloud/actiontrail/model/GetAccessKeyLastUsedEventsRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::GetAccessKeyLastUsedEventsRequest;
+
+GetAccessKeyLastUsedEventsRequest::GetAccessKeyLastUsedEventsRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "GetAccessKeyLastUsedEvents") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+GetAccessKeyLastUsedEventsRequest::~GetAccessKeyLastUsedEventsRequest() {}
+
+std::string GetAccessKeyLastUsedEventsRequest::getAccessKey() const {
+  return accessKey_;
+}
+
+void GetAccessKeyLastUsedEventsRequest::setAccessKey(const std::string &accessKey) {
+  accessKey_ = accessKey;
+  setParameter(std::string("AccessKey"), accessKey);
+}
+
+std::string GetAccessKeyLastUsedEventsRequest::getNextToken() const {
+  return nextToken_;
+}
+
+void GetAccessKeyLastUsedEventsRequest::setNextToken(const std::string &nextToken) {
+  nextToken_ = nextToken;
+  setParameter(std::string("NextToken"), nextToken);
+}
+
+std::string GetAccessKeyLastUsedEventsRequest::getPageSize() const {
+  return pageSize_;
+}
+
+void GetAccessKeyLastUsedEventsRequest::setPageSize(const std::string &pageSize) {
+  pageSize_ = pageSize;
+  setParameter(std::string("PageSize"), pageSize);
+}
+
+std::string GetAccessKeyLastUsedEventsRequest::getServiceName() const {
+  return serviceName_;
+}
+
+void GetAccessKeyLastUsedEventsRequest::setServiceName(const std::string &serviceName) {
+  serviceName_ = serviceName;
+  setParameter(std::string("ServiceName"), serviceName);
+}
+

actiontrail/src/model/GetAccessKeyLastUsedEventsResult.cc

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/actiontrail/model/GetAccessKeyLastUsedEventsResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Actiontrail;
+using namespace AlibabaCloud::Actiontrail::Model;
+
+GetAccessKeyLastUsedEventsResult::GetAccessKeyLastUsedEventsResult() :
+	ServiceResult()
+{}
+
+GetAccessKeyLastUsedEventsResult::GetAccessKeyLastUsedEventsResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+GetAccessKeyLastUsedEventsResult::~GetAccessKeyLastUsedEventsResult()
+{}
+
+void GetAccessKeyLastUsedEventsResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allEventsNode = value["Events"]["EventsItem"];
+	for (auto valueEventsEventsItem : allEventsNode)
+	{
+		EventsItem eventsObject;
+		if(!valueEventsEventsItem["UsedTimestamp"].isNull())
+			eventsObject.usedTimestamp = std::stol(valueEventsEventsItem["UsedTimestamp"].asString());
+		if(!valueEventsEventsItem["Detail"].isNull())
+			eventsObject.detail = valueEventsEventsItem["Detail"].asString();
+		if(!valueEventsEventsItem["EventName"].isNull())
+			eventsObject.eventName = valueEventsEventsItem["EventName"].asString();
+		if(!valueEventsEventsItem["Source"].isNull())
+			eventsObject.source = valueEventsEventsItem["Source"].asString();
+		events_.push_back(eventsObject);
+	}
+	if(!value["NextToken"].isNull())
+		nextToken_ = value["NextToken"].asString();
+
+}
+
+std::string GetAccessKeyLastUsedEventsResult::getNextToken()const
+{
+	return nextToken_;
+}
+
+std::vector<GetAccessKeyLastUsedEventsResult::EventsItem> GetAccessKeyLastUsedEventsResult::getEvents()const
+{
+	return events_;
+}
+

actiontrail/src/model/GetAccessKeyLastUsedInfoRequest.cc

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/actiontrail/model/GetAccessKeyLastUsedInfoRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::GetAccessKeyLastUsedInfoRequest;
+
+GetAccessKeyLastUsedInfoRequest::GetAccessKeyLastUsedInfoRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "GetAccessKeyLastUsedInfo") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+GetAccessKeyLastUsedInfoRequest::~GetAccessKeyLastUsedInfoRequest() {}
+
+std::string GetAccessKeyLastUsedInfoRequest::getAccessKey() const {
+  return accessKey_;
+}
+
+void GetAccessKeyLastUsedInfoRequest::setAccessKey(const std::string &accessKey) {
+  accessKey_ = accessKey;
+  setParameter(std::string("AccessKey"), accessKey);
+}
+

actiontrail/src/model/GetAccessKeyLastUsedInfoResult.cc

@@ -0,0 +1,121 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/actiontrail/model/GetAccessKeyLastUsedInfoResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Actiontrail;
+using namespace AlibabaCloud::Actiontrail::Model;
+
+GetAccessKeyLastUsedInfoResult::GetAccessKeyLastUsedInfoResult() :
+	ServiceResult()
+{}
+
+GetAccessKeyLastUsedInfoResult::GetAccessKeyLastUsedInfoResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+GetAccessKeyLastUsedInfoResult::~GetAccessKeyLastUsedInfoResult()
+{}
+
+void GetAccessKeyLastUsedInfoResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["AccessKeyId"].isNull())
+		accessKeyId_ = value["AccessKeyId"].asString();
+	if(!value["AccountId"].isNull())
+		accountId_ = value["AccountId"].asString();
+	if(!value["OwnerId"].isNull())
+		ownerId_ = value["OwnerId"].asString();
+	if(!value["UserName"].isNull())
+		userName_ = value["UserName"].asString();
+	if(!value["AccountType"].isNull())
+		accountType_ = value["AccountType"].asString();
+	if(!value["UsedTimestamp"].isNull())
+		usedTimestamp_ = std::stol(value["UsedTimestamp"].asString());
+	if(!value["Detail"].isNull())
+		detail_ = value["Detail"].asString();
+	if(!value["Source"].isNull())
+		source_ = value["Source"].asString();
+	if(!value["ServiceName"].isNull())
+		serviceName_ = value["ServiceName"].asString();
+	if(!value["ServiceNameCn"].isNull())
+		serviceNameCn_ = value["ServiceNameCn"].asString();
+	if(!value["ServiceNameEn"].isNull())
+		serviceNameEn_ = value["ServiceNameEn"].asString();
+
+}
+
+std::string GetAccessKeyLastUsedInfoResult::getAccountId()const
+{
+	return accountId_;
+}
+
+std::string GetAccessKeyLastUsedInfoResult::getUserName()const
+{
+	return userName_;
+}
+
+std::string GetAccessKeyLastUsedInfoResult::getOwnerId()const
+{
+	return ownerId_;
+}
+
+std::string GetAccessKeyLastUsedInfoResult::getServiceName()const
+{
+	return serviceName_;
+}
+
+std::string GetAccessKeyLastUsedInfoResult::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+std::string GetAccessKeyLastUsedInfoResult::getServiceNameCn()const
+{
+	return serviceNameCn_;
+}
+
+std::string GetAccessKeyLastUsedInfoResult::getServiceNameEn()const
+{
+	return serviceNameEn_;
+}
+
+std::string GetAccessKeyLastUsedInfoResult::getAccountType()const
+{
+	return accountType_;
+}
+
+long GetAccessKeyLastUsedInfoResult::getUsedTimestamp()const
+{
+	return usedTimestamp_;
+}
+
+std::string GetAccessKeyLastUsedInfoResult::getDetail()const
+{
+	return detail_;
+}
+
+std::string GetAccessKeyLastUsedInfoResult::getSource()const
+{
+	return source_;
+}
+

actiontrail/src/model/GetAccessKeyLastUsedIpsRequest.cc

@@ -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.
+ */
+
+#include <alibabacloud/actiontrail/model/GetAccessKeyLastUsedIpsRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::GetAccessKeyLastUsedIpsRequest;
+
+GetAccessKeyLastUsedIpsRequest::GetAccessKeyLastUsedIpsRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "GetAccessKeyLastUsedIps") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+GetAccessKeyLastUsedIpsRequest::~GetAccessKeyLastUsedIpsRequest() {}
+
+std::string GetAccessKeyLastUsedIpsRequest::getAccessKey() const {
+  return accessKey_;
+}
+
+void GetAccessKeyLastUsedIpsRequest::setAccessKey(const std::string &accessKey) {
+  accessKey_ = accessKey;
+  setParameter(std::string("AccessKey"), accessKey);
+}
+
+std::string GetAccessKeyLastUsedIpsRequest::getNextToken() const {
+  return nextToken_;
+}
+
+void GetAccessKeyLastUsedIpsRequest::setNextToken(const std::string &nextToken) {
+  nextToken_ = nextToken;
+  setParameter(std::string("NextToken"), nextToken);
+}
+
+std::string GetAccessKeyLastUsedIpsRequest::getPageSize() const {
+  return pageSize_;
+}
+
+void GetAccessKeyLastUsedIpsRequest::setPageSize(const std::string &pageSize) {
+  pageSize_ = pageSize;
+  setParameter(std::string("PageSize"), pageSize);
+}
+
+std::string GetAccessKeyLastUsedIpsRequest::getServiceName() const {
+  return serviceName_;
+}
+
+void GetAccessKeyLastUsedIpsRequest::setServiceName(const std::string &serviceName) {
+  serviceName_ = serviceName;
+  setParameter(std::string("ServiceName"), serviceName);
+}
+

actiontrail/src/model/GetAccessKeyLastUsedIpsResult.cc

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/actiontrail/model/GetAccessKeyLastUsedIpsResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Actiontrail;
+using namespace AlibabaCloud::Actiontrail::Model;
+
+GetAccessKeyLastUsedIpsResult::GetAccessKeyLastUsedIpsResult() :
+	ServiceResult()
+{}
+
+GetAccessKeyLastUsedIpsResult::GetAccessKeyLastUsedIpsResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+GetAccessKeyLastUsedIpsResult::~GetAccessKeyLastUsedIpsResult()
+{}
+
+void GetAccessKeyLastUsedIpsResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allIpsNode = value["Ips"]["IpsItem"];
+	for (auto valueIpsIpsItem : allIpsNode)
+	{
+		IpsItem ipsObject;
+		if(!valueIpsIpsItem["UsedTimestamp"].isNull())
+			ipsObject.usedTimestamp = std::stol(valueIpsIpsItem["UsedTimestamp"].asString());
+		if(!valueIpsIpsItem["Detail"].isNull())
+			ipsObject.detail = valueIpsIpsItem["Detail"].asString();
+		if(!valueIpsIpsItem["Source"].isNull())
+			ipsObject.source = valueIpsIpsItem["Source"].asString();
+		if(!valueIpsIpsItem["Ip"].isNull())
+			ipsObject.ip = valueIpsIpsItem["Ip"].asString();
+		ips_.push_back(ipsObject);
+	}
+	if(!value["NextToken"].isNull())
+		nextToken_ = value["NextToken"].asString();
+
+}
+
+std::string GetAccessKeyLastUsedIpsResult::getNextToken()const
+{
+	return nextToken_;
+}
+
+std::vector<GetAccessKeyLastUsedIpsResult::IpsItem> GetAccessKeyLastUsedIpsResult::getIps()const
+{
+	return ips_;
+}
+

actiontrail/src/model/GetAccessKeyLastUsedProductsRequest.cc

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/actiontrail/model/GetAccessKeyLastUsedProductsRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::GetAccessKeyLastUsedProductsRequest;
+
+GetAccessKeyLastUsedProductsRequest::GetAccessKeyLastUsedProductsRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "GetAccessKeyLastUsedProducts") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+GetAccessKeyLastUsedProductsRequest::~GetAccessKeyLastUsedProductsRequest() {}
+
+std::string GetAccessKeyLastUsedProductsRequest::getAccessKey() const {
+  return accessKey_;
+}
+
+void GetAccessKeyLastUsedProductsRequest::setAccessKey(const std::string &accessKey) {
+  accessKey_ = accessKey;
+  setParameter(std::string("AccessKey"), accessKey);
+}
+

actiontrail/src/model/GetAccessKeyLastUsedProductsResult.cc

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/actiontrail/model/GetAccessKeyLastUsedProductsResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Actiontrail;
+using namespace AlibabaCloud::Actiontrail::Model;
+
+GetAccessKeyLastUsedProductsResult::GetAccessKeyLastUsedProductsResult() :
+	ServiceResult()
+{}
+
+GetAccessKeyLastUsedProductsResult::GetAccessKeyLastUsedProductsResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+GetAccessKeyLastUsedProductsResult::~GetAccessKeyLastUsedProductsResult()
+{}
+
+void GetAccessKeyLastUsedProductsResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allProductsNode = value["Products"]["ProductsItem"];
+	for (auto valueProductsProductsItem : allProductsNode)
+	{
+		ProductsItem productsObject;
+		if(!valueProductsProductsItem["UsedTimestamp"].isNull())
+			productsObject.usedTimestamp = std::stol(valueProductsProductsItem["UsedTimestamp"].asString());
+		if(!valueProductsProductsItem["Detail"].isNull())
+			productsObject.detail = valueProductsProductsItem["Detail"].asString();
+		if(!valueProductsProductsItem["Source"].isNull())
+			productsObject.source = valueProductsProductsItem["Source"].asString();
+		if(!valueProductsProductsItem["ServiceName"].isNull())
+			productsObject.serviceName = valueProductsProductsItem["ServiceName"].asString();
+		if(!valueProductsProductsItem["ServiceNameCn"].isNull())
+			productsObject.serviceNameCn = valueProductsProductsItem["ServiceNameCn"].asString();
+		if(!valueProductsProductsItem["ServiceNameEn"].isNull())
+			productsObject.serviceNameEn = valueProductsProductsItem["ServiceNameEn"].asString();
+		products_.push_back(productsObject);
+	}
+
+}
+
+std::vector<GetAccessKeyLastUsedProductsResult::ProductsItem> GetAccessKeyLastUsedProductsResult::getProducts()const
+{
+	return products_;
+}
+

actiontrail/src/model/GetAccessKeyLastUsedResourcesRequest.cc

@@ -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.
+ */
+
+#include <alibabacloud/actiontrail/model/GetAccessKeyLastUsedResourcesRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::GetAccessKeyLastUsedResourcesRequest;
+
+GetAccessKeyLastUsedResourcesRequest::GetAccessKeyLastUsedResourcesRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "GetAccessKeyLastUsedResources") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+GetAccessKeyLastUsedResourcesRequest::~GetAccessKeyLastUsedResourcesRequest() {}
+
+std::string GetAccessKeyLastUsedResourcesRequest::getAccessKey() const {
+  return accessKey_;
+}
+
+void GetAccessKeyLastUsedResourcesRequest::setAccessKey(const std::string &accessKey) {
+  accessKey_ = accessKey;
+  setParameter(std::string("AccessKey"), accessKey);
+}
+
+std::string GetAccessKeyLastUsedResourcesRequest::getNextToken() const {
+  return nextToken_;
+}
+
+void GetAccessKeyLastUsedResourcesRequest::setNextToken(const std::string &nextToken) {
+  nextToken_ = nextToken;
+  setParameter(std::string("NextToken"), nextToken);
+}
+
+std::string GetAccessKeyLastUsedResourcesRequest::getPageSize() const {
+  return pageSize_;
+}
+
+void GetAccessKeyLastUsedResourcesRequest::setPageSize(const std::string &pageSize) {
+  pageSize_ = pageSize;
+  setParameter(std::string("PageSize"), pageSize);
+}
+
+std::string GetAccessKeyLastUsedResourcesRequest::getServiceName() const {
+  return serviceName_;
+}
+
+void GetAccessKeyLastUsedResourcesRequest::setServiceName(const std::string &serviceName) {
+  serviceName_ = serviceName;
+  setParameter(std::string("ServiceName"), serviceName);
+}
+

actiontrail/src/model/GetAccessKeyLastUsedResourcesResult.cc

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/actiontrail/model/GetAccessKeyLastUsedResourcesResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Actiontrail;
+using namespace AlibabaCloud::Actiontrail::Model;
+
+GetAccessKeyLastUsedResourcesResult::GetAccessKeyLastUsedResourcesResult() :
+	ServiceResult()
+{}
+
+GetAccessKeyLastUsedResourcesResult::GetAccessKeyLastUsedResourcesResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+GetAccessKeyLastUsedResourcesResult::~GetAccessKeyLastUsedResourcesResult()
+{}
+
+void GetAccessKeyLastUsedResourcesResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allResourcesNode = value["Resources"]["ResourcesItem"];
+	for (auto valueResourcesResourcesItem : allResourcesNode)
+	{
+		ResourcesItem resourcesObject;
+		if(!valueResourcesResourcesItem["UsedTimestamp"].isNull())
+			resourcesObject.usedTimestamp = std::stol(valueResourcesResourcesItem["UsedTimestamp"].asString());
+		if(!valueResourcesResourcesItem["Detail"].isNull())
+			resourcesObject.detail = valueResourcesResourcesItem["Detail"].asString();
+		if(!valueResourcesResourcesItem["ResourceName"].isNull())
+			resourcesObject.resourceName = valueResourcesResourcesItem["ResourceName"].asString();
+		if(!valueResourcesResourcesItem["ResourceType"].isNull())
+			resourcesObject.resourceType = valueResourcesResourcesItem["ResourceType"].asString();
+		if(!valueResourcesResourcesItem["Source"].isNull())
+			resourcesObject.source = valueResourcesResourcesItem["Source"].asString();
+		resources_.push_back(resourcesObject);
+	}
+	if(!value["NextToken"].isNull())
+		nextToken_ = value["NextToken"].asString();
+
+}
+
+std::string GetAccessKeyLastUsedResourcesResult::getNextToken()const
+{
+	return nextToken_;
+}
+
+std::vector<GetAccessKeyLastUsedResourcesResult::ResourcesItem> GetAccessKeyLastUsedResourcesResult::getResources()const
+{
+	return resources_;
+}
+

actiontrail/src/model/GetDeliveryHistoryJobRequest.cc

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/actiontrail/model/GetDeliveryHistoryJobRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::GetDeliveryHistoryJobRequest;
+
+GetDeliveryHistoryJobRequest::GetDeliveryHistoryJobRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "GetDeliveryHistoryJob") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+GetDeliveryHistoryJobRequest::~GetDeliveryHistoryJobRequest() {}
+
+long GetDeliveryHistoryJobRequest::getJobId() const {
+  return jobId_;
+}
+
+void GetDeliveryHistoryJobRequest::setJobId(long jobId) {
+  jobId_ = jobId;
+  setParameter(std::string("JobId"), std::to_string(jobId));
+}
+

actiontrail/src/model/GetDeliveryHistoryJobResult.cc

@@ -0,0 +1,115 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/actiontrail/model/GetDeliveryHistoryJobResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Actiontrail;
+using namespace AlibabaCloud::Actiontrail::Model;
+
+GetDeliveryHistoryJobResult::GetDeliveryHistoryJobResult() :
+	ServiceResult()
+{}
+
+GetDeliveryHistoryJobResult::GetDeliveryHistoryJobResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+GetDeliveryHistoryJobResult::~GetDeliveryHistoryJobResult()
+{}
+
+void GetDeliveryHistoryJobResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allStatusNode = value["Status"]["StatusItem"];
+	for (auto valueStatusStatusItem : allStatusNode)
+	{
+		StatusItem statusObject;
+		if(!valueStatusStatusItem["Status"].isNull())
+			statusObject.status = std::stoi(valueStatusStatusItem["Status"].asString());
+		if(!valueStatusStatusItem["Region"].isNull())
+			statusObject.region = valueStatusStatusItem["Region"].asString();
+		status_.push_back(statusObject);
+	}
+	if(!value["JobStatus"].isNull())
+		jobStatus_ = std::stoi(value["JobStatus"].asString());
+	if(!value["CreatedTime"].isNull())
+		createdTime_ = value["CreatedTime"].asString();
+	if(!value["EndTime"].isNull())
+		endTime_ = value["EndTime"].asString();
+	if(!value["StartTime"].isNull())
+		startTime_ = value["StartTime"].asString();
+	if(!value["TrailName"].isNull())
+		trailName_ = value["TrailName"].asString();
+	if(!value["UpdatedTime"].isNull())
+		updatedTime_ = value["UpdatedTime"].asString();
+	if(!value["JobId"].isNull())
+		jobId_ = std::stol(value["JobId"].asString());
+	if(!value["HomeRegion"].isNull())
+		homeRegion_ = value["HomeRegion"].asString();
+
+}
+
+std::vector<GetDeliveryHistoryJobResult::StatusItem> GetDeliveryHistoryJobResult::getStatus()const
+{
+	return status_;
+}
+
+int GetDeliveryHistoryJobResult::getJobStatus()const
+{
+	return jobStatus_;
+}
+
+std::string GetDeliveryHistoryJobResult::getCreatedTime()const
+{
+	return createdTime_;
+}
+
+std::string GetDeliveryHistoryJobResult::getEndTime()const
+{
+	return endTime_;
+}
+
+std::string GetDeliveryHistoryJobResult::getHomeRegion()const
+{
+	return homeRegion_;
+}
+
+std::string GetDeliveryHistoryJobResult::getStartTime()const
+{
+	return startTime_;
+}
+
+std::string GetDeliveryHistoryJobResult::getTrailName()const
+{
+	return trailName_;
+}
+
+std::string GetDeliveryHistoryJobResult::getUpdatedTime()const
+{
+	return updatedTime_;
+}
+
+long GetDeliveryHistoryJobResult::getJobId()const
+{
+	return jobId_;
+}
+

actiontrail/src/model/GetTrailStatusRequest.cc

@@ -1,51 +1,45 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#include <alibabacloud/actiontrail/model/GetTrailStatusRequest.h>
-
-using AlibabaCloud::Actiontrail::Model::GetTrailStatusRequest;
-
-GetTrailStatusRequest::GetTrailStatusRequest() :
-	RpcServiceRequest("actiontrail", "2020-07-06", "GetTrailStatus")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-GetTrailStatusRequest::~GetTrailStatusRequest()
-{}
-
-std::string GetTrailStatusRequest::getName()const
-{
-	return name_;
+ */
+
+#include <alibabacloud/actiontrail/model/GetTrailStatusRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::GetTrailStatusRequest;
+
+GetTrailStatusRequest::GetTrailStatusRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "GetTrailStatus") {
+  setMethod(HttpRequest::Method::Post);
 }
 
-void GetTrailStatusRequest::setName(const std::string& name)
-{
-	name_ = name;
-	setParameter("Name", name);
+GetTrailStatusRequest::~GetTrailStatusRequest() {}
+
+std::string GetTrailStatusRequest::getName() const {
+  return name_;
 }
 
-bool GetTrailStatusRequest::getIsOrganizationTrail()const
-{
-	return isOrganizationTrail_;
+void GetTrailStatusRequest::setName(const std::string &name) {
+  name_ = name;
+  setParameter(std::string("Name"), name);
 }
 
-void GetTrailStatusRequest::setIsOrganizationTrail(bool isOrganizationTrail)
-{
-	isOrganizationTrail_ = isOrganizationTrail;
-	setParameter("IsOrganizationTrail", isOrganizationTrail ? "true" : "false");
+bool GetTrailStatusRequest::getIsOrganizationTrail() const {
+  return isOrganizationTrail_;
+}
+
+void GetTrailStatusRequest::setIsOrganizationTrail(bool isOrganizationTrail) {
+  isOrganizationTrail_ = isOrganizationTrail;
+  setParameter(std::string("IsOrganizationTrail"), isOrganizationTrail ? "true" : "false");
 }
 

actiontrail/src/model/GetTrailStatusResult.cc

@@ -39,24 +39,24 @@ void GetTrailStatusResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].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";
+	if(!value["LatestDeliveryTime"].isNull())
+		latestDeliveryTime_ = value["LatestDeliveryTime"].asString();
+	if(!value["LatestDeliveryLogServiceError"].isNull())
+		latestDeliveryLogServiceError_ = value["LatestDeliveryLogServiceError"].asString();
+	if(!value["LatestDeliveryLogServiceTime"].isNull())
+		latestDeliveryLogServiceTime_ = value["LatestDeliveryLogServiceTime"].asString();
+	if(!value["OssBucketStatus"].isNull())
+		ossBucketStatus_ = value["OssBucketStatus"].asString() == "true";
+	if(!value["SlsLogStoreStatus"].isNull())
+		slsLogStoreStatus_ = value["SlsLogStoreStatus"].asString() == "true";
 
 }
 
@@ -95,13 +95,13 @@ bool GetTrailStatusResult::getSlsLogStoreStatus()const
 	return slsLogStoreStatus_;
 }
 
-std::string GetTrailStatusResult::getLatestDeliveryTime()const
-{
-	return latestDeliveryTime_;
-}
-
 bool GetTrailStatusResult::getIsLogging()const
 {
 	return isLogging_;
 }
 
+std::string GetTrailStatusResult::getLatestDeliveryTime()const
+{
+	return latestDeliveryTime_;
+}
+

actiontrail/src/model/ListDeliveryHistoryJobsRequest.cc

@@ -1,51 +1,45 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#include <alibabacloud/actiontrail/model/ListDeliveryHistoryJobsRequest.h>
-
-using AlibabaCloud::Actiontrail::Model::ListDeliveryHistoryJobsRequest;
-
-ListDeliveryHistoryJobsRequest::ListDeliveryHistoryJobsRequest() :
-	RpcServiceRequest("actiontrail", "2020-07-06", "ListDeliveryHistoryJobs")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-ListDeliveryHistoryJobsRequest::~ListDeliveryHistoryJobsRequest()
-{}
-
-int ListDeliveryHistoryJobsRequest::getPageNumber()const
-{
-	return pageNumber_;
+ */
+
+#include <alibabacloud/actiontrail/model/ListDeliveryHistoryJobsRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::ListDeliveryHistoryJobsRequest;
+
+ListDeliveryHistoryJobsRequest::ListDeliveryHistoryJobsRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "ListDeliveryHistoryJobs") {
+  setMethod(HttpRequest::Method::Post);
 }
 
-void ListDeliveryHistoryJobsRequest::setPageNumber(int pageNumber)
-{
-	pageNumber_ = pageNumber;
-	setParameter("PageNumber", std::to_string(pageNumber));
+ListDeliveryHistoryJobsRequest::~ListDeliveryHistoryJobsRequest() {}
+
+int ListDeliveryHistoryJobsRequest::getPageNumber() const {
+  return pageNumber_;
 }
 
-int ListDeliveryHistoryJobsRequest::getPageSize()const
-{
-	return pageSize_;
+void ListDeliveryHistoryJobsRequest::setPageNumber(int pageNumber) {
+  pageNumber_ = pageNumber;
+  setParameter(std::string("PageNumber"), std::to_string(pageNumber));
 }
 
-void ListDeliveryHistoryJobsRequest::setPageSize(int pageSize)
-{
-	pageSize_ = pageSize;
-	setParameter("PageSize", std::to_string(pageSize));
+int ListDeliveryHistoryJobsRequest::getPageSize() const {
+  return pageSize_;
+}
+
+void ListDeliveryHistoryJobsRequest::setPageSize(int pageSize) {
+  pageSize_ = pageSize;
+  setParameter(std::string("PageSize"), std::to_string(pageSize));
 }
 

actiontrail/src/model/ListDeliveryHistoryJobsResult.cc

@@ -45,28 +45,28 @@ void ListDeliveryHistoryJobsResult::parse(const std::string &payload)
 		DeliveryHistoryJob deliveryHistoryJobsObject;
 		if(!valueDeliveryHistoryJobsDeliveryHistoryJob["TrailName"].isNull())
 			deliveryHistoryJobsObject.trailName = valueDeliveryHistoryJobsDeliveryHistoryJob["TrailName"].asString();
-		if(!valueDeliveryHistoryJobsDeliveryHistoryJob["CreatedTime"].isNull())
-			deliveryHistoryJobsObject.createdTime = valueDeliveryHistoryJobsDeliveryHistoryJob["CreatedTime"].asString();
-		if(!valueDeliveryHistoryJobsDeliveryHistoryJob["UpdatedTime"].isNull())
-			deliveryHistoryJobsObject.updatedTime = valueDeliveryHistoryJobsDeliveryHistoryJob["UpdatedTime"].asString();
-		if(!valueDeliveryHistoryJobsDeliveryHistoryJob["HomeRegion"].isNull())
-			deliveryHistoryJobsObject.homeRegion = valueDeliveryHistoryJobsDeliveryHistoryJob["HomeRegion"].asString();
-		if(!valueDeliveryHistoryJobsDeliveryHistoryJob["StartTime"].isNull())
-			deliveryHistoryJobsObject.startTime = valueDeliveryHistoryJobsDeliveryHistoryJob["StartTime"].asString();
 		if(!valueDeliveryHistoryJobsDeliveryHistoryJob["EndTime"].isNull())
 			deliveryHistoryJobsObject.endTime = valueDeliveryHistoryJobsDeliveryHistoryJob["EndTime"].asString();
-		if(!valueDeliveryHistoryJobsDeliveryHistoryJob["JobId"].isNull())
-			deliveryHistoryJobsObject.jobId = std::stol(valueDeliveryHistoryJobsDeliveryHistoryJob["JobId"].asString());
+		if(!valueDeliveryHistoryJobsDeliveryHistoryJob["StartTime"].isNull())
+			deliveryHistoryJobsObject.startTime = valueDeliveryHistoryJobsDeliveryHistoryJob["StartTime"].asString();
 		if(!valueDeliveryHistoryJobsDeliveryHistoryJob["JobStatus"].isNull())
 			deliveryHistoryJobsObject.jobStatus = std::stoi(valueDeliveryHistoryJobsDeliveryHistoryJob["JobStatus"].asString());
+		if(!valueDeliveryHistoryJobsDeliveryHistoryJob["HomeRegion"].isNull())
+			deliveryHistoryJobsObject.homeRegion = valueDeliveryHistoryJobsDeliveryHistoryJob["HomeRegion"].asString();
+		if(!valueDeliveryHistoryJobsDeliveryHistoryJob["UpdatedTime"].isNull())
+			deliveryHistoryJobsObject.updatedTime = valueDeliveryHistoryJobsDeliveryHistoryJob["UpdatedTime"].asString();
+		if(!valueDeliveryHistoryJobsDeliveryHistoryJob["JobId"].isNull())
+			deliveryHistoryJobsObject.jobId = std::stol(valueDeliveryHistoryJobsDeliveryHistoryJob["JobId"].asString());
+		if(!valueDeliveryHistoryJobsDeliveryHistoryJob["CreatedTime"].isNull())
+			deliveryHistoryJobsObject.createdTime = valueDeliveryHistoryJobsDeliveryHistoryJob["CreatedTime"].asString();
 		deliveryHistoryJobs_.push_back(deliveryHistoryJobsObject);
 	}
 	if(!value["TotalCount"].isNull())
 		totalCount_ = std::stoi(value["TotalCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
 	if(!value["PageSize"].isNull())
 		pageSize_ = std::stoi(value["PageSize"].asString());
+	if(!value["PageNumber"].isNull())
+		pageNumber_ = std::stoi(value["PageNumber"].asString());
 
 }
 

actiontrail/src/model/LookupEventsRequest.cc

@@ -1,100 +1,86 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#include <alibabacloud/actiontrail/model/LookupEventsRequest.h>
-
-using AlibabaCloud::Actiontrail::Model::LookupEventsRequest;
-
-LookupEventsRequest::LookupEventsRequest() :
-	RpcServiceRequest("actiontrail", "2020-07-06", "LookupEvents")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-LookupEventsRequest::~LookupEventsRequest()
-{}
-
-std::string LookupEventsRequest::getEndTime()const
-{
-	return endTime_;
+ */
+
+#include <alibabacloud/actiontrail/model/LookupEventsRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::LookupEventsRequest;
+
+LookupEventsRequest::LookupEventsRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "LookupEvents") {
+  setMethod(HttpRequest::Method::Post);
 }
 
-void LookupEventsRequest::setEndTime(const std::string& endTime)
-{
-	endTime_ = endTime;
-	setParameter("EndTime", endTime);
+LookupEventsRequest::~LookupEventsRequest() {}
+
+std::string LookupEventsRequest::getEndTime() const {
+  return endTime_;
 }
 
-std::string LookupEventsRequest::getStartTime()const
-{
-	return startTime_;
+void LookupEventsRequest::setEndTime(const std::string &endTime) {
+  endTime_ = endTime;
+  setParameter(std::string("EndTime"), endTime);
 }
 
-void LookupEventsRequest::setStartTime(const std::string& startTime)
-{
-	startTime_ = startTime;
-	setParameter("StartTime", startTime);
+std::string LookupEventsRequest::getStartTime() const {
+  return startTime_;
 }
 
-std::string LookupEventsRequest::getNextToken()const
-{
-	return nextToken_;
+void LookupEventsRequest::setStartTime(const std::string &startTime) {
+  startTime_ = startTime;
+  setParameter(std::string("StartTime"), startTime);
 }
 
-void LookupEventsRequest::setNextToken(const std::string& nextToken)
-{
-	nextToken_ = nextToken;
-	setParameter("NextToken", nextToken);
+std::string LookupEventsRequest::getNextToken() const {
+  return nextToken_;
 }
 
-std::vector<LookupEventsRequest::LookupAttribute> LookupEventsRequest::getLookupAttribute()const
-{
-	return lookupAttribute_;
+void LookupEventsRequest::setNextToken(const std::string &nextToken) {
+  nextToken_ = nextToken;
+  setParameter(std::string("NextToken"), nextToken);
 }
 
-void LookupEventsRequest::setLookupAttribute(const std::vector<LookupAttribute>& lookupAttribute)
-{
-	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::vector<LookupEventsRequest::LookupAttribute> LookupEventsRequest::getLookupAttribute() const {
+  return lookupAttribute_;
 }
 
-std::string LookupEventsRequest::getMaxResults()const
-{
-	return maxResults_;
+void LookupEventsRequest::setLookupAttribute(const std::vector<LookupEventsRequest::LookupAttribute> &lookupAttribute) {
+  lookupAttribute_ = lookupAttribute;
+  for(int dep1 = 0; dep1 != lookupAttribute.size(); dep1++) {
+  auto lookupAttributeObj = lookupAttribute.at(dep1);
+  std::string lookupAttributeObjStr = std::string("LookupAttribute") + "." + std::to_string(dep1 + 1);
+    setParameter(lookupAttributeObjStr + ".Value", lookupAttributeObj.value);
+    setParameter(lookupAttributeObjStr + ".Key", lookupAttributeObj.key);
+  }
 }
 
-void LookupEventsRequest::setMaxResults(const std::string& maxResults)
-{
-	maxResults_ = maxResults;
-	setParameter("MaxResults", maxResults);
+std::string LookupEventsRequest::getMaxResults() const {
+  return maxResults_;
 }
 
-std::string LookupEventsRequest::getDirection()const
-{
-	return direction_;
+void LookupEventsRequest::setMaxResults(const std::string &maxResults) {
+  maxResults_ = maxResults;
+  setParameter(std::string("MaxResults"), maxResults);
 }
 
-void LookupEventsRequest::setDirection(const std::string& direction)
-{
-	direction_ = direction;
-	setParameter("Direction", direction);
+std::string LookupEventsRequest::getDirection() const {
+  return direction_;
+}
+
+void LookupEventsRequest::setDirection(const std::string &direction) {
+  direction_ = direction;
+  setParameter(std::string("Direction"), direction);
 }
 

actiontrail/src/model/StartLoggingRequest.cc

@@ -1,40 +1,36 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#include <alibabacloud/actiontrail/model/StartLoggingRequest.h>
-
-using AlibabaCloud::Actiontrail::Model::StartLoggingRequest;
-
-StartLoggingRequest::StartLoggingRequest() :
-	RpcServiceRequest("actiontrail", "2020-07-06", "StartLogging")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-StartLoggingRequest::~StartLoggingRequest()
-{}
-
-std::string StartLoggingRequest::getName()const
-{
-	return name_;
+ */
+
+#include <alibabacloud/actiontrail/model/StartLoggingRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::StartLoggingRequest;
+
+StartLoggingRequest::StartLoggingRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "StartLogging") {
+  setMethod(HttpRequest::Method::Post);
 }
 
-void StartLoggingRequest::setName(const std::string& name)
-{
-	name_ = name;
-	setParameter("Name", name);
+StartLoggingRequest::~StartLoggingRequest() {}
+
+std::string StartLoggingRequest::getName() const {
+  return name_;
+}
+
+void StartLoggingRequest::setName(const std::string &name) {
+  name_ = name;
+  setParameter(std::string("Name"), name);
 }
 

actiontrail/src/model/StopLoggingRequest.cc

@@ -1,40 +1,36 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#include <alibabacloud/actiontrail/model/StopLoggingRequest.h>
-
-using AlibabaCloud::Actiontrail::Model::StopLoggingRequest;
-
-StopLoggingRequest::StopLoggingRequest() :
-	RpcServiceRequest("actiontrail", "2020-07-06", "StopLogging")
-{
-	setMethod(HttpRequest::Method::Get);
-}
-
-StopLoggingRequest::~StopLoggingRequest()
-{}
-
-std::string StopLoggingRequest::getName()const
-{
-	return name_;
+ */
+
+#include <alibabacloud/actiontrail/model/StopLoggingRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::StopLoggingRequest;
+
+StopLoggingRequest::StopLoggingRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "StopLogging") {
+  setMethod(HttpRequest::Method::Get);
 }
 
-void StopLoggingRequest::setName(const std::string& name)
-{
-	name_ = name;
-	setParameter("Name", name);
+StopLoggingRequest::~StopLoggingRequest() {}
+
+std::string StopLoggingRequest::getName() const {
+  return name_;
+}
+
+void StopLoggingRequest::setName(const std::string &name) {
+  name_ = name;
+  setParameter(std::string("Name"), name);
 }
 

actiontrail/src/model/UpdateTrailRequest.cc

@@ -1,117 +1,99 @@
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-#include <alibabacloud/actiontrail/model/UpdateTrailRequest.h>
-
-using AlibabaCloud::Actiontrail::Model::UpdateTrailRequest;
-
-UpdateTrailRequest::UpdateTrailRequest() :
-	RpcServiceRequest("actiontrail", "2020-07-06", "UpdateTrail")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-UpdateTrailRequest::~UpdateTrailRequest()
-{}
-
-std::string UpdateTrailRequest::getSlsProjectArn()const
-{
-	return slsProjectArn_;
+ */
+
+#include <alibabacloud/actiontrail/model/UpdateTrailRequest.h>
+
+using AlibabaCloud::Actiontrail::Model::UpdateTrailRequest;
+
+UpdateTrailRequest::UpdateTrailRequest()
+    : RpcServiceRequest("actiontrail", "2020-07-06", "UpdateTrail") {
+  setMethod(HttpRequest::Method::Post);
 }
 
-void UpdateTrailRequest::setSlsProjectArn(const std::string& slsProjectArn)
-{
-	slsProjectArn_ = slsProjectArn;
-	setParameter("SlsProjectArn", slsProjectArn);
+UpdateTrailRequest::~UpdateTrailRequest() {}
+
+std::string UpdateTrailRequest::getSlsProjectArn() const {
+  return slsProjectArn_;
 }
 
-std::string UpdateTrailRequest::getSlsWriteRoleArn()const
-{
-	return slsWriteRoleArn_;
+void UpdateTrailRequest::setSlsProjectArn(const std::string &slsProjectArn) {
+  slsProjectArn_ = slsProjectArn;
+  setParameter(std::string("SlsProjectArn"), slsProjectArn);
 }
 
-void UpdateTrailRequest::setSlsWriteRoleArn(const std::string& slsWriteRoleArn)
-{
-	slsWriteRoleArn_ = slsWriteRoleArn;
-	setParameter("SlsWriteRoleArn", slsWriteRoleArn);
+std::string UpdateTrailRequest::getSlsWriteRoleArn() const {
+  return slsWriteRoleArn_;
 }
 
-std::string UpdateTrailRequest::getOssKeyPrefix()const
-{
-	return ossKeyPrefix_;
+void UpdateTrailRequest::setSlsWriteRoleArn(const std::string &slsWriteRoleArn) {
+  slsWriteRoleArn_ = slsWriteRoleArn;
+  setParameter(std::string("SlsWriteRoleArn"), slsWriteRoleArn);
 }
 
-void UpdateTrailRequest::setOssKeyPrefix(const std::string& ossKeyPrefix)
-{
-	ossKeyPrefix_ = ossKeyPrefix;
-	setParameter("OssKeyPrefix", ossKeyPrefix);
+std::string UpdateTrailRequest::getOssKeyPrefix() const {
+  return ossKeyPrefix_;
 }
 
-std::string UpdateTrailRequest::getOssWriteRoleArn()const
-{
-	return ossWriteRoleArn_;
+void UpdateTrailRequest::setOssKeyPrefix(const std::string &ossKeyPrefix) {
+  ossKeyPrefix_ = ossKeyPrefix;
+  setParameter(std::string("OssKeyPrefix"), ossKeyPrefix);
 }
 
-void UpdateTrailRequest::setOssWriteRoleArn(const std::string& ossWriteRoleArn)
-{
-	ossWriteRoleArn_ = ossWriteRoleArn;
-	setParameter("OssWriteRoleArn", ossWriteRoleArn);
+std::string UpdateTrailRequest::getOssWriteRoleArn() const {
+  return ossWriteRoleArn_;
 }
 
-std::string UpdateTrailRequest::getEventRW()const
-{
-	return eventRW_;
+void UpdateTrailRequest::setOssWriteRoleArn(const std::string &ossWriteRoleArn) {
+  ossWriteRoleArn_ = ossWriteRoleArn;
+  setParameter(std::string("OssWriteRoleArn"), ossWriteRoleArn);
 }
 
-void UpdateTrailRequest::setEventRW(const std::string& eventRW)
-{
-	eventRW_ = eventRW;
-	setParameter("EventRW", eventRW);
+std::string UpdateTrailRequest::getEventRW() const {
+  return eventRW_;
 }
 
-std::string UpdateTrailRequest::getName()const
-{
-	return name_;
+void UpdateTrailRequest::setEventRW(const std::string &eventRW) {
+  eventRW_ = eventRW;
+  setParameter(std::string("EventRW"), eventRW);
 }
 
-void UpdateTrailRequest::setName(const std::string& name)
-{
-	name_ = name;
-	setParameter("Name", name);
+std::string UpdateTrailRequest::getName() const {
+  return name_;
 }
 
-std::string UpdateTrailRequest::getOssBucketName()const
-{
-	return ossBucketName_;
+void UpdateTrailRequest::setName(const std::string &name) {
+  name_ = name;
+  setParameter(std::string("Name"), name);
 }
 
-void UpdateTrailRequest::setOssBucketName(const std::string& ossBucketName)
-{
-	ossBucketName_ = ossBucketName;
-	setParameter("OssBucketName", ossBucketName);
+std::string UpdateTrailRequest::getOssBucketName() const {
+  return ossBucketName_;
 }
 
-std::string UpdateTrailRequest::getTrailRegion()const
-{
-	return trailRegion_;
+void UpdateTrailRequest::setOssBucketName(const std::string &ossBucketName) {
+  ossBucketName_ = ossBucketName;
+  setParameter(std::string("OssBucketName"), ossBucketName);
 }
 
-void UpdateTrailRequest::setTrailRegion(const std::string& trailRegion)
-{
-	trailRegion_ = trailRegion;
-	setParameter("TrailRegion", trailRegion);
+std::string UpdateTrailRequest::getTrailRegion() const {
+  return trailRegion_;
+}
+
+void UpdateTrailRequest::setTrailRegion(const std::string &trailRegion) {
+  trailRegion_ = trailRegion;
+  setParameter(std::string("TrailRegion"), trailRegion);
 }
 

actiontrail/src/model/UpdateTrailResult.cc

@@ -41,6 +41,8 @@ void UpdateTrailResult::parse(const std::string &payload)
 	setRequestId(value["RequestId"].asString());
 	if(!value["SlsProjectArn"].isNull())
 		slsProjectArn_ = value["SlsProjectArn"].asString();
+	if(!value["OssWriteRoleArn"].isNull())
+		ossWriteRoleArn_ = value["OssWriteRoleArn"].asString();
 	if(!value["EventRW"].isNull())
 		eventRW_ = value["EventRW"].asString();
 	if(!value["HomeRegion"].isNull())
@@ -51,8 +53,6 @@ void UpdateTrailResult::parse(const std::string &payload)
 		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["Name"].isNull())
@@ -85,16 +85,16 @@ std::string UpdateTrailResult::getOssBucketName()const
 	return ossBucketName_;
 }
 
-std::string UpdateTrailResult::getSlsWriteRoleArn()const
-{
-	return slsWriteRoleArn_;
-}
-
 std::string UpdateTrailResult::getOssWriteRoleArn()const
 {
 	return ossWriteRoleArn_;
 }
 
+std::string UpdateTrailResult::getSlsWriteRoleArn()const
+{
+	return slsWriteRoleArn_;
+}
+
 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;
 				};