Public beta version.

CHANGELOG

@@ -1,3 +1,57 @@
+2020-08-17 Version: 1.36.588
+- Public beta version.
+- Add Api Overseas.
+
+2020-08-17 Version: 1.36.587
+- Add new tags for corp group.
+
+2020-08-17 Version: 1.36.586
+- Add new tags for corp group.
+
+2020-08-16 Version: 1.36.585
+- Add new tags for corp group.
+
+2020-08-14 Version: 1.36.584
+- Add sdk.
+
+2020-08-14 Version: 1.36.583
+- Supported Api DetectIPCPedestrian.
+
+2020-08-14 Version: 1.36.582
+- Supported CheckCloudResourceAuthorized API.
+
+2020-08-14 Version: 1.36.581
+- Add project Api.
+
+2020-08-13 Version: 1.36.580
+- Add PipCode and CommodityCode for QueryInstanceBill, QueryBillOverview, QueryBill, QuerySettleBill, QueryAccountBill, QuerySplitItemBill.
+- Support BillOwnerId filter for QueryInstanceBill, QueryBillOverview, QueryBill, QuerySettleBill, QueryAccountBill, QuerySplitItemBill.
+
+2020-08-13 Version: 1.36.579
+- Release DetectKneeXRay DetectSpineMRI TranslateMed.
+
+2020-08-13 Version: 1.36.578
+- Release DetectKneeXRay DetectSpineMRI TranslateMed.
+
+2020-08-13 Version: 1.36.577
+- Release DetectKneeXRay DetectSpineMRI TranslateMed.
+
+2020-08-13 Version: 1.36.576
+- GetImageTranslate add column orc.
+
+2020-08-13 Version: 1.36.575
+- DescribePrice update amount parameters type, float to string.
+- Add ResourceGroupId parameter to support resource group.
+
+2020-08-13 Version: 1.36.574
+- Release SegmentHalfBody.
+
+2020-08-13 Version: 1.36.573
+- Release SegmentHalfBody.
+
+2020-08-12 Version: 1.36.572
+- Support corp group api.
+
 2020-08-12 Version: 1.36.571
 - Add pipeline status api.
 

VERSION

@@ -1 +1 @@
-1.36.571
+1.36.588

alimt/include/alibabacloud/alimt/model/GetImageTranslateResult.h

@@ -34,6 +34,7 @@ namespace AlibabaCloud
 			public:
 				struct Data
 				{
+					std::string orc;
 					std::string url;
 				};
 

alimt/src/model/GetImageTranslateResult.cc

@@ -42,6 +42,8 @@ void GetImageTranslateResult::parse(const std::string &payload)
 	auto dataNode = value["Data"];
 	if(!dataNode["Url"].isNull())
 		data_.url = dataNode["Url"].asString();
+	if(!dataNode["Orc"].isNull())
+		data_.orc = dataNode["Orc"].asString();
 	if(!value["Code"].isNull())
 		code_ = std::stoi(value["Code"].asString());
 	if(!value["Message"].isNull())

aliyuncvc/CMakeLists.txt

