Update new version.

CHANGELOG

@@ -1,3 +1,13 @@
+2020-11-12 Version: patch
+- Update new version.
+
+2020-11-12 Version: patch
+- Support DescribeDBClusterTDE.
+- Support ModifyDBClusterTDE.
+
+2020-11-12 Version: patch
+- Supported Open Api.
+
 2020-11-12 Version: patch
 - Support OpenAPI.
 

polardb/CMakeLists.txt

@@ -83,6 +83,8 @@ set(polardb_public_header_model
 	include/alibabacloud/polardb/model/DescribeDBClusterPerformanceResult.h
 	include/alibabacloud/polardb/model/DescribeDBClusterSSLRequest.h
 	include/alibabacloud/polardb/model/DescribeDBClusterSSLResult.h
+	include/alibabacloud/polardb/model/DescribeDBClusterTDERequest.h
+	include/alibabacloud/polardb/model/DescribeDBClusterTDEResult.h
 	include/alibabacloud/polardb/model/DescribeDBClustersRequest.h
 	include/alibabacloud/polardb/model/DescribeDBClustersResult.h
 	include/alibabacloud/polardb/model/DescribeDBClustersWithBackupsRequest.h
@@ -137,6 +139,8 @@ set(polardb_public_header_model
 	include/alibabacloud/polardb/model/ModifyDBClusterParametersResult.h
 	include/alibabacloud/polardb/model/ModifyDBClusterSSLRequest.h
 	include/alibabacloud/polardb/model/ModifyDBClusterSSLResult.h
+	include/alibabacloud/polardb/model/ModifyDBClusterTDERequest.h
+	include/alibabacloud/polardb/model/ModifyDBClusterTDEResult.h
 	include/alibabacloud/polardb/model/ModifyDBDescriptionRequest.h
 	include/alibabacloud/polardb/model/ModifyDBDescriptionResult.h
 	include/alibabacloud/polardb/model/ModifyDBEndpointAddressRequest.h
@@ -222,6 +226,8 @@ set(polardb_src
 	src/model/DescribeDBClusterPerformanceResult.cc
 	src/model/DescribeDBClusterSSLRequest.cc
 	src/model/DescribeDBClusterSSLResult.cc
+	src/model/DescribeDBClusterTDERequest.cc
+	src/model/DescribeDBClusterTDEResult.cc
 	src/model/DescribeDBClustersRequest.cc
 	src/model/DescribeDBClustersResult.cc
 	src/model/DescribeDBClustersWithBackupsRequest.cc
@@ -276,6 +282,8 @@ set(polardb_src
 	src/model/ModifyDBClusterParametersResult.cc
 	src/model/ModifyDBClusterSSLRequest.cc
 	src/model/ModifyDBClusterSSLResult.cc
+	src/model/ModifyDBClusterTDERequest.cc
+	src/model/ModifyDBClusterTDEResult.cc
 	src/model/ModifyDBDescriptionRequest.cc
 	src/model/ModifyDBDescriptionResult.cc
 	src/model/ModifyDBEndpointAddressRequest.cc

polardb/include/alibabacloud/polardb/PolardbClient.h

@@ -84,6 +84,8 @@
 #include "model/DescribeDBClusterPerformanceResult.h"
 #include "model/DescribeDBClusterSSLRequest.h"
 #include "model/DescribeDBClusterSSLResult.h"
+#include "model/DescribeDBClusterTDERequest.h"
+#include "model/DescribeDBClusterTDEResult.h"
 #include "model/DescribeDBClustersRequest.h"
 #include "model/DescribeDBClustersResult.h"
 #include "model/DescribeDBClustersWithBackupsRequest.h"
@@ -138,6 +140,8 @@
 #include "model/ModifyDBClusterParametersResult.h"
 #include "model/ModifyDBClusterSSLRequest.h"
 #include "model/ModifyDBClusterSSLResult.h"
+#include "model/ModifyDBClusterTDERequest.h"
+#include "model/ModifyDBClusterTDEResult.h"
 #include "model/ModifyDBDescriptionRequest.h"
 #include "model/ModifyDBDescriptionResult.h"
 #include "model/ModifyDBEndpointAddressRequest.h"
@@ -260,6 +264,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDBClusterSSLResult> DescribeDBClusterSSLOutcome;
 			typedef std::future<DescribeDBClusterSSLOutcome> DescribeDBClusterSSLOutcomeCallable;
 			typedef std::function<void(const PolardbClient*, const Model::DescribeDBClusterSSLRequest&, const DescribeDBClusterSSLOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBClusterSSLAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDBClusterTDEResult> DescribeDBClusterTDEOutcome;
+			typedef std::future<DescribeDBClusterTDEOutcome> DescribeDBClusterTDEOutcomeCallable;
+			typedef std::function<void(const PolardbClient*, const Model::DescribeDBClusterTDERequest&, const DescribeDBClusterTDEOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBClusterTDEAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDBClustersResult> DescribeDBClustersOutcome;
 			typedef std::future<DescribeDBClustersOutcome> DescribeDBClustersOutcomeCallable;
 			typedef std::function<void(const PolardbClient*, const Model::DescribeDBClustersRequest&, const DescribeDBClustersOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBClustersAsyncHandler;
@@ -341,6 +348,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ModifyDBClusterSSLResult> ModifyDBClusterSSLOutcome;
 			typedef std::future<ModifyDBClusterSSLOutcome> ModifyDBClusterSSLOutcomeCallable;
 			typedef std::function<void(const PolardbClient*, const Model::ModifyDBClusterSSLRequest&, const ModifyDBClusterSSLOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDBClusterSSLAsyncHandler;
+			typedef Outcome<Error, Model::ModifyDBClusterTDEResult> ModifyDBClusterTDEOutcome;
+			typedef std::future<ModifyDBClusterTDEOutcome> ModifyDBClusterTDEOutcomeCallable;
+			typedef std::function<void(const PolardbClient*, const Model::ModifyDBClusterTDERequest&, const ModifyDBClusterTDEOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDBClusterTDEAsyncHandler;
 			typedef Outcome<Error, Model::ModifyDBDescriptionResult> ModifyDBDescriptionOutcome;
 			typedef std::future<ModifyDBDescriptionOutcome> ModifyDBDescriptionOutcomeCallable;
 			typedef std::function<void(const PolardbClient*, const Model::ModifyDBDescriptionRequest&, const ModifyDBDescriptionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyDBDescriptionAsyncHandler;
@@ -469,6 +479,9 @@ namespace AlibabaCloud
 			DescribeDBClusterSSLOutcome describeDBClusterSSL(const Model::DescribeDBClusterSSLRequest &request)const;
 			void describeDBClusterSSLAsync(const Model::DescribeDBClusterSSLRequest& request, const DescribeDBClusterSSLAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDBClusterSSLOutcomeCallable describeDBClusterSSLCallable(const Model::DescribeDBClusterSSLRequest& request) const;
+			DescribeDBClusterTDEOutcome describeDBClusterTDE(const Model::DescribeDBClusterTDERequest &request)const;
+			void describeDBClusterTDEAsync(const Model::DescribeDBClusterTDERequest& request, const DescribeDBClusterTDEAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDBClusterTDEOutcomeCallable describeDBClusterTDECallable(const Model::DescribeDBClusterTDERequest& request) const;
 			DescribeDBClustersOutcome describeDBClusters(const Model::DescribeDBClustersRequest &request)const;
 			void describeDBClustersAsync(const Model::DescribeDBClustersRequest& request, const DescribeDBClustersAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDBClustersOutcomeCallable describeDBClustersCallable(const Model::DescribeDBClustersRequest& request) const;
@@ -550,6 +563,9 @@ namespace AlibabaCloud
 			ModifyDBClusterSSLOutcome modifyDBClusterSSL(const Model::ModifyDBClusterSSLRequest &request)const;
 			void modifyDBClusterSSLAsync(const Model::ModifyDBClusterSSLRequest& request, const ModifyDBClusterSSLAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyDBClusterSSLOutcomeCallable modifyDBClusterSSLCallable(const Model::ModifyDBClusterSSLRequest& request) const;
+			ModifyDBClusterTDEOutcome modifyDBClusterTDE(const Model::ModifyDBClusterTDERequest &request)const;
+			void modifyDBClusterTDEAsync(const Model::ModifyDBClusterTDERequest& request, const ModifyDBClusterTDEAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ModifyDBClusterTDEOutcomeCallable modifyDBClusterTDECallable(const Model::ModifyDBClusterTDERequest& request) const;
 			ModifyDBDescriptionOutcome modifyDBDescription(const Model::ModifyDBDescriptionRequest &request)const;
 			void modifyDBDescriptionAsync(const Model::ModifyDBDescriptionRequest& request, const ModifyDBDescriptionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyDBDescriptionOutcomeCallable modifyDBDescriptionCallable(const Model::ModifyDBDescriptionRequest& request) const;

polardb/include/alibabacloud/polardb/model/DescribeDBClusterTDERequest.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_POLARDB_MODEL_DESCRIBEDBCLUSTERTDEREQUEST_H_
+#define ALIBABACLOUD_POLARDB_MODEL_DESCRIBEDBCLUSTERTDEREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/polardb/PolardbExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Polardb
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_POLARDB_EXPORT DescribeDBClusterTDERequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeDBClusterTDERequest();
+				~DescribeDBClusterTDERequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getDBClusterId()const;
+				void setDBClusterId(const std::string& dBClusterId);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+
+            private:
+				long resourceOwnerId_;
+				std::string accessKeyId_;
+				std::string resourceOwnerAccount_;
+				std::string dBClusterId_;
+				std::string ownerAccount_;
+				long ownerId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_POLARDB_MODEL_DESCRIBEDBCLUSTERTDEREQUEST_H_

polardb/include/alibabacloud/polardb/model/DescribeDBClusterTDEResult.h

@@ -0,0 +1,55 @@
+/*
+ * 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_POLARDB_MODEL_DESCRIBEDBCLUSTERTDERESULT_H_
+#define ALIBABACLOUD_POLARDB_MODEL_DESCRIBEDBCLUSTERTDERESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/polardb/PolardbExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Polardb
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_POLARDB_EXPORT DescribeDBClusterTDEResult : public ServiceResult
+			{
+			public:
+
+
+				DescribeDBClusterTDEResult();
+				explicit DescribeDBClusterTDEResult(const std::string &payload);
+				~DescribeDBClusterTDEResult();
+				std::string getTDEStatus()const;
+				std::string getDBClusterId()const;
+				std::string getEncryptionKey()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string tDEStatus_;
+				std::string dBClusterId_;
+				std::string encryptionKey_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_POLARDB_MODEL_DESCRIBEDBCLUSTERTDERESULT_H_

polardb/include/alibabacloud/polardb/model/ModifyDBClusterTDERequest.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_POLARDB_MODEL_MODIFYDBCLUSTERTDEREQUEST_H_
+#define ALIBABACLOUD_POLARDB_MODEL_MODIFYDBCLUSTERTDEREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/polardb/PolardbExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Polardb
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_POLARDB_EXPORT ModifyDBClusterTDERequest : public RpcServiceRequest
+			{
+
+			public:
+				ModifyDBClusterTDERequest();
+				~ModifyDBClusterTDERequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getDBClusterId()const;
+				void setDBClusterId(const std::string& dBClusterId);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getEncryptionKey()const;
+				void setEncryptionKey(const std::string& encryptionKey);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getRoleArn()const;
+				void setRoleArn(const std::string& roleArn);
+				std::string getTDEStatus()const;
+				void setTDEStatus(const std::string& tDEStatus);
+
+            private:
+				long resourceOwnerId_;
+				std::string accessKeyId_;
+				std::string resourceOwnerAccount_;
+				std::string dBClusterId_;
+				std::string ownerAccount_;
+				std::string encryptionKey_;
+				long ownerId_;
+				std::string roleArn_;
+				std::string tDEStatus_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_POLARDB_MODEL_MODIFYDBCLUSTERTDEREQUEST_H_

polardb/include/alibabacloud/polardb/model/ModifyDBClusterTDEResult.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_POLARDB_MODEL_MODIFYDBCLUSTERTDERESULT_H_
+#define ALIBABACLOUD_POLARDB_MODEL_MODIFYDBCLUSTERTDERESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/polardb/PolardbExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Polardb
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_POLARDB_EXPORT ModifyDBClusterTDEResult : public ServiceResult
+			{
+			public:
+
+
+				ModifyDBClusterTDEResult();
+				explicit ModifyDBClusterTDEResult(const std::string &payload);
+				~ModifyDBClusterTDEResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_POLARDB_MODEL_MODIFYDBCLUSTERTDERESULT_H_

polardb/src/PolardbClient.cc

@@ -1167,6 +1167,42 @@ PolardbClient::DescribeDBClusterSSLOutcomeCallable PolardbClient::describeDBClus
 	return task->get_future();
 }
 
+PolardbClient::DescribeDBClusterTDEOutcome PolardbClient::describeDBClusterTDE(const DescribeDBClusterTDERequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeDBClusterTDEOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeDBClusterTDEOutcome(DescribeDBClusterTDEResult(outcome.result()));
+	else
+		return DescribeDBClusterTDEOutcome(outcome.error());
+}
+
+void PolardbClient::describeDBClusterTDEAsync(const DescribeDBClusterTDERequest& request, const DescribeDBClusterTDEAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeDBClusterTDE(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+PolardbClient::DescribeDBClusterTDEOutcomeCallable PolardbClient::describeDBClusterTDECallable(const DescribeDBClusterTDERequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeDBClusterTDEOutcome()>>(
+			[this, request]()
+			{
+			return this->describeDBClusterTDE(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 PolardbClient::DescribeDBClustersOutcome PolardbClient::describeDBClusters(const DescribeDBClustersRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -2139,6 +2175,42 @@ PolardbClient::ModifyDBClusterSSLOutcomeCallable PolardbClient::modifyDBClusterS
 	return task->get_future();
 }
 
+PolardbClient::ModifyDBClusterTDEOutcome PolardbClient::modifyDBClusterTDE(const ModifyDBClusterTDERequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ModifyDBClusterTDEOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ModifyDBClusterTDEOutcome(ModifyDBClusterTDEResult(outcome.result()));
+	else
+		return ModifyDBClusterTDEOutcome(outcome.error());
+}
+
+void PolardbClient::modifyDBClusterTDEAsync(const ModifyDBClusterTDERequest& request, const ModifyDBClusterTDEAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, modifyDBClusterTDE(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+PolardbClient::ModifyDBClusterTDEOutcomeCallable PolardbClient::modifyDBClusterTDECallable(const ModifyDBClusterTDERequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ModifyDBClusterTDEOutcome()>>(
+			[this, request]()
+			{
+			return this->modifyDBClusterTDE(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 PolardbClient::ModifyDBDescriptionOutcome PolardbClient::modifyDBDescription(const ModifyDBDescriptionRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

polardb/src/model/DescribeAccountsResult.cc

@@ -57,14 +57,14 @@ void DescribeAccountsResult::parse(const std::string &payload)
 			accountsObject.privilegeExceeded = valueAccountsDBAccount["PrivilegeExceeded"].asString();
 		if(!valueAccountsDBAccount["AccountPasswordValidTime"].isNull())
 			accountsObject.accountPasswordValidTime = valueAccountsDBAccount["AccountPasswordValidTime"].asString();
-		auto allDatabasePrivilegesNode = allAccountsNode["DatabasePrivileges"]["DatabasePrivilege"];
-		for (auto allAccountsNodeDatabasePrivilegesDatabasePrivilege : allDatabasePrivilegesNode)
+		auto allDatabasePrivilegesNode = valueAccountsDBAccount["DatabasePrivileges"]["DatabasePrivilege"];
+		for (auto valueAccountsDBAccountDatabasePrivilegesDatabasePrivilege : allDatabasePrivilegesNode)
 		{
 			DBAccount::DatabasePrivilege databasePrivilegesObject;
-			if(!allAccountsNodeDatabasePrivilegesDatabasePrivilege["DBName"].isNull())
-				databasePrivilegesObject.dBName = allAccountsNodeDatabasePrivilegesDatabasePrivilege["DBName"].asString();
-			if(!allAccountsNodeDatabasePrivilegesDatabasePrivilege["AccountPrivilege"].isNull())
-				databasePrivilegesObject.accountPrivilege = allAccountsNodeDatabasePrivilegesDatabasePrivilege["AccountPrivilege"].asString();
+			if(!valueAccountsDBAccountDatabasePrivilegesDatabasePrivilege["DBName"].isNull())
+				databasePrivilegesObject.dBName = valueAccountsDBAccountDatabasePrivilegesDatabasePrivilege["DBName"].asString();
+			if(!valueAccountsDBAccountDatabasePrivilegesDatabasePrivilege["AccountPrivilege"].isNull())
+				databasePrivilegesObject.accountPrivilege = valueAccountsDBAccountDatabasePrivilegesDatabasePrivilege["AccountPrivilege"].asString();
 			accountsObject.databasePrivileges.push_back(databasePrivilegesObject);
 		}
 		accounts_.push_back(accountsObject);

polardb/src/model/DescribeDBClusterAvailableResourcesResult.cc

@@ -47,20 +47,20 @@ void DescribeDBClusterAvailableResourcesResult::parse(const std::string &payload
 			availableZonesObject.regionId = valueAvailableZonesAvailableZone["RegionId"].asString();
 		if(!valueAvailableZonesAvailableZone["ZoneId"].isNull())
 			availableZonesObject.zoneId = valueAvailableZonesAvailableZone["ZoneId"].asString();
-		auto allSupportedEnginesNode = allAvailableZonesNode["SupportedEngines"]["SupportedEngine"];
-		for (auto allAvailableZonesNodeSupportedEnginesSupportedEngine : allSupportedEnginesNode)
+		auto allSupportedEnginesNode = valueAvailableZonesAvailableZone["SupportedEngines"]["SupportedEngine"];
+		for (auto valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngine : allSupportedEnginesNode)
 		{
 			AvailableZone::SupportedEngine supportedEnginesObject;
-			if(!allAvailableZonesNodeSupportedEnginesSupportedEngine["Engine"].isNull())
-				supportedEnginesObject.engine = allAvailableZonesNodeSupportedEnginesSupportedEngine["Engine"].asString();
-			auto allAvailableResourcesNode = allSupportedEnginesNode["AvailableResources"]["AvailableResource"];
-			for (auto allSupportedEnginesNodeAvailableResourcesAvailableResource : allAvailableResourcesNode)
+			if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngine["Engine"].isNull())
+				supportedEnginesObject.engine = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngine["Engine"].asString();
+			auto allAvailableResourcesNode = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngine["AvailableResources"]["AvailableResource"];
+			for (auto valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineAvailableResourcesAvailableResource : allAvailableResourcesNode)
 			{
 				AvailableZone::SupportedEngine::AvailableResource availableResourcesObject;
-				if(!allSupportedEnginesNodeAvailableResourcesAvailableResource["DBNodeClass"].isNull())
-					availableResourcesObject.dBNodeClass = allSupportedEnginesNodeAvailableResourcesAvailableResource["DBNodeClass"].asString();
-				if(!allSupportedEnginesNodeAvailableResourcesAvailableResource["Category"].isNull())
-					availableResourcesObject.category = allSupportedEnginesNodeAvailableResourcesAvailableResource["Category"].asString();
+				if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineAvailableResourcesAvailableResource["DBNodeClass"].isNull())
+					availableResourcesObject.dBNodeClass = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineAvailableResourcesAvailableResource["DBNodeClass"].asString();
+				if(!valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineAvailableResourcesAvailableResource["Category"].isNull())
+					availableResourcesObject.category = valueAvailableZonesAvailableZoneSupportedEnginesSupportedEngineAvailableResourcesAvailableResource["Category"].asString();
 				supportedEnginesObject.availableResources.push_back(availableResourcesObject);
 			}
 			availableZonesObject.supportedEngines.push_back(supportedEnginesObject);

polardb/src/model/DescribeDBClusterEndpointsResult.cc

@@ -59,26 +59,26 @@ void DescribeDBClusterEndpointsResult::parse(const std::string &payload)
 			itemsObject.nodeWithRoles = valueItemsDBEndpoint["NodeWithRoles"].asString();
 		if(!valueItemsDBEndpoint["DBEndpointDescription"].isNull())
 			itemsObject.dBEndpointDescription = valueItemsDBEndpoint["DBEndpointDescription"].asString();
-		auto allAddressItemsNode = allItemsNode["AddressItems"]["Address"];
-		for (auto allItemsNodeAddressItemsAddress : allAddressItemsNode)
+		auto allAddressItemsNode = valueItemsDBEndpoint["AddressItems"]["Address"];
+		for (auto valueItemsDBEndpointAddressItemsAddress : allAddressItemsNode)
 		{
 			DBEndpoint::Address addressItemsObject;
-			if(!allItemsNodeAddressItemsAddress["ConnectionString"].isNull())
-				addressItemsObject.connectionString = allItemsNodeAddressItemsAddress["ConnectionString"].asString();
-			if(!allItemsNodeAddressItemsAddress["IPAddress"].isNull())
-				addressItemsObject.iPAddress = allItemsNodeAddressItemsAddress["IPAddress"].asString();
-			if(!allItemsNodeAddressItemsAddress["NetType"].isNull())
-				addressItemsObject.netType = allItemsNodeAddressItemsAddress["NetType"].asString();
-			if(!allItemsNodeAddressItemsAddress["Port"].isNull())
-				addressItemsObject.port = allItemsNodeAddressItemsAddress["Port"].asString();
-			if(!allItemsNodeAddressItemsAddress["VPCId"].isNull())
-				addressItemsObject.vPCId = allItemsNodeAddressItemsAddress["VPCId"].asString();
-			if(!allItemsNodeAddressItemsAddress["VSwitchId"].isNull())
-				addressItemsObject.vSwitchId = allItemsNodeAddressItemsAddress["VSwitchId"].asString();
-			if(!allItemsNodeAddressItemsAddress["VpcInstanceId"].isNull())
-				addressItemsObject.vpcInstanceId = allItemsNodeAddressItemsAddress["VpcInstanceId"].asString();
-			if(!allItemsNodeAddressItemsAddress["PrivateZoneConnectionString"].isNull())
-				addressItemsObject.privateZoneConnectionString = allItemsNodeAddressItemsAddress["PrivateZoneConnectionString"].asString();
+			if(!valueItemsDBEndpointAddressItemsAddress["ConnectionString"].isNull())
+				addressItemsObject.connectionString = valueItemsDBEndpointAddressItemsAddress["ConnectionString"].asString();
+			if(!valueItemsDBEndpointAddressItemsAddress["IPAddress"].isNull())
+				addressItemsObject.iPAddress = valueItemsDBEndpointAddressItemsAddress["IPAddress"].asString();
+			if(!valueItemsDBEndpointAddressItemsAddress["NetType"].isNull())
+				addressItemsObject.netType = valueItemsDBEndpointAddressItemsAddress["NetType"].asString();
+			if(!valueItemsDBEndpointAddressItemsAddress["Port"].isNull())
+				addressItemsObject.port = valueItemsDBEndpointAddressItemsAddress["Port"].asString();
+			if(!valueItemsDBEndpointAddressItemsAddress["VPCId"].isNull())
+				addressItemsObject.vPCId = valueItemsDBEndpointAddressItemsAddress["VPCId"].asString();
+			if(!valueItemsDBEndpointAddressItemsAddress["VSwitchId"].isNull())
+				addressItemsObject.vSwitchId = valueItemsDBEndpointAddressItemsAddress["VSwitchId"].asString();
+			if(!valueItemsDBEndpointAddressItemsAddress["VpcInstanceId"].isNull())
+				addressItemsObject.vpcInstanceId = valueItemsDBEndpointAddressItemsAddress["VpcInstanceId"].asString();
+			if(!valueItemsDBEndpointAddressItemsAddress["PrivateZoneConnectionString"].isNull())
+				addressItemsObject.privateZoneConnectionString = valueItemsDBEndpointAddressItemsAddress["PrivateZoneConnectionString"].asString();
 			itemsObject.addressItems.push_back(addressItemsObject);
 		}
 		items_.push_back(itemsObject);

polardb/src/model/DescribeDBClusterMigrationResult.cc

@@ -47,22 +47,22 @@ void DescribeDBClusterMigrationResult::parse(const std::string &payload)
 			dBClusterEndpointListObject.dBEndpointId = valueDBClusterEndpointListDBClusterEndpoint["DBEndpointId"].asString();
 		if(!valueDBClusterEndpointListDBClusterEndpoint["EndpointType"].isNull())
 			dBClusterEndpointListObject.endpointType = valueDBClusterEndpointListDBClusterEndpoint["EndpointType"].asString();
-		auto allAddressItemsNode = allDBClusterEndpointListNode["AddressItems"]["Address"];
-		for (auto allDBClusterEndpointListNodeAddressItemsAddress : allAddressItemsNode)
+		auto allAddressItemsNode = valueDBClusterEndpointListDBClusterEndpoint["AddressItems"]["Address"];
+		for (auto valueDBClusterEndpointListDBClusterEndpointAddressItemsAddress : allAddressItemsNode)
 		{
 			DBClusterEndpoint::Address addressItemsObject;
-			if(!allDBClusterEndpointListNodeAddressItemsAddress["ConnectionString"].isNull())
-				addressItemsObject.connectionString = allDBClusterEndpointListNodeAddressItemsAddress["ConnectionString"].asString();
-			if(!allDBClusterEndpointListNodeAddressItemsAddress["IPAddress"].isNull())
-				addressItemsObject.iPAddress = allDBClusterEndpointListNodeAddressItemsAddress["IPAddress"].asString();
-			if(!allDBClusterEndpointListNodeAddressItemsAddress["NetType"].isNull())
-				addressItemsObject.netType = allDBClusterEndpointListNodeAddressItemsAddress["NetType"].asString();
-			if(!allDBClusterEndpointListNodeAddressItemsAddress["Port"].isNull())
-				addressItemsObject.port = allDBClusterEndpointListNodeAddressItemsAddress["Port"].asString();
-			if(!allDBClusterEndpointListNodeAddressItemsAddress["VPCId"].isNull())
-				addressItemsObject.vPCId = allDBClusterEndpointListNodeAddressItemsAddress["VPCId"].asString();
-			if(!allDBClusterEndpointListNodeAddressItemsAddress["VSwitchId"].isNull())
-				addressItemsObject.vSwitchId = allDBClusterEndpointListNodeAddressItemsAddress["VSwitchId"].asString();
+			if(!valueDBClusterEndpointListDBClusterEndpointAddressItemsAddress["ConnectionString"].isNull())
+				addressItemsObject.connectionString = valueDBClusterEndpointListDBClusterEndpointAddressItemsAddress["ConnectionString"].asString();
+			if(!valueDBClusterEndpointListDBClusterEndpointAddressItemsAddress["IPAddress"].isNull())
+				addressItemsObject.iPAddress = valueDBClusterEndpointListDBClusterEndpointAddressItemsAddress["IPAddress"].asString();
+			if(!valueDBClusterEndpointListDBClusterEndpointAddressItemsAddress["NetType"].isNull())
+				addressItemsObject.netType = valueDBClusterEndpointListDBClusterEndpointAddressItemsAddress["NetType"].asString();
+			if(!valueDBClusterEndpointListDBClusterEndpointAddressItemsAddress["Port"].isNull())
+				addressItemsObject.port = valueDBClusterEndpointListDBClusterEndpointAddressItemsAddress["Port"].asString();
+			if(!valueDBClusterEndpointListDBClusterEndpointAddressItemsAddress["VPCId"].isNull())
+				addressItemsObject.vPCId = valueDBClusterEndpointListDBClusterEndpointAddressItemsAddress["VPCId"].asString();
+			if(!valueDBClusterEndpointListDBClusterEndpointAddressItemsAddress["VSwitchId"].isNull())
+				addressItemsObject.vSwitchId = valueDBClusterEndpointListDBClusterEndpointAddressItemsAddress["VSwitchId"].asString();
 			dBClusterEndpointListObject.addressItems.push_back(addressItemsObject);
 		}
 		dBClusterEndpointList_.push_back(dBClusterEndpointListObject);
@@ -75,22 +75,22 @@ void DescribeDBClusterMigrationResult::parse(const std::string &payload)
 			rdsEndpointListObject.dBEndpointId = valueRdsEndpointListRdsEndpoint["DBEndpointId"].asString();
 		if(!valueRdsEndpointListRdsEndpoint["EndpointType"].isNull())
 			rdsEndpointListObject.endpointType = valueRdsEndpointListRdsEndpoint["EndpointType"].asString();
-		auto allAddressItems1Node = allRdsEndpointListNode["AddressItems"]["Address"];
-		for (auto allRdsEndpointListNodeAddressItemsAddress : allAddressItems1Node)
+		auto allAddressItems1Node = valueRdsEndpointListRdsEndpoint["AddressItems"]["Address"];
+		for (auto valueRdsEndpointListRdsEndpointAddressItemsAddress : allAddressItems1Node)
 		{
 			RdsEndpoint::Address2 addressItems1Object;
-			if(!allRdsEndpointListNodeAddressItemsAddress["ConnectionString"].isNull())
-				addressItems1Object.connectionString = allRdsEndpointListNodeAddressItemsAddress["ConnectionString"].asString();
-			if(!allRdsEndpointListNodeAddressItemsAddress["IPAddress"].isNull())
-				addressItems1Object.iPAddress = allRdsEndpointListNodeAddressItemsAddress["IPAddress"].asString();
-			if(!allRdsEndpointListNodeAddressItemsAddress["NetType"].isNull())
-				addressItems1Object.netType = allRdsEndpointListNodeAddressItemsAddress["NetType"].asString();
-			if(!allRdsEndpointListNodeAddressItemsAddress["Port"].isNull())
-				addressItems1Object.port = allRdsEndpointListNodeAddressItemsAddress["Port"].asString();
-			if(!allRdsEndpointListNodeAddressItemsAddress["VPCId"].isNull())
-				addressItems1Object.vPCId = allRdsEndpointListNodeAddressItemsAddress["VPCId"].asString();
-			if(!allRdsEndpointListNodeAddressItemsAddress["VSwitchId"].isNull())
-				addressItems1Object.vSwitchId = allRdsEndpointListNodeAddressItemsAddress["VSwitchId"].asString();
+			if(!valueRdsEndpointListRdsEndpointAddressItemsAddress["ConnectionString"].isNull())
+				addressItems1Object.connectionString = valueRdsEndpointListRdsEndpointAddressItemsAddress["ConnectionString"].asString();
+			if(!valueRdsEndpointListRdsEndpointAddressItemsAddress["IPAddress"].isNull())
+				addressItems1Object.iPAddress = valueRdsEndpointListRdsEndpointAddressItemsAddress["IPAddress"].asString();
+			if(!valueRdsEndpointListRdsEndpointAddressItemsAddress["NetType"].isNull())
+				addressItems1Object.netType = valueRdsEndpointListRdsEndpointAddressItemsAddress["NetType"].asString();
+			if(!valueRdsEndpointListRdsEndpointAddressItemsAddress["Port"].isNull())
+				addressItems1Object.port = valueRdsEndpointListRdsEndpointAddressItemsAddress["Port"].asString();
+			if(!valueRdsEndpointListRdsEndpointAddressItemsAddress["VPCId"].isNull())
+				addressItems1Object.vPCId = valueRdsEndpointListRdsEndpointAddressItemsAddress["VPCId"].asString();
+			if(!valueRdsEndpointListRdsEndpointAddressItemsAddress["VSwitchId"].isNull())
+				addressItems1Object.vSwitchId = valueRdsEndpointListRdsEndpointAddressItemsAddress["VSwitchId"].asString();
 			rdsEndpointListObject.addressItems1.push_back(addressItems1Object);
 		}
 		rdsEndpointList_.push_back(rdsEndpointListObject);

polardb/src/model/DescribeDBClusterPerformanceResult.cc

@@ -49,14 +49,14 @@ void DescribeDBClusterPerformanceResult::parse(const std::string &payload)
 			performanceKeysObject.measurement = valuePerformanceKeysPerformanceItem["Measurement"].asString();
 		if(!valuePerformanceKeysPerformanceItem["MetricName"].isNull())
 			performanceKeysObject.metricName = valuePerformanceKeysPerformanceItem["MetricName"].asString();
-		auto allPointsNode = allPerformanceKeysNode["Points"]["PerformanceItemValue"];
-		for (auto allPerformanceKeysNodePointsPerformanceItemValue : allPointsNode)
+		auto allPointsNode = valuePerformanceKeysPerformanceItem["Points"]["PerformanceItemValue"];
+		for (auto valuePerformanceKeysPerformanceItemPointsPerformanceItemValue : allPointsNode)
 		{
 			PerformanceItem::PerformanceItemValue pointsObject;
-			if(!allPerformanceKeysNodePointsPerformanceItemValue["Value"].isNull())
-				pointsObject.value = allPerformanceKeysNodePointsPerformanceItemValue["Value"].asString();
-			if(!allPerformanceKeysNodePointsPerformanceItemValue["Timestamp"].isNull())
-				pointsObject.timestamp = std::stol(allPerformanceKeysNodePointsPerformanceItemValue["Timestamp"].asString());
+			if(!valuePerformanceKeysPerformanceItemPointsPerformanceItemValue["Value"].isNull())
+				pointsObject.value = valuePerformanceKeysPerformanceItemPointsPerformanceItemValue["Value"].asString();
+			if(!valuePerformanceKeysPerformanceItemPointsPerformanceItemValue["Timestamp"].isNull())
+				pointsObject.timestamp = std::stol(valuePerformanceKeysPerformanceItemPointsPerformanceItemValue["Timestamp"].asString());
 			performanceKeysObject.points.push_back(pointsObject);
 		}
 		performanceKeys_.push_back(performanceKeysObject);

polardb/src/model/DescribeDBClusterTDERequest.cc

@@ -0,0 +1,95 @@
+/*
+ * 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/polardb/model/DescribeDBClusterTDERequest.h>
+
+using AlibabaCloud::Polardb::Model::DescribeDBClusterTDERequest;
+
+DescribeDBClusterTDERequest::DescribeDBClusterTDERequest() :
+	RpcServiceRequest("polardb", "2017-08-01", "DescribeDBClusterTDE")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeDBClusterTDERequest::~DescribeDBClusterTDERequest()
+{}
+
+long DescribeDBClusterTDERequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void DescribeDBClusterTDERequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string DescribeDBClusterTDERequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void DescribeDBClusterTDERequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string DescribeDBClusterTDERequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void DescribeDBClusterTDERequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string DescribeDBClusterTDERequest::getDBClusterId()const
+{
+	return dBClusterId_;
+}
+
+void DescribeDBClusterTDERequest::setDBClusterId(const std::string& dBClusterId)
+{
+	dBClusterId_ = dBClusterId;
+	setParameter("DBClusterId", dBClusterId);
+}
+
+std::string DescribeDBClusterTDERequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void DescribeDBClusterTDERequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setParameter("OwnerAccount", ownerAccount);
+}
+
+long DescribeDBClusterTDERequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeDBClusterTDERequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+

polardb/src/model/DescribeDBClusterTDEResult.cc

@@ -0,0 +1,65 @@
+/*
+ * 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/polardb/model/DescribeDBClusterTDEResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Polardb;
+using namespace AlibabaCloud::Polardb::Model;
+
+DescribeDBClusterTDEResult::DescribeDBClusterTDEResult() :
+	ServiceResult()
+{}
+
+DescribeDBClusterTDEResult::DescribeDBClusterTDEResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeDBClusterTDEResult::~DescribeDBClusterTDEResult()
+{}
+
+void DescribeDBClusterTDEResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["DBClusterId"].isNull())
+		dBClusterId_ = value["DBClusterId"].asString();
+	if(!value["TDEStatus"].isNull())
+		tDEStatus_ = value["TDEStatus"].asString();
+	if(!value["EncryptionKey"].isNull())
+		encryptionKey_ = value["EncryptionKey"].asString();
+
+}
+
+std::string DescribeDBClusterTDEResult::getTDEStatus()const
+{
+	return tDEStatus_;
+}
+
+std::string DescribeDBClusterTDEResult::getDBClusterId()const
+{
+	return dBClusterId_;
+}
+
+std::string DescribeDBClusterTDEResult::getEncryptionKey()const
+{
+	return encryptionKey_;
+}
+

polardb/src/model/DescribeDBClustersResult.cc

@@ -83,30 +83,30 @@ void DescribeDBClustersResult::parse(const std::string &payload)
 			itemsObject.storageUsed = std::stol(valueItemsDBCluster["StorageUsed"].asString());
 		if(!valueItemsDBCluster["ResourceGroupId"].isNull())
 			itemsObject.resourceGroupId = valueItemsDBCluster["ResourceGroupId"].asString();
-		auto allDBNodesNode = allItemsNode["DBNodes"]["DBNode"];
-		for (auto allItemsNodeDBNodesDBNode : allDBNodesNode)
+		auto allDBNodesNode = valueItemsDBCluster["DBNodes"]["DBNode"];
+		for (auto valueItemsDBClusterDBNodesDBNode : allDBNodesNode)
 		{
 			DBCluster::DBNode dBNodesObject;
-			if(!allItemsNodeDBNodesDBNode["DBNodeId"].isNull())
-				dBNodesObject.dBNodeId = allItemsNodeDBNodesDBNode["DBNodeId"].asString();
-			if(!allItemsNodeDBNodesDBNode["DBNodeClass"].isNull())
-				dBNodesObject.dBNodeClass = allItemsNodeDBNodesDBNode["DBNodeClass"].asString();
-			if(!allItemsNodeDBNodesDBNode["DBNodeRole"].isNull())
-				dBNodesObject.dBNodeRole = allItemsNodeDBNodesDBNode["DBNodeRole"].asString();
-			if(!allItemsNodeDBNodesDBNode["RegionId"].isNull())
-				dBNodesObject.regionId = allItemsNodeDBNodesDBNode["RegionId"].asString();
-			if(!allItemsNodeDBNodesDBNode["ZoneId"].isNull())
-				dBNodesObject.zoneId = allItemsNodeDBNodesDBNode["ZoneId"].asString();
+			if(!valueItemsDBClusterDBNodesDBNode["DBNodeId"].isNull())
+				dBNodesObject.dBNodeId = valueItemsDBClusterDBNodesDBNode["DBNodeId"].asString();
+			if(!valueItemsDBClusterDBNodesDBNode["DBNodeClass"].isNull())
+				dBNodesObject.dBNodeClass = valueItemsDBClusterDBNodesDBNode["DBNodeClass"].asString();
+			if(!valueItemsDBClusterDBNodesDBNode["DBNodeRole"].isNull())
+				dBNodesObject.dBNodeRole = valueItemsDBClusterDBNodesDBNode["DBNodeRole"].asString();
+			if(!valueItemsDBClusterDBNodesDBNode["RegionId"].isNull())
+				dBNodesObject.regionId = valueItemsDBClusterDBNodesDBNode["RegionId"].asString();
+			if(!valueItemsDBClusterDBNodesDBNode["ZoneId"].isNull())
+				dBNodesObject.zoneId = valueItemsDBClusterDBNodesDBNode["ZoneId"].asString();
 			itemsObject.dBNodes.push_back(dBNodesObject);
 		}
-		auto allTagsNode = allItemsNode["Tags"]["Tag"];
-		for (auto allItemsNodeTagsTag : allTagsNode)
+		auto allTagsNode = valueItemsDBCluster["Tags"]["Tag"];
+		for (auto valueItemsDBClusterTagsTag : allTagsNode)
 		{
 			DBCluster::Tag tagsObject;
-			if(!allItemsNodeTagsTag["Key"].isNull())
-				tagsObject.key = allItemsNodeTagsTag["Key"].asString();
-			if(!allItemsNodeTagsTag["Value"].isNull())
-				tagsObject.value = allItemsNodeTagsTag["Value"].asString();
+			if(!valueItemsDBClusterTagsTag["Key"].isNull())
+				tagsObject.key = valueItemsDBClusterTagsTag["Key"].asString();
+			if(!valueItemsDBClusterTagsTag["Value"].isNull())
+				tagsObject.value = valueItemsDBClusterTagsTag["Value"].asString();
 			itemsObject.tags.push_back(tagsObject);
 		}
 		items_.push_back(itemsObject);

polardb/src/model/DescribeDBNodePerformanceResult.cc

@@ -47,14 +47,14 @@ void DescribeDBNodePerformanceResult::parse(const std::string &payload)
 			performanceKeysObject.metricName = valuePerformanceKeysPerformanceItem["MetricName"].asString();
 		if(!valuePerformanceKeysPerformanceItem["Measurement"].isNull())
 			performanceKeysObject.measurement = valuePerformanceKeysPerformanceItem["Measurement"].asString();
-		auto allPointsNode = allPerformanceKeysNode["Points"]["PerformanceItemValue"];
-		for (auto allPerformanceKeysNodePointsPerformanceItemValue : allPointsNode)
+		auto allPointsNode = valuePerformanceKeysPerformanceItem["Points"]["PerformanceItemValue"];
+		for (auto valuePerformanceKeysPerformanceItemPointsPerformanceItemValue : allPointsNode)
 		{
 			PerformanceItem::PerformanceItemValue pointsObject;
-			if(!allPerformanceKeysNodePointsPerformanceItemValue["Value"].isNull())
-				pointsObject.value = allPerformanceKeysNodePointsPerformanceItemValue["Value"].asString();
-			if(!allPerformanceKeysNodePointsPerformanceItemValue["Timestamp"].isNull())
-				pointsObject.timestamp = std::stol(allPerformanceKeysNodePointsPerformanceItemValue["Timestamp"].asString());
+			if(!valuePerformanceKeysPerformanceItemPointsPerformanceItemValue["Value"].isNull())
+				pointsObject.value = valuePerformanceKeysPerformanceItemPointsPerformanceItemValue["Value"].asString();
+			if(!valuePerformanceKeysPerformanceItemPointsPerformanceItemValue["Timestamp"].isNull())
+				pointsObject.timestamp = std::stol(valuePerformanceKeysPerformanceItemPointsPerformanceItemValue["Timestamp"].asString());
 			performanceKeysObject.points.push_back(pointsObject);
 		}
 		performanceKeys_.push_back(performanceKeysObject);

polardb/src/model/DescribeDatabasesResult.cc

@@ -53,18 +53,18 @@ void DescribeDatabasesResult::parse(const std::string &payload)
 			databasesObject.characterSetName = valueDatabasesDatabase["CharacterSetName"].asString();
 		if(!valueDatabasesDatabase["Engine"].isNull())
 			databasesObject.engine = valueDatabasesDatabase["Engine"].asString();
-		auto allAccountsNode = allDatabasesNode["Accounts"]["Account"];
-		for (auto allDatabasesNodeAccountsAccount : allAccountsNode)
+		auto allAccountsNode = valueDatabasesDatabase["Accounts"]["Account"];
+		for (auto valueDatabasesDatabaseAccountsAccount : allAccountsNode)
 		{
 			Database::Account accountsObject;
-			if(!allDatabasesNodeAccountsAccount["AccountName"].isNull())
-				accountsObject.accountName = allDatabasesNodeAccountsAccount["AccountName"].asString();
-			if(!allDatabasesNodeAccountsAccount["AccountStatus"].isNull())
-				accountsObject.accountStatus = allDatabasesNodeAccountsAccount["AccountStatus"].asString();
-			if(!allDatabasesNodeAccountsAccount["AccountPrivilege"].isNull())
-				accountsObject.accountPrivilege = allDatabasesNodeAccountsAccount["AccountPrivilege"].asString();
-			if(!allDatabasesNodeAccountsAccount["PrivilegeStatus"].isNull())
-				accountsObject.privilegeStatus = allDatabasesNodeAccountsAccount["PrivilegeStatus"].asString();
+			if(!valueDatabasesDatabaseAccountsAccount["AccountName"].isNull())
+				accountsObject.accountName = valueDatabasesDatabaseAccountsAccount["AccountName"].asString();
+			if(!valueDatabasesDatabaseAccountsAccount["AccountStatus"].isNull())
+				accountsObject.accountStatus = valueDatabasesDatabaseAccountsAccount["AccountStatus"].asString();
+			if(!valueDatabasesDatabaseAccountsAccount["AccountPrivilege"].isNull())
+				accountsObject.accountPrivilege = valueDatabasesDatabaseAccountsAccount["AccountPrivilege"].asString();
+			if(!valueDatabasesDatabaseAccountsAccount["PrivilegeStatus"].isNull())
+				accountsObject.privilegeStatus = valueDatabasesDatabaseAccountsAccount["PrivilegeStatus"].asString();
 			databasesObject.accounts.push_back(accountsObject);
 		}
 		databases_.push_back(databasesObject);

polardb/src/model/DescribeRegionsResult.cc

@@ -45,14 +45,14 @@ void DescribeRegionsResult::parse(const std::string &payload)
 		Region regionsObject;
 		if(!valueRegionsRegion["RegionId"].isNull())
 			regionsObject.regionId = valueRegionsRegion["RegionId"].asString();
-		auto allZonesNode = allRegionsNode["Zones"]["Zone"];
-		for (auto allRegionsNodeZonesZone : allZonesNode)
+		auto allZonesNode = valueRegionsRegion["Zones"]["Zone"];
+		for (auto valueRegionsRegionZonesZone : allZonesNode)
 		{
 			Region::Zone zonesObject;
-			if(!allRegionsNodeZonesZone["ZoneId"].isNull())
-				zonesObject.zoneId = allRegionsNodeZonesZone["ZoneId"].asString();
-			if(!allRegionsNodeZonesZone["VpcEnabled"].isNull())
-				zonesObject.vpcEnabled = allRegionsNodeZonesZone["VpcEnabled"].asString() == "true";
+			if(!valueRegionsRegionZonesZone["ZoneId"].isNull())
+				zonesObject.zoneId = valueRegionsRegionZonesZone["ZoneId"].asString();
+			if(!valueRegionsRegionZonesZone["VpcEnabled"].isNull())
+				zonesObject.vpcEnabled = valueRegionsRegionZonesZone["VpcEnabled"].asString() == "true";
 			regionsObject.zones.push_back(zonesObject);
 		}
 		regions_.push_back(regionsObject);

polardb/src/model/ModifyDBClusterTDERequest.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/polardb/model/ModifyDBClusterTDERequest.h>
+
+using AlibabaCloud::Polardb::Model::ModifyDBClusterTDERequest;
+
+ModifyDBClusterTDERequest::ModifyDBClusterTDERequest() :
+	RpcServiceRequest("polardb", "2017-08-01", "ModifyDBClusterTDE")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+ModifyDBClusterTDERequest::~ModifyDBClusterTDERequest()
+{}
+
+long ModifyDBClusterTDERequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void ModifyDBClusterTDERequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string ModifyDBClusterTDERequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void ModifyDBClusterTDERequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string ModifyDBClusterTDERequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void ModifyDBClusterTDERequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string ModifyDBClusterTDERequest::getDBClusterId()const
+{
+	return dBClusterId_;
+}
+
+void ModifyDBClusterTDERequest::setDBClusterId(const std::string& dBClusterId)
+{
+	dBClusterId_ = dBClusterId;
+	setParameter("DBClusterId", dBClusterId);
+}
+
+std::string ModifyDBClusterTDERequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void ModifyDBClusterTDERequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setParameter("OwnerAccount", ownerAccount);
+}
+
+std::string ModifyDBClusterTDERequest::getEncryptionKey()const
+{
+	return encryptionKey_;
+}
+
+void ModifyDBClusterTDERequest::setEncryptionKey(const std::string& encryptionKey)
+{
+	encryptionKey_ = encryptionKey;
+	setParameter("EncryptionKey", encryptionKey);
+}
+
+long ModifyDBClusterTDERequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void ModifyDBClusterTDERequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string ModifyDBClusterTDERequest::getRoleArn()const
+{
+	return roleArn_;
+}
+
+void ModifyDBClusterTDERequest::setRoleArn(const std::string& roleArn)
+{
+	roleArn_ = roleArn;
+	setParameter("RoleArn", roleArn);
+}
+
+std::string ModifyDBClusterTDERequest::getTDEStatus()const
+{
+	return tDEStatus_;
+}
+
+void ModifyDBClusterTDERequest::setTDEStatus(const std::string& tDEStatus)
+{
+	tDEStatus_ = tDEStatus;
+	setParameter("TDEStatus", tDEStatus);
+}
+

polardb/src/model/ModifyDBClusterTDEResult.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/polardb/model/ModifyDBClusterTDEResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Polardb;
+using namespace AlibabaCloud::Polardb::Model;
+
+ModifyDBClusterTDEResult::ModifyDBClusterTDEResult() :
+	ServiceResult()
+{}
+
+ModifyDBClusterTDEResult::ModifyDBClusterTDEResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+ModifyDBClusterTDEResult::~ModifyDBClusterTDEResult()
+{}
+
+void ModifyDBClusterTDEResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+
+}
+

pvtz/include/alibabacloud/pvtz/model/DescribeRequestGraphRequest.h

@@ -39,10 +39,14 @@ namespace AlibabaCloud
 				void setStartTimestamp(long startTimestamp);
 				long getEndTimestamp()const;
 				void setEndTimestamp(long endTimestamp);
+				std::string getBizType()const;
+				void setBizType(const std::string& bizType);
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
 				std::string getUserClientIp()const;
 				void setUserClientIp(const std::string& userClientIp);
+				std::string getBizId()const;
+				void setBizId(const std::string& bizId);
 				std::string getZoneId()const;
 				void setZoneId(const std::string& zoneId);
 				std::string getLang()const;
@@ -51,8 +55,10 @@ namespace AlibabaCloud
             private:
 				long startTimestamp_;
 				long endTimestamp_;
+				std::string bizType_;
 				std::string vpcId_;
 				std::string userClientIp_;
+				std::string bizId_;
 				std::string zoneId_;
 				std::string lang_;
 

pvtz/include/alibabacloud/pvtz/model/DescribeStatisticSummaryResult.h

@@ -35,6 +35,7 @@ namespace AlibabaCloud
 				struct ZoneRequestTop
 				{
 					std::string zoneName;
+					std::string bizType;
 					long requestCount;
 				};
 				struct VpcRequestTop

pvtz/include/alibabacloud/pvtz/model/DescribeZoneInfoResult.h

@@ -44,34 +44,36 @@ namespace AlibabaCloud
 				DescribeZoneInfoResult();
 				explicit DescribeZoneInfoResult(const std::string &payload);
 				~DescribeZoneInfoResult();
-				std::string getZoneName()const;
 				std::string getZoneId()const;
 				bool getSlaveDns()const;
+				std::string getResourceGroupId()const;
 				std::string getProxyPattern()const;
 				std::string getCreateTime()const;
+				std::string getRemark()const;
+				std::string getZoneName()const;
 				std::string getUpdateTime()const;
 				long getUpdateTimestamp()const;
 				std::vector<Vpc> getBindVpcs()const;
 				int getRecordCount()const;
 				long getCreateTimestamp()const;
 				bool getIsPtr()const;
-				std::string getRemark()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::string zoneName_;
 				std::string zoneId_;
 				bool slaveDns_;
+				std::string resourceGroupId_;
 				std::string proxyPattern_;
 				std::string createTime_;
+				std::string remark_;
+				std::string zoneName_;
 				std::string updateTime_;
 				long updateTimestamp_;
 				std::vector<Vpc> bindVpcs_;
 				int recordCount_;
 				long createTimestamp_;
 				bool isPtr_;
-				std::string remark_;
 
 			};
 		}

pvtz/include/alibabacloud/pvtz/model/DescribeZonesResult.h

@@ -36,6 +36,7 @@ namespace AlibabaCloud
 				{
 					std::string zoneName;
 					std::string zoneId;
+					std::string resourceGroupId;
 					std::string proxyPattern;
 					std::string createTime;
 					std::string updateTime;

pvtz/src/model/DescribeRequestGraphRequest.cc

@@ -49,6 +49,17 @@ void DescribeRequestGraphRequest::setEndTimestamp(long endTimestamp)
 	setParameter("EndTimestamp", std::to_string(endTimestamp));
 }
 
+std::string DescribeRequestGraphRequest::getBizType()const
+{
+	return bizType_;
+}
+
+void DescribeRequestGraphRequest::setBizType(const std::string& bizType)
+{
+	bizType_ = bizType;
+	setParameter("BizType", bizType);
+}
+
 std::string DescribeRequestGraphRequest::getVpcId()const
 {
 	return vpcId_;
@@ -71,6 +82,17 @@ void DescribeRequestGraphRequest::setUserClientIp(const std::string& userClientI
 	setParameter("UserClientIp", userClientIp);
 }
 
+std::string DescribeRequestGraphRequest::getBizId()const
+{
+	return bizId_;
+}
+
+void DescribeRequestGraphRequest::setBizId(const std::string& bizId)
+{
+	bizId_ = bizId;
+	setParameter("BizId", bizId);
+}
+
 std::string DescribeRequestGraphRequest::getZoneId()const
 {
 	return zoneId_;

pvtz/src/model/DescribeStatisticSummaryResult.cc

@@ -47,6 +47,8 @@ void DescribeStatisticSummaryResult::parse(const std::string &payload)
 			zoneRequestTopsObject.zoneName = valueZoneRequestTopsZoneRequestTop["ZoneName"].asString();
 		if(!valueZoneRequestTopsZoneRequestTop["RequestCount"].isNull())
 			zoneRequestTopsObject.requestCount = std::stol(valueZoneRequestTopsZoneRequestTop["RequestCount"].asString());
+		if(!valueZoneRequestTopsZoneRequestTop["BizType"].isNull())
+			zoneRequestTopsObject.bizType = valueZoneRequestTopsZoneRequestTop["BizType"].asString();
 		zoneRequestTops_.push_back(zoneRequestTopsObject);
 	}
 	auto allVpcRequestTopsNode = value["VpcRequestTops"]["VpcRequestTop"];

pvtz/src/model/DescribeZoneInfoResult.cc

@@ -75,14 +75,11 @@ void DescribeZoneInfoResult::parse(const std::string &payload)
 		proxyPattern_ = value["ProxyPattern"].asString();
 	if(!value["SlaveDns"].isNull())
 		slaveDns_ = value["SlaveDns"].asString() == "true";
+	if(!value["ResourceGroupId"].isNull())
+		resourceGroupId_ = value["ResourceGroupId"].asString();
 
 }
 
-std::string DescribeZoneInfoResult::getZoneName()const
-{
-	return zoneName_;
-}
-
 std::string DescribeZoneInfoResult::getZoneId()const
 {
 	return zoneId_;
@@ -93,6 +90,11 @@ bool DescribeZoneInfoResult::getSlaveDns()const
 	return slaveDns_;
 }
 
+std::string DescribeZoneInfoResult::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
 std::string DescribeZoneInfoResult::getProxyPattern()const
 {
 	return proxyPattern_;
@@ -103,6 +105,16 @@ std::string DescribeZoneInfoResult::getCreateTime()const
 	return createTime_;
 }
 
+std::string DescribeZoneInfoResult::getRemark()const
+{
+	return remark_;
+}
+
+std::string DescribeZoneInfoResult::getZoneName()const
+{
+	return zoneName_;
+}
+
 std::string DescribeZoneInfoResult::getUpdateTime()const
 {
 	return updateTime_;
@@ -133,8 +145,3 @@ bool DescribeZoneInfoResult::getIsPtr()const
 	return isPtr_;
 }
 
-std::string DescribeZoneInfoResult::getRemark()const
-{
-	return remark_;
-}
-

pvtz/src/model/DescribeZoneVpcTreeResult.cc

@@ -61,18 +61,18 @@ void DescribeZoneVpcTreeResult::parse(const std::string &payload)
 			zonesObject.updateTimestamp = std::stol(valueZonesZone["UpdateTimestamp"].asString());
 		if(!valueZonesZone["IsPtr"].isNull())
 			zonesObject.isPtr = valueZonesZone["IsPtr"].asString() == "true";
-		auto allVpcsNode = allZonesNode["Vpcs"]["Vpc"];
-		for (auto allZonesNodeVpcsVpc : allVpcsNode)
+		auto allVpcsNode = valueZonesZone["Vpcs"]["Vpc"];
+		for (auto valueZonesZoneVpcsVpc : allVpcsNode)
 		{
 			Zone::Vpc vpcsObject;
-			if(!allZonesNodeVpcsVpc["RegionId"].isNull())
-				vpcsObject.regionId = allZonesNodeVpcsVpc["RegionId"].asString();
-			if(!allZonesNodeVpcsVpc["RegionName"].isNull())
-				vpcsObject.regionName = allZonesNodeVpcsVpc["RegionName"].asString();
-			if(!allZonesNodeVpcsVpc["VpcId"].isNull())
-				vpcsObject.vpcId = allZonesNodeVpcsVpc["VpcId"].asString();
-			if(!allZonesNodeVpcsVpc["VpcName"].isNull())
-				vpcsObject.vpcName = allZonesNodeVpcsVpc["VpcName"].asString();
+			if(!valueZonesZoneVpcsVpc["RegionId"].isNull())
+				vpcsObject.regionId = valueZonesZoneVpcsVpc["RegionId"].asString();
+			if(!valueZonesZoneVpcsVpc["RegionName"].isNull())
+				vpcsObject.regionName = valueZonesZoneVpcsVpc["RegionName"].asString();
+			if(!valueZonesZoneVpcsVpc["VpcId"].isNull())
+				vpcsObject.vpcId = valueZonesZoneVpcsVpc["VpcId"].asString();
+			if(!valueZonesZoneVpcsVpc["VpcName"].isNull())
+				vpcsObject.vpcName = valueZonesZoneVpcsVpc["VpcName"].asString();
 			zonesObject.vpcs.push_back(vpcsObject);
 		}
 		zones_.push_back(zonesObject);

pvtz/src/model/DescribeZonesResult.cc

@@ -63,6 +63,8 @@ void DescribeZonesResult::parse(const std::string &payload)
 			zonesObject.isPtr = valueZonesZone["IsPtr"].asString() == "true";
 		if(!valueZonesZone["ProxyPattern"].isNull())
 			zonesObject.proxyPattern = valueZonesZone["ProxyPattern"].asString();
+		if(!valueZonesZone["ResourceGroupId"].isNull())
+			zonesObject.resourceGroupId = valueZonesZone["ResourceGroupId"].asString();
 		zones_.push_back(zonesObject);
 	}
 	if(!value["TotalItems"].isNull())