Update monitor related API.

CHANGELOG

@@ -1,3 +1,27 @@
+2020-06-04 Version: 1.36.447
+- Update monitor related API.
+
+2020-06-04 Version: 1.36.446
+- Update monitor related API.
+
+2020-06-03 Version: 1.36.445
+- Describe describeAvailableResource.
+
+2020-06-03 Version: 1.36.444
+- Describe describeAvailableResource.
+
+2020-06-03 Version: 1.36.443
+- Generated 2019-01-01 for `Cassandra`.
+
+2020-06-03 Version: 1.36.442
+- DescribeCameraStatistics add filed.
+
+2020-06-02 Version: 1.36.441
+- Edit SearchTraces api.
+
+2020-05-28 Version: 1.36.440
+- Supported AndroidNotificationXiaomiChannel for Push and MassPush.
+
 2020-05-27 Version: 1.36.439
 - Added cn-heyuan endpoint url.
 - Added cn-wulanchabu endpoint url.

VERSION

@@ -1 +1 @@
-1.36.439
+1.36.447

arms/include/alibabacloud/arms/model/SearchTracesRequest.h

@@ -31,6 +31,11 @@ namespace AlibabaCloud
 			class ALIBABACLOUD_ARMS_EXPORT SearchTracesRequest : public RpcServiceRequest
 			{
 			public:
+				struct ExclusionFilters
+				{
+					std::string value;
+					std::string key;
+				};
 				struct Tag
 				{
 					std::string value;
@@ -51,6 +56,8 @@ namespace AlibabaCloud
 				void setMinDuration(long minDuration);
 				std::string getServiceIp()const;
 				void setServiceIp(const std::string& serviceIp);
+				std::vector<ExclusionFilters> getExclusionFilters()const;
+				void setExclusionFilters(const std::vector<ExclusionFilters>& exclusionFilters);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				std::string getOperationName()const;
@@ -66,6 +73,7 @@ namespace AlibabaCloud
 				bool reverse_;
 				long minDuration_;
 				std::string serviceIp_;
+				std::vector<ExclusionFilters> exclusionFilters_;
 				std::string regionId_;
 				std::string operationName_;
 				std::string serviceName_;

arms/src/model/SearchTracesRequest.cc

@@ -82,6 +82,22 @@ void SearchTracesRequest::setServiceIp(const std::string& serviceIp)
 	setParameter("ServiceIp", serviceIp);
 }
 
+std::vector<SearchTracesRequest::ExclusionFilters> SearchTracesRequest::getExclusionFilters()const
+{
+	return exclusionFilters_;
+}
+
+void SearchTracesRequest::setExclusionFilters(const std::vector<ExclusionFilters>& exclusionFilters)
+{
+	exclusionFilters_ = exclusionFilters;
+	for(int dep1 = 0; dep1!= exclusionFilters.size(); dep1++) {
+		auto exclusionFiltersObj = exclusionFilters.at(dep1);
+		std::string exclusionFiltersObjStr = "ExclusionFilters." + std::to_string(dep1 + 1);
+		setParameter(exclusionFiltersObjStr + ".Value", exclusionFiltersObj.value);
+		setParameter(exclusionFiltersObjStr + ".Key", exclusionFiltersObj.key);
+	}
+}
+
 std::string SearchTracesRequest::getRegionId()const
 {
 	return regionId_;

cassandra/include/alibabacloud/cassandra/model/DescribeClusterResult.h

@@ -41,6 +41,7 @@ namespace AlibabaCloud
 					};
 					std::string status;
 					std::string majorVersion;
+					int autoRenewPeriod;
 					std::string createdTime;
 					std::string clusterId;
 					std::string minorVersion;
@@ -48,6 +49,7 @@ namespace AlibabaCloud
 					std::string lockMode;
 					bool isLatestVersion;
 					std::string maintainEndTime;
+					bool autoRenewal;
 					int dataCenterCount;
 					std::string clusterName;
 					std::string expireTime;

cassandra/include/alibabacloud/cassandra/model/DescribeClustersResult.h

@@ -41,13 +41,15 @@ namespace AlibabaCloud
 					};
 					std::string status;
 					std::string majorVersion;
+					int autoRenewPeriod;
 					std::string createdTime;
 					std::string clusterId;
-					int dataCenterCount;
-					std::string clusterName;
 					std::string minorVersion;
 					std::string payType;
 					std::string lockMode;
+					bool autoRenewal;
+					int dataCenterCount;
+					std::string clusterName;
 					std::string expireTime;
 					std::vector<Cluster::Tag> tags;
 				};

cassandra/include/alibabacloud/cassandra/model/DescribeDataCenterResult.h

@@ -38,6 +38,7 @@ namespace AlibabaCloud
 				explicit DescribeDataCenterResult(const std::string &payload);
 				~DescribeDataCenterResult();
 				std::string getStatus()const;
+				int getAutoRenewPeriod()const;
 				std::string getDataCenterId()const;
 				std::string getCreatedTime()const;
 				std::string getCommodityInstance()const;
@@ -50,6 +51,7 @@ namespace AlibabaCloud
 				std::string getVswitchId()const;
 				std::string getDiskType()const;
 				std::string getVpcId()const;
+				bool getAutoRenewal()const;
 				int getDiskSize()const;
 				std::string getRegionId()const;
 				std::string getInstanceType()const;
@@ -59,6 +61,7 @@ namespace AlibabaCloud
 				void parse(const std::string &payload);
 			private:
 				std::string status_;
+				int autoRenewPeriod_;
 				std::string dataCenterId_;
 				std::string createdTime_;
 				std::string commodityInstance_;
@@ -71,6 +74,7 @@ namespace AlibabaCloud
 				std::string vswitchId_;
 				std::string diskType_;
 				std::string vpcId_;
+				bool autoRenewal_;
 				int diskSize_;
 				std::string regionId_;
 				std::string instanceType_;

