Add prometheus ListDashboards api.

1. fixed code about delete char*
2. free curl_slist
3. added lock for EndpointProvider::LoadLocalEndpoints()

CHANGELOG

@@ -1,3 +1,66 @@
+2020-04-29 Version: 1.36.396
+- Add prometheus ListDashboards api.
+
+2020-04-29 Version: 1.36.395
+- Add prometheus ListDashboards api.
+
+2020-04-29 Version: 1.36.394
+- Supported VideoProduce.
+
+2020-04-29 Version: 1.36.393
+- Supported VideoProduce.
+
+2020-04-29 Version: 1.36.392
+- Supported VideoProduce.
+
+2020-04-29 Version: 1.36.391
+- Add ListTemplateVersions API.
+- GenerateExecutionPolicy supports TemplateVersion.
+- CreateTemplate and UpdateTemplate support VersionName.
+
+
+2020-04-29 Version: 1.36.390
+- Support groupId operations.
+
+2020-04-29 Version: 1.36.389
+- Add ExportTas apis.
+
+2020-04-29 Version: 1.36.388
+- Support Document Translation.
+- Support Lanuage Detection.
+
+2020-04-29 Version: 1.36.387
+- Sync cdn APIs.
+
+2020-04-29 Version: 1.36.386
+- Add Scdn APIS.
+- Sync cdn APIS.
+
+2020-04-28 Version: 1.36.385
+- Generated 2019-03-15 for `fnf`.
+
+2020-04-28 Version: 1.36.384
+- Add CompareFaceVerify API.
+
+2020-04-27 Version: 1.36.383
+- Support watermark.
+
+2020-04-27 Version: 1.36.382
+- Describe describeAvailableResource.
+
+2020-04-27 Version: 1.36.381
+- ContrastFaceVerify Return SubCode.
+
+2020-04-27 Version: 1.36.380
+- Generated 2019-01-01 for `Cassandra`.
+
+2020-04-26 Version: 1.36.379
+- New api publish.
+
+2020-04-25 Version: 1.36.378
+- Generated 2015-01-01 for `R-kvstore`.
+- Add RestoreTime for CreateInstance API.
+
 2020-04-24 Version: 1.36.377
 - Publish apis for ledger instances.
 - Publish apis for members.

VERSION

@@ -1 +1 @@
-1.36.377
+1.36.396

alimt/src/AlimtClient.cc

@@ -31,21 +31,21 @@ AlimtClient::AlimtClient(const Credentials &credentials, const ClientConfigurati
 	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, "alimtct");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "alimt");
 }
 
 AlimtClient::AlimtClient(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, "alimtct");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "alimt");
 }
 
 AlimtClient::AlimtClient(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, "alimtct");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "alimt");
 }
 
 AlimtClient::~AlimtClient()

arms/CMakeLists.txt