@@ -73,6 +73,8 @@ set(aliyuncvc_public_header_model
 	include/alibabacloud/aliyuncvc/model/GetMembersResult.h
 	include/alibabacloud/aliyuncvc/model/GetUserRequest.h
 	include/alibabacloud/aliyuncvc/model/GetUserResult.h
+	include/alibabacloud/aliyuncvc/model/InviteUserRequest.h
+	include/alibabacloud/aliyuncvc/model/InviteUserResult.h
 	include/alibabacloud/aliyuncvc/model/JoinDeviceMeetingRequest.h
 	include/alibabacloud/aliyuncvc/model/JoinDeviceMeetingResult.h
 	include/alibabacloud/aliyuncvc/model/JoinLiveRequest.h
@@ -164,6 +166,8 @@ set(aliyuncvc_src
 	src/model/GetMembersResult.cc
 	src/model/GetUserRequest.cc
 	src/model/GetUserResult.cc
+	src/model/InviteUserRequest.cc
+	src/model/InviteUserResult.cc
 	src/model/JoinDeviceMeetingRequest.cc
 	src/model/JoinDeviceMeetingResult.cc
 	src/model/JoinLiveRequest.cc

aliyuncvc/include/alibabacloud/aliyuncvc/AliyuncvcClient.h

@@ -74,6 +74,8 @@
 #include "model/GetMembersResult.h"
 #include "model/GetUserRequest.h"
 #include "model/GetUserResult.h"
+#include "model/InviteUserRequest.h"
+#include "model/InviteUserResult.h"
 #include "model/JoinDeviceMeetingRequest.h"
 #include "model/JoinDeviceMeetingResult.h"
 #include "model/JoinLiveRequest.h"
@@ -197,6 +199,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::GetUserResult> GetUserOutcome;
 			typedef std::future<GetUserOutcome> GetUserOutcomeCallable;
 			typedef std::function<void(const AliyuncvcClient*, const Model::GetUserRequest&, const GetUserOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetUserAsyncHandler;
+			typedef Outcome<Error, Model::InviteUserResult> InviteUserOutcome;
+			typedef std::future<InviteUserOutcome> InviteUserOutcomeCallable;
+			typedef std::function<void(const AliyuncvcClient*, const Model::InviteUserRequest&, const InviteUserOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> InviteUserAsyncHandler;
 			typedef Outcome<Error, Model::JoinDeviceMeetingResult> JoinDeviceMeetingOutcome;
 			typedef std::future<JoinDeviceMeetingOutcome> JoinDeviceMeetingOutcomeCallable;
 			typedef std::function<void(const AliyuncvcClient*, const Model::JoinDeviceMeetingRequest&, const JoinDeviceMeetingOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> JoinDeviceMeetingAsyncHandler;
@@ -334,6 +339,9 @@ namespace AlibabaCloud
 			GetUserOutcome getUser(const Model::GetUserRequest &request)const;
 			void getUserAsync(const Model::GetUserRequest& request, const GetUserAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			GetUserOutcomeCallable getUserCallable(const Model::GetUserRequest& request) const;
+			InviteUserOutcome inviteUser(const Model::InviteUserRequest &request)const;
+			void inviteUserAsync(const Model::InviteUserRequest& request, const InviteUserAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			InviteUserOutcomeCallable inviteUserCallable(const Model::InviteUserRequest& request) const;
 			JoinDeviceMeetingOutcome joinDeviceMeeting(const Model::JoinDeviceMeetingRequest &request)const;
 			void joinDeviceMeetingAsync(const Model::JoinDeviceMeetingRequest& request, const JoinDeviceMeetingAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			JoinDeviceMeetingOutcomeCallable joinDeviceMeetingCallable(const Model::JoinDeviceMeetingRequest& request) const;

aliyuncvc/include/alibabacloud/aliyuncvc/model/InviteUserRequest.h

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_ALIYUNCVC_MODEL_INVITEUSERREQUEST_H_
+#define ALIBABACLOUD_ALIYUNCVC_MODEL_INVITEUSERREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/aliyuncvc/AliyuncvcExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Aliyuncvc
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ALIYUNCVC_EXPORT InviteUserRequest : public RpcServiceRequest
+			{
+
+			public:
+				InviteUserRequest();
+				~InviteUserRequest();
+
+				std::string getMeetingUUID()const;
+				void setMeetingUUID(const std::string& meetingUUID);
+				std::string getUserIds()const;
+				void setUserIds(const std::string& userIds);
+
+            private:
+				std::string meetingUUID_;
+				std::string userIds_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ALIYUNCVC_MODEL_INVITEUSERREQUEST_H_

aliyuncvc/include/alibabacloud/aliyuncvc/model/InviteUserResult.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_ALIYUNCVC_MODEL_INVITEUSERRESULT_H_
+#define ALIBABACLOUD_ALIYUNCVC_MODEL_INVITEUSERRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/aliyuncvc/AliyuncvcExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Aliyuncvc
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ALIYUNCVC_EXPORT InviteUserResult : public ServiceResult
+			{
+			public:
+
+
+				InviteUserResult();
+				explicit InviteUserResult(const std::string &payload);
+				~InviteUserResult();
+				std::string getMessage()const;
+				int getErrorCode()const;
+				bool getSuccess()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				int errorCode_;
+				bool success_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ALIYUNCVC_MODEL_INVITEUSERRESULT_H_

aliyuncvc/src/AliyuncvcClient.cc

@@ -987,6 +987,42 @@ AliyuncvcClient::GetUserOutcomeCallable AliyuncvcClient::getUserCallable(const G
 	return task->get_future();
 }
 
+AliyuncvcClient::InviteUserOutcome AliyuncvcClient::inviteUser(const InviteUserRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return InviteUserOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return InviteUserOutcome(InviteUserResult(outcome.result()));
+	else
+		return InviteUserOutcome(outcome.error());
+}
+
+void AliyuncvcClient::inviteUserAsync(const InviteUserRequest& request, const InviteUserAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, inviteUser(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+AliyuncvcClient::InviteUserOutcomeCallable AliyuncvcClient::inviteUserCallable(const InviteUserRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<InviteUserOutcome()>>(
+			[this, request]()
+			{
+			return this->inviteUser(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 AliyuncvcClient::JoinDeviceMeetingOutcome AliyuncvcClient::joinDeviceMeeting(const JoinDeviceMeetingRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

aliyuncvc/src/model/InviteUserRequest.cc

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/aliyuncvc/model/InviteUserRequest.h>
+
+using AlibabaCloud::Aliyuncvc::Model::InviteUserRequest;
+
+InviteUserRequest::InviteUserRequest() :
+	RpcServiceRequest("aliyuncvc", "2019-10-30", "InviteUser")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+InviteUserRequest::~InviteUserRequest()
+{}
+
+std::string InviteUserRequest::getMeetingUUID()const
+{
+	return meetingUUID_;
+}
+
+void InviteUserRequest::setMeetingUUID(const std::string& meetingUUID)
+{
+	meetingUUID_ = meetingUUID;
+	setBodyParameter("MeetingUUID", meetingUUID);
+}
+
+std::string InviteUserRequest::getUserIds()const
+{
+	return userIds_;
+}
+
+void InviteUserRequest::setUserIds(const std::string& userIds)
+{
+	userIds_ = userIds;
+	setBodyParameter("UserIds", userIds);
+}
+

aliyuncvc/src/model/InviteUserResult.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/aliyuncvc/model/InviteUserResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Aliyuncvc;
+using namespace AlibabaCloud::Aliyuncvc::Model;
+
+InviteUserResult::InviteUserResult() :
+	ServiceResult()
+{}
+
+InviteUserResult::InviteUserResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+InviteUserResult::~InviteUserResult()
+{}
+
+void InviteUserResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["ErrorCode"].isNull())
+		errorCode_ = std::stoi(value["ErrorCode"].asString());
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["Success"].isNull())
+		success_ = value["Success"].asString() == "true";
+
+}
+
+std::string InviteUserResult::getMessage()const
+{
+	return message_;
+}
+
+int InviteUserResult::getErrorCode()const
+{
+	return errorCode_;
+}
+
+bool InviteUserResult::getSuccess()const
+{
+	return success_;
+}
+

bssopenapi/CMakeLists.txt

@@ -113,6 +113,8 @@ set(bssopenapi_public_header_model
 	include/alibabacloud/bssopenapi/model/QueryResellerAvailableQuotaResult.h
 	include/alibabacloud/bssopenapi/model/QueryResourcePackageInstancesRequest.h
 	include/alibabacloud/bssopenapi/model/QueryResourcePackageInstancesResult.h
+	include/alibabacloud/bssopenapi/model/QuerySettleBillRequest.h
+	include/alibabacloud/bssopenapi/model/QuerySettleBillResult.h
 	include/alibabacloud/bssopenapi/model/QuerySettlementBillRequest.h
 	include/alibabacloud/bssopenapi/model/QuerySettlementBillResult.h
 	include/alibabacloud/bssopenapi/model/QuerySplitItemBillRequest.h
@@ -232,6 +234,8 @@ set(bssopenapi_src
 	src/model/QueryResellerAvailableQuotaResult.cc
 	src/model/QueryResourcePackageInstancesRequest.cc
 	src/model/QueryResourcePackageInstancesResult.cc
+	src/model/QuerySettleBillRequest.cc
+	src/model/QuerySettleBillResult.cc
 	src/model/QuerySettlementBillRequest.cc
 	src/model/QuerySettlementBillResult.cc
 	src/model/QuerySplitItemBillRequest.cc

bssopenapi/include/alibabacloud/bssopenapi/BssOpenApiClient.h

@@ -114,6 +114,8 @@
 #include "model/QueryResellerAvailableQuotaResult.h"
 #include "model/QueryResourcePackageInstancesRequest.h"
 #include "model/QueryResourcePackageInstancesResult.h"
+#include "model/QuerySettleBillRequest.h"
+#include "model/QuerySettleBillResult.h"
 #include "model/QuerySettlementBillRequest.h"
 #include "model/QuerySettlementBillResult.h"
 #include "model/QuerySplitItemBillRequest.h"
@@ -285,6 +287,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::QueryResourcePackageInstancesResult> QueryResourcePackageInstancesOutcome;
 			typedef std::future<QueryResourcePackageInstancesOutcome> QueryResourcePackageInstancesOutcomeCallable;
 			typedef std::function<void(const BssOpenApiClient*, const Model::QueryResourcePackageInstancesRequest&, const QueryResourcePackageInstancesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> QueryResourcePackageInstancesAsyncHandler;
+			typedef Outcome<Error, Model::QuerySettleBillResult> QuerySettleBillOutcome;
+			typedef std::future<QuerySettleBillOutcome> QuerySettleBillOutcomeCallable;
+			typedef std::function<void(const BssOpenApiClient*, const Model::QuerySettleBillRequest&, const QuerySettleBillOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> QuerySettleBillAsyncHandler;
 			typedef Outcome<Error, Model::QuerySettlementBillResult> QuerySettlementBillOutcome;
 			typedef std::future<QuerySettlementBillOutcome> QuerySettlementBillOutcomeCallable;
 			typedef std::function<void(const BssOpenApiClient*, const Model::QuerySettlementBillRequest&, const QuerySettlementBillOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> QuerySettlementBillAsyncHandler;
@@ -464,6 +469,9 @@ namespace AlibabaCloud
 			QueryResourcePackageInstancesOutcome queryResourcePackageInstances(const Model::QueryResourcePackageInstancesRequest &request)const;
 			void queryResourcePackageInstancesAsync(const Model::QueryResourcePackageInstancesRequest& request, const QueryResourcePackageInstancesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			QueryResourcePackageInstancesOutcomeCallable queryResourcePackageInstancesCallable(const Model::QueryResourcePackageInstancesRequest& request) const;
+			QuerySettleBillOutcome querySettleBill(const Model::QuerySettleBillRequest &request)const;
+			void querySettleBillAsync(const Model::QuerySettleBillRequest& request, const QuerySettleBillAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			QuerySettleBillOutcomeCallable querySettleBillCallable(const Model::QuerySettleBillRequest& request) const;
 			QuerySettlementBillOutcome querySettlementBill(const Model::QuerySettlementBillRequest &request)const;
 			void querySettlementBillAsync(const Model::QuerySettlementBillRequest& request, const QuerySettlementBillAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			QuerySettlementBillOutcomeCallable querySettlementBillCallable(const Model::QuerySettlementBillRequest& request) const;

bssopenapi/include/alibabacloud/bssopenapi/model/AllocateCostUnitResourceRequest.h

@@ -36,6 +36,7 @@ namespace AlibabaCloud
 					std::string resourceId;
 					std::string commodityCode;
 					long resourceUserId;
+					std::string apportionCode;
 				};
 
 			public:

bssopenapi/include/alibabacloud/bssopenapi/model/QueryAccountBillRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setPageNum(int pageNum);
 				long getOwnerID()const;
 				void setOwnerID(long ownerID);
+				long getBillOwnerId()const;
+				void setBillOwnerId(long billOwnerId);
 				bool getIsGroupByProduct()const;
 				void setIsGroupByProduct(bool isGroupByProduct);
 				int getPageSize()const;
@@ -53,6 +55,7 @@ namespace AlibabaCloud
 				std::string billingCycle_;
 				int pageNum_;
 				long ownerID_;
+				long billOwnerId_;
 				bool isGroupByProduct_;
 				int pageSize_;
 

bssopenapi/include/alibabacloud/bssopenapi/model/QueryAccountBillResult.h

@@ -44,6 +44,7 @@ namespace AlibabaCloud
 						float outstandingAmount;
 						float paymentAmount;
 						float deductedByPrepaidCard;
+						std::string pipCode;
 						float invoiceDiscount;
 						std::string subscriptionType;
 						float pretaxGrossAmount;

bssopenapi/include/alibabacloud/bssopenapi/model/QueryBillOverviewRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setSubscriptionType(const std::string& subscriptionType);
 				std::string getBillingCycle()const;
 				void setBillingCycle(const std::string& billingCycle);
+				long getBillOwnerId()const;
+				void setBillOwnerId(long billOwnerId);
 				std::string getProductType()const;
 				void setProductType(const std::string& productType);
 
@@ -48,6 +50,7 @@ namespace AlibabaCloud
 				std::string productCode_;
 				std::string subscriptionType_;
 				std::string billingCycle_;
+				long billOwnerId_;
 				std::string productType_;
 
 			};

bssopenapi/include/alibabacloud/bssopenapi/model/QueryBillOverviewResult.h

@@ -49,12 +49,14 @@ namespace AlibabaCloud
 						std::string paymentCurrency;
 						float paymentAmount;
 						float deductedByPrepaidCard;
+						std::string pipCode;
 						float invoiceDiscount;
 						std::string item;
 						std::string subscriptionType;
 						float pretaxGrossAmount;
 						float pretaxAmount;
 						std::string currency;
+						std::string commodityCode;
 						float pretaxAmountLocal;
 					};
 					std::string billingCycle;

bssopenapi/include/alibabacloud/bssopenapi/model/QueryBillRequest.h

@@ -51,6 +51,8 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				int getPageNum()const;
 				void setPageNum(int pageNum);
+				long getBillOwnerId()const;
+				void setBillOwnerId(long billOwnerId);
 				std::string getProductType()const;
 				void setProductType(const std::string& productType);
 				int getPageSize()const;
@@ -65,6 +67,7 @@ namespace AlibabaCloud
 				std::string type_;
 				long ownerId_;
 				int pageNum_;
+				long billOwnerId_;
 				std::string productType_;
 				int pageSize_;
 

bssopenapi/include/alibabacloud/bssopenapi/model/QueryBillResult.h

@@ -51,6 +51,7 @@ namespace AlibabaCloud
 						std::string subscriptionType;
 						float pretaxGrossAmount;
 						std::string currency;
+						std::string commodityCode;
 						std::string usageStartTime;
 						std::string status;
 						std::string paymentTransactionID;
@@ -60,6 +61,7 @@ namespace AlibabaCloud
 						std::string productCode;
 						std::string productType;
 						float outstandingAmount;
+						std::string pipCode;
 						std::string ownerID;
 						float pretaxAmount;
 						std::string recordID;

bssopenapi/include/alibabacloud/bssopenapi/model/QueryInstanceBillRequest.h

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				int getPageNum()const;
 				void setPageNum(int pageNum);
+				long getBillOwnerId()const;
+				void setBillOwnerId(long billOwnerId);
 				std::string getBillingDate()const;
 				void setBillingDate(const std::string& billingDate);
 				std::string getProductType()const;
@@ -65,6 +67,7 @@ namespace AlibabaCloud
 				std::string billingCycle_;
 				long ownerId_;
 				int pageNum_;
+				long billOwnerId_;
 				std::string billingDate_;
 				std::string productType_;
 				bool isBillingItem_;

bssopenapi/include/alibabacloud/bssopenapi/model/QueryInstanceBillResult.h

@@ -51,6 +51,7 @@ namespace AlibabaCloud
 						float pretaxGrossAmount;
 						std::string instanceConfig;
 						std::string currency;
+						std::string commodityCode;
 						std::string costUnit;
 						std::string resourceGroup;
 						std::string billingType;
@@ -64,6 +65,7 @@ namespace AlibabaCloud
 						std::string billingItem;
 						std::string nickName;
 						std::string intranetIP;
+						std::string pipCode;
 						std::string servicePeriodUnit;
 						std::string servicePeriod;
 						std::string deductedByResourcePackage;

bssopenapi/include/alibabacloud/bssopenapi/model/QuerySettleBillRequest.h

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_BSSOPENAPI_MODEL_QUERYSETTLEBILLREQUEST_H_
+#define ALIBABACLOUD_BSSOPENAPI_MODEL_QUERYSETTLEBILLREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/bssopenapi/BssOpenApiExport.h>
+
+namespace AlibabaCloud
+{
+	namespace BssOpenApi
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_BSSOPENAPI_EXPORT QuerySettleBillRequest : public RpcServiceRequest
+			{
+
+			public:
+				QuerySettleBillRequest();
+				~QuerySettleBillRequest();
+
+				std::string getProductCode()const;
+				void setProductCode(const std::string& productCode);
+				bool getIsHideZeroCharge()const;
+				void setIsHideZeroCharge(bool isHideZeroCharge);
+				bool getIsDisplayLocalCurrency()const;
+				void setIsDisplayLocalCurrency(bool isDisplayLocalCurrency);
+				std::string getSubscriptionType()const;
+				void setSubscriptionType(const std::string& subscriptionType);
+				std::string getBillingCycle()const;
+				void setBillingCycle(const std::string& billingCycle);
+				std::string getType()const;
+				void setType(const std::string& type);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				long getBillOwnerId()const;
+				void setBillOwnerId(long billOwnerId);
+				std::string getProductType()const;
+				void setProductType(const std::string& productType);
+				std::string getNextToken()const;
+				void setNextToken(const std::string& nextToken);
+				int getMaxResults()const;
+				void setMaxResults(int maxResults);
+
+            private:
+				std::string productCode_;
+				bool isHideZeroCharge_;
+				bool isDisplayLocalCurrency_;
+				std::string subscriptionType_;
+				std::string billingCycle_;
+				std::string type_;
+				long ownerId_;
+				long billOwnerId_;
+				std::string productType_;
+				std::string nextToken_;
+				int maxResults_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_BSSOPENAPI_MODEL_QUERYSETTLEBILLREQUEST_H_

bssopenapi/include/alibabacloud/bssopenapi/model/QuerySettleBillResult.h

@@ -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.
+ */
+
+#ifndef ALIBABACLOUD_BSSOPENAPI_MODEL_QUERYSETTLEBILLRESULT_H_
+#define ALIBABACLOUD_BSSOPENAPI_MODEL_QUERYSETTLEBILLRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/bssopenapi/BssOpenApiExport.h>
+
+namespace AlibabaCloud
+{
+	namespace BssOpenApi
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_BSSOPENAPI_EXPORT QuerySettleBillResult : public ServiceResult
+			{
+			public:
+				struct Data
+				{
+					struct Item
+					{
+						float afterTaxAmount;
+						std::string productName;
+						std::string subOrderId;
+						float deductedByCashCoupons;
+						std::string paymentTime;
+						float tax;
+						std::string paymentCurrency;
+						float paymentAmount;
+						float deductedByPrepaidCard;
+						float invoiceDiscount;
+						std::string usageEndTime;
+						std::string item;
+						std::string subscriptionType;
+						float pretaxGrossAmount;
+						std::string currency;
+						std::string commodityCode;
+						std::string usageStartTime;
+						std::string status;
+						std::string paymentTransactionID;
+						float deductedByCoupons;
+						std::string roundDownDiscount;
+						std::string productDetail;
+						std::string productCode;
+						std::string productType;
+						float outstandingAmount;
+						std::string pipCode;
+						std::string ownerID;
+						float pretaxAmount;
+						std::string recordID;
+						float pretaxAmountLocal;
+					};
+					std::string billingCycle;
+					int totalCount;
+					std::string accountID;
+					std::string nextToken;
+					int maxResults;
+					std::vector<Item> items;
+					std::string accountName;
+				};
+
+
+				QuerySettleBillResult();
+				explicit QuerySettleBillResult(const std::string &payload);
+				~QuerySettleBillResult();
+				std::string getMessage()const;
+				Data getData()const;
+				std::string getCode()const;
+				bool getSuccess()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				Data data_;
+				std::string code_;
+				bool success_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_BSSOPENAPI_MODEL_QUERYSETTLEBILLRESULT_H_

bssopenapi/include/alibabacloud/bssopenapi/model/QuerySplitItemBillRequest.h

@@ -45,6 +45,8 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				int getPageNum()const;
 				void setPageNum(int pageNum);
+				long getBillOwnerId()const;
+				void setBillOwnerId(long billOwnerId);
 				std::string getProductType()const;
 				void setProductType(const std::string& productType);
 				int getPageSize()const;
@@ -56,6 +58,7 @@ namespace AlibabaCloud
 				std::string billingCycle_;
 				long ownerId_;
 				int pageNum_;
+				long billOwnerId_;
 				std::string productType_;
 				int pageSize_;
 

bssopenapi/include/alibabacloud/bssopenapi/model/QuerySplitItemBillResult.h

@@ -52,6 +52,7 @@ namespace AlibabaCloud
 						float pretaxGrossAmount;
 						std::string instanceConfig;
 						std::string currency;
+						std::string commodityCode;
 						std::string costUnit;
 						std::string resourceGroup;
 						std::string billingType;
@@ -65,6 +66,7 @@ namespace AlibabaCloud
 						std::string billingItem;
 						std::string nickName;
 						std::string intranetIP;
+						std::string pipCode;
 						std::string servicePeriod;
 						std::string splitItemID;
 						std::string deductedByResourcePackage;

bssopenapi/src/BssOpenApiClient.cc

@@ -1707,6 +1707,42 @@ BssOpenApiClient::QueryResourcePackageInstancesOutcomeCallable BssOpenApiClient:
 	return task->get_future();
 }
 
+BssOpenApiClient::QuerySettleBillOutcome BssOpenApiClient::querySettleBill(const QuerySettleBillRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return QuerySettleBillOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return QuerySettleBillOutcome(QuerySettleBillResult(outcome.result()));
+	else
+		return QuerySettleBillOutcome(outcome.error());
+}
+
+void BssOpenApiClient::querySettleBillAsync(const QuerySettleBillRequest& request, const QuerySettleBillAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, querySettleBill(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+BssOpenApiClient::QuerySettleBillOutcomeCallable BssOpenApiClient::querySettleBillCallable(const QuerySettleBillRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<QuerySettleBillOutcome()>>(
+			[this, request]()
+			{
+			return this->querySettleBill(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 BssOpenApiClient::QuerySettlementBillOutcome BssOpenApiClient::querySettlementBill(const QuerySettlementBillRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

bssopenapi/src/model/AllocateCostUnitResourceRequest.cc

@@ -41,6 +41,7 @@ void AllocateCostUnitResourceRequest::setResourceInstanceList(const std::vector<
 		setParameter(resourceInstanceListObjStr + ".ResourceId", resourceInstanceListObj.resourceId);
 		setParameter(resourceInstanceListObjStr + ".CommodityCode", resourceInstanceListObj.commodityCode);
 		setParameter(resourceInstanceListObjStr + ".ResourceUserId", std::to_string(resourceInstanceListObj.resourceUserId));
+		setParameter(resourceInstanceListObjStr + ".ApportionCode", resourceInstanceListObj.apportionCode);
 	}
 }
 

bssopenapi/src/model/QueryAccountBillRequest.cc

@@ -71,6 +71,17 @@ void QueryAccountBillRequest::setOwnerID(long ownerID)
 	setParameter("OwnerID", std::to_string(ownerID));
 }
 
+long QueryAccountBillRequest::getBillOwnerId()const
+{
+	return billOwnerId_;
+}
+
+void QueryAccountBillRequest::setBillOwnerId(long billOwnerId)
+{
+	billOwnerId_ = billOwnerId;
+	setParameter("BillOwnerId", std::to_string(billOwnerId));
+}
+
 bool QueryAccountBillRequest::getIsGroupByProduct()const
 {
 	return isGroupByProduct_;

bssopenapi/src/model/QueryAccountBillResult.cc

@@ -86,6 +86,8 @@ void QueryAccountBillResult::parse(const std::string &payload)
 			itemObject.productName = dataNodeItemsItem["ProductName"].asString();
 		if(!dataNodeItemsItem["SubscriptionType"].isNull())
 			itemObject.subscriptionType = dataNodeItemsItem["SubscriptionType"].asString();
+		if(!dataNodeItemsItem["PipCode"].isNull())
+			itemObject.pipCode = dataNodeItemsItem["PipCode"].asString();
 		data_.items.push_back(itemObject);
 	}
 	if(!value["Success"].isNull())

bssopenapi/src/model/QueryBillOverviewRequest.cc

@@ -60,6 +60,17 @@ void QueryBillOverviewRequest::setBillingCycle(const std::string& billingCycle)
 	setParameter("BillingCycle", billingCycle);
 }
 
+long QueryBillOverviewRequest::getBillOwnerId()const
+{
+	return billOwnerId_;
+}
+
+void QueryBillOverviewRequest::setBillOwnerId(long billOwnerId)
+{
+	billOwnerId_ = billOwnerId;
+	setParameter("BillOwnerId", std::to_string(billOwnerId));
+}
+
 std::string QueryBillOverviewRequest::getProductType()const
 {
 	return productType_;

bssopenapi/src/model/QueryBillOverviewResult.cc

@@ -90,6 +90,10 @@ void QueryBillOverviewResult::parse(const std::string &payload)
 			itemObject.paymentCurrency = dataNodeItemsItem["PaymentCurrency"].asString();
 		if(!dataNodeItemsItem["RoundDownDiscount"].isNull())
 			itemObject.roundDownDiscount = dataNodeItemsItem["RoundDownDiscount"].asString();
+		if(!dataNodeItemsItem["PipCode"].isNull())
+			itemObject.pipCode = dataNodeItemsItem["PipCode"].asString();
+		if(!dataNodeItemsItem["CommodityCode"].isNull())
+			itemObject.commodityCode = dataNodeItemsItem["CommodityCode"].asString();
 		data_.items.push_back(itemObject);
 	}
 	if(!value["Success"].isNull())

bssopenapi/src/model/QueryBillRequest.cc

@@ -115,6 +115,17 @@ void QueryBillRequest::setPageNum(int pageNum)
 	setParameter("PageNum", std::to_string(pageNum));
 }
 
+long QueryBillRequest::getBillOwnerId()const
+{
+	return billOwnerId_;
+}
+
+void QueryBillRequest::setBillOwnerId(long billOwnerId)
+{
+	billOwnerId_ = billOwnerId;
+	setParameter("BillOwnerId", std::to_string(billOwnerId));
+}
+
 std::string QueryBillRequest::getProductType()const
 {
 	return productType_;

bssopenapi/src/model/QueryBillResult.cc

@@ -112,6 +112,10 @@ void QueryBillResult::parse(const std::string &payload)
 			itemObject.roundDownDiscount = dataNodeItemsItem["RoundDownDiscount"].asString();
 		if(!dataNodeItemsItem["SubOrderId"].isNull())
 			itemObject.subOrderId = dataNodeItemsItem["SubOrderId"].asString();
+		if(!dataNodeItemsItem["PipCode"].isNull())
+			itemObject.pipCode = dataNodeItemsItem["PipCode"].asString();
+		if(!dataNodeItemsItem["CommodityCode"].isNull())
+			itemObject.commodityCode = dataNodeItemsItem["CommodityCode"].asString();
 		data_.items.push_back(itemObject);
 	}
 	if(!value["Success"].isNull())

bssopenapi/src/model/QueryInstanceBillRequest.cc

@@ -93,6 +93,17 @@ void QueryInstanceBillRequest::setPageNum(int pageNum)
 	setParameter("PageNum", std::to_string(pageNum));
 }
 
+long QueryInstanceBillRequest::getBillOwnerId()const
+{
+	return billOwnerId_;
+}
+
+void QueryInstanceBillRequest::setBillOwnerId(long billOwnerId)
+{
+	billOwnerId_ = billOwnerId;
+	setParameter("BillOwnerId", std::to_string(billOwnerId));
+}
+
 std::string QueryInstanceBillRequest::getBillingDate()const
 {
 	return billingDate_;

bssopenapi/src/model/QueryInstanceBillResult.cc

@@ -130,6 +130,10 @@ void QueryInstanceBillResult::parse(const std::string &payload)
 			itemObject.billingDate = dataNodeItemsItem["BillingDate"].asString();
 		if(!dataNodeItemsItem["ServicePeriodUnit"].isNull())
 			itemObject.servicePeriodUnit = dataNodeItemsItem["ServicePeriodUnit"].asString();
+		if(!dataNodeItemsItem["PipCode"].isNull())
+			itemObject.pipCode = dataNodeItemsItem["PipCode"].asString();
+		if(!dataNodeItemsItem["CommodityCode"].isNull())
+			itemObject.commodityCode = dataNodeItemsItem["CommodityCode"].asString();
 		data_.items.push_back(itemObject);
 	}
 	if(!value["Success"].isNull())

bssopenapi/src/model/QuerySettleBillRequest.cc

@@ -0,0 +1,150 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/bssopenapi/model/QuerySettleBillRequest.h>
+
+using AlibabaCloud::BssOpenApi::Model::QuerySettleBillRequest;
+
+QuerySettleBillRequest::QuerySettleBillRequest() :
+	RpcServiceRequest("bssopenapi", "2017-12-14", "QuerySettleBill")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+QuerySettleBillRequest::~QuerySettleBillRequest()
+{}
+
+std::string QuerySettleBillRequest::getProductCode()const
+{
+	return productCode_;
+}
+
+void QuerySettleBillRequest::setProductCode(const std::string& productCode)
+{
+	productCode_ = productCode;
+	setParameter("ProductCode", productCode);
+}
+
+bool QuerySettleBillRequest::getIsHideZeroCharge()const
+{
+	return isHideZeroCharge_;
+}
+
+void QuerySettleBillRequest::setIsHideZeroCharge(bool isHideZeroCharge)
+{
+	isHideZeroCharge_ = isHideZeroCharge;
+	setParameter("IsHideZeroCharge", isHideZeroCharge ? "true" : "false");
+}
+
+bool QuerySettleBillRequest::getIsDisplayLocalCurrency()const
+{
+	return isDisplayLocalCurrency_;
+}
+
+void QuerySettleBillRequest::setIsDisplayLocalCurrency(bool isDisplayLocalCurrency)
+{
+	isDisplayLocalCurrency_ = isDisplayLocalCurrency;
+	setParameter("IsDisplayLocalCurrency", isDisplayLocalCurrency ? "true" : "false");
+}
+
+std::string QuerySettleBillRequest::getSubscriptionType()const
+{
+	return subscriptionType_;
+}
+
+void QuerySettleBillRequest::setSubscriptionType(const std::string& subscriptionType)
+{
+	subscriptionType_ = subscriptionType;
+	setParameter("SubscriptionType", subscriptionType);
+}
+
+std::string QuerySettleBillRequest::getBillingCycle()const
+{
+	return billingCycle_;
+}
+
+void QuerySettleBillRequest::setBillingCycle(const std::string& billingCycle)
+{
+	billingCycle_ = billingCycle;
+	setParameter("BillingCycle", billingCycle);
+}
+
+std::string QuerySettleBillRequest::getType()const
+{
+	return type_;
+}
+
+void QuerySettleBillRequest::setType(const std::string& type)
+{
+	type_ = type;
+	setParameter("Type", type);
+}
+
+long QuerySettleBillRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void QuerySettleBillRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+long QuerySettleBillRequest::getBillOwnerId()const
+{
+	return billOwnerId_;
+}
+
+void QuerySettleBillRequest::setBillOwnerId(long billOwnerId)
+{
+	billOwnerId_ = billOwnerId;
+	setParameter("BillOwnerId", std::to_string(billOwnerId));
+}
+
+std::string QuerySettleBillRequest::getProductType()const
+{
+	return productType_;
+}
+
+void QuerySettleBillRequest::setProductType(const std::string& productType)
+{
+	productType_ = productType;
+	setParameter("ProductType", productType);
+}
+
+std::string QuerySettleBillRequest::getNextToken()const
+{
+	return nextToken_;
+}
+
+void QuerySettleBillRequest::setNextToken(const std::string& nextToken)
+{
+	nextToken_ = nextToken;
+	setParameter("NextToken", nextToken);
+}
+
+int QuerySettleBillRequest::getMaxResults()const
+{
+	return maxResults_;
+}
+
+void QuerySettleBillRequest::setMaxResults(int maxResults)
+{
+	maxResults_ = maxResults;
+	setParameter("MaxResults", std::to_string(maxResults));
+}
+

bssopenapi/src/model/QuerySettleBillResult.cc

@@ -0,0 +1,149 @@
+/*
+ * 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/bssopenapi/model/QuerySettleBillResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::BssOpenApi;
+using namespace AlibabaCloud::BssOpenApi::Model;
+
+QuerySettleBillResult::QuerySettleBillResult() :
+	ServiceResult()
+{}
+
+QuerySettleBillResult::QuerySettleBillResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+QuerySettleBillResult::~QuerySettleBillResult()
+{}
+
+void QuerySettleBillResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto dataNode = value["Data"];
+	if(!dataNode["BillingCycle"].isNull())
+		data_.billingCycle = dataNode["BillingCycle"].asString();
+	if(!dataNode["AccountID"].isNull())
+		data_.accountID = dataNode["AccountID"].asString();
+	if(!dataNode["AccountName"].isNull())
+		data_.accountName = dataNode["AccountName"].asString();
+	if(!dataNode["NextToken"].isNull())
+		data_.nextToken = dataNode["NextToken"].asString();
+	if(!dataNode["MaxResults"].isNull())
+		data_.maxResults = std::stoi(dataNode["MaxResults"].asString());
+	if(!dataNode["TotalCount"].isNull())
+		data_.totalCount = std::stoi(dataNode["TotalCount"].asString());
+	auto allItemsNode = dataNode["Items"]["Item"];
+	for (auto dataNodeItemsItem : allItemsNode)
+	{
+		Data::Item itemObject;
+		if(!dataNodeItemsItem["RecordID"].isNull())
+			itemObject.recordID = dataNodeItemsItem["RecordID"].asString();
+		if(!dataNodeItemsItem["Item"].isNull())
+			itemObject.item = dataNodeItemsItem["Item"].asString();
+		if(!dataNodeItemsItem["OwnerID"].isNull())
+			itemObject.ownerID = dataNodeItemsItem["OwnerID"].asString();
+		if(!dataNodeItemsItem["UsageStartTime"].isNull())
+			itemObject.usageStartTime = dataNodeItemsItem["UsageStartTime"].asString();
+		if(!dataNodeItemsItem["UsageEndTime"].isNull())
+			itemObject.usageEndTime = dataNodeItemsItem["UsageEndTime"].asString();
+		if(!dataNodeItemsItem["PaymentTime"].isNull())
+			itemObject.paymentTime = dataNodeItemsItem["PaymentTime"].asString();
+		if(!dataNodeItemsItem["ProductCode"].isNull())
+			itemObject.productCode = dataNodeItemsItem["ProductCode"].asString();
+		if(!dataNodeItemsItem["ProductType"].isNull())
+			itemObject.productType = dataNodeItemsItem["ProductType"].asString();
+		if(!dataNodeItemsItem["SubscriptionType"].isNull())
+			itemObject.subscriptionType = dataNodeItemsItem["SubscriptionType"].asString();
+		if(!dataNodeItemsItem["ProductName"].isNull())
+			itemObject.productName = dataNodeItemsItem["ProductName"].asString();
+		if(!dataNodeItemsItem["ProductDetail"].isNull())
+			itemObject.productDetail = dataNodeItemsItem["ProductDetail"].asString();
+		if(!dataNodeItemsItem["PretaxGrossAmount"].isNull())
+			itemObject.pretaxGrossAmount = std::stof(dataNodeItemsItem["PretaxGrossAmount"].asString());
+		if(!dataNodeItemsItem["DeductedByCoupons"].isNull())
+			itemObject.deductedByCoupons = std::stof(dataNodeItemsItem["DeductedByCoupons"].asString());
+		if(!dataNodeItemsItem["InvoiceDiscount"].isNull())
+			itemObject.invoiceDiscount = std::stof(dataNodeItemsItem["InvoiceDiscount"].asString());
+		if(!dataNodeItemsItem["PretaxAmount"].isNull())
+			itemObject.pretaxAmount = std::stof(dataNodeItemsItem["PretaxAmount"].asString());
+		if(!dataNodeItemsItem["Currency"].isNull())
+			itemObject.currency = dataNodeItemsItem["Currency"].asString();
+		if(!dataNodeItemsItem["PretaxAmountLocal"].isNull())
+			itemObject.pretaxAmountLocal = std::stof(dataNodeItemsItem["PretaxAmountLocal"].asString());
+		if(!dataNodeItemsItem["Tax"].isNull())
+			itemObject.tax = std::stof(dataNodeItemsItem["Tax"].asString());
+		if(!dataNodeItemsItem["PaymentAmount"].isNull())
+			itemObject.paymentAmount = std::stof(dataNodeItemsItem["PaymentAmount"].asString());
+		if(!dataNodeItemsItem["DeductedByCashCoupons"].isNull())
+			itemObject.deductedByCashCoupons = std::stof(dataNodeItemsItem["DeductedByCashCoupons"].asString());
+		if(!dataNodeItemsItem["DeductedByPrepaidCard"].isNull())
+			itemObject.deductedByPrepaidCard = std::stof(dataNodeItemsItem["DeductedByPrepaidCard"].asString());
+		if(!dataNodeItemsItem["OutstandingAmount"].isNull())
+			itemObject.outstandingAmount = std::stof(dataNodeItemsItem["OutstandingAmount"].asString());
+		if(!dataNodeItemsItem["AfterTaxAmount"].isNull())
+			itemObject.afterTaxAmount = std::stof(dataNodeItemsItem["AfterTaxAmount"].asString());
+		if(!dataNodeItemsItem["Status"].isNull())
+			itemObject.status = dataNodeItemsItem["Status"].asString();
+		if(!dataNodeItemsItem["PaymentCurrency"].isNull())
+			itemObject.paymentCurrency = dataNodeItemsItem["PaymentCurrency"].asString();
+		if(!dataNodeItemsItem["PaymentTransactionID"].isNull())
+			itemObject.paymentTransactionID = dataNodeItemsItem["PaymentTransactionID"].asString();
+		if(!dataNodeItemsItem["RoundDownDiscount"].isNull())
+			itemObject.roundDownDiscount = dataNodeItemsItem["RoundDownDiscount"].asString();
+		if(!dataNodeItemsItem["SubOrderId"].isNull())
+			itemObject.subOrderId = dataNodeItemsItem["SubOrderId"].asString();
+		if(!dataNodeItemsItem["PipCode"].isNull())
+			itemObject.pipCode = dataNodeItemsItem["PipCode"].asString();
+		if(!dataNodeItemsItem["CommodityCode"].isNull())
+			itemObject.commodityCode = dataNodeItemsItem["CommodityCode"].asString();
+		data_.items.push_back(itemObject);
+	}
+	if(!value["Success"].isNull())
+		success_ = value["Success"].asString() == "true";
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+
+}
+
+std::string QuerySettleBillResult::getMessage()const
+{
+	return message_;
+}
+
+QuerySettleBillResult::Data QuerySettleBillResult::getData()const
+{
+	return data_;
+}
+
+std::string QuerySettleBillResult::getCode()const
+{
+	return code_;
+}
+
+bool QuerySettleBillResult::getSuccess()const
+{
+	return success_;
+}
+

bssopenapi/src/model/QuerySplitItemBillRequest.cc

@@ -82,6 +82,17 @@ void QuerySplitItemBillRequest::setPageNum(int pageNum)
 	setParameter("PageNum", std::to_string(pageNum));
 }
 
+long QuerySplitItemBillRequest::getBillOwnerId()const
+{
+	return billOwnerId_;
+}
+
+void QuerySplitItemBillRequest::setBillOwnerId(long billOwnerId)
+{
+	billOwnerId_ = billOwnerId;
+	setParameter("BillOwnerId", std::to_string(billOwnerId));
+}
+
 std::string QuerySplitItemBillRequest::getProductType()const
 {
 	return productType_;

bssopenapi/src/model/QuerySplitItemBillResult.cc

@@ -132,6 +132,10 @@ void QuerySplitItemBillResult::parse(const std::string &payload)
 			itemObject.splitItemID = dataNodeItemsItem["SplitItemID"].asString();
 		if(!dataNodeItemsItem["SplitItemName"].isNull())
 			itemObject.splitItemName = dataNodeItemsItem["SplitItemName"].asString();
+		if(!dataNodeItemsItem["PipCode"].isNull())
+			itemObject.pipCode = dataNodeItemsItem["PipCode"].asString();
+		if(!dataNodeItemsItem["CommodityCode"].isNull())
+			itemObject.commodityCode = dataNodeItemsItem["CommodityCode"].asString();
 		data_.items.push_back(itemObject);
 	}
 	if(!value["Success"].isNull())

dds/CMakeLists.txt

@@ -45,6 +45,10 @@ set(dds_public_header_model
 	include/alibabacloud/dds/model/DeleteNodeResult.h
 	include/alibabacloud/dds/model/DescribeAccountsRequest.h
 	include/alibabacloud/dds/model/DescribeAccountsResult.h
+	include/alibabacloud/dds/model/DescribeActiveOperationTaskCountRequest.h
+	include/alibabacloud/dds/model/DescribeActiveOperationTaskCountResult.h
+	include/alibabacloud/dds/model/DescribeActiveOperationTaskTypeRequest.h
+	include/alibabacloud/dds/model/DescribeActiveOperationTaskTypeResult.h
 	include/alibabacloud/dds/model/DescribeAuditFilesRequest.h
 	include/alibabacloud/dds/model/DescribeAuditFilesResult.h
 	include/alibabacloud/dds/model/DescribeAuditLogFilterRequest.h
@@ -121,6 +125,8 @@ set(dds_public_header_model
 	include/alibabacloud/dds/model/DescribeUserEncryptionKeyListResult.h
 	include/alibabacloud/dds/model/DestroyInstanceRequest.h
 	include/alibabacloud/dds/model/DestroyInstanceResult.h
+	include/alibabacloud/dds/model/EvaluateResourceRequest.h
+	include/alibabacloud/dds/model/EvaluateResourceResult.h
 	include/alibabacloud/dds/model/ListTagResourcesRequest.h
 	include/alibabacloud/dds/model/ListTagResourcesResult.h
 	include/alibabacloud/dds/model/MigrateAvailableZoneRequest.h
@@ -216,6 +222,10 @@ set(dds_src
 	src/model/DeleteNodeResult.cc
 	src/model/DescribeAccountsRequest.cc
 	src/model/DescribeAccountsResult.cc
+	src/model/DescribeActiveOperationTaskCountRequest.cc
+	src/model/DescribeActiveOperationTaskCountResult.cc
+	src/model/DescribeActiveOperationTaskTypeRequest.cc
+	src/model/DescribeActiveOperationTaskTypeResult.cc
 	src/model/DescribeAuditFilesRequest.cc
 	src/model/DescribeAuditFilesResult.cc
 	src/model/DescribeAuditLogFilterRequest.cc
@@ -292,6 +302,8 @@ set(dds_src
 	src/model/DescribeUserEncryptionKeyListResult.cc
 	src/model/DestroyInstanceRequest.cc
 	src/model/DestroyInstanceResult.cc
+	src/model/EvaluateResourceRequest.cc
+	src/model/EvaluateResourceResult.cc
 	src/model/ListTagResourcesRequest.cc
 	src/model/ListTagResourcesResult.cc
 	src/model/MigrateAvailableZoneRequest.cc

dds/include/alibabacloud/dds/DdsClient.h

@@ -46,6 +46,10 @@
 #include "model/DeleteNodeResult.h"
 #include "model/DescribeAccountsRequest.h"
 #include "model/DescribeAccountsResult.h"
+#include "model/DescribeActiveOperationTaskCountRequest.h"
+#include "model/DescribeActiveOperationTaskCountResult.h"
+#include "model/DescribeActiveOperationTaskTypeRequest.h"
+#include "model/DescribeActiveOperationTaskTypeResult.h"
 #include "model/DescribeAuditFilesRequest.h"
 #include "model/DescribeAuditFilesResult.h"
 #include "model/DescribeAuditLogFilterRequest.h"
@@ -122,6 +126,8 @@
 #include "model/DescribeUserEncryptionKeyListResult.h"
 #include "model/DestroyInstanceRequest.h"
 #include "model/DestroyInstanceResult.h"
+#include "model/EvaluateResourceRequest.h"
+#include "model/EvaluateResourceResult.h"
 #include "model/ListTagResourcesRequest.h"
 #include "model/ListTagResourcesResult.h"
 #include "model/MigrateAvailableZoneRequest.h"
@@ -235,6 +241,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeAccountsResult> DescribeAccountsOutcome;
 			typedef std::future<DescribeAccountsOutcome> DescribeAccountsOutcomeCallable;
 			typedef std::function<void(const DdsClient*, const Model::DescribeAccountsRequest&, const DescribeAccountsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAccountsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeActiveOperationTaskCountResult> DescribeActiveOperationTaskCountOutcome;
+			typedef std::future<DescribeActiveOperationTaskCountOutcome> DescribeActiveOperationTaskCountOutcomeCallable;
+			typedef std::function<void(const DdsClient*, const Model::DescribeActiveOperationTaskCountRequest&, const DescribeActiveOperationTaskCountOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeActiveOperationTaskCountAsyncHandler;
+			typedef Outcome<Error, Model::DescribeActiveOperationTaskTypeResult> DescribeActiveOperationTaskTypeOutcome;
+			typedef std::future<DescribeActiveOperationTaskTypeOutcome> DescribeActiveOperationTaskTypeOutcomeCallable;
+			typedef std::function<void(const DdsClient*, const Model::DescribeActiveOperationTaskTypeRequest&, const DescribeActiveOperationTaskTypeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeActiveOperationTaskTypeAsyncHandler;
 			typedef Outcome<Error, Model::DescribeAuditFilesResult> DescribeAuditFilesOutcome;
 			typedef std::future<DescribeAuditFilesOutcome> DescribeAuditFilesOutcomeCallable;
 			typedef std::function<void(const DdsClient*, const Model::DescribeAuditFilesRequest&, const DescribeAuditFilesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAuditFilesAsyncHandler;
@@ -349,6 +361,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DestroyInstanceResult> DestroyInstanceOutcome;
 			typedef std::future<DestroyInstanceOutcome> DestroyInstanceOutcomeCallable;
 			typedef std::function<void(const DdsClient*, const Model::DestroyInstanceRequest&, const DestroyInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DestroyInstanceAsyncHandler;
+			typedef Outcome<Error, Model::EvaluateResourceResult> EvaluateResourceOutcome;
+			typedef std::future<EvaluateResourceOutcome> EvaluateResourceOutcomeCallable;
+			typedef std::function<void(const DdsClient*, const Model::EvaluateResourceRequest&, const EvaluateResourceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> EvaluateResourceAsyncHandler;
 			typedef Outcome<Error, Model::ListTagResourcesResult> ListTagResourcesOutcome;
 			typedef std::future<ListTagResourcesOutcome> ListTagResourcesOutcomeCallable;
 			typedef std::function<void(const DdsClient*, const Model::ListTagResourcesRequest&, const ListTagResourcesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListTagResourcesAsyncHandler;
@@ -492,6 +507,12 @@ namespace AlibabaCloud
 			DescribeAccountsOutcome describeAccounts(const Model::DescribeAccountsRequest &request)const;
 			void describeAccountsAsync(const Model::DescribeAccountsRequest& request, const DescribeAccountsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeAccountsOutcomeCallable describeAccountsCallable(const Model::DescribeAccountsRequest& request) const;
+			DescribeActiveOperationTaskCountOutcome describeActiveOperationTaskCount(const Model::DescribeActiveOperationTaskCountRequest &request)const;
+			void describeActiveOperationTaskCountAsync(const Model::DescribeActiveOperationTaskCountRequest& request, const DescribeActiveOperationTaskCountAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeActiveOperationTaskCountOutcomeCallable describeActiveOperationTaskCountCallable(const Model::DescribeActiveOperationTaskCountRequest& request) const;
+			DescribeActiveOperationTaskTypeOutcome describeActiveOperationTaskType(const Model::DescribeActiveOperationTaskTypeRequest &request)const;
+			void describeActiveOperationTaskTypeAsync(const Model::DescribeActiveOperationTaskTypeRequest& request, const DescribeActiveOperationTaskTypeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeActiveOperationTaskTypeOutcomeCallable describeActiveOperationTaskTypeCallable(const Model::DescribeActiveOperationTaskTypeRequest& request) const;
 			DescribeAuditFilesOutcome describeAuditFiles(const Model::DescribeAuditFilesRequest &request)const;
 			void describeAuditFilesAsync(const Model::DescribeAuditFilesRequest& request, const DescribeAuditFilesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeAuditFilesOutcomeCallable describeAuditFilesCallable(const Model::DescribeAuditFilesRequest& request) const;
@@ -606,6 +627,9 @@ namespace AlibabaCloud
 			DestroyInstanceOutcome destroyInstance(const Model::DestroyInstanceRequest &request)const;
 			void destroyInstanceAsync(const Model::DestroyInstanceRequest& request, const DestroyInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DestroyInstanceOutcomeCallable destroyInstanceCallable(const Model::DestroyInstanceRequest& request) const;
+			EvaluateResourceOutcome evaluateResource(const Model::EvaluateResourceRequest &request)const;
+			void evaluateResourceAsync(const Model::EvaluateResourceRequest& request, const EvaluateResourceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			EvaluateResourceOutcomeCallable evaluateResourceCallable(const Model::EvaluateResourceRequest& request) const;
 			ListTagResourcesOutcome listTagResources(const Model::ListTagResourcesRequest &request)const;
 			void listTagResourcesAsync(const Model::ListTagResourcesRequest& request, const ListTagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListTagResourcesOutcomeCallable listTagResourcesCallable(const Model::ListTagResourcesRequest& request) const;

dds/include/alibabacloud/dds/model/CheckRecoveryConditionRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getDatabaseNames()const;
 				void setDatabaseNames(const std::string& databaseNames);
 				std::string getSecurityToken()const;
@@ -59,6 +61,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string databaseNames_;
 				std::string securityToken_;
 				std::string restoreTime_;

dds/include/alibabacloud/dds/model/DeleteNodeResult.h

@@ -38,11 +38,13 @@ namespace AlibabaCloud
 				explicit DeleteNodeResult(const std::string &payload);
 				~DeleteNodeResult();
 				int getTaskId()const;
+				std::string getOrderId()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
 				int taskId_;
+				std::string orderId_;
 
 			};
 		}

dds/include/alibabacloud/dds/model/DescribeActiveOperationTaskCountRequest.h

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKCOUNTREQUEST_H_
+#define ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKCOUNTREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/dds/DdsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dds
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DDS_EXPORT DescribeActiveOperationTaskCountRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeActiveOperationTaskCountRequest();
+				~DescribeActiveOperationTaskCountRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+
+            private:
+				long resourceOwnerId_;
+				std::string accessKeyId_;
+				std::string resourceGroupId_;
+				std::string securityToken_;
+				std::string resourceOwnerAccount_;
+				std::string ownerAccount_;
+				long ownerId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKCOUNTREQUEST_H_

dds/include/alibabacloud/dds/model/DescribeActiveOperationTaskCountResult.h

@@ -0,0 +1,53 @@
+/*
+ * 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_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKCOUNTRESULT_H_
+#define ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKCOUNTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/dds/DdsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dds
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DDS_EXPORT DescribeActiveOperationTaskCountResult : public ServiceResult
+			{
+			public:
+
+
+				DescribeActiveOperationTaskCountResult();
+				explicit DescribeActiveOperationTaskCountResult(const std::string &payload);
+				~DescribeActiveOperationTaskCountResult();
+				int getNeedPop()const;
+				int getTaskCount()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				int needPop_;
+				int taskCount_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKCOUNTRESULT_H_

dds/include/alibabacloud/dds/model/DescribeActiveOperationTaskTypeRequest.h

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKTYPEREQUEST_H_
+#define ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKTYPEREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/dds/DdsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dds
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DDS_EXPORT DescribeActiveOperationTaskTypeRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeActiveOperationTaskTypeRequest();
+				~DescribeActiveOperationTaskTypeRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
+				int getIsHistory()const;
+				void setIsHistory(int isHistory);
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+
+            private:
+				long resourceOwnerId_;
+				std::string accessKeyId_;
+				std::string resourceGroupId_;
+				int isHistory_;
+				std::string securityToken_;
+				std::string resourceOwnerAccount_;
+				std::string ownerAccount_;
+				long ownerId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKTYPEREQUEST_H_

dds/include/alibabacloud/dds/model/DescribeActiveOperationTaskTypeResult.h

@@ -0,0 +1,56 @@
+/*
+ * 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_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKTYPERESULT_H_
+#define ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKTYPERESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/dds/DdsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dds
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DDS_EXPORT DescribeActiveOperationTaskTypeResult : public ServiceResult
+			{
+			public:
+				struct Items
+				{
+					std::string taskType;
+					int count;
+				};
+
+
+				DescribeActiveOperationTaskTypeResult();
+				explicit DescribeActiveOperationTaskTypeResult(const std::string &payload);
+				~DescribeActiveOperationTaskTypeResult();
+				std::vector<Items> getTypeList()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<Items> typeList_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DDS_MODEL_DESCRIBEACTIVEOPERATIONTASKTYPERESULT_H_

dds/include/alibabacloud/dds/model/DescribeBackupDBsRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				int getPageSize()const;
@@ -62,6 +64,7 @@ namespace AlibabaCloud
 				long resourceOwnerId_;
 				int pageNumber_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string securityToken_;
 				int pageSize_;
 				std::string restoreTime_;

dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getEngine()const;
@@ -55,6 +57,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string engine_;
 				std::string dBInstanceId_;

dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h

@@ -122,6 +122,7 @@ namespace AlibabaCloud
 					std::vector<DBInstance::ConfigserverAttribute> configserverList;
 					std::string regionId;
 					std::string expireTime;
+					std::string kindCode;
 				};
 
 

dds/include/alibabacloud/dds/model/DescribeDBInstancesRequest.h

@@ -77,6 +77,8 @@ namespace AlibabaCloud
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getConnectionDomain()const;
+				void setConnectionDomain(const std::string& connectionDomain);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
 				std::string getDBInstanceType()const;
@@ -111,6 +113,7 @@ namespace AlibabaCloud
 				std::string expireTime_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
+				std::string connectionDomain_;
 				long ownerId_;
 				std::string dBInstanceType_;
 				std::string dBInstanceClass_;

dds/include/alibabacloud/dds/model/DescribeErrorLogRecordsRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				int getPageSize()const;
@@ -53,8 +55,6 @@ namespace AlibabaCloud
 				void setRoleType(const std::string& roleType);
 				std::string getNodeId()const;
 				void setNodeId(const std::string& nodeId);
-				long getSQLId()const;
-				void setSQLId(long sQLId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -71,12 +71,12 @@ namespace AlibabaCloud
 				std::string startTime_;
 				int pageNumber_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string securityToken_;
 				int pageSize_;
 				std::string dBInstanceId_;
 				std::string roleType_;
 				std::string nodeId_;
-				long sQLId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string endTime_;

dds/include/alibabacloud/dds/model/DescribePriceRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setCouponNo(const std::string& couponNo);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getBusinessInfo()const;
@@ -67,6 +69,7 @@ namespace AlibabaCloud
 				std::string productCode_;
 				std::string couponNo_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string businessInfo_;
 				std::string resourceOwnerAccount_;

dds/include/alibabacloud/dds/model/DescribePriceResult.h

@@ -43,10 +43,10 @@ namespace AlibabaCloud
 					};
 					std::vector<std::string> ruleIds1;
 					std::string currency;
-					float tradeAmount;
+					std::string tradeAmount;
 					std::vector<Coupon> coupons;
-					float originalAmount;
-					float discountAmount;
+					std::string originalAmount;
+					std::string discountAmount;
 				};
 				struct Rule
 				{
@@ -58,9 +58,9 @@ namespace AlibabaCloud
 				{
 					std::string instanceId;
 					std::vector<std::string> ruleIds;
-					float tradeAmount;
-					float originalAmount;
-					float discountAmount;
+					std::string tradeAmount;
+					std::string originalAmount;
+					std::string discountAmount;
 				};
 
 

dds/include/alibabacloud/dds/model/DescribeRunningLogRecordsRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				int getPageSize()const;
@@ -53,8 +55,6 @@ namespace AlibabaCloud
 				void setRoleType(const std::string& roleType);
 				std::string getNodeId()const;
 				void setNodeId(const std::string& nodeId);
-				long getSQLId()const;
-				void setSQLId(long sQLId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -73,12 +73,12 @@ namespace AlibabaCloud
 				std::string startTime_;
 				int pageNumber_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string securityToken_;
 				int pageSize_;
 				std::string dBInstanceId_;
 				std::string roleType_;
 				std::string nodeId_;
-				long sQLId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string endTime_;

dds/include/alibabacloud/dds/model/DescribeRunningLogRecordsResult.h

@@ -36,7 +36,7 @@ namespace AlibabaCloud
 				{
 					std::string connInfo;
 					std::string category;
-					long content;
+					std::string content;
 					std::string createTime;
 					int id;
 				};

dds/include/alibabacloud/dds/model/DescribeSlowLogRecordsRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setPageNumber(int pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				int getPageSize()const;
@@ -51,8 +53,6 @@ namespace AlibabaCloud
 				void setDBInstanceId(const std::string& dBInstanceId);
 				std::string getNodeId()const;
 				void setNodeId(const std::string& nodeId);
-				long getSQLId()const;
-				void setSQLId(long sQLId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -71,11 +71,11 @@ namespace AlibabaCloud
 				std::string startTime_;
 				int pageNumber_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string securityToken_;
 				int pageSize_;
 				std::string dBInstanceId_;
 				std::string nodeId_;
-				long sQLId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string endTime_;

dds/include/alibabacloud/dds/model/DescribeTagsRequest.h

@@ -39,12 +39,12 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				std::string getNextToken()const;
 				void setNextToken(const std::string& nextToken);
-				std::string getProduct()const;
-				void setProduct(const std::string& product);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -53,20 +53,17 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				std::string getResourceType()const;
 				void setResourceType(const std::string& resourceType);
-				std::string getCategory()const;
-				void setCategory(const std::string& category);
 
             private:
 				long resourceOwnerId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::string nextToken_;
-				std::string product_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				long ownerId_;
 				std::string resourceType_;
-				std::string category_;
 
 			};
 		}

dds/include/alibabacloud/dds/model/DescribeUserEncryptionKeyListRequest.h

@@ -49,6 +49,8 @@ namespace AlibabaCloud
 				void setOwnerAccount(const std::string& ownerAccount);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
+				std::string getTargetRegionId()const;
+				void setTargetRegionId(const std::string& targetRegionId);
 
             private:
 				long resourceOwnerId_;
@@ -58,6 +60,7 @@ namespace AlibabaCloud
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				long ownerId_;
+				std::string targetRegionId_;
 
 			};
 		}

dds/include/alibabacloud/dds/model/DestroyInstanceRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setClientToken(const std::string& clientToken);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getDBInstanceId()const;
@@ -58,6 +60,7 @@ namespace AlibabaCloud
 				long resourceOwnerId_;
 				std::string clientToken_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string securityToken_;
 				std::string dBInstanceId_;
 				std::string resourceOwnerAccount_;

dds/include/alibabacloud/dds/model/EvaluateResourceRequest.h

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_DDS_MODEL_EVALUATERESOURCEREQUEST_H_
+#define ALIBABACLOUD_DDS_MODEL_EVALUATERESOURCEREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/dds/DdsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dds
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DDS_EXPORT EvaluateResourceRequest : public RpcServiceRequest
+			{
+
+			public:
+				EvaluateResourceRequest();
+				~EvaluateResourceRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getEngineVersion()const;
+				void setEngineVersion(const std::string& engineVersion);
+				std::string getShardsInfo()const;
+				void setShardsInfo(const std::string& shardsInfo);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getEngine()const;
+				void setEngine(const std::string& engine);
+				std::string getDBInstanceId()const;
+				void setDBInstanceId(const std::string& dBInstanceId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getDBInstanceClass()const;
+				void setDBInstanceClass(const std::string& dBInstanceClass);
+				std::string getZoneId()const;
+				void setZoneId(const std::string& zoneId);
+
+            private:
+				long resourceOwnerId_;
+				std::string engineVersion_;
+				std::string shardsInfo_;
+				std::string accessKeyId_;
+				std::string securityToken_;
+				std::string regionId_;
+				std::string engine_;
+				std::string dBInstanceId_;
+				std::string resourceOwnerAccount_;
+				std::string ownerAccount_;
+				long ownerId_;
+				std::string dBInstanceClass_;
+				std::string zoneId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DDS_MODEL_EVALUATERESOURCEREQUEST_H_

dds/include/alibabacloud/dds/model/EvaluateResourceResult.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_DDS_MODEL_EVALUATERESOURCERESULT_H_
+#define ALIBABACLOUD_DDS_MODEL_EVALUATERESOURCERESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/dds/DdsExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dds
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DDS_EXPORT EvaluateResourceResult : public ServiceResult
+			{
+			public:
+
+
+				EvaluateResourceResult();
+				explicit EvaluateResourceResult(const std::string &payload);
+				~EvaluateResourceResult();
+				std::string getDBInstanceAvailable()const;
+				std::string getEngineVersion()const;
+				std::string getEngine()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string dBInstanceAvailable_;
+				std::string engineVersion_;
+				std::string engine_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DDS_MODEL_EVALUATERESOURCERESULT_H_

dds/include/alibabacloud/dds/model/SwitchDBInstanceHARequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				int getSwitchMode()const;
+				void setSwitchMode(int switchMode);
 				std::string getRoleIds()const;
 				void setRoleIds(const std::string& roleIds);
 				std::string getSecurityToken()const;
@@ -57,6 +59,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string accessKeyId_;
+				int switchMode_;
 				std::string roleIds_;
 				std::string securityToken_;
 				std::string dBInstanceId_;

dds/include/alibabacloud/dds/model/TagResourcesRequest.h

@@ -45,6 +45,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				std::vector<Tag> getTag()const;
@@ -63,6 +65,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::vector<Tag> tag_;
 				std::vector<std::string> resourceId_;

dds/include/alibabacloud/dds/model/UntagResourcesRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				bool getAll()const;
@@ -59,6 +61,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				bool all_;
 				std::vector<std::string> resourceId_;

dds/src/DdsClient.cc

@@ -483,6 +483,78 @@ DdsClient::DescribeAccountsOutcomeCallable DdsClient::describeAccountsCallable(c
 	return task->get_future();
 }
 
+DdsClient::DescribeActiveOperationTaskCountOutcome DdsClient::describeActiveOperationTaskCount(const DescribeActiveOperationTaskCountRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeActiveOperationTaskCountOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeActiveOperationTaskCountOutcome(DescribeActiveOperationTaskCountResult(outcome.result()));
+	else
+		return DescribeActiveOperationTaskCountOutcome(outcome.error());
+}
+
+void DdsClient::describeActiveOperationTaskCountAsync(const DescribeActiveOperationTaskCountRequest& request, const DescribeActiveOperationTaskCountAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeActiveOperationTaskCount(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DdsClient::DescribeActiveOperationTaskCountOutcomeCallable DdsClient::describeActiveOperationTaskCountCallable(const DescribeActiveOperationTaskCountRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeActiveOperationTaskCountOutcome()>>(
+			[this, request]()
+			{
+			return this->describeActiveOperationTaskCount(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+DdsClient::DescribeActiveOperationTaskTypeOutcome DdsClient::describeActiveOperationTaskType(const DescribeActiveOperationTaskTypeRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeActiveOperationTaskTypeOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeActiveOperationTaskTypeOutcome(DescribeActiveOperationTaskTypeResult(outcome.result()));
+	else
+		return DescribeActiveOperationTaskTypeOutcome(outcome.error());
+}
+
+void DdsClient::describeActiveOperationTaskTypeAsync(const DescribeActiveOperationTaskTypeRequest& request, const DescribeActiveOperationTaskTypeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeActiveOperationTaskType(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DdsClient::DescribeActiveOperationTaskTypeOutcomeCallable DdsClient::describeActiveOperationTaskTypeCallable(const DescribeActiveOperationTaskTypeRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeActiveOperationTaskTypeOutcome()>>(
+			[this, request]()
+			{
+			return this->describeActiveOperationTaskType(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 DdsClient::DescribeAuditFilesOutcome DdsClient::describeAuditFiles(const DescribeAuditFilesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1851,6 +1923,42 @@ DdsClient::DestroyInstanceOutcomeCallable DdsClient::destroyInstanceCallable(con
 	return task->get_future();
 }
 
+DdsClient::EvaluateResourceOutcome DdsClient::evaluateResource(const EvaluateResourceRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return EvaluateResourceOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return EvaluateResourceOutcome(EvaluateResourceResult(outcome.result()));
+	else
+		return EvaluateResourceOutcome(outcome.error());
+}
+
+void DdsClient::evaluateResourceAsync(const EvaluateResourceRequest& request, const EvaluateResourceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, evaluateResource(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DdsClient::EvaluateResourceOutcomeCallable DdsClient::evaluateResourceCallable(const EvaluateResourceRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<EvaluateResourceOutcome()>>(
+			[this, request]()
+			{
+			return this->evaluateResource(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 DdsClient::ListTagResourcesOutcome DdsClient::listTagResources(const ListTagResourcesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

dds/src/model/CheckRecoveryConditionRequest.cc

@@ -49,6 +49,17 @@ void CheckRecoveryConditionRequest::setAccessKeyId(const std::string& accessKeyI
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string CheckRecoveryConditionRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void CheckRecoveryConditionRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string CheckRecoveryConditionRequest::getDatabaseNames()const
 {
 	return databaseNames_;

dds/src/model/DeleteNodeResult.cc

@@ -41,6 +41,8 @@ void DeleteNodeResult::parse(const std::string &payload)
 	setRequestId(value["RequestId"].asString());
 	if(!value["TaskId"].isNull())
 		taskId_ = std::stoi(value["TaskId"].asString());
+	if(!value["OrderId"].isNull())
+		orderId_ = value["OrderId"].asString();
 
 }
 
@@ -49,3 +51,8 @@ int DeleteNodeResult::getTaskId()const
 	return taskId_;
 }
 
+std::string DeleteNodeResult::getOrderId()const
+{
+	return orderId_;
+}
+

dds/src/model/DescribeActiveOperationTaskCountRequest.cc

@@ -0,0 +1,106 @@
+/*
+ * 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/dds/model/DescribeActiveOperationTaskCountRequest.h>
+
+using AlibabaCloud::Dds::Model::DescribeActiveOperationTaskCountRequest;
+
+DescribeActiveOperationTaskCountRequest::DescribeActiveOperationTaskCountRequest() :
+	RpcServiceRequest("dds", "2015-12-01", "DescribeActiveOperationTaskCount")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeActiveOperationTaskCountRequest::~DescribeActiveOperationTaskCountRequest()
+{}
+
+long DescribeActiveOperationTaskCountRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void DescribeActiveOperationTaskCountRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string DescribeActiveOperationTaskCountRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void DescribeActiveOperationTaskCountRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string DescribeActiveOperationTaskCountRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeActiveOperationTaskCountRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
+std::string DescribeActiveOperationTaskCountRequest::getSecurityToken()const
+{
+	return securityToken_;
+}
+
+void DescribeActiveOperationTaskCountRequest::setSecurityToken(const std::string& securityToken)
+{
+	securityToken_ = securityToken;
+	setParameter("SecurityToken", securityToken);
+}
+
+std::string DescribeActiveOperationTaskCountRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void DescribeActiveOperationTaskCountRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string DescribeActiveOperationTaskCountRequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void DescribeActiveOperationTaskCountRequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setParameter("OwnerAccount", ownerAccount);
+}
+
+long DescribeActiveOperationTaskCountRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeActiveOperationTaskCountRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+

dds/src/model/DescribeActiveOperationTaskCountResult.cc

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

dds/src/model/DescribeActiveOperationTaskTypeRequest.cc

@@ -0,0 +1,117 @@
+/*
+ * 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/dds/model/DescribeActiveOperationTaskTypeRequest.h>
+
+using AlibabaCloud::Dds::Model::DescribeActiveOperationTaskTypeRequest;
+
+DescribeActiveOperationTaskTypeRequest::DescribeActiveOperationTaskTypeRequest() :
+	RpcServiceRequest("dds", "2015-12-01", "DescribeActiveOperationTaskType")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeActiveOperationTaskTypeRequest::~DescribeActiveOperationTaskTypeRequest()
+{}
+
+long DescribeActiveOperationTaskTypeRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string DescribeActiveOperationTaskTypeRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string DescribeActiveOperationTaskTypeRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
+int DescribeActiveOperationTaskTypeRequest::getIsHistory()const
+{
+	return isHistory_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setIsHistory(int isHistory)
+{
+	isHistory_ = isHistory;
+	setParameter("IsHistory", std::to_string(isHistory));
+}
+
+std::string DescribeActiveOperationTaskTypeRequest::getSecurityToken()const
+{
+	return securityToken_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setSecurityToken(const std::string& securityToken)
+{
+	securityToken_ = securityToken;
+	setParameter("SecurityToken", securityToken);
+}
+
+std::string DescribeActiveOperationTaskTypeRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string DescribeActiveOperationTaskTypeRequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setParameter("OwnerAccount", ownerAccount);
+}
+
+long DescribeActiveOperationTaskTypeRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeActiveOperationTaskTypeRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+

dds/src/model/DescribeActiveOperationTaskTypeResult.cc

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

dds/src/model/DescribeBackupDBsRequest.cc

@@ -60,6 +60,17 @@ void DescribeBackupDBsRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DescribeBackupDBsRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeBackupDBsRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeBackupDBsRequest::getSecurityToken()const
 {
 	return securityToken_;

dds/src/model/DescribeDBInstanceAttributeRequest.cc

@@ -49,6 +49,17 @@ void DescribeDBInstanceAttributeRequest::setAccessKeyId(const std::string& acces
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DescribeDBInstanceAttributeRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeDBInstanceAttributeRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeDBInstanceAttributeRequest::getSecurityToken()const
 {
 	return securityToken_;

dds/src/model/DescribeDBInstanceAttributeResult.cc

@@ -71,6 +71,8 @@ void DescribeDBInstanceAttributeResult::parse(const std::string &payload)
 			dBInstancesObject.vSwitchId = valueDBInstancesDBInstance["VSwitchId"].asString();
 		if(!valueDBInstancesDBInstance["VPCCloudInstanceIds"].isNull())
 			dBInstancesObject.vPCCloudInstanceIds = valueDBInstancesDBInstance["VPCCloudInstanceIds"].asString();
+		if(!valueDBInstancesDBInstance["KindCode"].isNull())
+			dBInstancesObject.kindCode = valueDBInstancesDBInstance["KindCode"].asString();
 		if(!valueDBInstancesDBInstance["DBInstanceStatus"].isNull())
 			dBInstancesObject.dBInstanceStatus = valueDBInstancesDBInstance["DBInstanceStatus"].asString();
 		if(!valueDBInstancesDBInstance["LockMode"].isNull())

dds/src/model/DescribeDBInstancesRequest.cc

@@ -230,6 +230,17 @@ void DescribeDBInstancesRequest::setOwnerAccount(const std::string& ownerAccount
 	setParameter("OwnerAccount", ownerAccount);
 }
 
+std::string DescribeDBInstancesRequest::getConnectionDomain()const
+{
+	return connectionDomain_;
+}
+
+void DescribeDBInstancesRequest::setConnectionDomain(const std::string& connectionDomain)
+{
+	connectionDomain_ = connectionDomain;
+	setParameter("ConnectionDomain", connectionDomain);
+}
+
 long DescribeDBInstancesRequest::getOwnerId()const
 {
 	return ownerId_;

dds/src/model/DescribeErrorLogRecordsRequest.cc

@@ -71,6 +71,17 @@ void DescribeErrorLogRecordsRequest::setAccessKeyId(const std::string& accessKey
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DescribeErrorLogRecordsRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeErrorLogRecordsRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeErrorLogRecordsRequest::getSecurityToken()const
 {
 	return securityToken_;
@@ -126,17 +137,6 @@ void DescribeErrorLogRecordsRequest::setNodeId(const std::string& nodeId)
 	setParameter("NodeId", nodeId);
 }
 
-long DescribeErrorLogRecordsRequest::getSQLId()const
-{
-	return sQLId_;
-}
-
-void DescribeErrorLogRecordsRequest::setSQLId(long sQLId)
-{
-	sQLId_ = sQLId;
-	setParameter("SQLId", std::to_string(sQLId));
-}
-
 std::string DescribeErrorLogRecordsRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;

dds/src/model/DescribePriceRequest.cc

@@ -71,6 +71,17 @@ void DescribePriceRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DescribePriceRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribePriceRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribePriceRequest::getSecurityToken()const
 {
 	return securityToken_;

dds/src/model/DescribePriceResult.cc

@@ -56,11 +56,11 @@ void DescribePriceResult::parse(const std::string &payload)
 	{
 		SubOrder subOrdersObject;
 		if(!valueSubOrdersSubOrder["OriginalAmount"].isNull())
-			subOrdersObject.originalAmount = std::stof(valueSubOrdersSubOrder["OriginalAmount"].asString());
+			subOrdersObject.originalAmount = valueSubOrdersSubOrder["OriginalAmount"].asString();
 		if(!valueSubOrdersSubOrder["TradeAmount"].isNull())
-			subOrdersObject.tradeAmount = std::stof(valueSubOrdersSubOrder["TradeAmount"].asString());
+			subOrdersObject.tradeAmount = valueSubOrdersSubOrder["TradeAmount"].asString();
 		if(!valueSubOrdersSubOrder["DiscountAmount"].isNull())
-			subOrdersObject.discountAmount = std::stof(valueSubOrdersSubOrder["DiscountAmount"].asString());
+			subOrdersObject.discountAmount = valueSubOrdersSubOrder["DiscountAmount"].asString();
 		if(!valueSubOrdersSubOrder["InstanceId"].isNull())
 			subOrdersObject.instanceId = valueSubOrdersSubOrder["InstanceId"].asString();
 		auto allRuleIds = value["RuleIds"]["RuleId"];
@@ -70,11 +70,11 @@ void DescribePriceResult::parse(const std::string &payload)
 	}
 	auto orderNode = value["Order"];
 	if(!orderNode["OriginalAmount"].isNull())
-		order_.originalAmount = std::stof(orderNode["OriginalAmount"].asString());
+		order_.originalAmount = orderNode["OriginalAmount"].asString();
 	if(!orderNode["TradeAmount"].isNull())
-		order_.tradeAmount = std::stof(orderNode["TradeAmount"].asString());
+		order_.tradeAmount = orderNode["TradeAmount"].asString();
 	if(!orderNode["DiscountAmount"].isNull())
-		order_.discountAmount = std::stof(orderNode["DiscountAmount"].asString());
+		order_.discountAmount = orderNode["DiscountAmount"].asString();
 	if(!orderNode["Currency"].isNull())
 		order_.currency = orderNode["Currency"].asString();
 	auto allCouponsNode = orderNode["Coupons"]["Coupon"];

dds/src/model/DescribeRunningLogRecordsRequest.cc

@@ -71,6 +71,17 @@ void DescribeRunningLogRecordsRequest::setAccessKeyId(const std::string& accessK
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DescribeRunningLogRecordsRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeRunningLogRecordsRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeRunningLogRecordsRequest::getSecurityToken()const
 {
 	return securityToken_;
@@ -126,17 +137,6 @@ void DescribeRunningLogRecordsRequest::setNodeId(const std::string& nodeId)
 	setParameter("NodeId", nodeId);
 }
 
-long DescribeRunningLogRecordsRequest::getSQLId()const
-{
-	return sQLId_;
-}
-
-void DescribeRunningLogRecordsRequest::setSQLId(long sQLId)
-{
-	sQLId_ = sQLId;
-	setParameter("SQLId", std::to_string(sQLId));
-}
-
 std::string DescribeRunningLogRecordsRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;

dds/src/model/DescribeRunningLogRecordsResult.cc

@@ -52,7 +52,7 @@ void DescribeRunningLogRecordsResult::parse(const std::string &payload)
 		if(!valueItemsLogRecords["ConnInfo"].isNull())
 			itemsObject.connInfo = valueItemsLogRecords["ConnInfo"].asString();
 		if(!valueItemsLogRecords["Content"].isNull())
-			itemsObject.content = std::stol(valueItemsLogRecords["Content"].asString());
+			itemsObject.content = valueItemsLogRecords["Content"].asString();
 		items_.push_back(itemsObject);
 	}
 	if(!value["Engine"].isNull())

dds/src/model/DescribeSlowLogRecordsRequest.cc

@@ -71,6 +71,17 @@ void DescribeSlowLogRecordsRequest::setAccessKeyId(const std::string& accessKeyI
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DescribeSlowLogRecordsRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeSlowLogRecordsRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeSlowLogRecordsRequest::getSecurityToken()const
 {
 	return securityToken_;
@@ -115,17 +126,6 @@ void DescribeSlowLogRecordsRequest::setNodeId(const std::string& nodeId)
 	setParameter("NodeId", nodeId);
 }
 
-long DescribeSlowLogRecordsRequest::getSQLId()const
-{
-	return sQLId_;
-}
-
-void DescribeSlowLogRecordsRequest::setSQLId(long sQLId)
-{
-	sQLId_ = sQLId;
-	setParameter("SQLId", std::to_string(sQLId));
-}
-
 std::string DescribeSlowLogRecordsRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;

dds/src/model/DescribeTagsRequest.cc

@@ -49,6 +49,17 @@ void DescribeTagsRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DescribeTagsRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DescribeTagsRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DescribeTagsRequest::getRegionId()const
 {
 	return regionId_;
@@ -71,17 +82,6 @@ void DescribeTagsRequest::setNextToken(const std::string& nextToken)
 	setParameter("NextToken", nextToken);
 }
 
-std::string DescribeTagsRequest::getProduct()const
-{
-	return product_;
-}
-
-void DescribeTagsRequest::setProduct(const std::string& product)
-{
-	product_ = product;
-	setParameter("Product", product);
-}
-
 std::string DescribeTagsRequest::getResourceOwnerAccount()const
 {
 	return resourceOwnerAccount_;
@@ -126,14 +126,3 @@ void DescribeTagsRequest::setResourceType(const std::string& resourceType)
 	setParameter("ResourceType", resourceType);
 }
 
-std::string DescribeTagsRequest::getCategory()const
-{
-	return category_;
-}
-
-void DescribeTagsRequest::setCategory(const std::string& category)
-{
-	category_ = category;
-	setParameter("Category", category);
-}
-

dds/src/model/DescribeUserEncryptionKeyListRequest.cc

@@ -104,3 +104,14 @@ void DescribeUserEncryptionKeyListRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
+std::string DescribeUserEncryptionKeyListRequest::getTargetRegionId()const
+{
+	return targetRegionId_;
+}
+
+void DescribeUserEncryptionKeyListRequest::setTargetRegionId(const std::string& targetRegionId)
+{
+	targetRegionId_ = targetRegionId;
+	setParameter("TargetRegionId", targetRegionId);
+}
+

dds/src/model/DestroyInstanceRequest.cc

@@ -60,6 +60,17 @@ void DestroyInstanceRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string DestroyInstanceRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void DestroyInstanceRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string DestroyInstanceRequest::getSecurityToken()const
 {
 	return securityToken_;

dds/src/model/EvaluateResourceRequest.cc

@@ -0,0 +1,172 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/dds/model/EvaluateResourceRequest.h>
+
+using AlibabaCloud::Dds::Model::EvaluateResourceRequest;
+
+EvaluateResourceRequest::EvaluateResourceRequest() :
+	RpcServiceRequest("dds", "2015-12-01", "EvaluateResource")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+EvaluateResourceRequest::~EvaluateResourceRequest()
+{}
+
+long EvaluateResourceRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void EvaluateResourceRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string EvaluateResourceRequest::getEngineVersion()const
+{
+	return engineVersion_;
+}
+
+void EvaluateResourceRequest::setEngineVersion(const std::string& engineVersion)
+{
+	engineVersion_ = engineVersion;
+	setParameter("EngineVersion", engineVersion);
+}
+
+std::string EvaluateResourceRequest::getShardsInfo()const
+{
+	return shardsInfo_;
+}
+
+void EvaluateResourceRequest::setShardsInfo(const std::string& shardsInfo)
+{
+	shardsInfo_ = shardsInfo;
+	setParameter("ShardsInfo", shardsInfo);
+}
+
+std::string EvaluateResourceRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void EvaluateResourceRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string EvaluateResourceRequest::getSecurityToken()const
+{
+	return securityToken_;
+}
+
+void EvaluateResourceRequest::setSecurityToken(const std::string& securityToken)
+{
+	securityToken_ = securityToken;
+	setParameter("SecurityToken", securityToken);
+}
+
+std::string EvaluateResourceRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void EvaluateResourceRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string EvaluateResourceRequest::getEngine()const
+{
+	return engine_;
+}
+
+void EvaluateResourceRequest::setEngine(const std::string& engine)
+{
+	engine_ = engine;
+	setParameter("Engine", engine);
+}
+
+std::string EvaluateResourceRequest::getDBInstanceId()const
+{
+	return dBInstanceId_;
+}
+
+void EvaluateResourceRequest::setDBInstanceId(const std::string& dBInstanceId)
+{
+	dBInstanceId_ = dBInstanceId;
+	setParameter("DBInstanceId", dBInstanceId);
+}
+
+std::string EvaluateResourceRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void EvaluateResourceRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string EvaluateResourceRequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void EvaluateResourceRequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setParameter("OwnerAccount", ownerAccount);
+}
+
+long EvaluateResourceRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void EvaluateResourceRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string EvaluateResourceRequest::getDBInstanceClass()const
+{
+	return dBInstanceClass_;
+}
+
+void EvaluateResourceRequest::setDBInstanceClass(const std::string& dBInstanceClass)
+{
+	dBInstanceClass_ = dBInstanceClass;
+	setParameter("DBInstanceClass", dBInstanceClass);
+}
+
+std::string EvaluateResourceRequest::getZoneId()const
+{
+	return zoneId_;
+}
+
+void EvaluateResourceRequest::setZoneId(const std::string& zoneId)
+{
+	zoneId_ = zoneId;
+	setParameter("ZoneId", zoneId);
+}
+

dds/src/model/EvaluateResourceResult.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/dds/model/EvaluateResourceResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Dds;
+using namespace AlibabaCloud::Dds::Model;
+
+EvaluateResourceResult::EvaluateResourceResult() :
+	ServiceResult()
+{}
+
+EvaluateResourceResult::EvaluateResourceResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+EvaluateResourceResult::~EvaluateResourceResult()
+{}
+
+void EvaluateResourceResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["Engine"].isNull())
+		engine_ = value["Engine"].asString();
+	if(!value["EngineVersion"].isNull())
+		engineVersion_ = value["EngineVersion"].asString();
+	if(!value["DBInstanceAvailable"].isNull())
+		dBInstanceAvailable_ = value["DBInstanceAvailable"].asString();
+
+}
+
+std::string EvaluateResourceResult::getDBInstanceAvailable()const
+{
+	return dBInstanceAvailable_;
+}
+
+std::string EvaluateResourceResult::getEngineVersion()const
+{
+	return engineVersion_;
+}
+
+std::string EvaluateResourceResult::getEngine()const
+{
+	return engine_;
+}
+

dds/src/model/SwitchDBInstanceHARequest.cc

@@ -49,6 +49,17 @@ void SwitchDBInstanceHARequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+int SwitchDBInstanceHARequest::getSwitchMode()const
+{
+	return switchMode_;
+}
+
+void SwitchDBInstanceHARequest::setSwitchMode(int switchMode)
+{
+	switchMode_ = switchMode;
+	setParameter("SwitchMode", std::to_string(switchMode));
+}
+
 std::string SwitchDBInstanceHARequest::getRoleIds()const
 {
 	return roleIds_;

dds/src/model/TagResourcesRequest.cc

@@ -49,6 +49,17 @@ void TagResourcesRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string TagResourcesRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void TagResourcesRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string TagResourcesRequest::getRegionId()const
 {
 	return regionId_;

dds/src/model/UntagResourcesRequest.cc

@@ -49,6 +49,17 @@ void UntagResourcesRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string UntagResourcesRequest::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
+void UntagResourcesRequest::setResourceGroupId(const std::string& resourceGroupId)
+{
+	resourceGroupId_ = resourceGroupId;
+	setParameter("ResourceGroupId", resourceGroupId);
+}
+
 std::string UntagResourcesRequest::getRegionId()const
 {
 	return regionId_;

facebody/CMakeLists.txt

@@ -25,6 +25,8 @@ set(facebody_public_header_model
 	include/alibabacloud/facebody/model/AddFaceResult.h
 	include/alibabacloud/facebody/model/AddFaceEntityRequest.h
 	include/alibabacloud/facebody/model/AddFaceEntityResult.h
+	include/alibabacloud/facebody/model/BlurFaceRequest.h
+	include/alibabacloud/facebody/model/BlurFaceResult.h
 	include/alibabacloud/facebody/model/BodyPostureRequest.h
 	include/alibabacloud/facebody/model/BodyPostureResult.h
 	include/alibabacloud/facebody/model/CompareFaceRequest.h
@@ -43,6 +45,8 @@ set(facebody_public_header_model
 	include/alibabacloud/facebody/model/DetectCelebrityResult.h
 	include/alibabacloud/facebody/model/DetectFaceRequest.h
 	include/alibabacloud/facebody/model/DetectFaceResult.h
+	include/alibabacloud/facebody/model/DetectIPCPedestrianRequest.h
+	include/alibabacloud/facebody/model/DetectIPCPedestrianResult.h
 	include/alibabacloud/facebody/model/DetectLivingFaceRequest.h
 	include/alibabacloud/facebody/model/DetectLivingFaceResult.h
 	include/alibabacloud/facebody/model/DetectMaskRequest.h
@@ -94,6 +98,8 @@ set(facebody_src
 	src/model/AddFaceResult.cc
 	src/model/AddFaceEntityRequest.cc
 	src/model/AddFaceEntityResult.cc
+	src/model/BlurFaceRequest.cc
+	src/model/BlurFaceResult.cc
 	src/model/BodyPostureRequest.cc
 	src/model/BodyPostureResult.cc
 	src/model/CompareFaceRequest.cc
@@ -112,6 +118,8 @@ set(facebody_src
 	src/model/DetectCelebrityResult.cc
 	src/model/DetectFaceRequest.cc
 	src/model/DetectFaceResult.cc
+	src/model/DetectIPCPedestrianRequest.cc
+	src/model/DetectIPCPedestrianResult.cc
 	src/model/DetectLivingFaceRequest.cc
 	src/model/DetectLivingFaceResult.cc
 	src/model/DetectMaskRequest.cc

facebody/include/alibabacloud/facebody/FacebodyClient.h

@@ -26,6 +26,8 @@
 #include "model/AddFaceResult.h"
 #include "model/AddFaceEntityRequest.h"
 #include "model/AddFaceEntityResult.h"
+#include "model/BlurFaceRequest.h"
+#include "model/BlurFaceResult.h"
 #include "model/BodyPostureRequest.h"
 #include "model/BodyPostureResult.h"
 #include "model/CompareFaceRequest.h"
@@ -44,6 +46,8 @@
 #include "model/DetectCelebrityResult.h"
 #include "model/DetectFaceRequest.h"
 #include "model/DetectFaceResult.h"
+#include "model/DetectIPCPedestrianRequest.h"
+#include "model/DetectIPCPedestrianResult.h"
 #include "model/DetectLivingFaceRequest.h"
 #include "model/DetectLivingFaceResult.h"
 #include "model/DetectMaskRequest.h"
@@ -103,6 +107,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::AddFaceEntityResult> AddFaceEntityOutcome;
 			typedef std::future<AddFaceEntityOutcome> AddFaceEntityOutcomeCallable;
 			typedef std::function<void(const FacebodyClient*, const Model::AddFaceEntityRequest&, const AddFaceEntityOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> AddFaceEntityAsyncHandler;
+			typedef Outcome<Error, Model::BlurFaceResult> BlurFaceOutcome;
+			typedef std::future<BlurFaceOutcome> BlurFaceOutcomeCallable;
+			typedef std::function<void(const FacebodyClient*, const Model::BlurFaceRequest&, const BlurFaceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> BlurFaceAsyncHandler;
 			typedef Outcome<Error, Model::BodyPostureResult> BodyPostureOutcome;
 			typedef std::future<BodyPostureOutcome> BodyPostureOutcomeCallable;
 			typedef std::function<void(const FacebodyClient*, const Model::BodyPostureRequest&, const BodyPostureOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> BodyPostureAsyncHandler;
@@ -130,6 +137,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DetectFaceResult> DetectFaceOutcome;
 			typedef std::future<DetectFaceOutcome> DetectFaceOutcomeCallable;
 			typedef std::function<void(const FacebodyClient*, const Model::DetectFaceRequest&, const DetectFaceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DetectFaceAsyncHandler;
+			typedef Outcome<Error, Model::DetectIPCPedestrianResult> DetectIPCPedestrianOutcome;
+			typedef std::future<DetectIPCPedestrianOutcome> DetectIPCPedestrianOutcomeCallable;
+			typedef std::function<void(const FacebodyClient*, const Model::DetectIPCPedestrianRequest&, const DetectIPCPedestrianOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DetectIPCPedestrianAsyncHandler;
 			typedef Outcome<Error, Model::DetectLivingFaceResult> DetectLivingFaceOutcome;
 			typedef std::future<DetectLivingFaceOutcome> DetectLivingFaceOutcomeCallable;
 			typedef std::function<void(const FacebodyClient*, const Model::DetectLivingFaceRequest&, const DetectLivingFaceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DetectLivingFaceAsyncHandler;
@@ -207,6 +217,9 @@ namespace AlibabaCloud
 			AddFaceEntityOutcome addFaceEntity(const Model::AddFaceEntityRequest &request)const;
 			void addFaceEntityAsync(const Model::AddFaceEntityRequest& request, const AddFaceEntityAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			AddFaceEntityOutcomeCallable addFaceEntityCallable(const Model::AddFaceEntityRequest& request) const;
+			BlurFaceOutcome blurFace(const Model::BlurFaceRequest &request)const;
+			void blurFaceAsync(const Model::BlurFaceRequest& request, const BlurFaceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			BlurFaceOutcomeCallable blurFaceCallable(const Model::BlurFaceRequest& request) const;
 			BodyPostureOutcome bodyPosture(const Model::BodyPostureRequest &request)const;
 			void bodyPostureAsync(const Model::BodyPostureRequest& request, const BodyPostureAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			BodyPostureOutcomeCallable bodyPostureCallable(const Model::BodyPostureRequest& request) const;
@@ -234,6 +247,9 @@ namespace AlibabaCloud
 			DetectFaceOutcome detectFace(const Model::DetectFaceRequest &request)const;
 			void detectFaceAsync(const Model::DetectFaceRequest& request, const DetectFaceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DetectFaceOutcomeCallable detectFaceCallable(const Model::DetectFaceRequest& request) const;
+			DetectIPCPedestrianOutcome detectIPCPedestrian(const Model::DetectIPCPedestrianRequest &request)const;
+			void detectIPCPedestrianAsync(const Model::DetectIPCPedestrianRequest& request, const DetectIPCPedestrianAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DetectIPCPedestrianOutcomeCallable detectIPCPedestrianCallable(const Model::DetectIPCPedestrianRequest& request) const;
 			DetectLivingFaceOutcome detectLivingFace(const Model::DetectLivingFaceRequest &request)const;
 			void detectLivingFaceAsync(const Model::DetectLivingFaceRequest& request, const DetectLivingFaceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DetectLivingFaceOutcomeCallable detectLivingFaceCallable(const Model::DetectLivingFaceRequest& request) const;

facebody/include/alibabacloud/facebody/model/BlurFaceRequest.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_FACEBODY_MODEL_BLURFACEREQUEST_H_
+#define ALIBABACLOUD_FACEBODY_MODEL_BLURFACEREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/facebody/FacebodyExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Facebody
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_FACEBODY_EXPORT BlurFaceRequest : public RpcServiceRequest
+			{
+
+			public:
+				BlurFaceRequest();
+				~BlurFaceRequest();
+
+				std::string getImageURL()const;
+				void setImageURL(const std::string& imageURL);
+
+            private:
+				std::string imageURL_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_FACEBODY_MODEL_BLURFACEREQUEST_H_

facebody/include/alibabacloud/facebody/model/BlurFaceResult.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_FACEBODY_MODEL_BLURFACERESULT_H_
+#define ALIBABACLOUD_FACEBODY_MODEL_BLURFACERESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/facebody/FacebodyExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Facebody
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_FACEBODY_EXPORT BlurFaceResult : public ServiceResult
+			{
+			public:
+				struct Data
+				{
+					std::string imageURL;
+				};
+
+
+				BlurFaceResult();
+				explicit BlurFaceResult(const std::string &payload);
+				~BlurFaceResult();
+				Data getData()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				Data data_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_FACEBODY_MODEL_BLURFACERESULT_H_

facebody/include/alibabacloud/facebody/model/DetectIPCPedestrianRequest.h

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_FACEBODY_MODEL_DETECTIPCPEDESTRIANREQUEST_H_
+#define ALIBABACLOUD_FACEBODY_MODEL_DETECTIPCPEDESTRIANREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/facebody/FacebodyExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Facebody
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_FACEBODY_EXPORT DetectIPCPedestrianRequest : public RpcServiceRequest
+			{
+			public:
+				struct URLList
+				{
+					std::string dataId;
+					std::string imageURL;
+				};
+
+			public:
+				DetectIPCPedestrianRequest();
+				~DetectIPCPedestrianRequest();
+
+				std::string getImageData()const;
+				void setImageData(const std::string& imageData);
+				std::vector<URLList> getURLList()const;
+				void setURLList(const std::vector<URLList>& uRLList);
+				bool getContinueOnError()const;
+				void setContinueOnError(bool continueOnError);
+				int getWidth()const;
+				void setWidth(int width);
+				int getHeight()const;
+				void setHeight(int height);
+
+            private:
+				std::string imageData_;
+				std::vector<URLList> uRLList_;
+				bool continueOnError_;
+				int width_;
+				int height_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_FACEBODY_MODEL_DETECTIPCPEDESTRIANREQUEST_H_

facebody/include/alibabacloud/facebody/model/DetectIPCPedestrianResult.h

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_FACEBODY_MODEL_DETECTIPCPEDESTRIANRESULT_H_
+#define ALIBABACLOUD_FACEBODY_MODEL_DETECTIPCPEDESTRIANRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/facebody/FacebodyExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Facebody
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_FACEBODY_EXPORT DetectIPCPedestrianResult : public ServiceResult
+			{
+			public:
+				struct Data
+				{
+					struct ImageInfoListItem
+					{
+						struct Element
+						{
+							float score;
+							std::vector<std::string> boxes;
+						};
+						std::string dataId;
+						std::string errorCode;
+						std::vector<ImageInfoListItem::Element> elements;
+						std::string errorMessage;
+					};
+					std::vector<ImageInfoListItem> imageInfoList;
+				};
+
+
+				DetectIPCPedestrianResult();
+				explicit DetectIPCPedestrianResult(const std::string &payload);
+				~DetectIPCPedestrianResult();
+				Data getData()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				Data data_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_FACEBODY_MODEL_DETECTIPCPEDESTRIANRESULT_H_

facebody/src/FacebodyClient.cc

@@ -31,21 +31,21 @@ FacebodyClient::FacebodyClient(const Credentials &credentials, const ClientConfi
 	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, "facebody");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 FacebodyClient::FacebodyClient(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, "facebody");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 FacebodyClient::FacebodyClient(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, "facebody");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 FacebodyClient::~FacebodyClient()
@@ -123,6 +123,42 @@ FacebodyClient::AddFaceEntityOutcomeCallable FacebodyClient::addFaceEntityCallab
 	return task->get_future();
 }
 
+FacebodyClient::BlurFaceOutcome FacebodyClient::blurFace(const BlurFaceRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return BlurFaceOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return BlurFaceOutcome(BlurFaceResult(outcome.result()));
+	else
+		return BlurFaceOutcome(outcome.error());
+}
+
+void FacebodyClient::blurFaceAsync(const BlurFaceRequest& request, const BlurFaceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, blurFace(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+FacebodyClient::BlurFaceOutcomeCallable FacebodyClient::blurFaceCallable(const BlurFaceRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<BlurFaceOutcome()>>(
+			[this, request]()
+			{
+			return this->blurFace(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 FacebodyClient::BodyPostureOutcome FacebodyClient::bodyPosture(const BodyPostureRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -447,6 +483,42 @@ FacebodyClient::DetectFaceOutcomeCallable FacebodyClient::detectFaceCallable(con
 	return task->get_future();
 }
 
+FacebodyClient::DetectIPCPedestrianOutcome FacebodyClient::detectIPCPedestrian(const DetectIPCPedestrianRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DetectIPCPedestrianOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DetectIPCPedestrianOutcome(DetectIPCPedestrianResult(outcome.result()));
+	else
+		return DetectIPCPedestrianOutcome(outcome.error());
+}
+
+void FacebodyClient::detectIPCPedestrianAsync(const DetectIPCPedestrianRequest& request, const DetectIPCPedestrianAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, detectIPCPedestrian(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+FacebodyClient::DetectIPCPedestrianOutcomeCallable FacebodyClient::detectIPCPedestrianCallable(const DetectIPCPedestrianRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DetectIPCPedestrianOutcome()>>(
+			[this, request]()
+			{
+			return this->detectIPCPedestrian(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 FacebodyClient::DetectLivingFaceOutcome FacebodyClient::detectLivingFace(const DetectLivingFaceRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

facebody/src/model/BlurFaceRequest.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/facebody/model/BlurFaceRequest.h>
+
+using AlibabaCloud::Facebody::Model::BlurFaceRequest;
+
+BlurFaceRequest::BlurFaceRequest() :
+	RpcServiceRequest("facebody", "2019-12-30", "BlurFace")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+BlurFaceRequest::~BlurFaceRequest()
+{}
+
+std::string BlurFaceRequest::getImageURL()const
+{
+	return imageURL_;
+}
+
+void BlurFaceRequest::setImageURL(const std::string& imageURL)
+{
+	imageURL_ = imageURL;
+	setBodyParameter("ImageURL", imageURL);
+}
+

facebody/src/model/BlurFaceResult.cc

@@ -0,0 +1,52 @@
+/*
+ * 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/facebody/model/BlurFaceResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Facebody;
+using namespace AlibabaCloud::Facebody::Model;
+
+BlurFaceResult::BlurFaceResult() :
+	ServiceResult()
+{}
+
+BlurFaceResult::BlurFaceResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+BlurFaceResult::~BlurFaceResult()
+{}
+
+void BlurFaceResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto dataNode = value["Data"];
+	if(!dataNode["ImageURL"].isNull())
+		data_.imageURL = dataNode["ImageURL"].asString();
+
+}
+
+BlurFaceResult::Data BlurFaceResult::getData()const
+{
+	return data_;
+}
+