cassandra/include/alibabacloud/cassandra/model/DescribeDataCentersResult.h

@@ -35,6 +35,7 @@ namespace AlibabaCloud
 				struct DataCenter
 				{
 					std::string status;
+					int autoRenewPeriod;
 					std::string dataCenterId;
 					std::string createdTime;
 					std::string commodityInstance;
@@ -47,6 +48,7 @@ namespace AlibabaCloud
 					std::string vswitchId;
 					std::string diskType;
 					std::string vpcId;
+					bool autoRenewal;
 					int diskSize;
 					std::string regionId;
 					std::string instanceType;

cassandra/include/alibabacloud/cassandra/model/RebootClusterRequest.h

@@ -35,10 +35,13 @@ namespace AlibabaCloud
 				RebootClusterRequest();
 				~RebootClusterRequest();
 
+				std::string getDataCenterId()const;
+				void setDataCenterId(const std::string& dataCenterId);
 				std::string getClusterId()const;
 				void setClusterId(const std::string& clusterId);
 
             private:
+				std::string dataCenterId_;
 				std::string clusterId_;
 
 			};

cassandra/src/model/DescribeClusterResult.cc

@@ -66,6 +66,10 @@ void DescribeClusterResult::parse(const std::string &payload)
 		cluster_.maintainEndTime = clusterNode["MaintainEndTime"].asString();
 	if(!clusterNode["LockMode"].isNull())
 		cluster_.lockMode = clusterNode["LockMode"].asString();
+	if(!clusterNode["AutoRenewal"].isNull())
+		cluster_.autoRenewal = clusterNode["AutoRenewal"].asString() == "true";
+	if(!clusterNode["AutoRenewPeriod"].isNull())
+		cluster_.autoRenewPeriod = std::stoi(clusterNode["AutoRenewPeriod"].asString());
 	auto allTagsNode = clusterNode["Tags"]["Tag"];
 	for (auto clusterNodeTagsTag : allTagsNode)
 	{

cassandra/src/model/DescribeClustersResult.cc

@@ -63,6 +63,10 @@ void DescribeClustersResult::parse(const std::string &payload)
 			clustersObject.dataCenterCount = std::stoi(valueClustersCluster["DataCenterCount"].asString());
 		if(!valueClustersCluster["LockMode"].isNull())
 			clustersObject.lockMode = valueClustersCluster["LockMode"].asString();
+		if(!valueClustersCluster["AutoRenewal"].isNull())
+			clustersObject.autoRenewal = valueClustersCluster["AutoRenewal"].asString() == "true";
+		if(!valueClustersCluster["AutoRenewPeriod"].isNull())
+			clustersObject.autoRenewPeriod = std::stoi(valueClustersCluster["AutoRenewPeriod"].asString());
 		auto allTagsNode = allClustersNode["Tags"]["Tag"];
 		for (auto allClustersNodeTagsTag : allTagsNode)
 		{

cassandra/src/model/DescribeDataCenterResult.cc

@@ -73,6 +73,10 @@ void DescribeDataCenterResult::parse(const std::string &payload)
 		expireTime_ = value["ExpireTime"].asString();
 	if(!value["LockMode"].isNull())
 		lockMode_ = value["LockMode"].asString();
+	if(!value["AutoRenewal"].isNull())
+		autoRenewal_ = value["AutoRenewal"].asString() == "true";
+	if(!value["AutoRenewPeriod"].isNull())
+		autoRenewPeriod_ = std::stoi(value["AutoRenewPeriod"].asString());
 
 }
 
@@ -81,6 +85,11 @@ std::string DescribeDataCenterResult::getStatus()const
 	return status_;
 }
 
+int DescribeDataCenterResult::getAutoRenewPeriod()const
+{
+	return autoRenewPeriod_;
+}
+
 std::string DescribeDataCenterResult::getDataCenterId()const
 {
 	return dataCenterId_;
@@ -141,6 +150,11 @@ std::string DescribeDataCenterResult::getVpcId()const
 	return vpcId_;
 }
 
+bool DescribeDataCenterResult::getAutoRenewal()const
+{
+	return autoRenewal_;
+}
+
 int DescribeDataCenterResult::getDiskSize()const
 {
 	return diskSize_;

cassandra/src/model/DescribeDataCentersResult.cc

@@ -77,6 +77,10 @@ void DescribeDataCentersResult::parse(const std::string &payload)
 			dataCentersObject.expireTime = valueDataCentersDataCenter["ExpireTime"].asString();
 		if(!valueDataCentersDataCenter["LockMode"].isNull())
 			dataCentersObject.lockMode = valueDataCentersDataCenter["LockMode"].asString();
+		if(!valueDataCentersDataCenter["AutoRenewal"].isNull())
+			dataCentersObject.autoRenewal = valueDataCentersDataCenter["AutoRenewal"].asString() == "true";
+		if(!valueDataCentersDataCenter["AutoRenewPeriod"].isNull())
+			dataCentersObject.autoRenewPeriod = std::stoi(valueDataCentersDataCenter["AutoRenewPeriod"].asString());
 		dataCenters_.push_back(dataCentersObject);
 	}
 

cassandra/src/model/RebootClusterRequest.cc

@@ -27,6 +27,17 @@ RebootClusterRequest::RebootClusterRequest() :
 RebootClusterRequest::~RebootClusterRequest()
 {}
 