@@ -25,6 +25,8 @@ set(arms_public_header_model
 	include/alibabacloud/arms/model/AddGrafanaResult.h
 	include/alibabacloud/arms/model/AddIntegrationRequest.h
 	include/alibabacloud/arms/model/AddIntegrationResult.h
+	include/alibabacloud/arms/model/CheckDataConsistencyRequest.h
+	include/alibabacloud/arms/model/CheckDataConsistencyResult.h
 	include/alibabacloud/arms/model/CreateAlertContactRequest.h
 	include/alibabacloud/arms/model/CreateAlertContactResult.h
 	include/alibabacloud/arms/model/CreateAlertContactGroupRequest.h
@@ -39,6 +41,8 @@ set(arms_public_header_model
 	include/alibabacloud/arms/model/DeleteAlertRulesResult.h
 	include/alibabacloud/arms/model/DeleteRetcodeAppRequest.h
 	include/alibabacloud/arms/model/DeleteRetcodeAppResult.h
+	include/alibabacloud/arms/model/GetConsistencySnapshotRequest.h
+	include/alibabacloud/arms/model/GetConsistencySnapshotResult.h
 	include/alibabacloud/arms/model/GetPrometheusApiTokenRequest.h
 	include/alibabacloud/arms/model/GetPrometheusApiTokenResult.h
 	include/alibabacloud/arms/model/GetRetcodeShareUrlRequest.h
@@ -51,6 +55,8 @@ set(arms_public_header_model
 	include/alibabacloud/arms/model/ImportCustomAlertRulesResult.h
 	include/alibabacloud/arms/model/ListClusterFromGrafanaRequest.h
 	include/alibabacloud/arms/model/ListClusterFromGrafanaResult.h
+	include/alibabacloud/arms/model/ListDashboardsRequest.h
+	include/alibabacloud/arms/model/ListDashboardsResult.h
 	include/alibabacloud/arms/model/ListPromClustersRequest.h
 	include/alibabacloud/arms/model/ListPromClustersResult.h
 	include/alibabacloud/arms/model/ListRetcodeAppsRequest.h
@@ -98,6 +104,8 @@ set(arms_src
 	src/model/AddGrafanaResult.cc
 	src/model/AddIntegrationRequest.cc
 	src/model/AddIntegrationResult.cc
+	src/model/CheckDataConsistencyRequest.cc
+	src/model/CheckDataConsistencyResult.cc
 	src/model/CreateAlertContactRequest.cc
 	src/model/CreateAlertContactResult.cc
 	src/model/CreateAlertContactGroupRequest.cc
@@ -112,6 +120,8 @@ set(arms_src
 	src/model/DeleteAlertRulesResult.cc
 	src/model/DeleteRetcodeAppRequest.cc
 	src/model/DeleteRetcodeAppResult.cc
+	src/model/GetConsistencySnapshotRequest.cc
+	src/model/GetConsistencySnapshotResult.cc
 	src/model/GetPrometheusApiTokenRequest.cc
 	src/model/GetPrometheusApiTokenResult.cc
 	src/model/GetRetcodeShareUrlRequest.cc
@@ -124,6 +134,8 @@ set(arms_src
 	src/model/ImportCustomAlertRulesResult.cc
 	src/model/ListClusterFromGrafanaRequest.cc
 	src/model/ListClusterFromGrafanaResult.cc
+	src/model/ListDashboardsRequest.cc
+	src/model/ListDashboardsResult.cc
 	src/model/ListPromClustersRequest.cc
 	src/model/ListPromClustersResult.cc
 	src/model/ListRetcodeAppsRequest.cc

arms/include/alibabacloud/arms/ARMSClient.h

@@ -26,6 +26,8 @@
 #include "model/AddGrafanaResult.h"
 #include "model/AddIntegrationRequest.h"
 #include "model/AddIntegrationResult.h"
+#include "model/CheckDataConsistencyRequest.h"
+#include "model/CheckDataConsistencyResult.h"
 #include "model/CreateAlertContactRequest.h"
 #include "model/CreateAlertContactResult.h"
 #include "model/CreateAlertContactGroupRequest.h"
@@ -40,6 +42,8 @@
 #include "model/DeleteAlertRulesResult.h"
 #include "model/DeleteRetcodeAppRequest.h"
 #include "model/DeleteRetcodeAppResult.h"
+#include "model/GetConsistencySnapshotRequest.h"
+#include "model/GetConsistencySnapshotResult.h"
 #include "model/GetPrometheusApiTokenRequest.h"
 #include "model/GetPrometheusApiTokenResult.h"
 #include "model/GetRetcodeShareUrlRequest.h"
@@ -52,6 +56,8 @@
 #include "model/ImportCustomAlertRulesResult.h"
 #include "model/ListClusterFromGrafanaRequest.h"
 #include "model/ListClusterFromGrafanaResult.h"
+#include "model/ListDashboardsRequest.h"
+#include "model/ListDashboardsResult.h"
 #include "model/ListPromClustersRequest.h"
 #include "model/ListPromClustersResult.h"
 #include "model/ListRetcodeAppsRequest.h"
@@ -107,6 +113,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::AddIntegrationResult> AddIntegrationOutcome;
 			typedef std::future<AddIntegrationOutcome> AddIntegrationOutcomeCallable;
 			typedef std::function<void(const ARMSClient*, const Model::AddIntegrationRequest&, const AddIntegrationOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> AddIntegrationAsyncHandler;
+			typedef Outcome<Error, Model::CheckDataConsistencyResult> CheckDataConsistencyOutcome;
+			typedef std::future<CheckDataConsistencyOutcome> CheckDataConsistencyOutcomeCallable;
+			typedef std::function<void(const ARMSClient*, const Model::CheckDataConsistencyRequest&, const CheckDataConsistencyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CheckDataConsistencyAsyncHandler;
 			typedef Outcome<Error, Model::CreateAlertContactResult> CreateAlertContactOutcome;
 			typedef std::future<CreateAlertContactOutcome> CreateAlertContactOutcomeCallable;
 			typedef std::function<void(const ARMSClient*, const Model::CreateAlertContactRequest&, const CreateAlertContactOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateAlertContactAsyncHandler;
@@ -128,6 +137,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DeleteRetcodeAppResult> DeleteRetcodeAppOutcome;
 			typedef std::future<DeleteRetcodeAppOutcome> DeleteRetcodeAppOutcomeCallable;
 			typedef std::function<void(const ARMSClient*, const Model::DeleteRetcodeAppRequest&, const DeleteRetcodeAppOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteRetcodeAppAsyncHandler;
+			typedef Outcome<Error, Model::GetConsistencySnapshotResult> GetConsistencySnapshotOutcome;
+			typedef std::future<GetConsistencySnapshotOutcome> GetConsistencySnapshotOutcomeCallable;
+			typedef std::function<void(const ARMSClient*, const Model::GetConsistencySnapshotRequest&, const GetConsistencySnapshotOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetConsistencySnapshotAsyncHandler;
 			typedef Outcome<Error, Model::GetPrometheusApiTokenResult> GetPrometheusApiTokenOutcome;
 			typedef std::future<GetPrometheusApiTokenOutcome> GetPrometheusApiTokenOutcomeCallable;
 			typedef std::function<void(const ARMSClient*, const Model::GetPrometheusApiTokenRequest&, const GetPrometheusApiTokenOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetPrometheusApiTokenAsyncHandler;
@@ -146,6 +158,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ListClusterFromGrafanaResult> ListClusterFromGrafanaOutcome;
 			typedef std::future<ListClusterFromGrafanaOutcome> ListClusterFromGrafanaOutcomeCallable;
 			typedef std::function<void(const ARMSClient*, const Model::ListClusterFromGrafanaRequest&, const ListClusterFromGrafanaOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListClusterFromGrafanaAsyncHandler;
+			typedef Outcome<Error, Model::ListDashboardsResult> ListDashboardsOutcome;
+			typedef std::future<ListDashboardsOutcome> ListDashboardsOutcomeCallable;
+			typedef std::function<void(const ARMSClient*, const Model::ListDashboardsRequest&, const ListDashboardsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListDashboardsAsyncHandler;
 			typedef Outcome<Error, Model::ListPromClustersResult> ListPromClustersOutcome;
 			typedef std::future<ListPromClustersOutcome> ListPromClustersOutcomeCallable;
 			typedef std::function<void(const ARMSClient*, const Model::ListPromClustersRequest&, const ListPromClustersOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListPromClustersAsyncHandler;
@@ -217,6 +232,9 @@ namespace AlibabaCloud
 			AddIntegrationOutcome addIntegration(const Model::AddIntegrationRequest &request)const;
 			void addIntegrationAsync(const Model::AddIntegrationRequest& request, const AddIntegrationAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			AddIntegrationOutcomeCallable addIntegrationCallable(const Model::AddIntegrationRequest& request) const;
+			CheckDataConsistencyOutcome checkDataConsistency(const Model::CheckDataConsistencyRequest &request)const;
+			void checkDataConsistencyAsync(const Model::CheckDataConsistencyRequest& request, const CheckDataConsistencyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CheckDataConsistencyOutcomeCallable checkDataConsistencyCallable(const Model::CheckDataConsistencyRequest& request) const;
 			CreateAlertContactOutcome createAlertContact(const Model::CreateAlertContactRequest &request)const;
 			void createAlertContactAsync(const Model::CreateAlertContactRequest& request, const CreateAlertContactAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateAlertContactOutcomeCallable createAlertContactCallable(const Model::CreateAlertContactRequest& request) const;
@@ -238,6 +256,9 @@ namespace AlibabaCloud
 			DeleteRetcodeAppOutcome deleteRetcodeApp(const Model::DeleteRetcodeAppRequest &request)const;
 			void deleteRetcodeAppAsync(const Model::DeleteRetcodeAppRequest& request, const DeleteRetcodeAppAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteRetcodeAppOutcomeCallable deleteRetcodeAppCallable(const Model::DeleteRetcodeAppRequest& request) const;
+			GetConsistencySnapshotOutcome getConsistencySnapshot(const Model::GetConsistencySnapshotRequest &request)const;
+			void getConsistencySnapshotAsync(const Model::GetConsistencySnapshotRequest& request, const GetConsistencySnapshotAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			GetConsistencySnapshotOutcomeCallable getConsistencySnapshotCallable(const Model::GetConsistencySnapshotRequest& request) const;
 			GetPrometheusApiTokenOutcome getPrometheusApiToken(const Model::GetPrometheusApiTokenRequest &request)const;
 			void getPrometheusApiTokenAsync(const Model::GetPrometheusApiTokenRequest& request, const GetPrometheusApiTokenAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			GetPrometheusApiTokenOutcomeCallable getPrometheusApiTokenCallable(const Model::GetPrometheusApiTokenRequest& request) const;
@@ -256,6 +277,9 @@ namespace AlibabaCloud
 			ListClusterFromGrafanaOutcome listClusterFromGrafana(const Model::ListClusterFromGrafanaRequest &request)const;
 			void listClusterFromGrafanaAsync(const Model::ListClusterFromGrafanaRequest& request, const ListClusterFromGrafanaAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListClusterFromGrafanaOutcomeCallable listClusterFromGrafanaCallable(const Model::ListClusterFromGrafanaRequest& request) const;
+			ListDashboardsOutcome listDashboards(const Model::ListDashboardsRequest &request)const;
+			void listDashboardsAsync(const Model::ListDashboardsRequest& request, const ListDashboardsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ListDashboardsOutcomeCallable listDashboardsCallable(const Model::ListDashboardsRequest& request) const;
 			ListPromClustersOutcome listPromClusters(const Model::ListPromClustersRequest &request)const;
 			void listPromClustersAsync(const Model::ListPromClustersRequest& request, const ListPromClustersAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListPromClustersOutcomeCallable listPromClustersCallable(const Model::ListPromClustersRequest& request) const;

arms/include/alibabacloud/arms/model/CheckDataConsistencyRequest.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_ARMS_MODEL_CHECKDATACONSISTENCYREQUEST_H_
+#define ALIBABACLOUD_ARMS_MODEL_CHECKDATACONSISTENCYREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/arms/ARMSExport.h>
+
+namespace AlibabaCloud
+{
+	namespace ARMS
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ARMS_EXPORT CheckDataConsistencyRequest : public RpcServiceRequest
+			{
+
+			public:
+				CheckDataConsistencyRequest();
+				~CheckDataConsistencyRequest();
+
+				long getCurrentTimestamp()const;
+				void setCurrentTimestamp(long currentTimestamp);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getAppType()const;
+				void setAppType(const std::string& appType);
+				std::string getPid()const;
+				void setPid(const std::string& pid);
+				std::string getProxyUserId()const;
+				void setProxyUserId(const std::string& proxyUserId);
+
+            private:
+				long currentTimestamp_;
+				std::string regionId_;
+				std::string appType_;
+				std::string pid_;
+				std::string proxyUserId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ARMS_MODEL_CHECKDATACONSISTENCYREQUEST_H_

arms/include/alibabacloud/arms/model/CheckDataConsistencyResult.h

@@ -14,40 +14,38 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCERESULT_H_
-#define ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCERESULT_H_
+#ifndef ALIBABACLOUD_ARMS_MODEL_CHECKDATACONSISTENCYRESULT_H_
+#define ALIBABACLOUD_ARMS_MODEL_CHECKDATACONSISTENCYRESULT_H_
 
 #include <string>
 #include <vector>
 #include <utility>
 #include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/hbase/HBaseExport.h>
+#include <alibabacloud/arms/ARMSExport.h>
 
 namespace AlibabaCloud
 {
-	namespace HBase
+	namespace ARMS
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_HBASE_EXPORT CreateInstanceResult : public ServiceResult
+			class ALIBABACLOUD_ARMS_EXPORT CheckDataConsistencyResult : public ServiceResult
 			{
 			public:
 
 
-				CreateInstanceResult();
-				explicit CreateInstanceResult(const std::string &payload);
-				~CreateInstanceResult();
-				std::string getClusterId()const;
-				std::string getOrderId()const;
+				CheckDataConsistencyResult();
+				explicit CheckDataConsistencyResult(const std::string &payload);
+				~CheckDataConsistencyResult();
+				bool getIsDataConsistency()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::string clusterId_;
-				std::string orderId_;
+				bool isDataConsistency_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCERESULT_H_
+#endif // !ALIBABACLOUD_ARMS_MODEL_CHECKDATACONSISTENCYRESULT_H_

arms/include/alibabacloud/arms/model/GetConsistencySnapshotRequest.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_ARMS_MODEL_GETCONSISTENCYSNAPSHOTREQUEST_H_
+#define ALIBABACLOUD_ARMS_MODEL_GETCONSISTENCYSNAPSHOTREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/arms/ARMSExport.h>
+
+namespace AlibabaCloud
+{
+	namespace ARMS
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ARMS_EXPORT GetConsistencySnapshotRequest : public RpcServiceRequest
+			{
+
+			public:
+				GetConsistencySnapshotRequest();
+				~GetConsistencySnapshotRequest();
+
+				long getCurrentTimestamp()const;
+				void setCurrentTimestamp(long currentTimestamp);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getAppType()const;
+				void setAppType(const std::string& appType);
+				std::string getPid()const;
+				void setPid(const std::string& pid);
+				std::string getProxyUserId()const;
+				void setProxyUserId(const std::string& proxyUserId);
+
+            private:
+				long currentTimestamp_;
+				std::string regionId_;
+				std::string appType_;
+				std::string pid_;
+				std::string proxyUserId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ARMS_MODEL_GETCONSISTENCYSNAPSHOTREQUEST_H_

arms/include/alibabacloud/arms/model/GetConsistencySnapshotResult.h

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_ARMS_MODEL_GETCONSISTENCYSNAPSHOTRESULT_H_
+#define ALIBABACLOUD_ARMS_MODEL_GETCONSISTENCYSNAPSHOTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/arms/ARMSExport.h>
+
+namespace AlibabaCloud
+{
+	namespace ARMS
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ARMS_EXPORT GetConsistencySnapshotResult : public ServiceResult
+			{
+			public:
+				struct ConsistencyResult
+				{
+					struct SlsShardWatermarkBean
+					{
+						struct CheckPointResponse
+						{
+							std::string consumer;
+							long updateTime;
+							int shard;
+							std::string checkPoint;
+						};
+						std::string userId;
+						std::vector<CheckPointResponse> checkPointResponses;
+						std::string pid;
+						std::vector<std::string> cursorUpdateTimes;
+						std::string regionId;
+						std::string appType;
+					};
+					struct AgentHeartbeatInfo
+					{
+						long startTimestamp;
+						std::string agentVersion;
+						std::string ip;
+						std::string hostname;
+						long lastHeartbeatTime;
+						std::string pid;
+						std::string regionId;
+						std::string appType;
+						std::string procId;
+					};
+					long lastSlsShardWatermarkTimestamp;
+					long lastAgentInfoTimestamp;
+					long judgeTimestamp;
+					SlsShardWatermarkBean slsShardWatermarkBean;
+					std::string barrierPointsLastTimestampMap;
+					long lastBarrierTimestamp;
+					std::vector<AgentHeartbeatInfo> agentHeartbeatInfos;
+				};
+
+
+				GetConsistencySnapshotResult();
+				explicit GetConsistencySnapshotResult(const std::string &payload);
+				~GetConsistencySnapshotResult();
+				ConsistencyResult getConsistencyResult()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				ConsistencyResult consistencyResult_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ARMS_MODEL_GETCONSISTENCYSNAPSHOTRESULT_H_

arms/include/alibabacloud/arms/model/ListDashboardsRequest.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_ARMS_MODEL_LISTDASHBOARDSREQUEST_H_
+#define ALIBABACLOUD_ARMS_MODEL_LISTDASHBOARDSREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/arms/ARMSExport.h>
+
+namespace AlibabaCloud
+{
+	namespace ARMS
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ARMS_EXPORT ListDashboardsRequest : public RpcServiceRequest
+			{
+
+			public:
+				ListDashboardsRequest();
+				~ListDashboardsRequest();
+
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getClusterId()const;
+				void setClusterId(const std::string& clusterId);
+
+            private:
+				std::string regionId_;
+				std::string clusterId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ARMS_MODEL_LISTDASHBOARDSREQUEST_H_

arms/include/alibabacloud/arms/model/ListDashboardsResult.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_ARMS_MODEL_LISTDASHBOARDSRESULT_H_
+#define ALIBABACLOUD_ARMS_MODEL_LISTDASHBOARDSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/arms/ARMSExport.h>
+
+namespace AlibabaCloud
+{
+	namespace ARMS
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ARMS_EXPORT ListDashboardsResult : public ServiceResult
+			{
+			public:
+				struct DashboardVosItem
+				{
+					std::string uid;
+					std::string type;
+					std::string title;
+					std::string time;
+					std::string id;
+					std::string exporter;
+					std::string url;
+					std::vector<std::string> tags;
+					bool isArmsExporter;
+				};
+
+
+				ListDashboardsResult();
+				explicit ListDashboardsResult(const std::string &payload);
+				~ListDashboardsResult();
+				std::vector<DashboardVosItem> getDashboardVos()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<DashboardVosItem> dashboardVos_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ARMS_MODEL_LISTDASHBOARDSRESULT_H_

arms/include/alibabacloud/arms/model/QueryMetricRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				QueryMetricRequest();
 				~QueryMetricRequest();
 
+				std::string getConsistencyQueryStrategy()const;
+				void setConsistencyQueryStrategy(const std::string& consistencyQueryStrategy);
 				long getEndTime()const;
 				void setEndTime(long endTime);
 				std::string getOrderBy()const;
@@ -49,6 +51,8 @@ namespace AlibabaCloud
 				void setStartTime(long startTime);
 				std::vector<Filters> getFilters()const;
 				void setFilters(const std::vector<Filters>& filters);
+				std::string getConsistencyDataKey()const;
+				void setConsistencyDataKey(const std::string& consistencyDataKey);
 				std::string getProxyUserId()const;
 				void setProxyUserId(const std::string& proxyUserId);
 				std::vector<std::string> getMeasures()const;
@@ -65,10 +69,12 @@ namespace AlibabaCloud
 				void setOrder(const std::string& order);
 
             private:
+				std::string consistencyQueryStrategy_;
 				long endTime_;
 				std::string orderBy_;
 				long startTime_;
 				std::vector<Filters> filters_;
+				std::string consistencyDataKey_;
 				std::string proxyUserId_;
 				std::vector<std::string> measures_;
 				int intervalInSec_;

arms/src/ARMSClient.cc

@@ -123,6 +123,42 @@ ARMSClient::AddIntegrationOutcomeCallable ARMSClient::addIntegrationCallable(con
 	return task->get_future();
 }
 
+ARMSClient::CheckDataConsistencyOutcome ARMSClient::checkDataConsistency(const CheckDataConsistencyRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return CheckDataConsistencyOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return CheckDataConsistencyOutcome(CheckDataConsistencyResult(outcome.result()));
+	else
+		return CheckDataConsistencyOutcome(outcome.error());
+}
+
+void ARMSClient::checkDataConsistencyAsync(const CheckDataConsistencyRequest& request, const CheckDataConsistencyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, checkDataConsistency(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ARMSClient::CheckDataConsistencyOutcomeCallable ARMSClient::checkDataConsistencyCallable(const CheckDataConsistencyRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<CheckDataConsistencyOutcome()>>(
+			[this, request]()
+			{
+			return this->checkDataConsistency(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ARMSClient::CreateAlertContactOutcome ARMSClient::createAlertContact(const CreateAlertContactRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -375,6 +411,42 @@ ARMSClient::DeleteRetcodeAppOutcomeCallable ARMSClient::deleteRetcodeAppCallable
 	return task->get_future();
 }
 
+ARMSClient::GetConsistencySnapshotOutcome ARMSClient::getConsistencySnapshot(const GetConsistencySnapshotRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return GetConsistencySnapshotOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return GetConsistencySnapshotOutcome(GetConsistencySnapshotResult(outcome.result()));
+	else
+		return GetConsistencySnapshotOutcome(outcome.error());
+}
+
+void ARMSClient::getConsistencySnapshotAsync(const GetConsistencySnapshotRequest& request, const GetConsistencySnapshotAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, getConsistencySnapshot(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ARMSClient::GetConsistencySnapshotOutcomeCallable ARMSClient::getConsistencySnapshotCallable(const GetConsistencySnapshotRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<GetConsistencySnapshotOutcome()>>(
+			[this, request]()
+			{
+			return this->getConsistencySnapshot(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ARMSClient::GetPrometheusApiTokenOutcome ARMSClient::getPrometheusApiToken(const GetPrometheusApiTokenRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -591,6 +663,42 @@ ARMSClient::ListClusterFromGrafanaOutcomeCallable ARMSClient::listClusterFromGra
 	return task->get_future();
 }
 
+ARMSClient::ListDashboardsOutcome ARMSClient::listDashboards(const ListDashboardsRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ListDashboardsOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ListDashboardsOutcome(ListDashboardsResult(outcome.result()));
+	else
+		return ListDashboardsOutcome(outcome.error());
+}
+
+void ARMSClient::listDashboardsAsync(const ListDashboardsRequest& request, const ListDashboardsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, listDashboards(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ARMSClient::ListDashboardsOutcomeCallable ARMSClient::listDashboardsCallable(const ListDashboardsRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ListDashboardsOutcome()>>(
+			[this, request]()
+			{
+			return this->listDashboards(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ARMSClient::ListPromClustersOutcome ARMSClient::listPromClusters(const ListPromClustersRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

arms/src/model/CheckDataConsistencyRequest.cc

@@ -0,0 +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.
+ */
+
+#include <alibabacloud/arms/model/CheckDataConsistencyRequest.h>
+
+using AlibabaCloud::ARMS::Model::CheckDataConsistencyRequest;
+
+CheckDataConsistencyRequest::CheckDataConsistencyRequest() :
+	RpcServiceRequest("arms", "2019-08-08", "CheckDataConsistency")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+CheckDataConsistencyRequest::~CheckDataConsistencyRequest()
+{}
+
+long CheckDataConsistencyRequest::getCurrentTimestamp()const
+{
+	return currentTimestamp_;
+}
+
+void CheckDataConsistencyRequest::setCurrentTimestamp(long currentTimestamp)
+{
+	currentTimestamp_ = currentTimestamp;
+	setParameter("CurrentTimestamp", std::to_string(currentTimestamp));
+}
+
+std::string CheckDataConsistencyRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void CheckDataConsistencyRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string CheckDataConsistencyRequest::getAppType()const
+{
+	return appType_;
+}
+
+void CheckDataConsistencyRequest::setAppType(const std::string& appType)
+{
+	appType_ = appType;
+	setParameter("AppType", appType);
+}
+
+std::string CheckDataConsistencyRequest::getPid()const
+{
+	return pid_;
+}
+
+void CheckDataConsistencyRequest::setPid(const std::string& pid)
+{
+	pid_ = pid;
+	setParameter("Pid", pid);
+}
+
+std::string CheckDataConsistencyRequest::getProxyUserId()const
+{
+	return proxyUserId_;
+}
+
+void CheckDataConsistencyRequest::setProxyUserId(const std::string& proxyUserId)
+{
+	proxyUserId_ = proxyUserId;
+	setParameter("ProxyUserId", proxyUserId);
+}
+

arms/src/model/CheckDataConsistencyResult.cc

@@ -14,45 +14,38 @@
  * limitations under the License.
  */
 
-#include <alibabacloud/hbase/model/CreateInstanceResult.h>
+#include <alibabacloud/arms/model/CheckDataConsistencyResult.h>
 #include <json/json.h>
 
-using namespace AlibabaCloud::HBase;
-using namespace AlibabaCloud::HBase::Model;
+using namespace AlibabaCloud::ARMS;
+using namespace AlibabaCloud::ARMS::Model;
 
-CreateInstanceResult::CreateInstanceResult() :
+CheckDataConsistencyResult::CheckDataConsistencyResult() :
 	ServiceResult()
 {}
 
-CreateInstanceResult::CreateInstanceResult(const std::string &payload) :
+CheckDataConsistencyResult::CheckDataConsistencyResult(const std::string &payload) :
 	ServiceResult()
 {
 	parse(payload);
 }
 
-CreateInstanceResult::~CreateInstanceResult()
+CheckDataConsistencyResult::~CheckDataConsistencyResult()
 {}
 
-void CreateInstanceResult::parse(const std::string &payload)
+void CheckDataConsistencyResult::parse(const std::string &payload)
 {
 	Json::Reader reader;
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	if(!value["ClusterId"].isNull())
-		clusterId_ = value["ClusterId"].asString();
-	if(!value["OrderId"].isNull())
-		orderId_ = value["OrderId"].asString();
+	if(!value["IsDataConsistency"].isNull())
+		isDataConsistency_ = value["IsDataConsistency"].asString() == "true";
 
 }
 
-std::string CreateInstanceResult::getClusterId()const
+bool CheckDataConsistencyResult::getIsDataConsistency()const
 {
-	return clusterId_;
-}
-
-std::string CreateInstanceResult::getOrderId()const
-{
-	return orderId_;
+	return isDataConsistency_;
 }
 

arms/src/model/GetConsistencySnapshotRequest.cc

@@ -0,0 +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.
+ */
+
+#include <alibabacloud/arms/model/GetConsistencySnapshotRequest.h>
+
+using AlibabaCloud::ARMS::Model::GetConsistencySnapshotRequest;
+
+GetConsistencySnapshotRequest::GetConsistencySnapshotRequest() :
+	RpcServiceRequest("arms", "2019-08-08", "GetConsistencySnapshot")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+GetConsistencySnapshotRequest::~GetConsistencySnapshotRequest()
+{}
+
+long GetConsistencySnapshotRequest::getCurrentTimestamp()const
+{
+	return currentTimestamp_;
+}
+
+void GetConsistencySnapshotRequest::setCurrentTimestamp(long currentTimestamp)
+{
+	currentTimestamp_ = currentTimestamp;
+	setParameter("CurrentTimestamp", std::to_string(currentTimestamp));
+}
+
+std::string GetConsistencySnapshotRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void GetConsistencySnapshotRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string GetConsistencySnapshotRequest::getAppType()const
+{
+	return appType_;
+}
+
+void GetConsistencySnapshotRequest::setAppType(const std::string& appType)
+{
+	appType_ = appType;
+	setParameter("AppType", appType);
+}
+
+std::string GetConsistencySnapshotRequest::getPid()const
+{
+	return pid_;
+}
+
+void GetConsistencySnapshotRequest::setPid(const std::string& pid)
+{
+	pid_ = pid;
+	setParameter("Pid", pid);
+}
+
+std::string GetConsistencySnapshotRequest::getProxyUserId()const
+{
+	return proxyUserId_;
+}
+
+void GetConsistencySnapshotRequest::setProxyUserId(const std::string& proxyUserId)
+{
+	proxyUserId_ = proxyUserId;
+	setParameter("ProxyUserId", proxyUserId);
+}
+

arms/src/model/GetConsistencySnapshotResult.cc

@@ -0,0 +1,110 @@
+/*
+ * 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/arms/model/GetConsistencySnapshotResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::ARMS;
+using namespace AlibabaCloud::ARMS::Model;
+
+GetConsistencySnapshotResult::GetConsistencySnapshotResult() :
+	ServiceResult()
+{}
+
+GetConsistencySnapshotResult::GetConsistencySnapshotResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+GetConsistencySnapshotResult::~GetConsistencySnapshotResult()
+{}
+
+void GetConsistencySnapshotResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto consistencyResultNode = value["ConsistencyResult"];
+	if(!consistencyResultNode["JudgeTimestamp"].isNull())
+		consistencyResult_.judgeTimestamp = std::stol(consistencyResultNode["JudgeTimestamp"].asString());
+	if(!consistencyResultNode["LastSlsShardWatermarkTimestamp"].isNull())
+		consistencyResult_.lastSlsShardWatermarkTimestamp = std::stol(consistencyResultNode["LastSlsShardWatermarkTimestamp"].asString());
+	if(!consistencyResultNode["LastAgentInfoTimestamp"].isNull())
+		consistencyResult_.lastAgentInfoTimestamp = std::stol(consistencyResultNode["LastAgentInfoTimestamp"].asString());
+	if(!consistencyResultNode["BarrierPointsLastTimestampMap"].isNull())
+		consistencyResult_.barrierPointsLastTimestampMap = consistencyResultNode["BarrierPointsLastTimestampMap"].asString();
+	if(!consistencyResultNode["LastBarrierTimestamp"].isNull())
+		consistencyResult_.lastBarrierTimestamp = std::stol(consistencyResultNode["LastBarrierTimestamp"].asString());
+	auto allAgentHeartbeatInfosNode = consistencyResultNode["AgentHeartbeatInfos"]["AgentHeartbeatInfo"];
+	for (auto consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo : allAgentHeartbeatInfosNode)
+	{
+		ConsistencyResult::AgentHeartbeatInfo agentHeartbeatInfoObject;
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["RegionId"].isNull())
+			agentHeartbeatInfoObject.regionId = consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["RegionId"].asString();
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["AppType"].isNull())
+			agentHeartbeatInfoObject.appType = consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["AppType"].asString();
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["Pid"].isNull())
+			agentHeartbeatInfoObject.pid = consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["Pid"].asString();
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["Ip"].isNull())
+			agentHeartbeatInfoObject.ip = consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["Ip"].asString();
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["StartTimestamp"].isNull())
+			agentHeartbeatInfoObject.startTimestamp = std::stol(consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["StartTimestamp"].asString());
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["Hostname"].isNull())
+			agentHeartbeatInfoObject.hostname = consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["Hostname"].asString();
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["ProcId"].isNull())
+			agentHeartbeatInfoObject.procId = consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["ProcId"].asString();
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["AgentVersion"].isNull())
+			agentHeartbeatInfoObject.agentVersion = consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["AgentVersion"].asString();
+		if(!consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["LastHeartbeatTime"].isNull())
+			agentHeartbeatInfoObject.lastHeartbeatTime = std::stol(consistencyResultNodeAgentHeartbeatInfosAgentHeartbeatInfo["LastHeartbeatTime"].asString());
+		consistencyResult_.agentHeartbeatInfos.push_back(agentHeartbeatInfoObject);
+	}
+	auto slsShardWatermarkBeanNode = consistencyResultNode["SlsShardWatermarkBean"];
+	if(!slsShardWatermarkBeanNode["Pid"].isNull())
+		consistencyResult_.slsShardWatermarkBean.pid = slsShardWatermarkBeanNode["Pid"].asString();
+	if(!slsShardWatermarkBeanNode["UserId"].isNull())
+		consistencyResult_.slsShardWatermarkBean.userId = slsShardWatermarkBeanNode["UserId"].asString();
+	if(!slsShardWatermarkBeanNode["RegionId"].isNull())
+		consistencyResult_.slsShardWatermarkBean.regionId = slsShardWatermarkBeanNode["RegionId"].asString();
+	if(!slsShardWatermarkBeanNode["AppType"].isNull())
+		consistencyResult_.slsShardWatermarkBean.appType = slsShardWatermarkBeanNode["AppType"].asString();
+	auto allCheckPointResponsesNode = slsShardWatermarkBeanNode["CheckPointResponses"]["CheckPointResponse"];
+	for (auto slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse : allCheckPointResponsesNode)
+	{
+		ConsistencyResult::SlsShardWatermarkBean::CheckPointResponse checkPointResponseObject;
+		if(!slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["Shard"].isNull())
+			checkPointResponseObject.shard = std::stoi(slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["Shard"].asString());
+		if(!slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["CheckPoint"].isNull())
+			checkPointResponseObject.checkPoint = slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["CheckPoint"].asString();
+		if(!slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["UpdateTime"].isNull())
+			checkPointResponseObject.updateTime = std::stol(slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["UpdateTime"].asString());
+		if(!slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["Consumer"].isNull())
+			checkPointResponseObject.consumer = slsShardWatermarkBeanNodeCheckPointResponsesCheckPointResponse["Consumer"].asString();
+		consistencyResult_.slsShardWatermarkBean.checkPointResponses.push_back(checkPointResponseObject);
+	}
+		auto allCursorUpdateTimes = slsShardWatermarkBeanNode["CursorUpdateTimes"]["CursorUpdateTime"];
+		for (auto value : allCursorUpdateTimes)
+			consistencyResult_.slsShardWatermarkBean.cursorUpdateTimes.push_back(value.asString());
+
+}
+
+GetConsistencySnapshotResult::ConsistencyResult GetConsistencySnapshotResult::getConsistencyResult()const
+{
+	return consistencyResult_;
+}
+

arms/src/model/ListDashboardsRequest.cc

@@ -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.
+ */
+
+#include <alibabacloud/arms/model/ListDashboardsRequest.h>
+
+using AlibabaCloud::ARMS::Model::ListDashboardsRequest;
+
+ListDashboardsRequest::ListDashboardsRequest() :
+	RpcServiceRequest("arms", "2019-08-08", "ListDashboards")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+ListDashboardsRequest::~ListDashboardsRequest()
+{}
+
+std::string ListDashboardsRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void ListDashboardsRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string ListDashboardsRequest::getClusterId()const
+{
+	return clusterId_;
+}
+
+void ListDashboardsRequest::setClusterId(const std::string& clusterId)
+{
+	clusterId_ = clusterId;
+	setParameter("ClusterId", clusterId);
+}
+

arms/src/model/ListDashboardsResult.cc

@@ -0,0 +1,74 @@
+/*
+ * 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/arms/model/ListDashboardsResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::ARMS;
+using namespace AlibabaCloud::ARMS::Model;
+
+ListDashboardsResult::ListDashboardsResult() :
+	ServiceResult()
+{}
+
+ListDashboardsResult::ListDashboardsResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+ListDashboardsResult::~ListDashboardsResult()
+{}
+
+void ListDashboardsResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allDashboardVosNode = value["DashboardVos"]["DashboardVosItem"];
+	for (auto valueDashboardVosDashboardVosItem : allDashboardVosNode)
+	{
+		DashboardVosItem dashboardVosObject;
+		if(!valueDashboardVosDashboardVosItem["Id"].isNull())
+			dashboardVosObject.id = valueDashboardVosDashboardVosItem["Id"].asString();
+		if(!valueDashboardVosDashboardVosItem["Uid"].isNull())
+			dashboardVosObject.uid = valueDashboardVosDashboardVosItem["Uid"].asString();
+		if(!valueDashboardVosDashboardVosItem["Title"].isNull())
+			dashboardVosObject.title = valueDashboardVosDashboardVosItem["Title"].asString();
+		if(!valueDashboardVosDashboardVosItem["Time"].isNull())
+			dashboardVosObject.time = valueDashboardVosDashboardVosItem["Time"].asString();
+		if(!valueDashboardVosDashboardVosItem["Url"].isNull())
+			dashboardVosObject.url = valueDashboardVosDashboardVosItem["Url"].asString();
+		if(!valueDashboardVosDashboardVosItem["Type"].isNull())
+			dashboardVosObject.type = valueDashboardVosDashboardVosItem["Type"].asString();
+		if(!valueDashboardVosDashboardVosItem["Exporter"].isNull())
+			dashboardVosObject.exporter = valueDashboardVosDashboardVosItem["Exporter"].asString();
+		if(!valueDashboardVosDashboardVosItem["IsArmsExporter"].isNull())
+			dashboardVosObject.isArmsExporter = valueDashboardVosDashboardVosItem["IsArmsExporter"].asString() == "true";
+		auto allTags = value["Tags"]["Tags"];
+		for (auto value : allTags)
+			dashboardVosObject.tags.push_back(value.asString());
+		dashboardVos_.push_back(dashboardVosObject);
+	}
+
+}
+
+std::vector<ListDashboardsResult::DashboardVosItem> ListDashboardsResult::getDashboardVos()const
+{
+	return dashboardVos_;
+}
+

arms/src/model/QueryMetricRequest.cc

@@ -27,6 +27,17 @@ QueryMetricRequest::QueryMetricRequest() :
 QueryMetricRequest::~QueryMetricRequest()
 {}
 
+std::string QueryMetricRequest::getConsistencyQueryStrategy()const
+{
+	return consistencyQueryStrategy_;
+}
+
+void QueryMetricRequest::setConsistencyQueryStrategy(const std::string& consistencyQueryStrategy)
+{
+	consistencyQueryStrategy_ = consistencyQueryStrategy;
+	setParameter("ConsistencyQueryStrategy", consistencyQueryStrategy);
+}
+
 long QueryMetricRequest::getEndTime()const
 {
 	return endTime_;
@@ -76,6 +87,17 @@ void QueryMetricRequest::setFilters(const std::vector<Filters>& filters)
 	}
 }
 
+std::string QueryMetricRequest::getConsistencyDataKey()const
+{
+	return consistencyDataKey_;
+}
+
+void QueryMetricRequest::setConsistencyDataKey(const std::string& consistencyDataKey)
+{
+	consistencyDataKey_ = consistencyDataKey;
+	setParameter("ConsistencyDataKey", consistencyDataKey);
+}
+
 std::string QueryMetricRequest::getProxyUserId()const
 {
 	return proxyUserId_;

cdn/CMakeLists.txt

@@ -127,10 +127,10 @@ set(cdn_public_header_model
 	include/alibabacloud/cdn/model/DescribeDomainBpsDataResult.h
 	include/alibabacloud/cdn/model/DescribeDomainBpsDataByTimeStampRequest.h
 	include/alibabacloud/cdn/model/DescribeDomainBpsDataByTimeStampResult.h
+	include/alibabacloud/cdn/model/DescribeDomainCcActivityLogRequest.h
+	include/alibabacloud/cdn/model/DescribeDomainCcActivityLogResult.h
 	include/alibabacloud/cdn/model/DescribeDomainCertificateInfoRequest.h
 	include/alibabacloud/cdn/model/DescribeDomainCertificateInfoResult.h
-	include/alibabacloud/cdn/model/DescribeDomainCnameRequest.h
-	include/alibabacloud/cdn/model/DescribeDomainCnameResult.h
 	include/alibabacloud/cdn/model/DescribeDomainConfigsRequest.h
 	include/alibabacloud/cdn/model/DescribeDomainConfigsResult.h
 	include/alibabacloud/cdn/model/DescribeDomainCustomLogConfigRequest.h
@@ -516,10 +516,10 @@ set(cdn_src
 	src/model/DescribeDomainBpsDataResult.cc
 	src/model/DescribeDomainBpsDataByTimeStampRequest.cc
 	src/model/DescribeDomainBpsDataByTimeStampResult.cc
+	src/model/DescribeDomainCcActivityLogRequest.cc
+	src/model/DescribeDomainCcActivityLogResult.cc
 	src/model/DescribeDomainCertificateInfoRequest.cc
 	src/model/DescribeDomainCertificateInfoResult.cc
-	src/model/DescribeDomainCnameRequest.cc
-	src/model/DescribeDomainCnameResult.cc
 	src/model/DescribeDomainConfigsRequest.cc
 	src/model/DescribeDomainConfigsResult.cc
 	src/model/DescribeDomainCustomLogConfigRequest.cc

cdn/include/alibabacloud/cdn/CdnClient.h

@@ -128,10 +128,10 @@
 #include "model/DescribeDomainBpsDataResult.h"
 #include "model/DescribeDomainBpsDataByTimeStampRequest.h"
 #include "model/DescribeDomainBpsDataByTimeStampResult.h"
+#include "model/DescribeDomainCcActivityLogRequest.h"
+#include "model/DescribeDomainCcActivityLogResult.h"
 #include "model/DescribeDomainCertificateInfoRequest.h"
 #include "model/DescribeDomainCertificateInfoResult.h"
-#include "model/DescribeDomainCnameRequest.h"
-#include "model/DescribeDomainCnameResult.h"
 #include "model/DescribeDomainConfigsRequest.h"
 #include "model/DescribeDomainConfigsResult.h"
 #include "model/DescribeDomainCustomLogConfigRequest.h"
@@ -576,12 +576,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDomainBpsDataByTimeStampResult> DescribeDomainBpsDataByTimeStampOutcome;
 			typedef std::future<DescribeDomainBpsDataByTimeStampOutcome> DescribeDomainBpsDataByTimeStampOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::DescribeDomainBpsDataByTimeStampRequest&, const DescribeDomainBpsDataByTimeStampOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDomainBpsDataByTimeStampAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDomainCcActivityLogResult> DescribeDomainCcActivityLogOutcome;
+			typedef std::future<DescribeDomainCcActivityLogOutcome> DescribeDomainCcActivityLogOutcomeCallable;
+			typedef std::function<void(const CdnClient*, const Model::DescribeDomainCcActivityLogRequest&, const DescribeDomainCcActivityLogOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDomainCcActivityLogAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDomainCertificateInfoResult> DescribeDomainCertificateInfoOutcome;
 			typedef std::future<DescribeDomainCertificateInfoOutcome> DescribeDomainCertificateInfoOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::DescribeDomainCertificateInfoRequest&, const DescribeDomainCertificateInfoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDomainCertificateInfoAsyncHandler;
-			typedef Outcome<Error, Model::DescribeDomainCnameResult> DescribeDomainCnameOutcome;
-			typedef std::future<DescribeDomainCnameOutcome> DescribeDomainCnameOutcomeCallable;
-			typedef std::function<void(const CdnClient*, const Model::DescribeDomainCnameRequest&, const DescribeDomainCnameOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDomainCnameAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDomainConfigsResult> DescribeDomainConfigsOutcome;
 			typedef std::future<DescribeDomainConfigsOutcome> DescribeDomainConfigsOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::DescribeDomainConfigsRequest&, const DescribeDomainConfigsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDomainConfigsAsyncHandler;
@@ -1160,12 +1160,12 @@ namespace AlibabaCloud
 			DescribeDomainBpsDataByTimeStampOutcome describeDomainBpsDataByTimeStamp(const Model::DescribeDomainBpsDataByTimeStampRequest &request)const;
 			void describeDomainBpsDataByTimeStampAsync(const Model::DescribeDomainBpsDataByTimeStampRequest& request, const DescribeDomainBpsDataByTimeStampAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDomainBpsDataByTimeStampOutcomeCallable describeDomainBpsDataByTimeStampCallable(const Model::DescribeDomainBpsDataByTimeStampRequest& request) const;
+			DescribeDomainCcActivityLogOutcome describeDomainCcActivityLog(const Model::DescribeDomainCcActivityLogRequest &request)const;
+			void describeDomainCcActivityLogAsync(const Model::DescribeDomainCcActivityLogRequest& request, const DescribeDomainCcActivityLogAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDomainCcActivityLogOutcomeCallable describeDomainCcActivityLogCallable(const Model::DescribeDomainCcActivityLogRequest& request) const;
 			DescribeDomainCertificateInfoOutcome describeDomainCertificateInfo(const Model::DescribeDomainCertificateInfoRequest &request)const;
 			void describeDomainCertificateInfoAsync(const Model::DescribeDomainCertificateInfoRequest& request, const DescribeDomainCertificateInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDomainCertificateInfoOutcomeCallable describeDomainCertificateInfoCallable(const Model::DescribeDomainCertificateInfoRequest& request) const;
-			DescribeDomainCnameOutcome describeDomainCname(const Model::DescribeDomainCnameRequest &request)const;
-			void describeDomainCnameAsync(const Model::DescribeDomainCnameRequest& request, const DescribeDomainCnameAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeDomainCnameOutcomeCallable describeDomainCnameCallable(const Model::DescribeDomainCnameRequest& request) const;
 			DescribeDomainConfigsOutcome describeDomainConfigs(const Model::DescribeDomainConfigsRequest &request)const;
 			void describeDomainConfigsAsync(const Model::DescribeDomainConfigsRequest& request, const DescribeDomainConfigsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDomainConfigsOutcomeCallable describeDomainConfigsCallable(const Model::DescribeDomainConfigsRequest& request) const;

cdn/include/alibabacloud/cdn/model/AddLiveAppRecordConfigRequest.h

@@ -35,28 +35,28 @@ namespace AlibabaCloud
 				AddLiveAppRecordConfigRequest();
 				~AddLiveAppRecordConfigRequest();
 
-				std::string getOssBucket()const;
-				void setOssBucket(const std::string& ossBucket);
-				std::string getDomainName()const;
-				void setDomainName(const std::string& domainName);
 				std::string getOssEndpoint()const;
 				void setOssEndpoint(const std::string& ossEndpoint);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
 				std::string getAppName()const;
 				void setAppName(const std::string& appName);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
+				std::string getOssBucket()const;
+				void setOssBucket(const std::string& ossBucket);
+				std::string getDomainName()const;
+				void setDomainName(const std::string& domainName);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
 				std::string getOssObjectPrefix()const;
 				void setOssObjectPrefix(const std::string& ossObjectPrefix);
 
             private:
-				std::string ossBucket_;
-				std::string domainName_;
 				std::string ossEndpoint_;
-				long ownerId_;
 				std::string appName_;
 				std::string securityToken_;
+				std::string ossBucket_;
+				std::string domainName_;
+				long ownerId_;
 				std::string ossObjectPrefix_;
 
 			};

cdn/include/alibabacloud/cdn/model/DeleteLiveStreamTranscodeRequest.h

@@ -37,23 +37,23 @@ namespace AlibabaCloud
 
 				std::string get_Template()const;
 				void set_Template(const std::string& _template);
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
 				std::string getApp()const;
 				void setApp(const std::string& app);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getSecurityToken()const;
-				void setSecurityToken(const std::string& securityToken);
 				std::string getDomain()const;
 				void setDomain(const std::string& domain);
 
             private:
 				std::string _template_;
+				std::string securityToken_;
 				std::string app_;
 				std::string ownerAccount_;
 				long ownerId_;
-				std::string securityToken_;
 				std::string domain_;
 
 			};

cdn/include/alibabacloud/cdn/model/DescribeDomainCcActivityLogRequest.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_CDN_MODEL_DESCRIBEDOMAINCCACTIVITYLOGREQUEST_H_
+#define ALIBABACLOUD_CDN_MODEL_DESCRIBEDOMAINCCACTIVITYLOGREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/cdn/CdnExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cdn
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CDN_EXPORT DescribeDomainCcActivityLogRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeDomainCcActivityLogRequest();
+				~DescribeDomainCcActivityLogRequest();
+
+				std::string getRuleName()const;
+				void setRuleName(const std::string& ruleName);
+				std::string getStartTime()const;
+				void setStartTime(const std::string& startTime);
+				std::string getTriggerObject()const;
+				void setTriggerObject(const std::string& triggerObject);
+				long getPageNumber()const;
+				void setPageNumber(long pageNumber);
+				long getPageSize()const;
+				void setPageSize(long pageSize);
+				std::string getValue()const;
+				void setValue(const std::string& value);
+				std::string getDomainName()const;
+				void setDomainName(const std::string& domainName);
+				std::string getEndTime()const;
+				void setEndTime(const std::string& endTime);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+
+            private:
+				std::string ruleName_;
+				std::string startTime_;
+				std::string triggerObject_;
+				long pageNumber_;
+				long pageSize_;
+				std::string value_;
+				std::string domainName_;
+				std::string endTime_;
+				long ownerId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CDN_MODEL_DESCRIBEDOMAINCCACTIVITYLOGREQUEST_H_

cdn/include/alibabacloud/cdn/model/DescribeDomainCcActivityLogResult.h

@@ -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.
+ */
+
+#ifndef ALIBABACLOUD_CDN_MODEL_DESCRIBEDOMAINCCACTIVITYLOGRESULT_H_
+#define ALIBABACLOUD_CDN_MODEL_DESCRIBEDOMAINCCACTIVITYLOGRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/cdn/CdnExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cdn
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CDN_EXPORT DescribeDomainCcActivityLogResult : public ServiceResult
+			{
+			public:
+				struct LogInfo
+				{
+					std::string action;
+					std::string domainName;
+					std::string value;
+					std::string triggerObject;
+					long ttl;
+					std::string timeStamp;
+					std::string ruleName;
+				};
+
+
+				DescribeDomainCcActivityLogResult();
+				explicit DescribeDomainCcActivityLogResult(const std::string &payload);
+				~DescribeDomainCcActivityLogResult();
+				long getPageSize()const;
+				long getTotal()const;
+				std::vector<LogInfo> getActivityLog()const;
+				long getPageIndex()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				long pageSize_;
+				long total_;
+				std::vector<LogInfo> activityLog_;
+				long pageIndex_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CDN_MODEL_DESCRIBEDOMAINCCACTIVITYLOGRESULT_H_

cdn/include/alibabacloud/cdn/model/ModifyPathCacheExpiredConfigRequest.h

@@ -35,6 +35,8 @@ namespace AlibabaCloud
 				ModifyPathCacheExpiredConfigRequest();
 				~ModifyPathCacheExpiredConfigRequest();
 
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
 				std::string getDomainName()const;
 				void setDomainName(const std::string& domainName);
 				std::string getWeight()const;
@@ -45,18 +47,16 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				std::string getTTL()const;
 				void setTTL(const std::string& tTL);
-				std::string getSecurityToken()const;
-				void setSecurityToken(const std::string& securityToken);
 				std::string getConfigID()const;
 				void setConfigID(const std::string& configID);
 
             private:
+				std::string securityToken_;
 				std::string domainName_;
 				std::string weight_;
 				std::string cacheContent_;
 				long ownerId_;
 				std::string tTL_;
-				std::string securityToken_;
 				std::string configID_;
 
 			};

cdn/src/CdnClient.cc

@@ -1959,6 +1959,42 @@ CdnClient::DescribeDomainBpsDataByTimeStampOutcomeCallable CdnClient::describeDo
 	return task->get_future();
 }
 
+CdnClient::DescribeDomainCcActivityLogOutcome CdnClient::describeDomainCcActivityLog(const DescribeDomainCcActivityLogRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeDomainCcActivityLogOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeDomainCcActivityLogOutcome(DescribeDomainCcActivityLogResult(outcome.result()));
+	else
+		return DescribeDomainCcActivityLogOutcome(outcome.error());
+}
+
+void CdnClient::describeDomainCcActivityLogAsync(const DescribeDomainCcActivityLogRequest& request, const DescribeDomainCcActivityLogAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeDomainCcActivityLog(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+CdnClient::DescribeDomainCcActivityLogOutcomeCallable CdnClient::describeDomainCcActivityLogCallable(const DescribeDomainCcActivityLogRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeDomainCcActivityLogOutcome()>>(
+			[this, request]()
+			{
+			return this->describeDomainCcActivityLog(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 CdnClient::DescribeDomainCertificateInfoOutcome CdnClient::describeDomainCertificateInfo(const DescribeDomainCertificateInfoRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1995,42 +2031,6 @@ CdnClient::DescribeDomainCertificateInfoOutcomeCallable CdnClient::describeDomai
 	return task->get_future();
 }
 
-CdnClient::DescribeDomainCnameOutcome CdnClient::describeDomainCname(const DescribeDomainCnameRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeDomainCnameOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeDomainCnameOutcome(DescribeDomainCnameResult(outcome.result()));
-	else
-		return DescribeDomainCnameOutcome(outcome.error());
-}
-
-void CdnClient::describeDomainCnameAsync(const DescribeDomainCnameRequest& request, const DescribeDomainCnameAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeDomainCname(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-CdnClient::DescribeDomainCnameOutcomeCallable CdnClient::describeDomainCnameCallable(const DescribeDomainCnameRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeDomainCnameOutcome()>>(
-			[this, request]()
-			{
-			return this->describeDomainCname(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 CdnClient::DescribeDomainConfigsOutcome CdnClient::describeDomainConfigs(const DescribeDomainConfigsRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

cdn/src/model/AddLiveAppRecordConfigRequest.cc

@@ -27,28 +27,6 @@ AddLiveAppRecordConfigRequest::AddLiveAppRecordConfigRequest() :
 AddLiveAppRecordConfigRequest::~AddLiveAppRecordConfigRequest()
 {}
 
-std::string AddLiveAppRecordConfigRequest::getOssBucket()const
-{
-	return ossBucket_;
-}
-
-void AddLiveAppRecordConfigRequest::setOssBucket(const std::string& ossBucket)
-{
-	ossBucket_ = ossBucket;
-	setParameter("OssBucket", ossBucket);
-}
-
-std::string AddLiveAppRecordConfigRequest::getDomainName()const
-{
-	return domainName_;
-}
-
-void AddLiveAppRecordConfigRequest::setDomainName(const std::string& domainName)
-{
-	domainName_ = domainName;
-	setParameter("DomainName", domainName);
-}
-
 std::string AddLiveAppRecordConfigRequest::getOssEndpoint()const
 {
 	return ossEndpoint_;
@@ -60,17 +38,6 @@ void AddLiveAppRecordConfigRequest::setOssEndpoint(const std::string& ossEndpoin
 	setParameter("OssEndpoint", ossEndpoint);
 }
 
-long AddLiveAppRecordConfigRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void AddLiveAppRecordConfigRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
 std::string AddLiveAppRecordConfigRequest::getAppName()const
 {
 	return appName_;
@@ -93,6 +60,39 @@ void AddLiveAppRecordConfigRequest::setSecurityToken(const std::string& security
 	setParameter("SecurityToken", securityToken);
 }
 
+std::string AddLiveAppRecordConfigRequest::getOssBucket()const
+{
+	return ossBucket_;
+}
+
+void AddLiveAppRecordConfigRequest::setOssBucket(const std::string& ossBucket)
+{
+	ossBucket_ = ossBucket;
+	setParameter("OssBucket", ossBucket);
+}
+
+std::string AddLiveAppRecordConfigRequest::getDomainName()const
+{
+	return domainName_;
+}
+
+void AddLiveAppRecordConfigRequest::setDomainName(const std::string& domainName)
+{
+	domainName_ = domainName;
+	setParameter("DomainName", domainName);
+}
+
+long AddLiveAppRecordConfigRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void AddLiveAppRecordConfigRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
 std::string AddLiveAppRecordConfigRequest::getOssObjectPrefix()const
 {
 	return ossObjectPrefix_;

cdn/src/model/DeleteLiveStreamTranscodeRequest.cc

@@ -38,6 +38,17 @@ void DeleteLiveStreamTranscodeRequest::set_Template(const std::string& _template
 	setParameter("_Template", _template);
 }
 
+std::string DeleteLiveStreamTranscodeRequest::getSecurityToken()const
+{
+	return securityToken_;
+}
+
+void DeleteLiveStreamTranscodeRequest::setSecurityToken(const std::string& securityToken)
+{
+	securityToken_ = securityToken;
+	setParameter("SecurityToken", securityToken);
+}
+
 std::string DeleteLiveStreamTranscodeRequest::getApp()const
 {
 	return app_;
@@ -71,17 +82,6 @@ void DeleteLiveStreamTranscodeRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
-std::string DeleteLiveStreamTranscodeRequest::getSecurityToken()const
-{
-	return securityToken_;
-}
-
-void DeleteLiveStreamTranscodeRequest::setSecurityToken(const std::string& securityToken)
-{
-	securityToken_ = securityToken;
-	setParameter("SecurityToken", securityToken);
-}
-
 std::string DeleteLiveStreamTranscodeRequest::getDomain()const
 {
 	return domain_;

cdn/src/model/DescribeDomainCcActivityLogRequest.cc

@@ -0,0 +1,128 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/cdn/model/DescribeDomainCcActivityLogRequest.h>
+
+using AlibabaCloud::Cdn::Model::DescribeDomainCcActivityLogRequest;
+
+DescribeDomainCcActivityLogRequest::DescribeDomainCcActivityLogRequest() :
+	RpcServiceRequest("cdn", "2018-05-10", "DescribeDomainCcActivityLog")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeDomainCcActivityLogRequest::~DescribeDomainCcActivityLogRequest()
+{}
+
+std::string DescribeDomainCcActivityLogRequest::getRuleName()const
+{
+	return ruleName_;
+}
+
+void DescribeDomainCcActivityLogRequest::setRuleName(const std::string& ruleName)
+{
+	ruleName_ = ruleName;
+	setParameter("RuleName", ruleName);
+}
+
+std::string DescribeDomainCcActivityLogRequest::getStartTime()const
+{
+	return startTime_;
+}
+
+void DescribeDomainCcActivityLogRequest::setStartTime(const std::string& startTime)
+{
+	startTime_ = startTime;
+	setParameter("StartTime", startTime);
+}
+
+std::string DescribeDomainCcActivityLogRequest::getTriggerObject()const
+{
+	return triggerObject_;
+}
+
+void DescribeDomainCcActivityLogRequest::setTriggerObject(const std::string& triggerObject)
+{
+	triggerObject_ = triggerObject;
+	setParameter("TriggerObject", triggerObject);
+}
+
+long DescribeDomainCcActivityLogRequest::getPageNumber()const
+{
+	return pageNumber_;
+}
+
+void DescribeDomainCcActivityLogRequest::setPageNumber(long pageNumber)
+{
+	pageNumber_ = pageNumber;
+	setParameter("PageNumber", std::to_string(pageNumber));
+}
+
+long DescribeDomainCcActivityLogRequest::getPageSize()const
+{
+	return pageSize_;
+}
+
+void DescribeDomainCcActivityLogRequest::setPageSize(long pageSize)
+{
+	pageSize_ = pageSize;
+	setParameter("PageSize", std::to_string(pageSize));
+}
+
+std::string DescribeDomainCcActivityLogRequest::getValue()const
+{
+	return value_;
+}
+
+void DescribeDomainCcActivityLogRequest::setValue(const std::string& value)
+{
+	value_ = value;
+	setParameter("Value", value);
+}
+
+std::string DescribeDomainCcActivityLogRequest::getDomainName()const
+{
+	return domainName_;
+}
+
+void DescribeDomainCcActivityLogRequest::setDomainName(const std::string& domainName)
+{
+	domainName_ = domainName;
+	setParameter("DomainName", domainName);
+}
+
+std::string DescribeDomainCcActivityLogRequest::getEndTime()const
+{
+	return endTime_;
+}
+
+void DescribeDomainCcActivityLogRequest::setEndTime(const std::string& endTime)
+{
+	endTime_ = endTime;
+	setParameter("EndTime", endTime);
+}
+
+long DescribeDomainCcActivityLogRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeDomainCcActivityLogRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+

cdn/src/model/DescribeDomainCcActivityLogResult.cc

@@ -0,0 +1,90 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/cdn/model/DescribeDomainCcActivityLogResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Cdn;
+using namespace AlibabaCloud::Cdn::Model;
+
+DescribeDomainCcActivityLogResult::DescribeDomainCcActivityLogResult() :
+	ServiceResult()
+{}
+
+DescribeDomainCcActivityLogResult::DescribeDomainCcActivityLogResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeDomainCcActivityLogResult::~DescribeDomainCcActivityLogResult()
+{}
+
+void DescribeDomainCcActivityLogResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allActivityLogNode = value["ActivityLog"]["LogInfo"];
+	for (auto valueActivityLogLogInfo : allActivityLogNode)
+	{
+		LogInfo activityLogObject;
+		if(!valueActivityLogLogInfo["TimeStamp"].isNull())
+			activityLogObject.timeStamp = valueActivityLogLogInfo["TimeStamp"].asString();
+		if(!valueActivityLogLogInfo["Value"].isNull())
+			activityLogObject.value = valueActivityLogLogInfo["Value"].asString();
+		if(!valueActivityLogLogInfo["TriggerObject"].isNull())
+			activityLogObject.triggerObject = valueActivityLogLogInfo["TriggerObject"].asString();
+		if(!valueActivityLogLogInfo["DomainName"].isNull())
+			activityLogObject.domainName = valueActivityLogLogInfo["DomainName"].asString();
+		if(!valueActivityLogLogInfo["Ttl"].isNull())
+			activityLogObject.ttl = std::stol(valueActivityLogLogInfo["Ttl"].asString());
+		if(!valueActivityLogLogInfo["Action"].isNull())
+			activityLogObject.action = valueActivityLogLogInfo["Action"].asString();
+		if(!valueActivityLogLogInfo["RuleName"].isNull())
+			activityLogObject.ruleName = valueActivityLogLogInfo["RuleName"].asString();
+		activityLog_.push_back(activityLogObject);
+	}
+	if(!value["PageIndex"].isNull())
+		pageIndex_ = std::stol(value["PageIndex"].asString());
+	if(!value["PageSize"].isNull())
+		pageSize_ = std::stol(value["PageSize"].asString());
+	if(!value["Total"].isNull())
+		total_ = std::stol(value["Total"].asString());
+
+}
+
+long DescribeDomainCcActivityLogResult::getPageSize()const
+{
+	return pageSize_;
+}
+
+long DescribeDomainCcActivityLogResult::getTotal()const
+{
+	return total_;
+}
+
+std::vector<DescribeDomainCcActivityLogResult::LogInfo> DescribeDomainCcActivityLogResult::getActivityLog()const
+{
+	return activityLog_;
+}
+
+long DescribeDomainCcActivityLogResult::getPageIndex()const
+{
+	return pageIndex_;
+}
+

cdn/src/model/DescribeDomainCnameRequest.cc

@@ -1,51 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/cdn/model/DescribeDomainCnameRequest.h>
-
-using AlibabaCloud::Cdn::Model::DescribeDomainCnameRequest;
-
-DescribeDomainCnameRequest::DescribeDomainCnameRequest() :
-	RpcServiceRequest("cdn", "2014-11-11", "DescribeDomainCname")
-{
-	setMethod(HttpRequest::Method::Get);
-}
-
-DescribeDomainCnameRequest::~DescribeDomainCnameRequest()
-{}
-
-std::string DescribeDomainCnameRequest::getDomainName()const
-{
-	return domainName_;
-}
-
-void DescribeDomainCnameRequest::setDomainName(const std::string& domainName)
-{
-	domainName_ = domainName;
-	setParameter("DomainName", domainName);
-}
-
-long DescribeDomainCnameRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void DescribeDomainCnameRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-

cdn/src/model/DescribeDomainCnameResult.cc

@@ -1,61 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/cdn/model/DescribeDomainCnameResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Cdn;
-using namespace AlibabaCloud::Cdn::Model;
-
-DescribeDomainCnameResult::DescribeDomainCnameResult() :
-	ServiceResult()
-{}
-
-DescribeDomainCnameResult::DescribeDomainCnameResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DescribeDomainCnameResult::~DescribeDomainCnameResult()
-{}
-
-void DescribeDomainCnameResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allCnameDatasNode = value["CnameDatas"]["Data"];
-	for (auto valueCnameDatasData : allCnameDatasNode)
-	{
-		Data cnameDatasObject;
-		if(!valueCnameDatasData["Domain"].isNull())
-			cnameDatasObject.domain = valueCnameDatasData["Domain"].asString();
-		if(!valueCnameDatasData["Cname"].isNull())
-			cnameDatasObject.cname = valueCnameDatasData["Cname"].asString();
-		if(!valueCnameDatasData["Status"].isNull())
-			cnameDatasObject.status = std::stoi(valueCnameDatasData["Status"].asString());
-		cnameDatas_.push_back(cnameDatasObject);
-	}
-
-}
-
-std::vector<DescribeDomainCnameResult::Data> DescribeDomainCnameResult::getCnameDatas()const
-{
-	return cnameDatas_;
-}
-

cdn/src/model/ModifyPathCacheExpiredConfigRequest.cc

@@ -27,6 +27,17 @@ ModifyPathCacheExpiredConfigRequest::ModifyPathCacheExpiredConfigRequest() :
 ModifyPathCacheExpiredConfigRequest::~ModifyPathCacheExpiredConfigRequest()
 {}
 
+std::string ModifyPathCacheExpiredConfigRequest::getSecurityToken()const
+{
+	return securityToken_;
+}
+
+void ModifyPathCacheExpiredConfigRequest::setSecurityToken(const std::string& securityToken)
+{
+	securityToken_ = securityToken;
+	setParameter("SecurityToken", securityToken);
+}
+
 std::string ModifyPathCacheExpiredConfigRequest::getDomainName()const
 {
 	return domainName_;
@@ -82,17 +93,6 @@ void ModifyPathCacheExpiredConfigRequest::setTTL(const std::string& tTL)
 	setParameter("TTL", tTL);
 }
 
-std::string ModifyPathCacheExpiredConfigRequest::getSecurityToken()const
-{
-	return securityToken_;
-}
-
-void ModifyPathCacheExpiredConfigRequest::setSecurityToken(const std::string& securityToken)
-{
-	securityToken_ = securityToken;
-	setParameter("SecurityToken", securityToken);
-}
-
 std::string ModifyPathCacheExpiredConfigRequest::getConfigID()const
 {
 	return configID_;

cloudauth/CMakeLists.txt

@@ -21,6 +21,8 @@ set(cloudauth_public_header
 	include/alibabacloud/cloudauth/CloudauthExport.h )
 
 set(cloudauth_public_header_model 
+	include/alibabacloud/cloudauth/model/CompareFaceVerifyRequest.h
+	include/alibabacloud/cloudauth/model/CompareFaceVerifyResult.h
 	include/alibabacloud/cloudauth/model/CompareFacesRequest.h
 	include/alibabacloud/cloudauth/model/CompareFacesResult.h
 	include/alibabacloud/cloudauth/model/ContrastFaceVerifyRequest.h
@@ -84,6 +86,8 @@ set(cloudauth_public_header_model
 
 set(cloudauth_src 
 	src/CloudauthClient.cc
+	src/model/CompareFaceVerifyRequest.cc
+	src/model/CompareFaceVerifyResult.cc
 	src/model/CompareFacesRequest.cc
 	src/model/CompareFacesResult.cc
 	src/model/ContrastFaceVerifyRequest.cc

cloudauth/include/alibabacloud/cloudauth/CloudauthClient.h

@@ -22,6 +22,8 @@
 #include <alibabacloud/core/EndpointProvider.h>
 #include <alibabacloud/core/RpcServiceClient.h>
 #include "CloudauthExport.h"
+#include "model/CompareFaceVerifyRequest.h"
+#include "model/CompareFaceVerifyResult.h"
 #include "model/CompareFacesRequest.h"
 #include "model/CompareFacesResult.h"
 #include "model/ContrastFaceVerifyRequest.h"
@@ -91,6 +93,9 @@ namespace AlibabaCloud
 		class ALIBABACLOUD_CLOUDAUTH_EXPORT CloudauthClient : public RpcServiceClient
 		{
 		public:
+			typedef Outcome<Error, Model::CompareFaceVerifyResult> CompareFaceVerifyOutcome;
+			typedef std::future<CompareFaceVerifyOutcome> CompareFaceVerifyOutcomeCallable;
+			typedef std::function<void(const CloudauthClient*, const Model::CompareFaceVerifyRequest&, const CompareFaceVerifyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CompareFaceVerifyAsyncHandler;
 			typedef Outcome<Error, Model::CompareFacesResult> CompareFacesOutcome;
 			typedef std::future<CompareFacesOutcome> CompareFacesOutcomeCallable;
 			typedef std::function<void(const CloudauthClient*, const Model::CompareFacesRequest&, const CompareFacesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CompareFacesAsyncHandler;
@@ -186,6 +191,9 @@ namespace AlibabaCloud
 			CloudauthClient(const std::shared_ptr<CredentialsProvider> &credentialsProvider, const ClientConfiguration &configuration);
 			CloudauthClient(const std::string &accessKeyId, const std::string &accessKeySecret, const ClientConfiguration &configuration);
 			~CloudauthClient();
+			CompareFaceVerifyOutcome compareFaceVerify(const Model::CompareFaceVerifyRequest &request)const;
+			void compareFaceVerifyAsync(const Model::CompareFaceVerifyRequest& request, const CompareFaceVerifyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CompareFaceVerifyOutcomeCallable compareFaceVerifyCallable(const Model::CompareFaceVerifyRequest& request) const;
 			CompareFacesOutcome compareFaces(const Model::CompareFacesRequest &request)const;
 			void compareFacesAsync(const Model::CompareFacesRequest& request, const CompareFacesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CompareFacesOutcomeCallable compareFacesCallable(const Model::CompareFacesRequest& request) const;

cloudauth/include/alibabacloud/cloudauth/model/CompareFaceVerifyRequest.h

@@ -0,0 +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_CLOUDAUTH_MODEL_COMPAREFACEVERIFYREQUEST_H_
+#define ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/cloudauth/CloudauthExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cloudauth
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CLOUDAUTH_EXPORT CompareFaceVerifyRequest : public RpcServiceRequest
+			{
+
+			public:
+				CompareFaceVerifyRequest();
+				~CompareFaceVerifyRequest();
+
+				std::string getTargetFaceContrastPictureUrl()const;
+				void setTargetFaceContrastPictureUrl(const std::string& targetFaceContrastPictureUrl);
+				std::string getProductCode()const;
+				void setProductCode(const std::string& productCode);
+				std::string getTargetCertifyId()const;
+				void setTargetCertifyId(const std::string& targetCertifyId);
+				std::string getSourceOssObjectName()const;
+				void setSourceOssObjectName(const std::string& sourceOssObjectName);
+				std::string getTargetFaceContrastPicture()const;
+				void setTargetFaceContrastPicture(const std::string& targetFaceContrastPicture);
+				std::string getTargetOssBucketName()const;
+				void setTargetOssBucketName(const std::string& targetOssBucketName);
+				std::string getSourceOssBucketName()const;
+				void setSourceOssBucketName(const std::string& sourceOssBucketName);
+				std::string getOuterOrderNo()const;
+				void setOuterOrderNo(const std::string& outerOrderNo);
+				std::string getTargetOssObjectName()const;
+				void setTargetOssObjectName(const std::string& targetOssObjectName);
+				std::string getSourceFaceContrastPicture()const;
+				void setSourceFaceContrastPicture(const std::string& sourceFaceContrastPicture);
+				long getSceneId()const;
+				void setSceneId(long sceneId);
+				std::string getSourceFaceContrastPictureUrl()const;
+				void setSourceFaceContrastPictureUrl(const std::string& sourceFaceContrastPictureUrl);
+				std::string getSourceCertifyId()const;
+				void setSourceCertifyId(const std::string& sourceCertifyId);
+
+            private:
+				std::string targetFaceContrastPictureUrl_;
+				std::string productCode_;
+				std::string targetCertifyId_;
+				std::string sourceOssObjectName_;
+				std::string targetFaceContrastPicture_;
+				std::string targetOssBucketName_;
+				std::string sourceOssBucketName_;
+				std::string outerOrderNo_;
+				std::string targetOssObjectName_;
+				std::string sourceFaceContrastPicture_;
+				long sceneId_;
+				std::string sourceFaceContrastPictureUrl_;
+				std::string sourceCertifyId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYREQUEST_H_

cloudauth/include/alibabacloud/cloudauth/model/CompareFaceVerifyResult.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_CLOUDAUTH_MODEL_COMPAREFACEVERIFYRESULT_H_
+#define ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/cloudauth/CloudauthExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cloudauth
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CLOUDAUTH_EXPORT CompareFaceVerifyResult : public ServiceResult
+			{
+			public:
+				struct ResultObject
+				{
+					std::string passed;
+					float verifyScore;
+				};
+
+
+				CompareFaceVerifyResult();
+				explicit CompareFaceVerifyResult(const std::string &payload);
+				~CompareFaceVerifyResult();
+				ResultObject getResultObject()const;
+				std::string getMessage()const;
+				std::string getCode()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				ResultObject resultObject_;
+				std::string message_;
+				std::string code_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYRESULT_H_

cloudauth/include/alibabacloud/cloudauth/model/ContrastFaceVerifyResult.h

@@ -37,6 +37,7 @@ namespace AlibabaCloud
 					std::string passed;
 					std::string identityInfo;
 					std::string materialInfo;
+					std::string subCode;
 				};
 
 

cloudauth/include/alibabacloud/cloudauth/model/VerifyDeviceRequest.h

@@ -35,6 +35,8 @@ namespace AlibabaCloud
 				VerifyDeviceRequest();
 				~VerifyDeviceRequest();
 
+				std::string getExtInfo()const;
+				void setExtInfo(const std::string& extInfo);
 				std::string getCertifyData()const;
 				void setCertifyData(const std::string& certifyData);
 				std::string getAppVersion()const;
@@ -43,6 +45,7 @@ namespace AlibabaCloud
 				void setCertifyId(const std::string& certifyId);
 
             private:
+				std::string extInfo_;
 				std::string certifyData_;
 				std::string appVersion_;
 				std::string certifyId_;

cloudauth/src/CloudauthClient.cc

@@ -51,6 +51,42 @@ CloudauthClient::CloudauthClient(const std::string & accessKeyId, const std::str
 CloudauthClient::~CloudauthClient()
 {}
 
+CloudauthClient::CompareFaceVerifyOutcome CloudauthClient::compareFaceVerify(const CompareFaceVerifyRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return CompareFaceVerifyOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return CompareFaceVerifyOutcome(CompareFaceVerifyResult(outcome.result()));
+	else
+		return CompareFaceVerifyOutcome(outcome.error());
+}
+
+void CloudauthClient::compareFaceVerifyAsync(const CompareFaceVerifyRequest& request, const CompareFaceVerifyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, compareFaceVerify(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+CloudauthClient::CompareFaceVerifyOutcomeCallable CloudauthClient::compareFaceVerifyCallable(const CompareFaceVerifyRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<CompareFaceVerifyOutcome()>>(
+			[this, request]()
+			{
+			return this->compareFaceVerify(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 CloudauthClient::CompareFacesOutcome CloudauthClient::compareFaces(const CompareFacesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

cloudauth/src/model/CompareFaceVerifyRequest.cc

@@ -0,0 +1,172 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/cloudauth/model/CompareFaceVerifyRequest.h>
+
+using AlibabaCloud::Cloudauth::Model::CompareFaceVerifyRequest;
+
+CompareFaceVerifyRequest::CompareFaceVerifyRequest() :
+	RpcServiceRequest("cloudauth", "2019-03-07", "CompareFaceVerify")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+CompareFaceVerifyRequest::~CompareFaceVerifyRequest()
+{}
+
+std::string CompareFaceVerifyRequest::getTargetFaceContrastPictureUrl()const
+{
+	return targetFaceContrastPictureUrl_;
+}
+
+void CompareFaceVerifyRequest::setTargetFaceContrastPictureUrl(const std::string& targetFaceContrastPictureUrl)
+{
+	targetFaceContrastPictureUrl_ = targetFaceContrastPictureUrl;
+	setBodyParameter("TargetFaceContrastPictureUrl", targetFaceContrastPictureUrl);
+}
+
+std::string CompareFaceVerifyRequest::getProductCode()const
+{
+	return productCode_;
+}
+
+void CompareFaceVerifyRequest::setProductCode(const std::string& productCode)
+{
+	productCode_ = productCode;
+	setBodyParameter("ProductCode", productCode);
+}
+
+std::string CompareFaceVerifyRequest::getTargetCertifyId()const
+{
+	return targetCertifyId_;
+}
+
+void CompareFaceVerifyRequest::setTargetCertifyId(const std::string& targetCertifyId)
+{
+	targetCertifyId_ = targetCertifyId;
+	setBodyParameter("TargetCertifyId", targetCertifyId);
+}
+
+std::string CompareFaceVerifyRequest::getSourceOssObjectName()const
+{
+	return sourceOssObjectName_;
+}
+
+void CompareFaceVerifyRequest::setSourceOssObjectName(const std::string& sourceOssObjectName)
+{
+	sourceOssObjectName_ = sourceOssObjectName;
+	setBodyParameter("SourceOssObjectName", sourceOssObjectName);
+}
+
+std::string CompareFaceVerifyRequest::getTargetFaceContrastPicture()const
+{
+	return targetFaceContrastPicture_;
+}
+
+void CompareFaceVerifyRequest::setTargetFaceContrastPicture(const std::string& targetFaceContrastPicture)
+{
+	targetFaceContrastPicture_ = targetFaceContrastPicture;
+	setBodyParameter("TargetFaceContrastPicture", targetFaceContrastPicture);
+}
+
+std::string CompareFaceVerifyRequest::getTargetOssBucketName()const
+{
+	return targetOssBucketName_;
+}
+
+void CompareFaceVerifyRequest::setTargetOssBucketName(const std::string& targetOssBucketName)
+{
+	targetOssBucketName_ = targetOssBucketName;
+	setBodyParameter("TargetOssBucketName", targetOssBucketName);
+}
+
+std::string CompareFaceVerifyRequest::getSourceOssBucketName()const
+{
+	return sourceOssBucketName_;
+}
+
+void CompareFaceVerifyRequest::setSourceOssBucketName(const std::string& sourceOssBucketName)
+{
+	sourceOssBucketName_ = sourceOssBucketName;
+	setBodyParameter("SourceOssBucketName", sourceOssBucketName);
+}
+
+std::string CompareFaceVerifyRequest::getOuterOrderNo()const
+{
+	return outerOrderNo_;
+}
+
+void CompareFaceVerifyRequest::setOuterOrderNo(const std::string& outerOrderNo)
+{
+	outerOrderNo_ = outerOrderNo;
+	setBodyParameter("OuterOrderNo", outerOrderNo);
+}
+
+std::string CompareFaceVerifyRequest::getTargetOssObjectName()const
+{
+	return targetOssObjectName_;
+}
+
+void CompareFaceVerifyRequest::setTargetOssObjectName(const std::string& targetOssObjectName)
+{
+	targetOssObjectName_ = targetOssObjectName;
+	setBodyParameter("TargetOssObjectName", targetOssObjectName);
+}
+
+std::string CompareFaceVerifyRequest::getSourceFaceContrastPicture()const
+{
+	return sourceFaceContrastPicture_;
+}
+
+void CompareFaceVerifyRequest::setSourceFaceContrastPicture(const std::string& sourceFaceContrastPicture)
+{
+	sourceFaceContrastPicture_ = sourceFaceContrastPicture;
+	setBodyParameter("SourceFaceContrastPicture", sourceFaceContrastPicture);
+}
+
+long CompareFaceVerifyRequest::getSceneId()const
+{
+	return sceneId_;
+}
+
+void CompareFaceVerifyRequest::setSceneId(long sceneId)
+{
+	sceneId_ = sceneId;
+	setBodyParameter("SceneId", std::to_string(sceneId));
+}
+
+std::string CompareFaceVerifyRequest::getSourceFaceContrastPictureUrl()const
+{
+	return sourceFaceContrastPictureUrl_;
+}
+
+void CompareFaceVerifyRequest::setSourceFaceContrastPictureUrl(const std::string& sourceFaceContrastPictureUrl)
+{
+	sourceFaceContrastPictureUrl_ = sourceFaceContrastPictureUrl;
+	setBodyParameter("SourceFaceContrastPictureUrl", sourceFaceContrastPictureUrl);
+}
+
+std::string CompareFaceVerifyRequest::getSourceCertifyId()const
+{
+	return sourceCertifyId_;
+}
+
+void CompareFaceVerifyRequest::setSourceCertifyId(const std::string& sourceCertifyId)
+{
+	sourceCertifyId_ = sourceCertifyId;
+	setBodyParameter("SourceCertifyId", sourceCertifyId);
+}
+

cloudauth/src/model/CompareFaceVerifyResult.cc

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/cloudauth/model/CompareFaceVerifyResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Cloudauth;
+using namespace AlibabaCloud::Cloudauth::Model;
+
+CompareFaceVerifyResult::CompareFaceVerifyResult() :
+	ServiceResult()
+{}
+
+CompareFaceVerifyResult::CompareFaceVerifyResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+CompareFaceVerifyResult::~CompareFaceVerifyResult()
+{}
+
+void CompareFaceVerifyResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto resultObjectNode = value["ResultObject"];
+	if(!resultObjectNode["Passed"].isNull())
+		resultObject_.passed = resultObjectNode["Passed"].asString();
+	if(!resultObjectNode["VerifyScore"].isNull())
+		resultObject_.verifyScore = std::stof(resultObjectNode["VerifyScore"].asString());
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+
+}
+
+CompareFaceVerifyResult::ResultObject CompareFaceVerifyResult::getResultObject()const
+{
+	return resultObject_;
+}
+
+std::string CompareFaceVerifyResult::getMessage()const
+{
+	return message_;
+}
+
+std::string CompareFaceVerifyResult::getCode()const
+{
+	return code_;
+}
+

cloudauth/src/model/ContrastFaceVerifyResult.cc

@@ -46,6 +46,8 @@ void ContrastFaceVerifyResult::parse(const std::string &payload)
 		resultObject_.identityInfo = resultObjectNode["IdentityInfo"].asString();
 	if(!resultObjectNode["MaterialInfo"].isNull())
 		resultObject_.materialInfo = resultObjectNode["MaterialInfo"].asString();
+	if(!resultObjectNode["SubCode"].isNull())
+		resultObject_.subCode = resultObjectNode["SubCode"].asString();
 	if(!value["Message"].isNull())
 		message_ = value["Message"].asString();
 	if(!value["Code"].isNull())

cloudauth/src/model/VerifyDeviceRequest.cc

@@ -27,6 +27,17 @@ VerifyDeviceRequest::VerifyDeviceRequest() :
 VerifyDeviceRequest::~VerifyDeviceRequest()
 {}
 
+std::string VerifyDeviceRequest::getExtInfo()const
+{
+	return extInfo_;
+}
+
+void VerifyDeviceRequest::setExtInfo(const std::string& extInfo)
+{
+	extInfo_ = extInfo;
+	setBodyParameter("ExtInfo", extInfo);
+}
+
 std::string VerifyDeviceRequest::getCertifyData()const
 {
 	return certifyData_;

core/src/CurlHttpClient.cc

@@ -221,6 +221,7 @@ CurlHttpClient::makeRequest(const HttpRequest &request) {
           HttpMethodToString(request.method()) + " " + request.url().toString()));
     }
   }
+  curl_slist_free_all(list);
 }
 
 }  // namespace AlibabaCloud

core/src/EndpointProvider.cc

@@ -19,6 +19,9 @@
 #include <iomanip>
 #include <json/json.h>
 #include <sstream>
+#include <thread>
+#include <mutex>
+#include <condition_variable>
 
 #ifndef WIN32
 #include "LocalEndpoints.h"
@@ -39,7 +42,10 @@ namespace
 #include <strings.h>
 #endif
 
+std::mutex mutex;
+std::condition_variable cv;
 bool local_endpoints_loaded = false;
+bool local_endpoints_loading = false;
 typedef std::string productType;
 typedef std::string regionType;
 typedef std::string endpointType;
@@ -60,6 +66,8 @@ static void LoadLocalEndpoints()
 {
   Json::Reader reader;
   Json::Value value;
+  std::unique_lock<std::mutex> lock(mutex);
+
   if (local_endpoints_loaded)
   {
     return;
@@ -76,6 +84,10 @@ static void LoadLocalEndpoints()
     return;
   }
 
+  cv.wait(lock, [] { return !local_endpoints_loading; });// continue if loading completed
+
+  local_endpoints_loading = true;
+
   auto regions = value["regions"];
   for (const auto &region : regions)
   {
@@ -107,6 +119,10 @@ static void LoadLocalEndpoints()
     allLocalEndpoints[product] = p;
   }
   local_endpoints_loaded = true;
+  local_endpoints_loading = false;
+
+  lock.unlock();
+  cv.notify_one();
 }
 
 } // namespace

core/src/HttpMessage.cc

@@ -139,7 +139,7 @@ HttpMessage::HeaderValueType HttpMessage::header(KnownHeader header)const {
 
 void HttpMessage::setBody(const char *data, size_t size) {
   if (body_)
-    delete body_;
+    delete[] body_;
   body_ = nullptr;
   bodySize_ = 0;
   if (size) {

fnf/include/alibabacloud/fnf/model/CreateFlowRequest.h

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				void setName(const std::string& name);
 				std::string getDefinition()const;
 				void setDefinition(const std::string& definition);
+				std::string getExternalStorageLocation()const;
+				void setExternalStorageLocation(const std::string& externalStorageLocation);
 
             private:
 				std::string description_;
@@ -55,6 +57,7 @@ namespace AlibabaCloud
 				std::string roleArn_;
 				std::string name_;
 				std::string definition_;
+				std::string externalStorageLocation_;
 
 			};
 		}

fnf/include/alibabacloud/fnf/model/CreateFlowResult.h

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 				std::string getDefinition()const;
 				std::string getLastModifiedTime()const;
 				std::string getId()const;
+				std::string getExternalStorageLocation()const;
 				std::string getRoleArn()const;
 				std::string getName()const;
 
@@ -55,6 +56,7 @@ namespace AlibabaCloud
 				std::string definition_;
 				std::string lastModifiedTime_;
 				std::string id_;
+				std::string externalStorageLocation_;
 				std::string roleArn_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/DescribeExecutionResult.h

@@ -42,7 +42,9 @@ namespace AlibabaCloud
 				std::string getStoppedTime()const;
 				std::string getFlowName()const;
 				std::string getOutput()const;
+				std::string getExternalOutputUri()const;
 				std::string getStartedTime()const;
+				std::string getExternalInputUri()const;
 				std::string getFlowDefinition()const;
 				std::string getName()const;
 
@@ -54,7 +56,9 @@ namespace AlibabaCloud
 				std::string stoppedTime_;
 				std::string flowName_;
 				std::string output_;
+				std::string externalOutputUri_;
 				std::string startedTime_;
+				std::string externalInputUri_;
 				std::string flowDefinition_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/DescribeFlowResult.h

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 				std::string getDefinition()const;
 				std::string getLastModifiedTime()const;
 				std::string getId()const;
+				std::string getExternalStorageLocation()const;
 				std::string getRoleArn()const;
 				std::string getName()const;
 
@@ -55,6 +56,7 @@ namespace AlibabaCloud
 				std::string definition_;
 				std::string lastModifiedTime_;
 				std::string id_;
+				std::string externalStorageLocation_;
 				std::string roleArn_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/ListExecutionsResult.h

@@ -39,7 +39,9 @@ namespace AlibabaCloud
 					std::string stoppedTime;
 					std::string flowName;
 					std::string output;
+					std::string externalOutputUri;
 					std::string startedTime;
+					std::string externalInputUri;
 					std::string flowDefinition;
 					std::string name;
 				};

fnf/include/alibabacloud/fnf/model/ListFlowsResult.h

@@ -40,6 +40,7 @@ namespace AlibabaCloud
 					std::string definition;
 					std::string lastModifiedTime;
 					std::string id;
+					std::string externalStorageLocation;
 					std::string roleArn;
 					std::string name;
 				};

fnf/include/alibabacloud/fnf/model/StartExecutionResult.h

@@ -42,7 +42,9 @@ namespace AlibabaCloud
 				std::string getStoppedTime()const;
 				std::string getFlowName()const;
 				std::string getOutput()const;
+				std::string getExternalOutputUri()const;
 				std::string getStartedTime()const;
+				std::string getExternalInputUri()const;
 				std::string getFlowDefinition()const;
 				std::string getName()const;
 
@@ -54,7 +56,9 @@ namespace AlibabaCloud
 				std::string stoppedTime_;
 				std::string flowName_;
 				std::string output_;
+				std::string externalOutputUri_;
 				std::string startedTime_;
+				std::string externalInputUri_;
 				std::string flowDefinition_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/StopExecutionResult.h

@@ -42,7 +42,9 @@ namespace AlibabaCloud
 				std::string getStoppedTime()const;
 				std::string getFlowName()const;
 				std::string getOutput()const;
+				std::string getExternalOutputUri()const;
 				std::string getStartedTime()const;
+				std::string getExternalInputUri()const;
 				std::string getFlowDefinition()const;
 				std::string getName()const;
 
@@ -54,7 +56,9 @@ namespace AlibabaCloud
 				std::string stoppedTime_;
 				std::string flowName_;
 				std::string output_;
+				std::string externalOutputUri_;
 				std::string startedTime_;
+				std::string externalInputUri_;
 				std::string flowDefinition_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/UpdateFlowRequest.h

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				void setName(const std::string& name);
 				std::string getDefinition()const;
 				void setDefinition(const std::string& definition);
+				std::string getExternalStorageLocation()const;
+				void setExternalStorageLocation(const std::string& externalStorageLocation);
 
             private:
 				std::string description_;
@@ -55,6 +57,7 @@ namespace AlibabaCloud
 				std::string roleArn_;
 				std::string name_;
 				std::string definition_;
+				std::string externalStorageLocation_;
 
 			};
 		}

fnf/include/alibabacloud/fnf/model/UpdateFlowResult.h

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 				std::string getDefinition()const;
 				std::string getLastModifiedTime()const;
 				std::string getId()const;
+				std::string getExternalStorageLocation()const;
 				std::string getRoleArn()const;
 				std::string getName()const;
 
@@ -55,6 +56,7 @@ namespace AlibabaCloud
 				std::string definition_;
 				std::string lastModifiedTime_;
 				std::string id_;
+				std::string externalStorageLocation_;
 				std::string roleArn_;
 				std::string name_;
 

fnf/src/model/CreateFlowRequest.cc

@@ -93,3 +93,14 @@ void CreateFlowRequest::setDefinition(const std::string& definition)
 	setBodyParameter("Definition", definition);
 }
 
+std::string CreateFlowRequest::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
+void CreateFlowRequest::setExternalStorageLocation(const std::string& externalStorageLocation)
+{
+	externalStorageLocation_ = externalStorageLocation;
+	setBodyParameter("ExternalStorageLocation", externalStorageLocation);
+}
+

fnf/src/model/CreateFlowResult.cc

@@ -55,6 +55,8 @@ void CreateFlowResult::parse(const std::string &payload)
 		createdTime_ = value["CreatedTime"].asString();
 	if(!value["LastModifiedTime"].isNull())
 		lastModifiedTime_ = value["LastModifiedTime"].asString();
+	if(!value["ExternalStorageLocation"].isNull())
+		externalStorageLocation_ = value["ExternalStorageLocation"].asString();
 
 }
 
@@ -88,6 +90,11 @@ std::string CreateFlowResult::getId()const
 	return id_;
 }
 
+std::string CreateFlowResult::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
 std::string CreateFlowResult::getRoleArn()const
 {
 	return roleArn_;

fnf/src/model/DescribeExecutionResult.cc

@@ -55,6 +55,10 @@ void DescribeExecutionResult::parse(const std::string &payload)
 		startedTime_ = value["StartedTime"].asString();
 	if(!value["StoppedTime"].isNull())
 		stoppedTime_ = value["StoppedTime"].asString();
+	if(!value["ExternalInputUri"].isNull())
+		externalInputUri_ = value["ExternalInputUri"].asString();
+	if(!value["ExternalOutputUri"].isNull())
+		externalOutputUri_ = value["ExternalOutputUri"].asString();
 
 }
 
@@ -83,11 +87,21 @@ std::string DescribeExecutionResult::getOutput()const
 	return output_;
 }
 
+std::string DescribeExecutionResult::getExternalOutputUri()const
+{
+	return externalOutputUri_;
+}
+
 std::string DescribeExecutionResult::getStartedTime()const
 {
 	return startedTime_;
 }
 
+std::string DescribeExecutionResult::getExternalInputUri()const
+{
+	return externalInputUri_;
+}
+
 std::string DescribeExecutionResult::getFlowDefinition()const
 {
 	return flowDefinition_;

fnf/src/model/DescribeFlowResult.cc

@@ -55,6 +55,8 @@ void DescribeFlowResult::parse(const std::string &payload)
 		createdTime_ = value["CreatedTime"].asString();
 	if(!value["LastModifiedTime"].isNull())
 		lastModifiedTime_ = value["LastModifiedTime"].asString();
+	if(!value["ExternalStorageLocation"].isNull())
+		externalStorageLocation_ = value["ExternalStorageLocation"].asString();
 
 }
 
@@ -88,6 +90,11 @@ std::string DescribeFlowResult::getId()const
 	return id_;
 }
 
+std::string DescribeFlowResult::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
 std::string DescribeFlowResult::getRoleArn()const
 {
 	return roleArn_;

fnf/src/model/ListExecutionsResult.cc

@@ -59,6 +59,10 @@ void ListExecutionsResult::parse(const std::string &payload)
 			executionsObject.startedTime = valueExecutionsExecutionsItem["StartedTime"].asString();
 		if(!valueExecutionsExecutionsItem["StoppedTime"].isNull())
 			executionsObject.stoppedTime = valueExecutionsExecutionsItem["StoppedTime"].asString();
+		if(!valueExecutionsExecutionsItem["ExternalInputUri"].isNull())
+			executionsObject.externalInputUri = valueExecutionsExecutionsItem["ExternalInputUri"].asString();
+		if(!valueExecutionsExecutionsItem["ExternalOutputUri"].isNull())
+			executionsObject.externalOutputUri = valueExecutionsExecutionsItem["ExternalOutputUri"].asString();
 		executions_.push_back(executionsObject);
 	}
 	if(!value["NextToken"].isNull())

fnf/src/model/ListFlowsResult.cc

@@ -59,6 +59,8 @@ void ListFlowsResult::parse(const std::string &payload)
 			flowsObject.createdTime = valueFlowsFlowsItem["CreatedTime"].asString();
 		if(!valueFlowsFlowsItem["LastModifiedTime"].isNull())
 			flowsObject.lastModifiedTime = valueFlowsFlowsItem["LastModifiedTime"].asString();
+		if(!valueFlowsFlowsItem["ExternalStorageLocation"].isNull())
+			flowsObject.externalStorageLocation = valueFlowsFlowsItem["ExternalStorageLocation"].asString();
 		flows_.push_back(flowsObject);
 	}
 	if(!value["NextToken"].isNull())

fnf/src/model/StartExecutionResult.cc

@@ -55,6 +55,10 @@ void StartExecutionResult::parse(const std::string &payload)
 		startedTime_ = value["StartedTime"].asString();
 	if(!value["StoppedTime"].isNull())
 		stoppedTime_ = value["StoppedTime"].asString();
+	if(!value["ExternalInputUri"].isNull())
+		externalInputUri_ = value["ExternalInputUri"].asString();
+	if(!value["ExternalOutputUri"].isNull())
+		externalOutputUri_ = value["ExternalOutputUri"].asString();
 
 }
 
@@ -83,11 +87,21 @@ std::string StartExecutionResult::getOutput()const
 	return output_;
 }
 
+std::string StartExecutionResult::getExternalOutputUri()const
+{
+	return externalOutputUri_;
+}
+
 std::string StartExecutionResult::getStartedTime()const
 {
 	return startedTime_;
 }
 
+std::string StartExecutionResult::getExternalInputUri()const
+{
+	return externalInputUri_;
+}
+
 std::string StartExecutionResult::getFlowDefinition()const
 {
 	return flowDefinition_;

fnf/src/model/StopExecutionResult.cc

@@ -55,6 +55,10 @@ void StopExecutionResult::parse(const std::string &payload)
 		startedTime_ = value["StartedTime"].asString();
 	if(!value["StoppedTime"].isNull())
 		stoppedTime_ = value["StoppedTime"].asString();
+	if(!value["ExternalInputUri"].isNull())
+		externalInputUri_ = value["ExternalInputUri"].asString();
+	if(!value["ExternalOutputUri"].isNull())
+		externalOutputUri_ = value["ExternalOutputUri"].asString();
 
 }
 
@@ -83,11 +87,21 @@ std::string StopExecutionResult::getOutput()const
 	return output_;
 }
 
+std::string StopExecutionResult::getExternalOutputUri()const
+{
+	return externalOutputUri_;
+}
+
 std::string StopExecutionResult::getStartedTime()const
 {
 	return startedTime_;
 }
 
+std::string StopExecutionResult::getExternalInputUri()const
+{
+	return externalInputUri_;
+}
+
 std::string StopExecutionResult::getFlowDefinition()const
 {
 	return flowDefinition_;

fnf/src/model/UpdateFlowRequest.cc

@@ -93,3 +93,14 @@ void UpdateFlowRequest::setDefinition(const std::string& definition)
 	setBodyParameter("Definition", definition);
 }
 
+std::string UpdateFlowRequest::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
+void UpdateFlowRequest::setExternalStorageLocation(const std::string& externalStorageLocation)
+{
+	externalStorageLocation_ = externalStorageLocation;
+	setBodyParameter("ExternalStorageLocation", externalStorageLocation);
+}
+

fnf/src/model/UpdateFlowResult.cc

@@ -55,6 +55,8 @@ void UpdateFlowResult::parse(const std::string &payload)
 		createdTime_ = value["CreatedTime"].asString();
 	if(!value["LastModifiedTime"].isNull())
 		lastModifiedTime_ = value["LastModifiedTime"].asString();
+	if(!value["ExternalStorageLocation"].isNull())
+		externalStorageLocation_ = value["ExternalStorageLocation"].asString();
 
 }
 
@@ -88,6 +90,11 @@ std::string UpdateFlowResult::getId()const
 	return id_;
 }
 
+std::string UpdateFlowResult::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
 std::string UpdateFlowResult::getRoleArn()const
 {
 	return roleArn_;

hbase/CMakeLists.txt

@@ -31,8 +31,6 @@ set(hbase_public_header_model
 	include/alibabacloud/hbase/model/CreateClusterResult.h
 	include/alibabacloud/hbase/model/CreateHbaseHaSlbRequest.h
 	include/alibabacloud/hbase/model/CreateHbaseHaSlbResult.h
-	include/alibabacloud/hbase/model/CreateInstanceRequest.h
-	include/alibabacloud/hbase/model/CreateInstanceResult.h
 	include/alibabacloud/hbase/model/CreateRestorePlanRequest.h
 	include/alibabacloud/hbase/model/CreateRestorePlanResult.h
 	include/alibabacloud/hbase/model/DeleteHbaseHaSlbRequest.h
@@ -41,6 +39,8 @@ set(hbase_public_header_model
 	include/alibabacloud/hbase/model/DeleteInstanceResult.h
 	include/alibabacloud/hbase/model/DeleteUserHdfsInfoRequest.h
 	include/alibabacloud/hbase/model/DeleteUserHdfsInfoResult.h
+	include/alibabacloud/hbase/model/DescribeAvailableResourceRequest.h
+	include/alibabacloud/hbase/model/DescribeAvailableResourceResult.h
 	include/alibabacloud/hbase/model/DescribeBackupPlanConfigRequest.h
 	include/alibabacloud/hbase/model/DescribeBackupPlanConfigResult.h
 	include/alibabacloud/hbase/model/DescribeBackupStatusRequest.h
@@ -124,8 +124,6 @@ set(hbase_src
 	src/model/CreateClusterResult.cc
 	src/model/CreateHbaseHaSlbRequest.cc
 	src/model/CreateHbaseHaSlbResult.cc
-	src/model/CreateInstanceRequest.cc
-	src/model/CreateInstanceResult.cc
 	src/model/CreateRestorePlanRequest.cc
 	src/model/CreateRestorePlanResult.cc
 	src/model/DeleteHbaseHaSlbRequest.cc
@@ -134,6 +132,8 @@ set(hbase_src
 	src/model/DeleteInstanceResult.cc
 	src/model/DeleteUserHdfsInfoRequest.cc
 	src/model/DeleteUserHdfsInfoResult.cc
+	src/model/DescribeAvailableResourceRequest.cc
+	src/model/DescribeAvailableResourceResult.cc
 	src/model/DescribeBackupPlanConfigRequest.cc
 	src/model/DescribeBackupPlanConfigResult.cc
 	src/model/DescribeBackupStatusRequest.cc

hbase/include/alibabacloud/hbase/HBaseClient.h

@@ -32,8 +32,6 @@
 #include "model/CreateClusterResult.h"
 #include "model/CreateHbaseHaSlbRequest.h"
 #include "model/CreateHbaseHaSlbResult.h"
-#include "model/CreateInstanceRequest.h"
-#include "model/CreateInstanceResult.h"
 #include "model/CreateRestorePlanRequest.h"
 #include "model/CreateRestorePlanResult.h"
 #include "model/DeleteHbaseHaSlbRequest.h"
@@ -42,6 +40,8 @@
 #include "model/DeleteInstanceResult.h"
 #include "model/DeleteUserHdfsInfoRequest.h"
 #include "model/DeleteUserHdfsInfoResult.h"
+#include "model/DescribeAvailableResourceRequest.h"
+#include "model/DescribeAvailableResourceResult.h"
 #include "model/DescribeBackupPlanConfigRequest.h"
 #include "model/DescribeBackupPlanConfigResult.h"
 #include "model/DescribeBackupStatusRequest.h"
@@ -136,9 +136,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreateHbaseHaSlbResult> CreateHbaseHaSlbOutcome;
 			typedef std::future<CreateHbaseHaSlbOutcome> CreateHbaseHaSlbOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::CreateHbaseHaSlbRequest&, const CreateHbaseHaSlbOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateHbaseHaSlbAsyncHandler;
-			typedef Outcome<Error, Model::CreateInstanceResult> CreateInstanceOutcome;
-			typedef std::future<CreateInstanceOutcome> CreateInstanceOutcomeCallable;
-			typedef std::function<void(const HBaseClient*, const Model::CreateInstanceRequest&, const CreateInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateInstanceAsyncHandler;
 			typedef Outcome<Error, Model::CreateRestorePlanResult> CreateRestorePlanOutcome;
 			typedef std::future<CreateRestorePlanOutcome> CreateRestorePlanOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::CreateRestorePlanRequest&, const CreateRestorePlanOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateRestorePlanAsyncHandler;
@@ -151,6 +148,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DeleteUserHdfsInfoResult> DeleteUserHdfsInfoOutcome;
 			typedef std::future<DeleteUserHdfsInfoOutcome> DeleteUserHdfsInfoOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::DeleteUserHdfsInfoRequest&, const DeleteUserHdfsInfoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteUserHdfsInfoAsyncHandler;
+			typedef Outcome<Error, Model::DescribeAvailableResourceResult> DescribeAvailableResourceOutcome;
+			typedef std::future<DescribeAvailableResourceOutcome> DescribeAvailableResourceOutcomeCallable;
+			typedef std::function<void(const HBaseClient*, const Model::DescribeAvailableResourceRequest&, const DescribeAvailableResourceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAvailableResourceAsyncHandler;
 			typedef Outcome<Error, Model::DescribeBackupPlanConfigResult> DescribeBackupPlanConfigOutcome;
 			typedef std::future<DescribeBackupPlanConfigOutcome> DescribeBackupPlanConfigOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::DescribeBackupPlanConfigRequest&, const DescribeBackupPlanConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeBackupPlanConfigAsyncHandler;
@@ -276,9 +276,6 @@ namespace AlibabaCloud
 			CreateHbaseHaSlbOutcome createHbaseHaSlb(const Model::CreateHbaseHaSlbRequest &request)const;
 			void createHbaseHaSlbAsync(const Model::CreateHbaseHaSlbRequest& request, const CreateHbaseHaSlbAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateHbaseHaSlbOutcomeCallable createHbaseHaSlbCallable(const Model::CreateHbaseHaSlbRequest& request) const;
-			CreateInstanceOutcome createInstance(const Model::CreateInstanceRequest &request)const;
-			void createInstanceAsync(const Model::CreateInstanceRequest& request, const CreateInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			CreateInstanceOutcomeCallable createInstanceCallable(const Model::CreateInstanceRequest& request) const;
 			CreateRestorePlanOutcome createRestorePlan(const Model::CreateRestorePlanRequest &request)const;
 			void createRestorePlanAsync(const Model::CreateRestorePlanRequest& request, const CreateRestorePlanAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateRestorePlanOutcomeCallable createRestorePlanCallable(const Model::CreateRestorePlanRequest& request) const;
@@ -291,6 +288,9 @@ namespace AlibabaCloud
 			DeleteUserHdfsInfoOutcome deleteUserHdfsInfo(const Model::DeleteUserHdfsInfoRequest &request)const;
 			void deleteUserHdfsInfoAsync(const Model::DeleteUserHdfsInfoRequest& request, const DeleteUserHdfsInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteUserHdfsInfoOutcomeCallable deleteUserHdfsInfoCallable(const Model::DeleteUserHdfsInfoRequest& request) const;
+			DescribeAvailableResourceOutcome describeAvailableResource(const Model::DescribeAvailableResourceRequest &request)const;
+			void describeAvailableResourceAsync(const Model::DescribeAvailableResourceRequest& request, const DescribeAvailableResourceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeAvailableResourceOutcomeCallable describeAvailableResourceCallable(const Model::DescribeAvailableResourceRequest& request) const;
 			DescribeBackupPlanConfigOutcome describeBackupPlanConfig(const Model::DescribeBackupPlanConfigRequest &request)const;
 			void describeBackupPlanConfigAsync(const Model::DescribeBackupPlanConfigRequest& request, const DescribeBackupPlanConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeBackupPlanConfigOutcomeCallable describeBackupPlanConfigCallable(const Model::DescribeBackupPlanConfigRequest& request) const;

hbase/include/alibabacloud/hbase/model/CreateInstanceRequest.h

@@ -1,129 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCEREQUEST_H_
-#define ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/hbase/HBaseExport.h>
-
-namespace AlibabaCloud
-{
-	namespace HBase
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_HBASE_EXPORT CreateInstanceRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateInstanceRequest();
-				~CreateInstanceRequest();
-
-				std::string getClusterName()const;
-				void setClusterName(const std::string& clusterName);
-				std::string getDbInstanceConnType()const;
-				void setDbInstanceConnType(const std::string& dbInstanceConnType);
-				std::string getEngineVersion()const;
-				void setEngineVersion(const std::string& engineVersion);
-				std::string getDepMode()const;
-				void setDepMode(const std::string& depMode);
-				std::string getBackupId()const;
-				void setBackupId(const std::string& backupId);
-				std::string getDbInstanceType()const;
-				void setDbInstanceType(const std::string& dbInstanceType);
-				std::string getVSwitchId()const;
-				void setVSwitchId(const std::string& vSwitchId);
-				std::string getSecurityIPList()const;
-				void setSecurityIPList(const std::string& securityIPList);
-				std::string getAutoRenew()const;
-				void setAutoRenew(const std::string& autoRenew);
-				std::string getNetType()const;
-				void setNetType(const std::string& netType);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-				std::string getCoreDiskType()const;
-				void setCoreDiskType(const std::string& coreDiskType);
-				std::string getPricingCycle()const;
-				void setPricingCycle(const std::string& pricingCycle);
-				std::string getCoreInstanceQuantity()const;
-				void setCoreInstanceQuantity(const std::string& coreInstanceQuantity);
-				std::string getDuration()const;
-				void setDuration(const std::string& duration);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getEngine()const;
-				void setEngine(const std::string& engine);
-				std::string getRestoreTime()const;
-				void setRestoreTime(const std::string& restoreTime);
-				std::string getSrcDBInstanceId()const;
-				void setSrcDBInstanceId(const std::string& srcDBInstanceId);
-				std::string getMasterInstanceType()const;
-				void setMasterInstanceType(const std::string& masterInstanceType);
-				std::string getColdStorageSize()const;
-				void setColdStorageSize(const std::string& coldStorageSize);
-				std::string getCoreDiskQuantity()const;
-				void setCoreDiskQuantity(const std::string& coreDiskQuantity);
-				std::string getIsColdStorage()const;
-				void setIsColdStorage(const std::string& isColdStorage);
-				std::string getCoreInstanceType()const;
-				void setCoreInstanceType(const std::string& coreInstanceType);
-				std::string getCoreDiskSize()const;
-				void setCoreDiskSize(const std::string& coreDiskSize);
-				std::string getVpcId()const;
-				void setVpcId(const std::string& vpcId);
-				std::string getDbType()const;
-				void setDbType(const std::string& dbType);
-				std::string getPayType()const;
-				void setPayType(const std::string& payType);
-
-            private:
-				std::string clusterName_;
-				std::string dbInstanceConnType_;
-				std::string engineVersion_;
-				std::string depMode_;
-				std::string backupId_;
-				std::string dbInstanceType_;
-				std::string vSwitchId_;
-				std::string securityIPList_;
-				std::string autoRenew_;
-				std::string netType_;
-				std::string zoneId_;
-				std::string coreDiskType_;
-				std::string pricingCycle_;
-				std::string coreInstanceQuantity_;
-				std::string duration_;
-				std::string regionId_;
-				std::string engine_;
-				std::string restoreTime_;
-				std::string srcDBInstanceId_;
-				std::string masterInstanceType_;
-				std::string coldStorageSize_;
-				std::string coreDiskQuantity_;
-				std::string isColdStorage_;
-				std::string coreInstanceType_;
-				std::string coreDiskSize_;
-				std::string vpcId_;
-				std::string dbType_;
-				std::string payType_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCEREQUEST_H_

hbase/include/alibabacloud/hbase/model/DescribeAvailableResourceRequest.h

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_HBASE_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_
+#define ALIBABACLOUD_HBASE_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/hbase/HBaseExport.h>
+
+namespace AlibabaCloud
+{
+	namespace HBase
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_HBASE_EXPORT DescribeAvailableResourceRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeAvailableResourceRequest();
+				~DescribeAvailableResourceRequest();
+
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getZoneId()const;
+				void setZoneId(const std::string& zoneId);
+				std::string getChargeType()const;
+				void setChargeType(const std::string& chargeType);
+
+            private:
+				std::string regionId_;
+				std::string zoneId_;
+				std::string chargeType_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_HBASE_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_

hbase/include/alibabacloud/hbase/model/DescribeAvailableResourceResult.h

@@ -0,0 +1,105 @@
+/*
+ * 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_HBASE_MODEL_DESCRIBEAVAILABLERESOURCERESULT_H_
+#define ALIBABACLOUD_HBASE_MODEL_DESCRIBEAVAILABLERESOURCERESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/hbase/HBaseExport.h>
+
+namespace AlibabaCloud
+{
+	namespace HBase
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_HBASE_EXPORT DescribeAvailableResourceResult : public ServiceResult
+			{
+			public:
+				struct AvailableZone
+				{
+					struct SupportedEngine
+					{
+						struct SupportedEngineVersion
+						{
+							struct SupportedCategoriesItem
+							{
+								struct SupportedStorageType
+								{
+									struct CoreResource
+									{
+										struct DBInstanceStorageRange
+										{
+											int minSize;
+											int stepSize;
+											int maxSize;
+										};
+										struct InstanceTypeDetail
+										{
+											int mem;
+											int cpu;
+										};
+										InstanceTypeDetail instanceTypeDetail;
+										DBInstanceStorageRange dBInstanceStorageRange;
+										std::string instanceType;
+									};
+									std::string storageType;
+									std::vector<SupportedStorageType::CoreResource> coreResources;
+								};
+								std::string category;
+								std::vector<SupportedCategoriesItem::SupportedStorageType> supportedStorageTypes;
+							};
+							std::string version;
+							std::vector<SupportedEngineVersion::SupportedCategoriesItem> supportedCategories;
+						};
+						std::vector<SupportedEngine::SupportedEngineVersion> supportedEngineVersions;
+						std::string engine;
+					};
+					struct MasterResource
+					{
+						struct InstanceTypeDetail1
+						{
+							int mem;
+							int cpu;
+						};
+						InstanceTypeDetail1 instanceTypeDetail1;
+						std::string instanceType;
+					};
+					std::vector<AvailableZone::MasterResource> masterResources;
+					std::string zoneId;
+					std::vector<AvailableZone::SupportedEngine> supportedEngines;
+					std::string regionId;
+				};
+
+
+				DescribeAvailableResourceResult();
+				explicit DescribeAvailableResourceResult(const std::string &payload);
+				~DescribeAvailableResourceResult();
+				std::vector<AvailableZone> getAvailableZones()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<AvailableZone> availableZones_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_HBASE_MODEL_DESCRIBEAVAILABLERESOURCERESULT_H_

hbase/src/HBaseClient.cc

@@ -31,21 +31,21 @@ HBaseClient::HBaseClient(const Credentials &credentials, const ClientConfigurati
 	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, "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "hbase");
 }
 
 HBaseClient::HBaseClient(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, "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "hbase");
 }
 
 HBaseClient::HBaseClient(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, "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "hbase");
 }
 
 HBaseClient::~HBaseClient()
@@ -231,42 +231,6 @@ HBaseClient::CreateHbaseHaSlbOutcomeCallable HBaseClient::createHbaseHaSlbCallab
 	return task->get_future();
 }
 
-HBaseClient::CreateInstanceOutcome HBaseClient::createInstance(const CreateInstanceRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return CreateInstanceOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return CreateInstanceOutcome(CreateInstanceResult(outcome.result()));
-	else
-		return CreateInstanceOutcome(outcome.error());
-}
-
-void HBaseClient::createInstanceAsync(const CreateInstanceRequest& request, const CreateInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, createInstance(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-HBaseClient::CreateInstanceOutcomeCallable HBaseClient::createInstanceCallable(const CreateInstanceRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<CreateInstanceOutcome()>>(
-			[this, request]()
-			{
-			return this->createInstance(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 HBaseClient::CreateRestorePlanOutcome HBaseClient::createRestorePlan(const CreateRestorePlanRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -411,6 +375,42 @@ HBaseClient::DeleteUserHdfsInfoOutcomeCallable HBaseClient::deleteUserHdfsInfoCa
 	return task->get_future();
 }
 
+HBaseClient::DescribeAvailableResourceOutcome HBaseClient::describeAvailableResource(const DescribeAvailableResourceRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeAvailableResourceOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeAvailableResourceOutcome(DescribeAvailableResourceResult(outcome.result()));
+	else
+		return DescribeAvailableResourceOutcome(outcome.error());
+}
+
+void HBaseClient::describeAvailableResourceAsync(const DescribeAvailableResourceRequest& request, const DescribeAvailableResourceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeAvailableResource(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+HBaseClient::DescribeAvailableResourceOutcomeCallable HBaseClient::describeAvailableResourceCallable(const DescribeAvailableResourceRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeAvailableResourceOutcome()>>(
+			[this, request]()
+			{
+			return this->describeAvailableResource(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 HBaseClient::DescribeBackupPlanConfigOutcome HBaseClient::describeBackupPlanConfig(const DescribeBackupPlanConfigRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

hbase/src/model/CreateInstanceRequest.cc

@@ -1,337 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/hbase/model/CreateInstanceRequest.h>
-
-using AlibabaCloud::HBase::Model::CreateInstanceRequest;
-
-CreateInstanceRequest::CreateInstanceRequest() :
-	RpcServiceRequest("hbase", "2019-01-01", "CreateInstance")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-CreateInstanceRequest::~CreateInstanceRequest()
-{}
-
-std::string CreateInstanceRequest::getClusterName()const
-{
-	return clusterName_;
-}
-
-void CreateInstanceRequest::setClusterName(const std::string& clusterName)
-{
-	clusterName_ = clusterName;
-	setParameter("ClusterName", clusterName);
-}
-
-std::string CreateInstanceRequest::getDbInstanceConnType()const
-{
-	return dbInstanceConnType_;
-}
-
-void CreateInstanceRequest::setDbInstanceConnType(const std::string& dbInstanceConnType)
-{
-	dbInstanceConnType_ = dbInstanceConnType;
-	setParameter("DbInstanceConnType", dbInstanceConnType);
-}
-
-std::string CreateInstanceRequest::getEngineVersion()const
-{
-	return engineVersion_;
-}
-
-void CreateInstanceRequest::setEngineVersion(const std::string& engineVersion)
-{
-	engineVersion_ = engineVersion;
-	setParameter("EngineVersion", engineVersion);
-}
-
-std::string CreateInstanceRequest::getDepMode()const
-{
-	return depMode_;
-}
-
-void CreateInstanceRequest::setDepMode(const std::string& depMode)
-{
-	depMode_ = depMode;
-	setParameter("DepMode", depMode);
-}
-
-std::string CreateInstanceRequest::getBackupId()const
-{
-	return backupId_;
-}
-
-void CreateInstanceRequest::setBackupId(const std::string& backupId)
-{
-	backupId_ = backupId;
-	setParameter("BackupId", backupId);
-}
-
-std::string CreateInstanceRequest::getDbInstanceType()const
-{
-	return dbInstanceType_;
-}
-
-void CreateInstanceRequest::setDbInstanceType(const std::string& dbInstanceType)
-{
-	dbInstanceType_ = dbInstanceType;
-	setParameter("DbInstanceType", dbInstanceType);
-}
-
-std::string CreateInstanceRequest::getVSwitchId()const
-{
-	return vSwitchId_;
-}
-
-void CreateInstanceRequest::setVSwitchId(const std::string& vSwitchId)
-{
-	vSwitchId_ = vSwitchId;
-	setParameter("VSwitchId", vSwitchId);
-}
-
-std::string CreateInstanceRequest::getSecurityIPList()const
-{
-	return securityIPList_;
-}
-
-void CreateInstanceRequest::setSecurityIPList(const std::string& securityIPList)
-{
-	securityIPList_ = securityIPList;
-	setParameter("SecurityIPList", securityIPList);
-}
-
-std::string CreateInstanceRequest::getAutoRenew()const
-{
-	return autoRenew_;
-}
-
-void CreateInstanceRequest::setAutoRenew(const std::string& autoRenew)
-{
-	autoRenew_ = autoRenew;
-	setParameter("AutoRenew", autoRenew);
-}
-
-std::string CreateInstanceRequest::getNetType()const
-{
-	return netType_;
-}
-
-void CreateInstanceRequest::setNetType(const std::string& netType)
-{
-	netType_ = netType;
-	setParameter("NetType", netType);
-}
-
-std::string CreateInstanceRequest::getZoneId()const
-{
-	return zoneId_;
-}
-
-void CreateInstanceRequest::setZoneId(const std::string& zoneId)
-{
-	zoneId_ = zoneId;
-	setParameter("ZoneId", zoneId);
-}
-
-std::string CreateInstanceRequest::getCoreDiskType()const
-{
-	return coreDiskType_;
-}
-
-void CreateInstanceRequest::setCoreDiskType(const std::string& coreDiskType)
-{
-	coreDiskType_ = coreDiskType;
-	setParameter("CoreDiskType", coreDiskType);
-}
-
-std::string CreateInstanceRequest::getPricingCycle()const
-{
-	return pricingCycle_;
-}
-
-void CreateInstanceRequest::setPricingCycle(const std::string& pricingCycle)
-{
-	pricingCycle_ = pricingCycle;
-	setParameter("PricingCycle", pricingCycle);
-}
-
-std::string CreateInstanceRequest::getCoreInstanceQuantity()const
-{
-	return coreInstanceQuantity_;
-}
-
-void CreateInstanceRequest::setCoreInstanceQuantity(const std::string& coreInstanceQuantity)
-{
-	coreInstanceQuantity_ = coreInstanceQuantity;
-	setParameter("CoreInstanceQuantity", coreInstanceQuantity);
-}
-
-std::string CreateInstanceRequest::getDuration()const
-{
-	return duration_;
-}
-
-void CreateInstanceRequest::setDuration(const std::string& duration)
-{
-	duration_ = duration;
-	setParameter("Duration", duration);
-}
-
-std::string CreateInstanceRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void CreateInstanceRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setParameter("RegionId", regionId);
-}
-
-std::string CreateInstanceRequest::getEngine()const
-{
-	return engine_;
-}
-
-void CreateInstanceRequest::setEngine(const std::string& engine)
-{
-	engine_ = engine;
-	setParameter("Engine", engine);
-}
-
-std::string CreateInstanceRequest::getRestoreTime()const
-{
-	return restoreTime_;
-}
-
-void CreateInstanceRequest::setRestoreTime(const std::string& restoreTime)
-{
-	restoreTime_ = restoreTime;
-	setParameter("RestoreTime", restoreTime);
-}
-
-std::string CreateInstanceRequest::getSrcDBInstanceId()const
-{
-	return srcDBInstanceId_;
-}
-
-void CreateInstanceRequest::setSrcDBInstanceId(const std::string& srcDBInstanceId)
-{
-	srcDBInstanceId_ = srcDBInstanceId;
-	setParameter("SrcDBInstanceId", srcDBInstanceId);
-}
-
-std::string CreateInstanceRequest::getMasterInstanceType()const
-{
-	return masterInstanceType_;
-}
-
-void CreateInstanceRequest::setMasterInstanceType(const std::string& masterInstanceType)
-{
-	masterInstanceType_ = masterInstanceType;
-	setParameter("MasterInstanceType", masterInstanceType);
-}
-
-std::string CreateInstanceRequest::getColdStorageSize()const
-{
-	return coldStorageSize_;
-}
-
-void CreateInstanceRequest::setColdStorageSize(const std::string& coldStorageSize)
-{
-	coldStorageSize_ = coldStorageSize;
-	setParameter("ColdStorageSize", coldStorageSize);
-}
-
-std::string CreateInstanceRequest::getCoreDiskQuantity()const
-{
-	return coreDiskQuantity_;
-}
-
-void CreateInstanceRequest::setCoreDiskQuantity(const std::string& coreDiskQuantity)
-{
-	coreDiskQuantity_ = coreDiskQuantity;
-	setParameter("CoreDiskQuantity", coreDiskQuantity);
-}
-
-std::string CreateInstanceRequest::getIsColdStorage()const
-{
-	return isColdStorage_;
-}
-
-void CreateInstanceRequest::setIsColdStorage(const std::string& isColdStorage)
-{
-	isColdStorage_ = isColdStorage;
-	setParameter("IsColdStorage", isColdStorage);
-}
-
-std::string CreateInstanceRequest::getCoreInstanceType()const
-{
-	return coreInstanceType_;
-}
-
-void CreateInstanceRequest::setCoreInstanceType(const std::string& coreInstanceType)
-{
-	coreInstanceType_ = coreInstanceType;
-	setParameter("CoreInstanceType", coreInstanceType);
-}
-
-std::string CreateInstanceRequest::getCoreDiskSize()const
-{
-	return coreDiskSize_;
-}
-
-void CreateInstanceRequest::setCoreDiskSize(const std::string& coreDiskSize)
-{
-	coreDiskSize_ = coreDiskSize;
-	setParameter("CoreDiskSize", coreDiskSize);
-}
-
-std::string CreateInstanceRequest::getVpcId()const
-{
-	return vpcId_;
-}
-
-void CreateInstanceRequest::setVpcId(const std::string& vpcId)
-{
-	vpcId_ = vpcId;
-	setParameter("VpcId", vpcId);
-}
-
-std::string CreateInstanceRequest::getDbType()const
-{
-	return dbType_;
-}
-
-void CreateInstanceRequest::setDbType(const std::string& dbType)
-{
-	dbType_ = dbType;
-	setParameter("DbType", dbType);
-}
-
-std::string CreateInstanceRequest::getPayType()const
-{
-	return payType_;
-}
-
-void CreateInstanceRequest::setPayType(const std::string& payType)
-{
-	payType_ = payType;
-	setParameter("PayType", payType);
-}
-

hbase/src/model/DescribeAvailableResourceRequest.cc

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/hbase/model/DescribeAvailableResourceRequest.h>
+
+using AlibabaCloud::HBase::Model::DescribeAvailableResourceRequest;
+
+DescribeAvailableResourceRequest::DescribeAvailableResourceRequest() :
+	RpcServiceRequest("hbase", "2019-01-01", "DescribeAvailableResource")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeAvailableResourceRequest::~DescribeAvailableResourceRequest()
+{}
+
+std::string DescribeAvailableResourceRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void DescribeAvailableResourceRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string DescribeAvailableResourceRequest::getZoneId()const
+{
+	return zoneId_;
+}
+
+void DescribeAvailableResourceRequest::setZoneId(const std::string& zoneId)
+{
+	zoneId_ = zoneId;
+	setParameter("ZoneId", zoneId);
+}
+
+std::string DescribeAvailableResourceRequest::getChargeType()const
+{
+	return chargeType_;
+}
+
+void DescribeAvailableResourceRequest::setChargeType(const std::string& chargeType)
+{
+	chargeType_ = chargeType;
+	setParameter("ChargeType", chargeType);
+}
+

hbase/src/model/DescribeAvailableResourceResult.cc

@@ -0,0 +1,124 @@
+/*
+ * 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/hbase/model/DescribeAvailableResourceResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::HBase;
+using namespace AlibabaCloud::HBase::Model;
+
+DescribeAvailableResourceResult::DescribeAvailableResourceResult() :
+	ServiceResult()
+{}
+
+DescribeAvailableResourceResult::DescribeAvailableResourceResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeAvailableResourceResult::~DescribeAvailableResourceResult()
+{}
+
+void DescribeAvailableResourceResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allAvailableZonesNode = value["AvailableZones"]["AvailableZone"];
+	for (auto valueAvailableZonesAvailableZone : allAvailableZonesNode)
+	{
+		AvailableZone availableZonesObject;
+		if(!valueAvailableZonesAvailableZone["RegionId"].isNull())
+			availableZonesObject.regionId = valueAvailableZonesAvailableZone["RegionId"].asString();
+		if(!valueAvailableZonesAvailableZone["ZoneId"].isNull())
+			availableZonesObject.zoneId = valueAvailableZonesAvailableZone["ZoneId"].asString();
+		auto allSupportedEnginesNode = allAvailableZonesNode["SupportedEngines"]["SupportedEngine"];
+		for (auto allAvailableZonesNodeSupportedEnginesSupportedEngine : allSupportedEnginesNode)
+		{
+			AvailableZone::SupportedEngine supportedEnginesObject;
+			if(!allAvailableZonesNodeSupportedEnginesSupportedEngine["Engine"].isNull())
+				supportedEnginesObject.engine = allAvailableZonesNodeSupportedEnginesSupportedEngine["Engine"].asString();
+			auto allSupportedEngineVersionsNode = allSupportedEnginesNode["SupportedEngineVersions"]["SupportedEngineVersion"];
+			for (auto allSupportedEnginesNodeSupportedEngineVersionsSupportedEngineVersion : allSupportedEngineVersionsNode)
+			{
+				AvailableZone::SupportedEngine::SupportedEngineVersion supportedEngineVersionsObject;
+				if(!allSupportedEnginesNodeSupportedEngineVersionsSupportedEngineVersion["Version"].isNull())
+					supportedEngineVersionsObject.version = allSupportedEnginesNodeSupportedEngineVersionsSupportedEngineVersion["Version"].asString();
+				auto allSupportedCategoriesNode = allSupportedEngineVersionsNode["SupportedCategories"]["SupportedCategoriesItem"];
+				for (auto allSupportedEngineVersionsNodeSupportedCategoriesSupportedCategoriesItem : allSupportedCategoriesNode)
+				{
+					AvailableZone::SupportedEngine::SupportedEngineVersion::SupportedCategoriesItem supportedCategoriesObject;
+					if(!allSupportedEngineVersionsNodeSupportedCategoriesSupportedCategoriesItem["Category"].isNull())
+						supportedCategoriesObject.category = allSupportedEngineVersionsNodeSupportedCategoriesSupportedCategoriesItem["Category"].asString();
+					auto allSupportedStorageTypesNode = allSupportedCategoriesNode["SupportedStorageTypes"]["SupportedStorageType"];
+					for (auto allSupportedCategoriesNodeSupportedStorageTypesSupportedStorageType : allSupportedStorageTypesNode)
+					{
+						AvailableZone::SupportedEngine::SupportedEngineVersion::SupportedCategoriesItem::SupportedStorageType supportedStorageTypesObject;
+						if(!allSupportedCategoriesNodeSupportedStorageTypesSupportedStorageType["StorageType"].isNull())
+							supportedStorageTypesObject.storageType = allSupportedCategoriesNodeSupportedStorageTypesSupportedStorageType["StorageType"].asString();
+						auto allCoreResourcesNode = allSupportedStorageTypesNode["CoreResources"]["CoreResource"];
+						for (auto allSupportedStorageTypesNodeCoreResourcesCoreResource : allCoreResourcesNode)
+						{
+							AvailableZone::SupportedEngine::SupportedEngineVersion::SupportedCategoriesItem::SupportedStorageType::CoreResource coreResourcesObject;
+							if(!allSupportedStorageTypesNodeCoreResourcesCoreResource["InstanceType"].isNull())
+								coreResourcesObject.instanceType = allSupportedStorageTypesNodeCoreResourcesCoreResource["InstanceType"].asString();
+							auto dBInstanceStorageRangeNode = value["DBInstanceStorageRange"];
+							if(!dBInstanceStorageRangeNode["MaxSize"].isNull())
+								coreResourcesObject.dBInstanceStorageRange.maxSize = std::stoi(dBInstanceStorageRangeNode["MaxSize"].asString());
+							if(!dBInstanceStorageRangeNode["MinSize"].isNull())
+								coreResourcesObject.dBInstanceStorageRange.minSize = std::stoi(dBInstanceStorageRangeNode["MinSize"].asString());
+							if(!dBInstanceStorageRangeNode["StepSize"].isNull())
+								coreResourcesObject.dBInstanceStorageRange.stepSize = std::stoi(dBInstanceStorageRangeNode["StepSize"].asString());
+							auto instanceTypeDetailNode = value["InstanceTypeDetail"];
+							if(!instanceTypeDetailNode["Cpu"].isNull())
+								coreResourcesObject.instanceTypeDetail.cpu = std::stoi(instanceTypeDetailNode["Cpu"].asString());
+							if(!instanceTypeDetailNode["Mem"].isNull())
+								coreResourcesObject.instanceTypeDetail.mem = std::stoi(instanceTypeDetailNode["Mem"].asString());
+							supportedStorageTypesObject.coreResources.push_back(coreResourcesObject);
+						}
+						supportedCategoriesObject.supportedStorageTypes.push_back(supportedStorageTypesObject);
+					}
+					supportedEngineVersionsObject.supportedCategories.push_back(supportedCategoriesObject);
+				}
+				supportedEnginesObject.supportedEngineVersions.push_back(supportedEngineVersionsObject);
+			}
+			availableZonesObject.supportedEngines.push_back(supportedEnginesObject);
+		}
+		auto allMasterResourcesNode = allAvailableZonesNode["MasterResources"]["MasterResource"];
+		for (auto allAvailableZonesNodeMasterResourcesMasterResource : allMasterResourcesNode)
+		{
+			AvailableZone::MasterResource masterResourcesObject;
+			if(!allAvailableZonesNodeMasterResourcesMasterResource["InstanceType"].isNull())
+				masterResourcesObject.instanceType = allAvailableZonesNodeMasterResourcesMasterResource["InstanceType"].asString();
+			auto instanceTypeDetail1Node = value["InstanceTypeDetail"];
+			if(!instanceTypeDetail1Node["Cpu"].isNull())
+				masterResourcesObject.instanceTypeDetail1.cpu = std::stoi(instanceTypeDetail1Node["Cpu"].asString());
+			if(!instanceTypeDetail1Node["Mem"].isNull())
+				masterResourcesObject.instanceTypeDetail1.mem = std::stoi(instanceTypeDetail1Node["Mem"].asString());
+			availableZonesObject.masterResources.push_back(masterResourcesObject);
+		}
+		availableZones_.push_back(availableZonesObject);
+	}
+
+}
+
+std::vector<DescribeAvailableResourceResult::AvailableZone> DescribeAvailableResourceResult::getAvailableZones()const
+{
+	return availableZones_;
+}
+

imm/CMakeLists.txt

@@ -51,6 +51,8 @@ set(imm_public_header_model
 	include/alibabacloud/imm/model/CreateVideoAnalyseTaskResult.h
 	include/alibabacloud/imm/model/CreateVideoCompressTaskRequest.h
 	include/alibabacloud/imm/model/CreateVideoCompressTaskResult.h
+	include/alibabacloud/imm/model/CreateVideoProduceTaskRequest.h
+	include/alibabacloud/imm/model/CreateVideoProduceTaskResult.h
 	include/alibabacloud/imm/model/DecodeBlindWatermarkRequest.h
 	include/alibabacloud/imm/model/DecodeBlindWatermarkResult.h
 	include/alibabacloud/imm/model/DeleteDocIndexRequest.h
@@ -198,6 +200,8 @@ set(imm_src
 	src/model/CreateVideoAnalyseTaskResult.cc
 	src/model/CreateVideoCompressTaskRequest.cc
 	src/model/CreateVideoCompressTaskResult.cc
+	src/model/CreateVideoProduceTaskRequest.cc
+	src/model/CreateVideoProduceTaskResult.cc
 	src/model/DecodeBlindWatermarkRequest.cc
 	src/model/DecodeBlindWatermarkResult.cc
 	src/model/DeleteDocIndexRequest.cc

imm/include/alibabacloud/imm/ImmClient.h

@@ -52,6 +52,8 @@
 #include "model/CreateVideoAnalyseTaskResult.h"
 #include "model/CreateVideoCompressTaskRequest.h"
 #include "model/CreateVideoCompressTaskResult.h"
+#include "model/CreateVideoProduceTaskRequest.h"
+#include "model/CreateVideoProduceTaskResult.h"
 #include "model/DecodeBlindWatermarkRequest.h"
 #include "model/DecodeBlindWatermarkResult.h"
 #include "model/DeleteDocIndexRequest.h"
@@ -220,6 +222,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreateVideoCompressTaskResult> CreateVideoCompressTaskOutcome;
 			typedef std::future<CreateVideoCompressTaskOutcome> CreateVideoCompressTaskOutcomeCallable;
 			typedef std::function<void(const ImmClient*, const Model::CreateVideoCompressTaskRequest&, const CreateVideoCompressTaskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateVideoCompressTaskAsyncHandler;
+			typedef Outcome<Error, Model::CreateVideoProduceTaskResult> CreateVideoProduceTaskOutcome;
+			typedef std::future<CreateVideoProduceTaskOutcome> CreateVideoProduceTaskOutcomeCallable;
+			typedef std::function<void(const ImmClient*, const Model::CreateVideoProduceTaskRequest&, const CreateVideoProduceTaskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateVideoProduceTaskAsyncHandler;
 			typedef Outcome<Error, Model::DecodeBlindWatermarkResult> DecodeBlindWatermarkOutcome;
 			typedef std::future<DecodeBlindWatermarkOutcome> DecodeBlindWatermarkOutcomeCallable;
 			typedef std::function<void(const ImmClient*, const Model::DecodeBlindWatermarkRequest&, const DecodeBlindWatermarkOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DecodeBlindWatermarkAsyncHandler;
@@ -441,6 +446,9 @@ namespace AlibabaCloud
 			CreateVideoCompressTaskOutcome createVideoCompressTask(const Model::CreateVideoCompressTaskRequest &request)const;
 			void createVideoCompressTaskAsync(const Model::CreateVideoCompressTaskRequest& request, const CreateVideoCompressTaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateVideoCompressTaskOutcomeCallable createVideoCompressTaskCallable(const Model::CreateVideoCompressTaskRequest& request) const;
+			CreateVideoProduceTaskOutcome createVideoProduceTask(const Model::CreateVideoProduceTaskRequest &request)const;
+			void createVideoProduceTaskAsync(const Model::CreateVideoProduceTaskRequest& request, const CreateVideoProduceTaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CreateVideoProduceTaskOutcomeCallable createVideoProduceTaskCallable(const Model::CreateVideoProduceTaskRequest& request) const;
 			DecodeBlindWatermarkOutcome decodeBlindWatermark(const Model::DecodeBlindWatermarkRequest &request)const;
 			void decodeBlindWatermarkAsync(const Model::DecodeBlindWatermarkRequest& request, const DecodeBlindWatermarkAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DecodeBlindWatermarkOutcomeCallable decodeBlindWatermarkCallable(const Model::DecodeBlindWatermarkRequest& request) const;

imm/include/alibabacloud/imm/model/CreateVideoProduceTaskRequest.h

@@ -0,0 +1,78 @@
+/*
+ * 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_IMM_MODEL_CREATEVIDEOPRODUCETASKREQUEST_H_
+#define ALIBABACLOUD_IMM_MODEL_CREATEVIDEOPRODUCETASKREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/imm/ImmExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Imm
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_IMM_EXPORT CreateVideoProduceTaskRequest : public RpcServiceRequest
+			{
+
+			public:
+				CreateVideoProduceTaskRequest();
+				~CreateVideoProduceTaskRequest();
+
+				std::string getProject()const;
+				void setProject(const std::string& project);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getMusic()const;
+				void setMusic(const std::string& music);
+				std::string getNotifyEndpoint()const;
+				void setNotifyEndpoint(const std::string& notifyEndpoint);
+				std::string getTargetUri()const;
+				void setTargetUri(const std::string& targetUri);
+				std::string getTemplateName()const;
+				void setTemplateName(const std::string& templateName);
+				int getHeight()const;
+				void setHeight(int height);
+				std::string getCustomMessage()const;
+				void setCustomMessage(const std::string& customMessage);
+				std::string getImages()const;
+				void setImages(const std::string& images);
+				std::string getNotifyTopicName()const;
+				void setNotifyTopicName(const std::string& notifyTopicName);
+				int getWidth()const;
+				void setWidth(int width);
+
+            private:
+				std::string project_;
+				std::string accessKeyId_;
+				std::string music_;
+				std::string notifyEndpoint_;
+				std::string targetUri_;
+				std::string templateName_;
+				int height_;
+				std::string customMessage_;
+				std::string images_;
+				std::string notifyTopicName_;
+				int width_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_IMM_MODEL_CREATEVIDEOPRODUCETASKREQUEST_H_

imm/include/alibabacloud/imm/model/CreateVideoProduceTaskResult.h

@@ -14,44 +14,40 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_CDN_MODEL_DESCRIBEDOMAINCNAMERESULT_H_
-#define ALIBABACLOUD_CDN_MODEL_DESCRIBEDOMAINCNAMERESULT_H_
+#ifndef ALIBABACLOUD_IMM_MODEL_CREATEVIDEOPRODUCETASKRESULT_H_
+#define ALIBABACLOUD_IMM_MODEL_CREATEVIDEOPRODUCETASKRESULT_H_
 
 #include <string>
 #include <vector>
 #include <utility>
 #include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/cdn/CdnExport.h>
+#include <alibabacloud/imm/ImmExport.h>
 
 namespace AlibabaCloud
 {
-	namespace Cdn
+	namespace Imm
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_CDN_EXPORT DescribeDomainCnameResult : public ServiceResult
+			class ALIBABACLOUD_IMM_EXPORT CreateVideoProduceTaskResult : public ServiceResult
 			{
 			public:
-				struct Data
-				{
-					int status;
-					std::string domain;
-					std::string cname;
-				};
 
 
-				DescribeDomainCnameResult();
-				explicit DescribeDomainCnameResult(const std::string &payload);
-				~DescribeDomainCnameResult();
-				std::vector<Data> getCnameDatas()const;
+				CreateVideoProduceTaskResult();
+				explicit CreateVideoProduceTaskResult(const std::string &payload);
+				~CreateVideoProduceTaskResult();
+				std::string getTaskId()const;
+				std::string getTaskType()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::vector<Data> cnameDatas_;
+				std::string taskId_;
+				std::string taskType_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_CDN_MODEL_DESCRIBEDOMAINCNAMERESULT_H_
+#endif // !ALIBABACLOUD_IMM_MODEL_CREATEVIDEOPRODUCETASKRESULT_H_

imm/include/alibabacloud/imm/model/FindImagesByTagNamesResult.h

@@ -140,6 +140,7 @@ namespace AlibabaCloud
 					std::string addressModifyTime;
 					std::string imageFormat;
 					std::string tagsFailReason;
+					std::string remarksArrayB;
 					std::string facesModifyTime;
 					std::string exif;
 					std::string remarksC;
@@ -147,6 +148,7 @@ namespace AlibabaCloud
 					int imageWidth;
 					std::vector<Frames::CelebrityItem> celebrity;
 					std::string sourcePosition;
+					std::string remarksArrayA;
 					std::vector<Frames::FacesItem> faces;
 					std::vector<Frames::TagsItem> tags;
 					std::string addressStatus;

imm/include/alibabacloud/imm/model/FindImagesRequest.h

@@ -35,6 +35,8 @@ namespace AlibabaCloud
 				FindImagesRequest();
 				~FindImagesRequest();
 
+				std::string getRemarksArrayBIn()const;
+				void setRemarksArrayBIn(const std::string& remarksArrayBIn);
 				std::string getProject()const;
 				void setProject(const std::string& project);
 				std::string getExternalId()const;
@@ -67,6 +69,8 @@ namespace AlibabaCloud
 				void setAddressLineContentsMatch(const std::string& addressLineContentsMatch);
 				std::string getGender()const;
 				void setGender(const std::string& gender);
+				std::string getRemarksArrayAIn()const;
+				void setRemarksArrayAIn(const std::string& remarksArrayAIn);
 				std::string getImageSizeRange()const;
 				void setImageSizeRange(const std::string& imageSizeRange);
 				std::string getRemarksBPrefix()const;
@@ -93,6 +97,7 @@ namespace AlibabaCloud
 				void setSetId(const std::string& setId);
 
             private:
+				std::string remarksArrayBIn_;
 				std::string project_;
 				std::string externalId_;
 				std::string facesModifyTimeRange_;
@@ -109,6 +114,7 @@ namespace AlibabaCloud
 				std::string modifyTimeRange_;
 				std::string addressLineContentsMatch_;
 				std::string gender_;
+				std::string remarksArrayAIn_;
 				std::string imageSizeRange_;
 				std::string remarksBPrefix_;
 				std::string accessKeyId_;

imm/include/alibabacloud/imm/model/FindImagesResult.h

@@ -140,6 +140,7 @@ namespace AlibabaCloud
 					std::string addressModifyTime;
 					std::string imageFormat;
 					std::string tagsFailReason;
+					std::string remarksArrayB;
 					std::string facesModifyTime;
 					std::string exif;
 					std::string remarksC;
@@ -147,6 +148,7 @@ namespace AlibabaCloud
 					int imageWidth;
 					std::vector<ImagesItem::CelebrityItem> celebrity;
 					std::string sourcePosition;
+					std::string remarksArrayA;
 					std::vector<ImagesItem::FacesItem> faces;
 					std::vector<ImagesItem::TagsItem> tags;
 					std::string addressStatus;

imm/include/alibabacloud/imm/model/GetImageResult.h

@@ -143,6 +143,7 @@ namespace AlibabaCloud
 				std::string getAddressModifyTime()const;
 				std::string getImageFormat()const;
 				std::string getTagsFailReason()const;
+				std::string getRemarksArrayB()const;
 				std::string getExif()const;
 				std::string getFacesModifyTime()const;
 				std::string getRemarksC()const;
@@ -150,6 +151,7 @@ namespace AlibabaCloud
 				int getImageWidth()const;
 				std::vector<CelebrityItem> getCelebrity()const;
 				std::string getSourcePosition()const;
+				std::string getRemarksArrayA()const;
 				std::vector<FacesItem> getFaces()const;
 				std::vector<TagsItem> getTags()const;
 				std::string getAddressStatus()const;
@@ -187,6 +189,7 @@ namespace AlibabaCloud
 				std::string addressModifyTime_;
 				std::string imageFormat_;
 				std::string tagsFailReason_;
+				std::string remarksArrayB_;
 				std::string exif_;
 				std::string facesModifyTime_;
 				std::string remarksC_;
@@ -194,6 +197,7 @@ namespace AlibabaCloud
 				int imageWidth_;
 				std::vector<CelebrityItem> celebrity_;
 				std::string sourcePosition_;
+				std::string remarksArrayA_;
 				std::vector<FacesItem> faces_;
 				std::vector<TagsItem> tags_;
 				std::string addressStatus_;

imm/include/alibabacloud/imm/model/GetOfficePreviewURLRequest.h

@@ -39,19 +39,37 @@ namespace AlibabaCloud
 				void setSrcType(const std::string& srcType);
 				std::string getProject()const;
 				void setProject(const std::string& project);
+				int getWatermarkVertical()const;
+				void setWatermarkVertical(int watermarkVertical);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				bool getUseOldURL()const;
-				void setUseOldURL(bool useOldURL);
+				int getWatermarkType()const;
+				void setWatermarkType(int watermarkType);
+				float getWatermarkRotate()const;
+				void setWatermarkRotate(float watermarkRotate);
+				std::string getWatermarkValue()const;
+				void setWatermarkValue(const std::string& watermarkValue);
+				std::string getWatermarkFont()const;
+				void setWatermarkFont(const std::string& watermarkFont);
+				int getWatermarkHorizontal()const;
+				void setWatermarkHorizontal(int watermarkHorizontal);
 				std::string getSrcUri()const;
 				void setSrcUri(const std::string& srcUri);
+				std::string getWatermarkFillStyle()const;
+				void setWatermarkFillStyle(const std::string& watermarkFillStyle);
 
             private:
 				std::string srcType_;
 				std::string project_;
+				int watermarkVertical_;
 				std::string accessKeyId_;
-				bool useOldURL_;
+				int watermarkType_;
+				float watermarkRotate_;
+				std::string watermarkValue_;
+				std::string watermarkFont_;
+				int watermarkHorizontal_;
 				std::string srcUri_;
+				std::string watermarkFillStyle_;
 
 			};
 		}

imm/include/alibabacloud/imm/model/IndexImageRequest.h

@@ -55,6 +55,10 @@ namespace AlibabaCloud
 				void setRemarksA(const std::string& remarksA);
 				std::string getImageUri()const;
 				void setImageUri(const std::string& imageUri);
+				std::string getRemarksArrayA()const;
+				void setRemarksArrayA(const std::string& remarksArrayA);
+				std::string getRemarksArrayB()const;
+				void setRemarksArrayB(const std::string& remarksArrayB);
 				std::string getSourceUri()const;
 				void setSourceUri(const std::string& sourceUri);
 				std::string getSourcePosition()const;
@@ -77,6 +81,8 @@ namespace AlibabaCloud
 				std::string remarksB_;
 				std::string remarksA_;
 				std::string imageUri_;
+				std::string remarksArrayA_;
+				std::string remarksArrayB_;
 				std::string sourceUri_;
 				std::string sourcePosition_;
 				std::string remarksD_;

imm/include/alibabacloud/imm/model/IndexImageResult.h

@@ -37,11 +37,13 @@ namespace AlibabaCloud
 				IndexImageResult();
 				explicit IndexImageResult(const std::string &payload);
 				~IndexImageResult();
+				std::string getRemarksArrayB()const;
 				std::string getModifyTime()const;
 				std::string getRemarksC()const;
 				std::string getRemarksD()const;
 				std::string getCreateTime()const;
 				std::string getExternalId()const;
+				std::string getRemarksArrayA()const;
 				std::string getSetId()const;
 				std::string getImageUri()const;
 				std::string getRemarksA()const;
@@ -50,11 +52,13 @@ namespace AlibabaCloud
 			protected:
 				void parse(const std::string &payload);
 			private:
+				std::string remarksArrayB_;
 				std::string modifyTime_;
 				std::string remarksC_;
 				std::string remarksD_;
 				std::string createTime_;
 				std::string externalId_;
+				std::string remarksArrayA_;
 				std::string setId_;
 				std::string imageUri_;
 				std::string remarksA_;

imm/include/alibabacloud/imm/model/ListImagesResult.h

@@ -140,6 +140,7 @@ namespace AlibabaCloud
 					std::string addressModifyTime;
 					std::string imageFormat;
 					std::string tagsFailReason;
+					std::string remarksArrayB;
 					std::string facesModifyTime;
 					std::string exif;
 					std::string remarksC;
@@ -147,6 +148,7 @@ namespace AlibabaCloud
 					int imageWidth;
 					std::vector<ImagesItem::CelebrityItem> celebrity;
 					std::string sourcePosition;
+					std::string remarksArrayA;
 					std::vector<ImagesItem::FacesItem> faces;
 					std::vector<ImagesItem::TagsItem> tags;
 					std::string addressStatus;

imm/include/alibabacloud/imm/model/UpdateImageRequest.h

@@ -49,6 +49,10 @@ namespace AlibabaCloud
 				void setRemarksA(const std::string& remarksA);
 				std::string getImageUri()const;
 				void setImageUri(const std::string& imageUri);
+				std::string getRemarksArrayA()const;
+				void setRemarksArrayA(const std::string& remarksArrayA);
+				std::string getRemarksArrayB()const;
+				void setRemarksArrayB(const std::string& remarksArrayB);
 				std::string getSourceUri()const;
 				void setSourceUri(const std::string& sourceUri);
 				std::string getSourcePosition()const;
@@ -68,6 +72,8 @@ namespace AlibabaCloud
 				std::string remarksB_;
 				std::string remarksA_;
 				std::string imageUri_;
+				std::string remarksArrayA_;
+				std::string remarksArrayB_;
 				std::string sourceUri_;
 				std::string sourcePosition_;
 				std::string remarksD_;

imm/include/alibabacloud/imm/model/UpdateImageResult.h

@@ -37,11 +37,13 @@ namespace AlibabaCloud
 				UpdateImageResult();
 				explicit UpdateImageResult(const std::string &payload);
 				~UpdateImageResult();
+				std::string getRemarksArrayB()const;
 				std::string getModifyTime()const;
 				std::string getRemarksC()const;
 				std::string getRemarksD()const;
 				std::string getCreateTime()const;
 				std::string getExternalId()const;
+				std::string getRemarksArrayA()const;
 				std::string getSetId()const;
 				std::string getImageUri()const;
 				std::string getRemarksA()const;
@@ -50,11 +52,13 @@ namespace AlibabaCloud
 			protected:
 				void parse(const std::string &payload);
 			private:
+				std::string remarksArrayB_;
 				std::string modifyTime_;
 				std::string remarksC_;
 				std::string remarksD_;
 				std::string createTime_;
 				std::string externalId_;
+				std::string remarksArrayA_;
 				std::string setId_;
 				std::string imageUri_;
 				std::string remarksA_;

imm/src/ImmClient.cc

@@ -591,6 +591,42 @@ ImmClient::CreateVideoCompressTaskOutcomeCallable ImmClient::createVideoCompress
 	return task->get_future();
 }
 
+ImmClient::CreateVideoProduceTaskOutcome ImmClient::createVideoProduceTask(const CreateVideoProduceTaskRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return CreateVideoProduceTaskOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return CreateVideoProduceTaskOutcome(CreateVideoProduceTaskResult(outcome.result()));
+	else
+		return CreateVideoProduceTaskOutcome(outcome.error());
+}
+
+void ImmClient::createVideoProduceTaskAsync(const CreateVideoProduceTaskRequest& request, const CreateVideoProduceTaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, createVideoProduceTask(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ImmClient::CreateVideoProduceTaskOutcomeCallable ImmClient::createVideoProduceTaskCallable(const CreateVideoProduceTaskRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<CreateVideoProduceTaskOutcome()>>(
+			[this, request]()
+			{
+			return this->createVideoProduceTask(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ImmClient::DecodeBlindWatermarkOutcome ImmClient::decodeBlindWatermark(const DecodeBlindWatermarkRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

imm/src/model/CreateVideoProduceTaskRequest.cc

@@ -0,0 +1,150 @@
+/*
+ * 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/imm/model/CreateVideoProduceTaskRequest.h>
+
+using AlibabaCloud::Imm::Model::CreateVideoProduceTaskRequest;
+
+CreateVideoProduceTaskRequest::CreateVideoProduceTaskRequest() :
+	RpcServiceRequest("imm", "2017-09-06", "CreateVideoProduceTask")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+CreateVideoProduceTaskRequest::~CreateVideoProduceTaskRequest()
+{}
+
+std::string CreateVideoProduceTaskRequest::getProject()const
+{
+	return project_;
+}
+
+void CreateVideoProduceTaskRequest::setProject(const std::string& project)
+{
+	project_ = project;
+	setParameter("Project", project);
+}
+
+std::string CreateVideoProduceTaskRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void CreateVideoProduceTaskRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string CreateVideoProduceTaskRequest::getMusic()const
+{
+	return music_;
+}
+
+void CreateVideoProduceTaskRequest::setMusic(const std::string& music)
+{
+	music_ = music;
+	setParameter("Music", music);
+}
+
+std::string CreateVideoProduceTaskRequest::getNotifyEndpoint()const
+{
+	return notifyEndpoint_;
+}
+
+void CreateVideoProduceTaskRequest::setNotifyEndpoint(const std::string& notifyEndpoint)
+{
+	notifyEndpoint_ = notifyEndpoint;
+	setParameter("NotifyEndpoint", notifyEndpoint);
+}
+
+std::string CreateVideoProduceTaskRequest::getTargetUri()const
+{
+	return targetUri_;
+}
+
+void CreateVideoProduceTaskRequest::setTargetUri(const std::string& targetUri)
+{
+	targetUri_ = targetUri;
+	setParameter("TargetUri", targetUri);
+}
+
+std::string CreateVideoProduceTaskRequest::getTemplateName()const
+{
+	return templateName_;
+}
+
+void CreateVideoProduceTaskRequest::setTemplateName(const std::string& templateName)
+{
+	templateName_ = templateName;
+	setParameter("TemplateName", templateName);
+}
+
+int CreateVideoProduceTaskRequest::getHeight()const
+{
+	return height_;
+}
+
+void CreateVideoProduceTaskRequest::setHeight(int height)
+{
+	height_ = height;
+	setParameter("Height", std::to_string(height));
+}
+
+std::string CreateVideoProduceTaskRequest::getCustomMessage()const
+{
+	return customMessage_;
+}
+
+void CreateVideoProduceTaskRequest::setCustomMessage(const std::string& customMessage)
+{
+	customMessage_ = customMessage;
+	setParameter("CustomMessage", customMessage);
+}
+
+std::string CreateVideoProduceTaskRequest::getImages()const
+{
+	return images_;
+}
+
+void CreateVideoProduceTaskRequest::setImages(const std::string& images)
+{
+	images_ = images;
+	setParameter("Images", images);
+}
+
+std::string CreateVideoProduceTaskRequest::getNotifyTopicName()const
+{
+	return notifyTopicName_;
+}
+
+void CreateVideoProduceTaskRequest::setNotifyTopicName(const std::string& notifyTopicName)
+{
+	notifyTopicName_ = notifyTopicName;
+	setParameter("NotifyTopicName", notifyTopicName);
+}
+
+int CreateVideoProduceTaskRequest::getWidth()const
+{
+	return width_;
+}
+
+void CreateVideoProduceTaskRequest::setWidth(int width)
+{
+	width_ = width;
+	setParameter("Width", std::to_string(width));
+}
+

imm/src/model/CreateVideoProduceTaskResult.cc

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/imm/model/CreateVideoProduceTaskResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Imm;
+using namespace AlibabaCloud::Imm::Model;
+
+CreateVideoProduceTaskResult::CreateVideoProduceTaskResult() :
+	ServiceResult()
+{}
+
+CreateVideoProduceTaskResult::CreateVideoProduceTaskResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+CreateVideoProduceTaskResult::~CreateVideoProduceTaskResult()
+{}
+
+void CreateVideoProduceTaskResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["TaskId"].isNull())
+		taskId_ = value["TaskId"].asString();
+	if(!value["TaskType"].isNull())
+		taskType_ = value["TaskType"].asString();
+
+}
+
+std::string CreateVideoProduceTaskResult::getTaskId()const
+{
+	return taskId_;
+}
+
+std::string CreateVideoProduceTaskResult::getTaskType()const
+{
+	return taskType_;
+}
+

imm/src/model/FindImagesByTagNamesResult.cc

@@ -111,6 +111,10 @@ void FindImagesByTagNamesResult::parse(const std::string &payload)
 			imagesObject.addressStatus = valueImagesFrames["AddressStatus"].asString();
 		if(!valueImagesFrames["AddressFailReason"].isNull())
 			imagesObject.addressFailReason = valueImagesFrames["AddressFailReason"].asString();
+		if(!valueImagesFrames["RemarksArrayA"].isNull())
+			imagesObject.remarksArrayA = valueImagesFrames["RemarksArrayA"].asString();
+		if(!valueImagesFrames["RemarksArrayB"].isNull())
+			imagesObject.remarksArrayB = valueImagesFrames["RemarksArrayB"].asString();
 		auto allFacesNode = allImagesNode["Faces"]["FacesItem"];
 		for (auto allImagesNodeFacesFacesItem : allFacesNode)
 		{

imm/src/model/FindImagesRequest.cc

@@ -27,6 +27,17 @@ FindImagesRequest::FindImagesRequest() :
 FindImagesRequest::~FindImagesRequest()
 {}
 
+std::string FindImagesRequest::getRemarksArrayBIn()const
+{
+	return remarksArrayBIn_;
+}
+
+void FindImagesRequest::setRemarksArrayBIn(const std::string& remarksArrayBIn)
+{
+	remarksArrayBIn_ = remarksArrayBIn;
+	setParameter("RemarksArrayBIn", remarksArrayBIn);
+}
+
 std::string FindImagesRequest::getProject()const
 {
 	return project_;
@@ -203,6 +214,17 @@ void FindImagesRequest::setGender(const std::string& gender)
 	setParameter("Gender", gender);
 }
 
+std::string FindImagesRequest::getRemarksArrayAIn()const
+{
+	return remarksArrayAIn_;
+}
+
+void FindImagesRequest::setRemarksArrayAIn(const std::string& remarksArrayAIn)
+{
+	remarksArrayAIn_ = remarksArrayAIn;
+	setParameter("RemarksArrayAIn", remarksArrayAIn);
+}
+
 std::string FindImagesRequest::getImageSizeRange()const
 {
 	return imageSizeRange_;

imm/src/model/FindImagesResult.cc

@@ -111,6 +111,10 @@ void FindImagesResult::parse(const std::string &payload)
 			imagesObject.addressStatus = valueImagesImagesItem["AddressStatus"].asString();
 		if(!valueImagesImagesItem["AddressFailReason"].isNull())
 			imagesObject.addressFailReason = valueImagesImagesItem["AddressFailReason"].asString();
+		if(!valueImagesImagesItem["RemarksArrayB"].isNull())
+			imagesObject.remarksArrayB = valueImagesImagesItem["RemarksArrayB"].asString();
+		if(!valueImagesImagesItem["RemarksArrayA"].isNull())
+			imagesObject.remarksArrayA = valueImagesImagesItem["RemarksArrayA"].asString();
 		auto allFacesNode = allImagesNode["Faces"]["FacesItem"];
 		for (auto allImagesNodeFacesFacesItem : allFacesNode)
 		{

imm/src/model/GetImageResult.cc

@@ -252,6 +252,10 @@ void GetImageResult::parse(const std::string &payload)
 		addressStatus_ = value["AddressStatus"].asString();
 	if(!value["AddressFailReason"].isNull())
 		addressFailReason_ = value["AddressFailReason"].asString();
+	if(!value["RemarksArrayA"].isNull())
+		remarksArrayA_ = value["RemarksArrayA"].asString();
+	if(!value["RemarksArrayB"].isNull())
+		remarksArrayB_ = value["RemarksArrayB"].asString();
 
 }
 
@@ -310,6 +314,11 @@ std::string GetImageResult::getTagsFailReason()const
 	return tagsFailReason_;
 }
 
+std::string GetImageResult::getRemarksArrayB()const
+{
+	return remarksArrayB_;
+}
+
 std::string GetImageResult::getExif()const
 {
 	return exif_;
@@ -345,6 +354,11 @@ std::string GetImageResult::getSourcePosition()const
 	return sourcePosition_;
 }
 
+std::string GetImageResult::getRemarksArrayA()const
+{
+	return remarksArrayA_;
+}
+
 std::vector<GetImageResult::FacesItem> GetImageResult::getFaces()const
 {
 	return faces_;

imm/src/model/GetOfficePreviewURLRequest.cc

@@ -49,6 +49,17 @@ void GetOfficePreviewURLRequest::setProject(const std::string& project)
 	setParameter("Project", project);
 }
 
+int GetOfficePreviewURLRequest::getWatermarkVertical()const
+{
+	return watermarkVertical_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkVertical(int watermarkVertical)
+{
+	watermarkVertical_ = watermarkVertical;
+	setParameter("WatermarkVertical", std::to_string(watermarkVertical));
+}
+
 std::string GetOfficePreviewURLRequest::getAccessKeyId()const
 {
 	return accessKeyId_;
@@ -60,15 +71,59 @@ void GetOfficePreviewURLRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
-bool GetOfficePreviewURLRequest::getUseOldURL()const
+int GetOfficePreviewURLRequest::getWatermarkType()const
 {
-	return useOldURL_;
+	return watermarkType_;
 }
 
-void GetOfficePreviewURLRequest::setUseOldURL(bool useOldURL)
+void GetOfficePreviewURLRequest::setWatermarkType(int watermarkType)
 {
-	useOldURL_ = useOldURL;
-	setParameter("UseOldURL", useOldURL ? "true" : "false");
+	watermarkType_ = watermarkType;
+	setParameter("WatermarkType", std::to_string(watermarkType));
+}
+
+float GetOfficePreviewURLRequest::getWatermarkRotate()const
+{
+	return watermarkRotate_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkRotate(float watermarkRotate)
+{
+	watermarkRotate_ = watermarkRotate;
+	setParameter("WatermarkRotate", std::to_string(watermarkRotate));
+}
+
+std::string GetOfficePreviewURLRequest::getWatermarkValue()const
+{
+	return watermarkValue_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkValue(const std::string& watermarkValue)
+{
+	watermarkValue_ = watermarkValue;
+	setParameter("WatermarkValue", watermarkValue);
+}
+
+std::string GetOfficePreviewURLRequest::getWatermarkFont()const
+{
+	return watermarkFont_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkFont(const std::string& watermarkFont)
+{
+	watermarkFont_ = watermarkFont;
+	setParameter("WatermarkFont", watermarkFont);
+}
+
+int GetOfficePreviewURLRequest::getWatermarkHorizontal()const
+{
+	return watermarkHorizontal_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkHorizontal(int watermarkHorizontal)
+{
+	watermarkHorizontal_ = watermarkHorizontal;
+	setParameter("WatermarkHorizontal", std::to_string(watermarkHorizontal));
 }
 
 std::string GetOfficePreviewURLRequest::getSrcUri()const
@@ -82,3 +137,14 @@ void GetOfficePreviewURLRequest::setSrcUri(const std::string& srcUri)
 	setParameter("SrcUri", srcUri);
 }
 
+std::string GetOfficePreviewURLRequest::getWatermarkFillStyle()const
+{
+	return watermarkFillStyle_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkFillStyle(const std::string& watermarkFillStyle)
+{
+	watermarkFillStyle_ = watermarkFillStyle;
+	setParameter("WatermarkFillStyle", watermarkFillStyle);
+}
+