+std::string RebootClusterRequest::getDataCenterId()const
+{
+	return dataCenterId_;
+}
+
+void RebootClusterRequest::setDataCenterId(const std::string& dataCenterId)
+{
+	dataCenterId_ = dataCenterId;
+	setParameter("DataCenterId", dataCenterId);
+}
+
 std::string RebootClusterRequest::getClusterId()const
 {
 	return clusterId_;

hbase/CMakeLists.txt

@@ -55,6 +55,8 @@ set(hbase_public_header_model
 	include/alibabacloud/hbase/model/DescribeBackupTablesResult.h
 	include/alibabacloud/hbase/model/DescribeDBInstanceUsageRequest.h
 	include/alibabacloud/hbase/model/DescribeDBInstanceUsageResult.h
+	include/alibabacloud/hbase/model/DescribeDeletedInstancesRequest.h
+	include/alibabacloud/hbase/model/DescribeDeletedInstancesResult.h
 	include/alibabacloud/hbase/model/DescribeEndpointsRequest.h
 	include/alibabacloud/hbase/model/DescribeEndpointsResult.h
 	include/alibabacloud/hbase/model/DescribeInstanceRequest.h
@@ -101,6 +103,8 @@ set(hbase_public_header_model
 	include/alibabacloud/hbase/model/ModifySecurityGroupsResult.h
 	include/alibabacloud/hbase/model/ModifyUIAccountPasswordRequest.h
 	include/alibabacloud/hbase/model/ModifyUIAccountPasswordResult.h
+	include/alibabacloud/hbase/model/PurgeInstanceRequest.h
+	include/alibabacloud/hbase/model/PurgeInstanceResult.h
 	include/alibabacloud/hbase/model/QueryHBaseHaDBRequest.h
 	include/alibabacloud/hbase/model/QueryHBaseHaDBResult.h
 	include/alibabacloud/hbase/model/QueryXpackRelateDBRequest.h
@@ -158,6 +162,8 @@ set(hbase_src
 	src/model/DescribeBackupTablesResult.cc
 	src/model/DescribeDBInstanceUsageRequest.cc
 	src/model/DescribeDBInstanceUsageResult.cc
+	src/model/DescribeDeletedInstancesRequest.cc
+	src/model/DescribeDeletedInstancesResult.cc
 	src/model/DescribeEndpointsRequest.cc
 	src/model/DescribeEndpointsResult.cc
 	src/model/DescribeInstanceRequest.cc
@@ -204,6 +210,8 @@ set(hbase_src
 	src/model/ModifySecurityGroupsResult.cc
 	src/model/ModifyUIAccountPasswordRequest.cc
 	src/model/ModifyUIAccountPasswordResult.cc
+	src/model/PurgeInstanceRequest.cc
+	src/model/PurgeInstanceResult.cc
 	src/model/QueryHBaseHaDBRequest.cc
 	src/model/QueryHBaseHaDBResult.cc
 	src/model/QueryXpackRelateDBRequest.cc

hbase/include/alibabacloud/hbase/HBaseClient.h

@@ -56,6 +56,8 @@
 #include "model/DescribeBackupTablesResult.h"
 #include "model/DescribeDBInstanceUsageRequest.h"
 #include "model/DescribeDBInstanceUsageResult.h"
+#include "model/DescribeDeletedInstancesRequest.h"
+#include "model/DescribeDeletedInstancesResult.h"
 #include "model/DescribeEndpointsRequest.h"
 #include "model/DescribeEndpointsResult.h"
 #include "model/DescribeInstanceRequest.h"
@@ -102,6 +104,8 @@
 #include "model/ModifySecurityGroupsResult.h"
 #include "model/ModifyUIAccountPasswordRequest.h"
 #include "model/ModifyUIAccountPasswordResult.h"
+#include "model/PurgeInstanceRequest.h"
+#include "model/PurgeInstanceResult.h"
 #include "model/QueryHBaseHaDBRequest.h"
 #include "model/QueryHBaseHaDBResult.h"
 #include "model/QueryXpackRelateDBRequest.h"
@@ -182,6 +186,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDBInstanceUsageResult> DescribeDBInstanceUsageOutcome;
 			typedef std::future<DescribeDBInstanceUsageOutcome> DescribeDBInstanceUsageOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::DescribeDBInstanceUsageRequest&, const DescribeDBInstanceUsageOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBInstanceUsageAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDeletedInstancesResult> DescribeDeletedInstancesOutcome;
+			typedef std::future<DescribeDeletedInstancesOutcome> DescribeDeletedInstancesOutcomeCallable;
+			typedef std::function<void(const HBaseClient*, const Model::DescribeDeletedInstancesRequest&, const DescribeDeletedInstancesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDeletedInstancesAsyncHandler;
 			typedef Outcome<Error, Model::DescribeEndpointsResult> DescribeEndpointsOutcome;
 			typedef std::future<DescribeEndpointsOutcome> DescribeEndpointsOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::DescribeEndpointsRequest&, const DescribeEndpointsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeEndpointsAsyncHandler;
@@ -251,6 +258,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ModifyUIAccountPasswordResult> ModifyUIAccountPasswordOutcome;
 			typedef std::future<ModifyUIAccountPasswordOutcome> ModifyUIAccountPasswordOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::ModifyUIAccountPasswordRequest&, const ModifyUIAccountPasswordOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyUIAccountPasswordAsyncHandler;
+			typedef Outcome<Error, Model::PurgeInstanceResult> PurgeInstanceOutcome;
+			typedef std::future<PurgeInstanceOutcome> PurgeInstanceOutcomeCallable;
+			typedef std::function<void(const HBaseClient*, const Model::PurgeInstanceRequest&, const PurgeInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> PurgeInstanceAsyncHandler;
 			typedef Outcome<Error, Model::QueryHBaseHaDBResult> QueryHBaseHaDBOutcome;
 			typedef std::future<QueryHBaseHaDBOutcome> QueryHBaseHaDBOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::QueryHBaseHaDBRequest&, const QueryHBaseHaDBOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> QueryHBaseHaDBAsyncHandler;
@@ -337,6 +347,9 @@ namespace AlibabaCloud
 			DescribeDBInstanceUsageOutcome describeDBInstanceUsage(const Model::DescribeDBInstanceUsageRequest &request)const;
 			void describeDBInstanceUsageAsync(const Model::DescribeDBInstanceUsageRequest& request, const DescribeDBInstanceUsageAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDBInstanceUsageOutcomeCallable describeDBInstanceUsageCallable(const Model::DescribeDBInstanceUsageRequest& request) const;
+			DescribeDeletedInstancesOutcome describeDeletedInstances(const Model::DescribeDeletedInstancesRequest &request)const;
+			void describeDeletedInstancesAsync(const Model::DescribeDeletedInstancesRequest& request, const DescribeDeletedInstancesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDeletedInstancesOutcomeCallable describeDeletedInstancesCallable(const Model::DescribeDeletedInstancesRequest& request) const;
 			DescribeEndpointsOutcome describeEndpoints(const Model::DescribeEndpointsRequest &request)const;
 			void describeEndpointsAsync(const Model::DescribeEndpointsRequest& request, const DescribeEndpointsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeEndpointsOutcomeCallable describeEndpointsCallable(const Model::DescribeEndpointsRequest& request) const;
@@ -406,6 +419,9 @@ namespace AlibabaCloud
 			ModifyUIAccountPasswordOutcome modifyUIAccountPassword(const Model::ModifyUIAccountPasswordRequest &request)const;
 			void modifyUIAccountPasswordAsync(const Model::ModifyUIAccountPasswordRequest& request, const ModifyUIAccountPasswordAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyUIAccountPasswordOutcomeCallable modifyUIAccountPasswordCallable(const Model::ModifyUIAccountPasswordRequest& request) const;
+			PurgeInstanceOutcome purgeInstance(const Model::PurgeInstanceRequest &request)const;
+			void purgeInstanceAsync(const Model::PurgeInstanceRequest& request, const PurgeInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			PurgeInstanceOutcomeCallable purgeInstanceCallable(const Model::PurgeInstanceRequest& request) const;
 			QueryHBaseHaDBOutcome queryHBaseHaDB(const Model::QueryHBaseHaDBRequest &request)const;
 			void queryHBaseHaDBAsync(const Model::QueryHBaseHaDBRequest& request, const QueryHBaseHaDBAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			QueryHBaseHaDBOutcomeCallable queryHBaseHaDBCallable(const Model::QueryHBaseHaDBRequest& request) const;

hbase/include/alibabacloud/hbase/model/DescribeDeletedInstancesRequest.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_DESCRIBEDELETEDINSTANCESREQUEST_H_
+#define ALIBABACLOUD_HBASE_MODEL_DESCRIBEDELETEDINSTANCESREQUEST_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 DescribeDeletedInstancesRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeDeletedInstancesRequest();
+				~DescribeDeletedInstancesRequest();
+
+				int getPageNumber()const;
+				void setPageNumber(int pageNumber);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				int getPageSize()const;
+				void setPageSize(int pageSize);
+
+            private:
+				int pageNumber_;
+				std::string regionId_;
+				int pageSize_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_HBASE_MODEL_DESCRIBEDELETEDINSTANCESREQUEST_H_

hbase/include/alibabacloud/hbase/model/DescribeDeletedInstancesResult.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_HBASE_MODEL_DESCRIBEDELETEDINSTANCESRESULT_H_
+#define ALIBABACLOUD_HBASE_MODEL_DESCRIBEDELETEDINSTANCESRESULT_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 DescribeDeletedInstancesResult : public ServiceResult
+			{
+			public:
+				struct Instance
+				{
+					std::string instanceName;
+					std::string status;
+					std::string majorVersion;
+					std::string moduleStackVersion;
+					std::string parentId;
+					std::string createdTime;
+					std::string zoneId;
+					std::string instanceId;
+					std::string deleteTime;
+					std::string regionId;
+					std::string clusterType;
+					std::string engine;
+				};
+
+
+				DescribeDeletedInstancesResult();
+				explicit DescribeDeletedInstancesResult(const std::string &payload);
+				~DescribeDeletedInstancesResult();
+				std::vector<Instance> getInstances()const;
+				long getTotalCount()const;
+				int getPageSize()const;
+				int getPageNumber()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<Instance> instances_;
+				long totalCount_;
+				int pageSize_;
+				int pageNumber_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_HBASE_MODEL_DESCRIBEDELETEDINSTANCESRESULT_H_

hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h

@@ -70,6 +70,7 @@ namespace AlibabaCloud
 				std::string getColdStorageStatus()const;
 				std::string getMinorVersion()const;
 				std::string getCreatedTimeUTC()const;
+				int getDuration()const;
 				std::string getPayType()const;
 				bool getIsMultiModel()const;
 				std::string getClusterType()const;
@@ -77,6 +78,7 @@ namespace AlibabaCloud
 				std::string getInstanceName()const;
 				int getMasterNodeCount()const;
 				std::string getVpcId()const;
+				bool getAutoRenewal()const;
 				std::string getCoreDiskType()const;
 				std::string getRegionId()const;
 				std::string getExpireTime()const;
@@ -114,6 +116,7 @@ namespace AlibabaCloud
 				std::string coldStorageStatus_;
 				std::string minorVersion_;
 				std::string createdTimeUTC_;
+				int duration_;
 				std::string payType_;
 				bool isMultiModel_;
 				std::string clusterType_;
@@ -121,6 +124,7 @@ namespace AlibabaCloud
 				std::string instanceName_;
 				int masterNodeCount_;
 				std::string vpcId_;
+				bool autoRenewal_;
 				std::string coreDiskType_;
 				std::string regionId_;
 				std::string expireTime_;

hbase/include/alibabacloud/hbase/model/DescribeInstancesResult.h

@@ -63,12 +63,14 @@ namespace AlibabaCloud
 					std::string clusterId;
 					std::string coldStorageStatus;
 					std::string createdTimeUTC;
+					int duration;
 					std::string payType;
 					std::string clusterType;
 					std::string vswitchId;
 					std::string instanceName;
 					int masterNodeCount;
 					std::string vpcId;
+					bool autoRenewal;
 					std::string coreDiskType;
 					std::string regionId;
 					std::string expireTime;

hbase/include/alibabacloud/hbase/model/PurgeInstanceRequest.h

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_HBASE_MODEL_PURGEINSTANCEREQUEST_H_
+#define ALIBABACLOUD_HBASE_MODEL_PURGEINSTANCEREQUEST_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 PurgeInstanceRequest : public RpcServiceRequest
+			{
+
+			public:
+				PurgeInstanceRequest();
+				~PurgeInstanceRequest();
+
+				std::string getClusterId()const;
+				void setClusterId(const std::string& clusterId);
+
+            private:
+				std::string clusterId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_HBASE_MODEL_PURGEINSTANCEREQUEST_H_

hbase/include/alibabacloud/hbase/model/PurgeInstanceResult.h

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_HBASE_MODEL_PURGEINSTANCERESULT_H_
+#define ALIBABACLOUD_HBASE_MODEL_PURGEINSTANCERESULT_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 PurgeInstanceResult : public ServiceResult
+			{
+			public:
+
+
+				PurgeInstanceResult();
+				explicit PurgeInstanceResult(const std::string &payload);
+				~PurgeInstanceResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_HBASE_MODEL_PURGEINSTANCERESULT_H_

hbase/src/HBaseClient.cc

@@ -663,6 +663,42 @@ HBaseClient::DescribeDBInstanceUsageOutcomeCallable HBaseClient::describeDBInsta
 	return task->get_future();
 }
 
+HBaseClient::DescribeDeletedInstancesOutcome HBaseClient::describeDeletedInstances(const DescribeDeletedInstancesRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeDeletedInstancesOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeDeletedInstancesOutcome(DescribeDeletedInstancesResult(outcome.result()));
+	else
+		return DescribeDeletedInstancesOutcome(outcome.error());
+}
+
+void HBaseClient::describeDeletedInstancesAsync(const DescribeDeletedInstancesRequest& request, const DescribeDeletedInstancesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeDeletedInstances(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+HBaseClient::DescribeDeletedInstancesOutcomeCallable HBaseClient::describeDeletedInstancesCallable(const DescribeDeletedInstancesRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeDeletedInstancesOutcome()>>(
+			[this, request]()
+			{
+			return this->describeDeletedInstances(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 HBaseClient::DescribeEndpointsOutcome HBaseClient::describeEndpoints(const DescribeEndpointsRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1491,6 +1527,42 @@ HBaseClient::ModifyUIAccountPasswordOutcomeCallable HBaseClient::modifyUIAccount
 	return task->get_future();
 }
 
+HBaseClient::PurgeInstanceOutcome HBaseClient::purgeInstance(const PurgeInstanceRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return PurgeInstanceOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return PurgeInstanceOutcome(PurgeInstanceResult(outcome.result()));
+	else
+		return PurgeInstanceOutcome(outcome.error());
+}
+
+void HBaseClient::purgeInstanceAsync(const PurgeInstanceRequest& request, const PurgeInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, purgeInstance(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+HBaseClient::PurgeInstanceOutcomeCallable HBaseClient::purgeInstanceCallable(const PurgeInstanceRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<PurgeInstanceOutcome()>>(
+			[this, request]()
+			{
+			return this->purgeInstance(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 HBaseClient::QueryHBaseHaDBOutcome HBaseClient::queryHBaseHaDB(const QueryHBaseHaDBRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

hbase/src/model/DescribeDeletedInstancesRequest.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/DescribeDeletedInstancesRequest.h>
+
+using AlibabaCloud::HBase::Model::DescribeDeletedInstancesRequest;
+
+DescribeDeletedInstancesRequest::DescribeDeletedInstancesRequest() :
+	RpcServiceRequest("hbase", "2019-01-01", "DescribeDeletedInstances")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeDeletedInstancesRequest::~DescribeDeletedInstancesRequest()
+{}
+
+int DescribeDeletedInstancesRequest::getPageNumber()const
+{
+	return pageNumber_;
+}
+
+void DescribeDeletedInstancesRequest::setPageNumber(int pageNumber)
+{
+	pageNumber_ = pageNumber;
+	setParameter("PageNumber", std::to_string(pageNumber));
+}
+
+std::string DescribeDeletedInstancesRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void DescribeDeletedInstancesRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+int DescribeDeletedInstancesRequest::getPageSize()const
+{
+	return pageSize_;
+}
+
+void DescribeDeletedInstancesRequest::setPageSize(int pageSize)
+{
+	pageSize_ = pageSize;
+	setParameter("PageSize", std::to_string(pageSize));
+}
+

hbase/src/model/DescribeDeletedInstancesResult.cc

@@ -0,0 +1,100 @@
+/*
+ * 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/DescribeDeletedInstancesResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::HBase;
+using namespace AlibabaCloud::HBase::Model;
+
+DescribeDeletedInstancesResult::DescribeDeletedInstancesResult() :
+	ServiceResult()
+{}
+
+DescribeDeletedInstancesResult::DescribeDeletedInstancesResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeDeletedInstancesResult::~DescribeDeletedInstancesResult()
+{}
+
+void DescribeDeletedInstancesResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allInstancesNode = value["Instances"]["Instance"];
+	for (auto valueInstancesInstance : allInstancesNode)
+	{
+		Instance instancesObject;
+		if(!valueInstancesInstance["InstanceId"].isNull())
+			instancesObject.instanceId = valueInstancesInstance["InstanceId"].asString();
+		if(!valueInstancesInstance["InstanceName"].isNull())
+			instancesObject.instanceName = valueInstancesInstance["InstanceName"].asString();
+		if(!valueInstancesInstance["Status"].isNull())
+			instancesObject.status = valueInstancesInstance["Status"].asString();
+		if(!valueInstancesInstance["MajorVersion"].isNull())
+			instancesObject.majorVersion = valueInstancesInstance["MajorVersion"].asString();
+		if(!valueInstancesInstance["Engine"].isNull())
+			instancesObject.engine = valueInstancesInstance["Engine"].asString();
+		if(!valueInstancesInstance["RegionId"].isNull())
+			instancesObject.regionId = valueInstancesInstance["RegionId"].asString();
+		if(!valueInstancesInstance["ZoneId"].isNull())
+			instancesObject.zoneId = valueInstancesInstance["ZoneId"].asString();
+		if(!valueInstancesInstance["CreatedTime"].isNull())
+			instancesObject.createdTime = valueInstancesInstance["CreatedTime"].asString();
+		if(!valueInstancesInstance["DeleteTime"].isNull())
+			instancesObject.deleteTime = valueInstancesInstance["DeleteTime"].asString();
+		if(!valueInstancesInstance["ClusterType"].isNull())
+			instancesObject.clusterType = valueInstancesInstance["ClusterType"].asString();
+		if(!valueInstancesInstance["ModuleStackVersion"].isNull())
+			instancesObject.moduleStackVersion = valueInstancesInstance["ModuleStackVersion"].asString();
+		if(!valueInstancesInstance["ParentId"].isNull())
+			instancesObject.parentId = valueInstancesInstance["ParentId"].asString();
+		instances_.push_back(instancesObject);
+	}
+	if(!value["TotalCount"].isNull())
+		totalCount_ = std::stol(value["TotalCount"].asString());
+	if(!value["PageNumber"].isNull())
+		pageNumber_ = std::stoi(value["PageNumber"].asString());
+	if(!value["PageSize"].isNull())
+		pageSize_ = std::stoi(value["PageSize"].asString());
+
+}
+
+std::vector<DescribeDeletedInstancesResult::Instance> DescribeDeletedInstancesResult::getInstances()const
+{
+	return instances_;
+}
+
+long DescribeDeletedInstancesResult::getTotalCount()const
+{
+	return totalCount_;
+}
+
+int DescribeDeletedInstancesResult::getPageSize()const
+{
+	return pageSize_;
+}
+
+int DescribeDeletedInstancesResult::getPageNumber()const
+{
+	return pageNumber_;
+}
+

hbase/src/model/DescribeInstanceResult.cc

@@ -127,6 +127,10 @@ void DescribeInstanceResult::parse(const std::string &payload)
 		moduleId_ = std::stoi(value["ModuleId"].asString());
 	if(!value["ModuleStackVersion"].isNull())
 		moduleStackVersion_ = value["ModuleStackVersion"].asString();
+	if(!value["AutoRenewal"].isNull())
+		autoRenewal_ = value["AutoRenewal"].asString() == "true";
+	if(!value["Duration"].isNull())
+		duration_ = std::stoi(value["Duration"].asString());
 
 }
 
@@ -270,6 +274,11 @@ std::string DescribeInstanceResult::getCreatedTimeUTC()const
 	return createdTimeUTC_;
 }
 
+int DescribeInstanceResult::getDuration()const
+{
+	return duration_;
+}
+
 std::string DescribeInstanceResult::getPayType()const
 {
 	return payType_;
@@ -305,6 +314,11 @@ std::string DescribeInstanceResult::getVpcId()const
 	return vpcId_;
 }
 
+bool DescribeInstanceResult::getAutoRenewal()const
+{
+	return autoRenewal_;
+}
+
 std::string DescribeInstanceResult::getCoreDiskType()const
 {
 	return coreDiskType_;

hbase/src/model/DescribeInstancesResult.cc

@@ -111,6 +111,10 @@ void DescribeInstancesResult::parse(const std::string &payload)
 			instancesObject.moduleStackVersion = valueInstancesInstance["ModuleStackVersion"].asString();
 		if(!valueInstancesInstance["CoreDiskCount"].isNull())
 			instancesObject.coreDiskCount = valueInstancesInstance["CoreDiskCount"].asString();
+		if(!valueInstancesInstance["AutoRenewal"].isNull())
+			instancesObject.autoRenewal = valueInstancesInstance["AutoRenewal"].asString() == "true";
+		if(!valueInstancesInstance["Duration"].isNull())
+			instancesObject.duration = std::stoi(valueInstancesInstance["Duration"].asString());
 		auto allTagsNode = allInstancesNode["Tags"]["Tag"];
 		for (auto allInstancesNodeTagsTag : allTagsNode)
 		{

hbase/src/model/PurgeInstanceRequest.cc

@@ -0,0 +1,40 @@
+/*
+ * 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/PurgeInstanceRequest.h>
+
+using AlibabaCloud::HBase::Model::PurgeInstanceRequest;
+
+PurgeInstanceRequest::PurgeInstanceRequest() :
+	RpcServiceRequest("hbase", "2019-01-01", "PurgeInstance")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+PurgeInstanceRequest::~PurgeInstanceRequest()
+{}
+
+std::string PurgeInstanceRequest::getClusterId()const
+{
+	return clusterId_;
+}
+
+void PurgeInstanceRequest::setClusterId(const std::string& clusterId)
+{
+	clusterId_ = clusterId;
+	setParameter("ClusterId", clusterId);
+}
+

hbase/src/model/PurgeInstanceResult.cc

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

push/include/alibabacloud/push/model/MassPushRequest.h

@@ -55,6 +55,7 @@ namespace AlibabaCloud
 					std::string expireTime;
 					std::string androidPopupBody;
 					std::string iOSNotificationCategory;
+					std::string androidNotificationXiaomiChannel;
 					bool storeOffline;
 					bool iOSSilentNotification;
 					std::string jobKey;

push/include/alibabacloud/push/model/PushRequest.h

@@ -67,6 +67,8 @@ namespace AlibabaCloud
 				void setExpireTime(const std::string& expireTime);
 				std::string getIOSNotificationCategory()const;
 				void setIOSNotificationCategory(const std::string& iOSNotificationCategory);
+				std::string getAndroidNotificationXiaomiChannel()const;
+				void setAndroidNotificationXiaomiChannel(const std::string& androidNotificationXiaomiChannel);
 				bool getStoreOffline()const;
 				void setStoreOffline(bool storeOffline);
 				std::string getSmsParams()const;
@@ -143,6 +145,7 @@ namespace AlibabaCloud
 				int androidNotificationBarPriority_;
 				std::string expireTime_;
 				std::string iOSNotificationCategory_;
+				std::string androidNotificationXiaomiChannel_;
 				bool storeOffline_;
 				std::string smsParams_;
 				std::string jobKey_;

push/src/model/MassPushRequest.cc

@@ -71,6 +71,7 @@ void MassPushRequest::setPushTask(const std::vector<PushTask>& pushTask)
 		setParameter(pushTaskObjStr + ".ExpireTime", pushTaskObj.expireTime);
 		setParameter(pushTaskObjStr + ".AndroidPopupBody", pushTaskObj.androidPopupBody);
 		setParameter(pushTaskObjStr + ".IOSNotificationCategory", pushTaskObj.iOSNotificationCategory);
+		setParameter(pushTaskObjStr + ".AndroidNotificationXiaomiChannel", pushTaskObj.androidNotificationXiaomiChannel);
 		setParameter(pushTaskObjStr + ".StoreOffline", pushTaskObj.storeOffline ? "true" : "false");
 		setParameter(pushTaskObjStr + ".IOSSilentNotification", pushTaskObj.iOSSilentNotification ? "true" : "false");
 		setParameter(pushTaskObjStr + ".JobKey", pushTaskObj.jobKey);

push/src/model/PushRequest.cc

@@ -203,6 +203,17 @@ void PushRequest::setIOSNotificationCategory(const std::string& iOSNotificationC
 	setParameter("IOSNotificationCategory", iOSNotificationCategory);
 }
 
+std::string PushRequest::getAndroidNotificationXiaomiChannel()const
+{
+	return androidNotificationXiaomiChannel_;
+}
+
+void PushRequest::setAndroidNotificationXiaomiChannel(const std::string& androidNotificationXiaomiChannel)
+{
+	androidNotificationXiaomiChannel_ = androidNotificationXiaomiChannel;
+	setParameter("AndroidNotificationXiaomiChannel", androidNotificationXiaomiChannel);
+}
+
 bool PushRequest::getStoreOffline()const
 {
 	return storeOffline_;

reid/include/alibabacloud/reid/model/DescribeCameraStatisticsResult.h

@@ -41,6 +41,7 @@ namespace AlibabaCloud
 						float right;
 						float bottom;
 					};
+					long maxDataTime;
 					std::vector<PvStatisticResult::Rect> pvRects;
 					long locationId;
 					long processCursor;

reid/src/ReidClient.cc

@@ -31,21 +31,21 @@ ReidClient::ReidClient(const Credentials &credentials, const ClientConfiguration
 	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, "1.1.7");
 }
 
 ReidClient::ReidClient(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, "1.1.7");
 }
 
 ReidClient::ReidClient(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, "1.1.7");
 }
 
 ReidClient::~ReidClient()

reid/src/model/DescribeCameraStatisticsResult.cc

@@ -53,6 +53,8 @@ void DescribeCameraStatisticsResult::parse(const std::string &payload)
 			pvStatisticResultsObject.locationId = std::stol(valuePvStatisticResultsPvStatisticResult["LocationId"].asString());
 		if(!valuePvStatisticResultsPvStatisticResult["PvType"].isNull())
 			pvStatisticResultsObject.pvType = valuePvStatisticResultsPvStatisticResult["PvType"].asString();
+		if(!valuePvStatisticResultsPvStatisticResult["MaxDataTime"].isNull())
+			pvStatisticResultsObject.maxDataTime = std::stol(valuePvStatisticResultsPvStatisticResult["MaxDataTime"].asString());
 		auto allPvRectsNode = allPvStatisticResultsNode["PvRects"]["Rect"];
 		for (auto allPvStatisticResultsNodePvRectsRect : allPvRectsNode)
 		{

vcs/include/alibabacloud/vcs/model/AddMonitorResult.h

@@ -32,20 +32,24 @@ namespace AlibabaCloud
 			class ALIBABACLOUD_VCS_EXPORT AddMonitorResult : public ServiceResult
 			{
 			public:
+				struct Data
+				{
+					std::string taskId;
+				};
 
 
 				AddMonitorResult();
 				explicit AddMonitorResult(const std::string &payload);
 				~AddMonitorResult();
 				std::string getMessage()const;
-				std::string getData()const;
+				Data getData()const;
 				std::string getCode()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
 				std::string message_;
-				std::string data_;
+				Data data_;
 				std::string code_;
 
 			};

vcs/include/alibabacloud/vcs/model/UpdateMonitorRequest.h

@@ -35,12 +35,8 @@ namespace AlibabaCloud
 				UpdateMonitorRequest();
 				~UpdateMonitorRequest();
 
-				std::string getDeviceOperateType()const;
-				void setDeviceOperateType(const std::string& deviceOperateType);
 				std::string getCorpId()const;
 				void setCorpId(const std::string& corpId);
-				std::string getPicList()const;
-				void setPicList(const std::string& picList);
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
 				std::string getRuleName()const;
@@ -49,27 +45,34 @@ namespace AlibabaCloud
 				void setPicOperateType(const std::string& picOperateType);
 				std::string getAttributeName()const;
 				void setAttributeName(const std::string& attributeName);
+				std::string getAttributeOperateType()const;
+				void setAttributeOperateType(const std::string& attributeOperateType);
+				std::string getRuleExpression()const;
+				void setRuleExpression(const std::string& ruleExpression);
+				std::string getTaskId()const;
+				void setTaskId(const std::string& taskId);
+				std::string getDeviceOperateType()const;
+				void setDeviceOperateType(const std::string& deviceOperateType);
+				std::string getPicList()const;
+				void setPicList(const std::string& picList);
 				std::string getAttributeValueList()const;
 				void setAttributeValueList(const std::string& attributeValueList);
 				std::string getDeviceList()const;
 				void setDeviceList(const std::string& deviceList);
-				std::string getAttributeOperateType()const;
-				void setAttributeOperateType(const std::string& attributeOperateType);
-				std::string getTaskId()const;
-				void setTaskId(const std::string& taskId);
 
             private:
-				std::string deviceOperateType_;
 				std::string corpId_;
-				std::string picList_;
 				std::string description_;
 				std::string ruleName_;
 				std::string picOperateType_;
 				std::string attributeName_;
+				std::string attributeOperateType_;
+				std::string ruleExpression_;
+				std::string taskId_;
+				std::string deviceOperateType_;
+				std::string picList_;
 				std::string attributeValueList_;
 				std::string deviceList_;
-				std::string attributeOperateType_;
-				std::string taskId_;
 
 			};
 		}

vcs/src/model/AddMonitorResult.cc

@@ -39,12 +39,13 @@ void AddMonitorResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
+	auto dataNode = value["Data"];
+	if(!dataNode["TaskId"].isNull())
+		data_.taskId = dataNode["TaskId"].asString();
 	if(!value["Code"].isNull())
 		code_ = value["Code"].asString();
 	if(!value["Message"].isNull())
 		message_ = value["Message"].asString();
-	if(!value["Data"].isNull())
-		data_ = value["Data"].asString();
 
 }
 
@@ -53,7 +54,7 @@ std::string AddMonitorResult::getMessage()const
 	return message_;
 }
 
-std::string AddMonitorResult::getData()const
+AddMonitorResult::Data AddMonitorResult::getData()const
 {
 	return data_;
 }

vcs/src/model/UpdateMonitorRequest.cc

@@ -27,17 +27,6 @@ UpdateMonitorRequest::UpdateMonitorRequest() :
 UpdateMonitorRequest::~UpdateMonitorRequest()
 {}
 
-std::string UpdateMonitorRequest::getDeviceOperateType()const
-{
-	return deviceOperateType_;
-}
-
-void UpdateMonitorRequest::setDeviceOperateType(const std::string& deviceOperateType)
-{
-	deviceOperateType_ = deviceOperateType;
-	setBodyParameter("DeviceOperateType", deviceOperateType);
-}
-
 std::string UpdateMonitorRequest::getCorpId()const
 {
 	return corpId_;
@@ -49,17 +38,6 @@ void UpdateMonitorRequest::setCorpId(const std::string& corpId)
 	setBodyParameter("CorpId", corpId);
 }
 
-std::string UpdateMonitorRequest::getPicList()const
-{
-	return picList_;
-}
-
-void UpdateMonitorRequest::setPicList(const std::string& picList)
-{
-	picList_ = picList;
-	setBodyParameter("PicList", picList);
-}
-
 std::string UpdateMonitorRequest::getDescription()const
 {
 	return description_;
@@ -104,6 +82,61 @@ void UpdateMonitorRequest::setAttributeName(const std::string& attributeName)
 	setBodyParameter("AttributeName", attributeName);
 }
 
+std::string UpdateMonitorRequest::getAttributeOperateType()const
+{
+	return attributeOperateType_;
+}
+
+void UpdateMonitorRequest::setAttributeOperateType(const std::string& attributeOperateType)
+{
+	attributeOperateType_ = attributeOperateType;
+	setBodyParameter("AttributeOperateType", attributeOperateType);
+}
+
+std::string UpdateMonitorRequest::getRuleExpression()const
+{
+	return ruleExpression_;
+}
+
+void UpdateMonitorRequest::setRuleExpression(const std::string& ruleExpression)
+{
+	ruleExpression_ = ruleExpression;
+	setBodyParameter("RuleExpression", ruleExpression);
+}
+
+std::string UpdateMonitorRequest::getTaskId()const
+{
+	return taskId_;
+}
+
+void UpdateMonitorRequest::setTaskId(const std::string& taskId)
+{
+	taskId_ = taskId;
+	setBodyParameter("TaskId", taskId);
+}
+
+std::string UpdateMonitorRequest::getDeviceOperateType()const
+{
+	return deviceOperateType_;
+}
+
+void UpdateMonitorRequest::setDeviceOperateType(const std::string& deviceOperateType)
+{
+	deviceOperateType_ = deviceOperateType;
+	setBodyParameter("DeviceOperateType", deviceOperateType);
+}
+
+std::string UpdateMonitorRequest::getPicList()const
+{
+	return picList_;
+}
+
+void UpdateMonitorRequest::setPicList(const std::string& picList)
+{
+	picList_ = picList;
+	setBodyParameter("PicList", picList);
+}
+
 std::string UpdateMonitorRequest::getAttributeValueList()const
 {
 	return attributeValueList_;
@@ -126,25 +159,3 @@ void UpdateMonitorRequest::setDeviceList(const std::string& deviceList)
 	setBodyParameter("DeviceList", deviceList);
 }
 
-std::string UpdateMonitorRequest::getAttributeOperateType()const
-{
-	return attributeOperateType_;
-}
-
-void UpdateMonitorRequest::setAttributeOperateType(const std::string& attributeOperateType)
-{
-	attributeOperateType_ = attributeOperateType;
-	setBodyParameter("AttributeOperateType", attributeOperateType);
-}
-
-std::string UpdateMonitorRequest::getTaskId()const
-{
-	return taskId_;
-}
-
-void UpdateMonitorRequest::setTaskId(const std::string& taskId)
-{
-	taskId_ = taskId;
-	setBodyParameter("TaskId", taskId);
-}
-