Supported AndroidNotificationNotifyId for Push and MassPush.

CHANGELOG

@@ -1,3 +1,16 @@
+2020-10-16 Version: patch
+- Supported AndroidNotificationNotifyId for Push and MassPush.
+- Supported iOSNotificationCollapseId for Push and MassPush.
+
+2020-10-16 Version: patch
+- Support create for serverlesshbase.
+
+2020-10-16 Version: patch
+- Update cert API.
+
+2020-10-16 Version: patch
+- Update cert API.
+
 2020-10-15 Version: patch
 - Supported TAG APIs.
 

cdn/CMakeLists.txt

@@ -279,6 +279,8 @@ set(cdn_public_header_model
 	include/alibabacloud/cdn/model/DescribeTagResourcesResult.h
 	include/alibabacloud/cdn/model/DescribeTopDomainsByFlowRequest.h
 	include/alibabacloud/cdn/model/DescribeTopDomainsByFlowResult.h
+	include/alibabacloud/cdn/model/DescribeUserCertificateExpireCountRequest.h
+	include/alibabacloud/cdn/model/DescribeUserCertificateExpireCountResult.h
 	include/alibabacloud/cdn/model/DescribeUserConfigsRequest.h
 	include/alibabacloud/cdn/model/DescribeUserConfigsResult.h
 	include/alibabacloud/cdn/model/DescribeUserCustomLogConfigRequest.h
@@ -678,6 +680,8 @@ set(cdn_src
 	src/model/DescribeTagResourcesResult.cc
 	src/model/DescribeTopDomainsByFlowRequest.cc
 	src/model/DescribeTopDomainsByFlowResult.cc
+	src/model/DescribeUserCertificateExpireCountRequest.cc
+	src/model/DescribeUserCertificateExpireCountResult.cc
 	src/model/DescribeUserConfigsRequest.cc
 	src/model/DescribeUserConfigsResult.cc
 	src/model/DescribeUserCustomLogConfigRequest.cc

cdn/include/alibabacloud/cdn/CdnClient.h

@@ -280,6 +280,8 @@
 #include "model/DescribeTagResourcesResult.h"
 #include "model/DescribeTopDomainsByFlowRequest.h"
 #include "model/DescribeTopDomainsByFlowResult.h"
+#include "model/DescribeUserCertificateExpireCountRequest.h"
+#include "model/DescribeUserCertificateExpireCountResult.h"
 #include "model/DescribeUserConfigsRequest.h"
 #include "model/DescribeUserConfigsResult.h"
 #include "model/DescribeUserCustomLogConfigRequest.h"
@@ -814,6 +816,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeTopDomainsByFlowResult> DescribeTopDomainsByFlowOutcome;
 			typedef std::future<DescribeTopDomainsByFlowOutcome> DescribeTopDomainsByFlowOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::DescribeTopDomainsByFlowRequest&, const DescribeTopDomainsByFlowOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeTopDomainsByFlowAsyncHandler;
+			typedef Outcome<Error, Model::DescribeUserCertificateExpireCountResult> DescribeUserCertificateExpireCountOutcome;
+			typedef std::future<DescribeUserCertificateExpireCountOutcome> DescribeUserCertificateExpireCountOutcomeCallable;
+			typedef std::function<void(const CdnClient*, const Model::DescribeUserCertificateExpireCountRequest&, const DescribeUserCertificateExpireCountOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeUserCertificateExpireCountAsyncHandler;
 			typedef Outcome<Error, Model::DescribeUserConfigsResult> DescribeUserConfigsOutcome;
 			typedef std::future<DescribeUserConfigsOutcome> DescribeUserConfigsOutcomeCallable;
 			typedef std::function<void(const CdnClient*, const Model::DescribeUserConfigsRequest&, const DescribeUserConfigsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeUserConfigsAsyncHandler;
@@ -1413,6 +1418,9 @@ namespace AlibabaCloud
 			DescribeTopDomainsByFlowOutcome describeTopDomainsByFlow(const Model::DescribeTopDomainsByFlowRequest &request)const;
 			void describeTopDomainsByFlowAsync(const Model::DescribeTopDomainsByFlowRequest& request, const DescribeTopDomainsByFlowAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeTopDomainsByFlowOutcomeCallable describeTopDomainsByFlowCallable(const Model::DescribeTopDomainsByFlowRequest& request) const;
+			DescribeUserCertificateExpireCountOutcome describeUserCertificateExpireCount(const Model::DescribeUserCertificateExpireCountRequest &request)const;
+			void describeUserCertificateExpireCountAsync(const Model::DescribeUserCertificateExpireCountRequest& request, const DescribeUserCertificateExpireCountAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeUserCertificateExpireCountOutcomeCallable describeUserCertificateExpireCountCallable(const Model::DescribeUserCertificateExpireCountRequest& request) const;
 			DescribeUserConfigsOutcome describeUserConfigs(const Model::DescribeUserConfigsRequest &request)const;
 			void describeUserConfigsAsync(const Model::DescribeUserConfigsRequest& request, const DescribeUserConfigsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeUserConfigsOutcomeCallable describeUserConfigsCallable(const Model::DescribeUserConfigsRequest& request) const;

cdn/include/alibabacloud/cdn/model/DescribeUserCertificateExpireCountRequest.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_CDN_MODEL_DESCRIBEUSERCERTIFICATEEXPIRECOUNTREQUEST_H_
+#define ALIBABACLOUD_CDN_MODEL_DESCRIBEUSERCERTIFICATEEXPIRECOUNTREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/cdn/CdnExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cdn
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CDN_EXPORT DescribeUserCertificateExpireCountRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeUserCertificateExpireCountRequest();
+				~DescribeUserCertificateExpireCountRequest();
+
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+
+            private:
+				long ownerId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CDN_MODEL_DESCRIBEUSERCERTIFICATEEXPIRECOUNTREQUEST_H_

cdn/include/alibabacloud/cdn/model/DescribeUserCertificateExpireCountResult.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_CDN_MODEL_DESCRIBEUSERCERTIFICATEEXPIRECOUNTRESULT_H_
+#define ALIBABACLOUD_CDN_MODEL_DESCRIBEUSERCERTIFICATEEXPIRECOUNTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/cdn/CdnExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cdn
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CDN_EXPORT DescribeUserCertificateExpireCountResult : public ServiceResult
+			{
+			public:
+
+
+				DescribeUserCertificateExpireCountResult();
+				explicit DescribeUserCertificateExpireCountResult(const std::string &payload);
+				~DescribeUserCertificateExpireCountResult();
+				int getExpireWithin30DaysCount()const;
+				int getExpiredCount()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				int expireWithin30DaysCount_;
+				int expiredCount_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CDN_MODEL_DESCRIBEUSERCERTIFICATEEXPIRECOUNTRESULT_H_

cdn/src/CdnClient.cc

@@ -4695,6 +4695,42 @@ CdnClient::DescribeTopDomainsByFlowOutcomeCallable CdnClient::describeTopDomains
 	return task->get_future();
 }
 
+CdnClient::DescribeUserCertificateExpireCountOutcome CdnClient::describeUserCertificateExpireCount(const DescribeUserCertificateExpireCountRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeUserCertificateExpireCountOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeUserCertificateExpireCountOutcome(DescribeUserCertificateExpireCountResult(outcome.result()));
+	else
+		return DescribeUserCertificateExpireCountOutcome(outcome.error());
+}
+
+void CdnClient::describeUserCertificateExpireCountAsync(const DescribeUserCertificateExpireCountRequest& request, const DescribeUserCertificateExpireCountAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeUserCertificateExpireCount(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+CdnClient::DescribeUserCertificateExpireCountOutcomeCallable CdnClient::describeUserCertificateExpireCountCallable(const DescribeUserCertificateExpireCountRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeUserCertificateExpireCountOutcome()>>(
+			[this, request]()
+			{
+			return this->describeUserCertificateExpireCount(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 CdnClient::DescribeUserConfigsOutcome CdnClient::describeUserConfigs(const DescribeUserConfigsRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

cdn/src/model/DescribeUserCertificateExpireCountRequest.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/cdn/model/DescribeUserCertificateExpireCountRequest.h>
+
+using AlibabaCloud::Cdn::Model::DescribeUserCertificateExpireCountRequest;
+
+DescribeUserCertificateExpireCountRequest::DescribeUserCertificateExpireCountRequest() :
+	RpcServiceRequest("cdn", "2018-05-10", "DescribeUserCertificateExpireCount")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeUserCertificateExpireCountRequest::~DescribeUserCertificateExpireCountRequest()
+{}
+
+long DescribeUserCertificateExpireCountRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeUserCertificateExpireCountRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+

cdn/src/model/DescribeUserCertificateExpireCountResult.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/cdn/model/DescribeUserCertificateExpireCountResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Cdn;
+using namespace AlibabaCloud::Cdn::Model;
+
+DescribeUserCertificateExpireCountResult::DescribeUserCertificateExpireCountResult() :
+	ServiceResult()
+{}
+
+DescribeUserCertificateExpireCountResult::DescribeUserCertificateExpireCountResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeUserCertificateExpireCountResult::~DescribeUserCertificateExpireCountResult()
+{}
+
+void DescribeUserCertificateExpireCountResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["ExpireWithin30DaysCount"].isNull())
+		expireWithin30DaysCount_ = std::stoi(value["ExpireWithin30DaysCount"].asString());
+	if(!value["ExpiredCount"].isNull())
+		expiredCount_ = std::stoi(value["ExpiredCount"].asString());
+
+}
+
+int DescribeUserCertificateExpireCountResult::getExpireWithin30DaysCount()const
+{
+	return expireWithin30DaysCount_;
+}
+
+int DescribeUserCertificateExpireCountResult::getExpiredCount()const
+{
+	return expiredCount_;
+}
+

core/src/RoaServiceClient.cc

@@ -128,6 +128,12 @@ RoaServiceClient::buildHttpRequest(const std::string &endpoint,
     request.setHeader("Content-MD5",
                       ComputeContentMD5(msg.content(), msg.contentSize()));
     request.setBody(msg.content(), msg.contentSize());
+  } else {
+    if (msg.parameter("Content-Type").empty()) {
+      request.setHeader("Content-Type", "application/x-www-form-urlencoded");
+    }
+    request.setHeader("Content-MD5",
+                      ComputeContentMD5(msg.content(), msg.contentSize()));
   }
 
   std::time_t t = std::time(nullptr);

dcdn/CMakeLists.txt

@@ -39,6 +39,8 @@ set(dcdn_public_header_model
 	include/alibabacloud/dcdn/model/BatchStartDcdnDomainResult.h
 	include/alibabacloud/dcdn/model/BatchStopDcdnDomainRequest.h
 	include/alibabacloud/dcdn/model/BatchStopDcdnDomainResult.h
+	include/alibabacloud/dcdn/model/CreateDcdnCertificateSigningRequestRequest.h
+	include/alibabacloud/dcdn/model/CreateDcdnCertificateSigningRequestResult.h
 	include/alibabacloud/dcdn/model/DeleteDcdnDomainRequest.h
 	include/alibabacloud/dcdn/model/DeleteDcdnDomainResult.h
 	include/alibabacloud/dcdn/model/DeleteDcdnIpaDomainRequest.h
@@ -163,6 +165,8 @@ set(dcdn_public_header_model
 	include/alibabacloud/dcdn/model/DescribeDcdnUserResourcePackageResult.h
 	include/alibabacloud/dcdn/model/DescribeDcdnUserTagsRequest.h
 	include/alibabacloud/dcdn/model/DescribeDcdnUserTagsResult.h
+	include/alibabacloud/dcdn/model/DescribeDcdnVerifyContentRequest.h
+	include/alibabacloud/dcdn/model/DescribeDcdnVerifyContentResult.h
 	include/alibabacloud/dcdn/model/DescribeUserDcdnIpaStatusRequest.h
 	include/alibabacloud/dcdn/model/DescribeUserDcdnIpaStatusResult.h
 	include/alibabacloud/dcdn/model/DescribeUserDcdnStatusRequest.h
@@ -179,6 +183,8 @@ set(dcdn_public_header_model
 	include/alibabacloud/dcdn/model/RollbackDcdnStagingConfigResult.h
 	include/alibabacloud/dcdn/model/SetDcdnConfigOfVersionRequest.h
 	include/alibabacloud/dcdn/model/SetDcdnConfigOfVersionResult.h
+	include/alibabacloud/dcdn/model/SetDcdnDomainCSRCertificateRequest.h
+	include/alibabacloud/dcdn/model/SetDcdnDomainCSRCertificateResult.h
 	include/alibabacloud/dcdn/model/SetDcdnDomainCertificateRequest.h
 	include/alibabacloud/dcdn/model/SetDcdnDomainCertificateResult.h
 	include/alibabacloud/dcdn/model/SetDcdnDomainStagingConfigRequest.h
@@ -198,7 +204,9 @@ set(dcdn_public_header_model
 	include/alibabacloud/dcdn/model/UpdateDcdnDomainRequest.h
 	include/alibabacloud/dcdn/model/UpdateDcdnDomainResult.h
 	include/alibabacloud/dcdn/model/UpdateDcdnIpaDomainRequest.h
-	include/alibabacloud/dcdn/model/UpdateDcdnIpaDomainResult.h )
+	include/alibabacloud/dcdn/model/UpdateDcdnIpaDomainResult.h
+	include/alibabacloud/dcdn/model/VerifyDcdnDomainOwnerRequest.h
+	include/alibabacloud/dcdn/model/VerifyDcdnDomainOwnerResult.h )
 
 set(dcdn_src 
 	src/DcdnClient.cc
@@ -220,6 +228,8 @@ set(dcdn_src
 	src/model/BatchStartDcdnDomainResult.cc
 	src/model/BatchStopDcdnDomainRequest.cc
 	src/model/BatchStopDcdnDomainResult.cc
+	src/model/CreateDcdnCertificateSigningRequestRequest.cc
+	src/model/CreateDcdnCertificateSigningRequestResult.cc
 	src/model/DeleteDcdnDomainRequest.cc
 	src/model/DeleteDcdnDomainResult.cc
 	src/model/DeleteDcdnIpaDomainRequest.cc
@@ -344,6 +354,8 @@ set(dcdn_src
 	src/model/DescribeDcdnUserResourcePackageResult.cc
 	src/model/DescribeDcdnUserTagsRequest.cc
 	src/model/DescribeDcdnUserTagsResult.cc
+	src/model/DescribeDcdnVerifyContentRequest.cc
+	src/model/DescribeDcdnVerifyContentResult.cc
 	src/model/DescribeUserDcdnIpaStatusRequest.cc
 	src/model/DescribeUserDcdnIpaStatusResult.cc
 	src/model/DescribeUserDcdnStatusRequest.cc
@@ -360,6 +372,8 @@ set(dcdn_src
 	src/model/RollbackDcdnStagingConfigResult.cc
 	src/model/SetDcdnConfigOfVersionRequest.cc
 	src/model/SetDcdnConfigOfVersionResult.cc
+	src/model/SetDcdnDomainCSRCertificateRequest.cc
+	src/model/SetDcdnDomainCSRCertificateResult.cc
 	src/model/SetDcdnDomainCertificateRequest.cc
 	src/model/SetDcdnDomainCertificateResult.cc
 	src/model/SetDcdnDomainStagingConfigRequest.cc
@@ -379,7 +393,9 @@ set(dcdn_src
 	src/model/UpdateDcdnDomainRequest.cc
 	src/model/UpdateDcdnDomainResult.cc
 	src/model/UpdateDcdnIpaDomainRequest.cc
-	src/model/UpdateDcdnIpaDomainResult.cc )
+	src/model/UpdateDcdnIpaDomainResult.cc
+	src/model/VerifyDcdnDomainOwnerRequest.cc
+	src/model/VerifyDcdnDomainOwnerResult.cc )
 
 add_library(dcdn ${LIB_TYPE}
 	${dcdn_public_header}

dcdn/include/alibabacloud/dcdn/DcdnClient.h

@@ -40,6 +40,8 @@
 #include "model/BatchStartDcdnDomainResult.h"
 #include "model/BatchStopDcdnDomainRequest.h"
 #include "model/BatchStopDcdnDomainResult.h"
+#include "model/CreateDcdnCertificateSigningRequestRequest.h"
+#include "model/CreateDcdnCertificateSigningRequestResult.h"
 #include "model/DeleteDcdnDomainRequest.h"
 #include "model/DeleteDcdnDomainResult.h"
 #include "model/DeleteDcdnIpaDomainRequest.h"
@@ -164,6 +166,8 @@
 #include "model/DescribeDcdnUserResourcePackageResult.h"
 #include "model/DescribeDcdnUserTagsRequest.h"
 #include "model/DescribeDcdnUserTagsResult.h"
+#include "model/DescribeDcdnVerifyContentRequest.h"
+#include "model/DescribeDcdnVerifyContentResult.h"
 #include "model/DescribeUserDcdnIpaStatusRequest.h"
 #include "model/DescribeUserDcdnIpaStatusResult.h"
 #include "model/DescribeUserDcdnStatusRequest.h"
@@ -180,6 +184,8 @@
 #include "model/RollbackDcdnStagingConfigResult.h"
 #include "model/SetDcdnConfigOfVersionRequest.h"
 #include "model/SetDcdnConfigOfVersionResult.h"
+#include "model/SetDcdnDomainCSRCertificateRequest.h"
+#include "model/SetDcdnDomainCSRCertificateResult.h"
 #include "model/SetDcdnDomainCertificateRequest.h"
 #include "model/SetDcdnDomainCertificateResult.h"
 #include "model/SetDcdnDomainStagingConfigRequest.h"
@@ -200,6 +206,8 @@
 #include "model/UpdateDcdnDomainResult.h"
 #include "model/UpdateDcdnIpaDomainRequest.h"
 #include "model/UpdateDcdnIpaDomainResult.h"
+#include "model/VerifyDcdnDomainOwnerRequest.h"
+#include "model/VerifyDcdnDomainOwnerResult.h"
 
 
 namespace AlibabaCloud
@@ -236,6 +244,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::BatchStopDcdnDomainResult> BatchStopDcdnDomainOutcome;
 			typedef std::future<BatchStopDcdnDomainOutcome> BatchStopDcdnDomainOutcomeCallable;
 			typedef std::function<void(const DcdnClient*, const Model::BatchStopDcdnDomainRequest&, const BatchStopDcdnDomainOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> BatchStopDcdnDomainAsyncHandler;
+			typedef Outcome<Error, Model::CreateDcdnCertificateSigningRequestResult> CreateDcdnCertificateSigningRequestOutcome;
+			typedef std::future<CreateDcdnCertificateSigningRequestOutcome> CreateDcdnCertificateSigningRequestOutcomeCallable;
+			typedef std::function<void(const DcdnClient*, const Model::CreateDcdnCertificateSigningRequestRequest&, const CreateDcdnCertificateSigningRequestOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateDcdnCertificateSigningRequestAsyncHandler;
 			typedef Outcome<Error, Model::DeleteDcdnDomainResult> DeleteDcdnDomainOutcome;
 			typedef std::future<DeleteDcdnDomainOutcome> DeleteDcdnDomainOutcomeCallable;
 			typedef std::function<void(const DcdnClient*, const Model::DeleteDcdnDomainRequest&, const DeleteDcdnDomainOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteDcdnDomainAsyncHandler;
@@ -422,6 +433,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDcdnUserTagsResult> DescribeDcdnUserTagsOutcome;
 			typedef std::future<DescribeDcdnUserTagsOutcome> DescribeDcdnUserTagsOutcomeCallable;
 			typedef std::function<void(const DcdnClient*, const Model::DescribeDcdnUserTagsRequest&, const DescribeDcdnUserTagsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDcdnUserTagsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDcdnVerifyContentResult> DescribeDcdnVerifyContentOutcome;
+			typedef std::future<DescribeDcdnVerifyContentOutcome> DescribeDcdnVerifyContentOutcomeCallable;
+			typedef std::function<void(const DcdnClient*, const Model::DescribeDcdnVerifyContentRequest&, const DescribeDcdnVerifyContentOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDcdnVerifyContentAsyncHandler;
 			typedef Outcome<Error, Model::DescribeUserDcdnIpaStatusResult> DescribeUserDcdnIpaStatusOutcome;
 			typedef std::future<DescribeUserDcdnIpaStatusOutcome> DescribeUserDcdnIpaStatusOutcomeCallable;
 			typedef std::function<void(const DcdnClient*, const Model::DescribeUserDcdnIpaStatusRequest&, const DescribeUserDcdnIpaStatusOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeUserDcdnIpaStatusAsyncHandler;
@@ -446,6 +460,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::SetDcdnConfigOfVersionResult> SetDcdnConfigOfVersionOutcome;
 			typedef std::future<SetDcdnConfigOfVersionOutcome> SetDcdnConfigOfVersionOutcomeCallable;
 			typedef std::function<void(const DcdnClient*, const Model::SetDcdnConfigOfVersionRequest&, const SetDcdnConfigOfVersionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SetDcdnConfigOfVersionAsyncHandler;
+			typedef Outcome<Error, Model::SetDcdnDomainCSRCertificateResult> SetDcdnDomainCSRCertificateOutcome;
+			typedef std::future<SetDcdnDomainCSRCertificateOutcome> SetDcdnDomainCSRCertificateOutcomeCallable;
+			typedef std::function<void(const DcdnClient*, const Model::SetDcdnDomainCSRCertificateRequest&, const SetDcdnDomainCSRCertificateOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SetDcdnDomainCSRCertificateAsyncHandler;
 			typedef Outcome<Error, Model::SetDcdnDomainCertificateResult> SetDcdnDomainCertificateOutcome;
 			typedef std::future<SetDcdnDomainCertificateOutcome> SetDcdnDomainCertificateOutcomeCallable;
 			typedef std::function<void(const DcdnClient*, const Model::SetDcdnDomainCertificateRequest&, const SetDcdnDomainCertificateOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SetDcdnDomainCertificateAsyncHandler;
@@ -476,6 +493,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::UpdateDcdnIpaDomainResult> UpdateDcdnIpaDomainOutcome;
 			typedef std::future<UpdateDcdnIpaDomainOutcome> UpdateDcdnIpaDomainOutcomeCallable;
 			typedef std::function<void(const DcdnClient*, const Model::UpdateDcdnIpaDomainRequest&, const UpdateDcdnIpaDomainOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UpdateDcdnIpaDomainAsyncHandler;
+			typedef Outcome<Error, Model::VerifyDcdnDomainOwnerResult> VerifyDcdnDomainOwnerOutcome;
+			typedef std::future<VerifyDcdnDomainOwnerOutcome> VerifyDcdnDomainOwnerOutcomeCallable;
+			typedef std::function<void(const DcdnClient*, const Model::VerifyDcdnDomainOwnerRequest&, const VerifyDcdnDomainOwnerOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> VerifyDcdnDomainOwnerAsyncHandler;
 
 			DcdnClient(const Credentials &credentials, const ClientConfiguration &configuration);
 			DcdnClient(const std::shared_ptr<CredentialsProvider> &credentialsProvider, const ClientConfiguration &configuration);
@@ -508,6 +528,9 @@ namespace AlibabaCloud
 			BatchStopDcdnDomainOutcome batchStopDcdnDomain(const Model::BatchStopDcdnDomainRequest &request)const;
 			void batchStopDcdnDomainAsync(const Model::BatchStopDcdnDomainRequest& request, const BatchStopDcdnDomainAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			BatchStopDcdnDomainOutcomeCallable batchStopDcdnDomainCallable(const Model::BatchStopDcdnDomainRequest& request) const;
+			CreateDcdnCertificateSigningRequestOutcome createDcdnCertificateSigningRequest(const Model::CreateDcdnCertificateSigningRequestRequest &request)const;
+			void createDcdnCertificateSigningRequestAsync(const Model::CreateDcdnCertificateSigningRequestRequest& request, const CreateDcdnCertificateSigningRequestAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CreateDcdnCertificateSigningRequestOutcomeCallable createDcdnCertificateSigningRequestCallable(const Model::CreateDcdnCertificateSigningRequestRequest& request) const;
 			DeleteDcdnDomainOutcome deleteDcdnDomain(const Model::DeleteDcdnDomainRequest &request)const;
 			void deleteDcdnDomainAsync(const Model::DeleteDcdnDomainRequest& request, const DeleteDcdnDomainAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteDcdnDomainOutcomeCallable deleteDcdnDomainCallable(const Model::DeleteDcdnDomainRequest& request) const;
@@ -694,6 +717,9 @@ namespace AlibabaCloud
 			DescribeDcdnUserTagsOutcome describeDcdnUserTags(const Model::DescribeDcdnUserTagsRequest &request)const;
 			void describeDcdnUserTagsAsync(const Model::DescribeDcdnUserTagsRequest& request, const DescribeDcdnUserTagsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDcdnUserTagsOutcomeCallable describeDcdnUserTagsCallable(const Model::DescribeDcdnUserTagsRequest& request) const;
+			DescribeDcdnVerifyContentOutcome describeDcdnVerifyContent(const Model::DescribeDcdnVerifyContentRequest &request)const;
+			void describeDcdnVerifyContentAsync(const Model::DescribeDcdnVerifyContentRequest& request, const DescribeDcdnVerifyContentAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDcdnVerifyContentOutcomeCallable describeDcdnVerifyContentCallable(const Model::DescribeDcdnVerifyContentRequest& request) const;
 			DescribeUserDcdnIpaStatusOutcome describeUserDcdnIpaStatus(const Model::DescribeUserDcdnIpaStatusRequest &request)const;
 			void describeUserDcdnIpaStatusAsync(const Model::DescribeUserDcdnIpaStatusRequest& request, const DescribeUserDcdnIpaStatusAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeUserDcdnIpaStatusOutcomeCallable describeUserDcdnIpaStatusCallable(const Model::DescribeUserDcdnIpaStatusRequest& request) const;
@@ -718,6 +744,9 @@ namespace AlibabaCloud
 			SetDcdnConfigOfVersionOutcome setDcdnConfigOfVersion(const Model::SetDcdnConfigOfVersionRequest &request)const;
 			void setDcdnConfigOfVersionAsync(const Model::SetDcdnConfigOfVersionRequest& request, const SetDcdnConfigOfVersionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			SetDcdnConfigOfVersionOutcomeCallable setDcdnConfigOfVersionCallable(const Model::SetDcdnConfigOfVersionRequest& request) const;
+			SetDcdnDomainCSRCertificateOutcome setDcdnDomainCSRCertificate(const Model::SetDcdnDomainCSRCertificateRequest &request)const;
+			void setDcdnDomainCSRCertificateAsync(const Model::SetDcdnDomainCSRCertificateRequest& request, const SetDcdnDomainCSRCertificateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			SetDcdnDomainCSRCertificateOutcomeCallable setDcdnDomainCSRCertificateCallable(const Model::SetDcdnDomainCSRCertificateRequest& request) const;
 			SetDcdnDomainCertificateOutcome setDcdnDomainCertificate(const Model::SetDcdnDomainCertificateRequest &request)const;
 			void setDcdnDomainCertificateAsync(const Model::SetDcdnDomainCertificateRequest& request, const SetDcdnDomainCertificateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			SetDcdnDomainCertificateOutcomeCallable setDcdnDomainCertificateCallable(const Model::SetDcdnDomainCertificateRequest& request) const;
@@ -748,6 +777,9 @@ namespace AlibabaCloud
 			UpdateDcdnIpaDomainOutcome updateDcdnIpaDomain(const Model::UpdateDcdnIpaDomainRequest &request)const;
 			void updateDcdnIpaDomainAsync(const Model::UpdateDcdnIpaDomainRequest& request, const UpdateDcdnIpaDomainAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			UpdateDcdnIpaDomainOutcomeCallable updateDcdnIpaDomainCallable(const Model::UpdateDcdnIpaDomainRequest& request) const;
+			VerifyDcdnDomainOwnerOutcome verifyDcdnDomainOwner(const Model::VerifyDcdnDomainOwnerRequest &request)const;
+			void verifyDcdnDomainOwnerAsync(const Model::VerifyDcdnDomainOwnerRequest& request, const VerifyDcdnDomainOwnerAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			VerifyDcdnDomainOwnerOutcomeCallable verifyDcdnDomainOwnerCallable(const Model::VerifyDcdnDomainOwnerRequest& request) const;
 	
 		private:
 			std::shared_ptr<EndpointProvider> endpointProvider_;

dcdn/include/alibabacloud/dcdn/model/CreateDcdnCertificateSigningRequestRequest.h

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_DCDN_MODEL_CREATEDCDNCERTIFICATESIGNINGREQUESTREQUEST_H_
+#define ALIBABACLOUD_DCDN_MODEL_CREATEDCDNCERTIFICATESIGNINGREQUESTREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/dcdn/DcdnExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dcdn
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DCDN_EXPORT CreateDcdnCertificateSigningRequestRequest : public RpcServiceRequest
+			{
+
+			public:
+				CreateDcdnCertificateSigningRequestRequest();
+				~CreateDcdnCertificateSigningRequestRequest();
+
+				std::string getCountry()const;
+				void setCountry(const std::string& country);
+				std::string getCity()const;
+				void setCity(const std::string& city);
+				std::string getCommonName()const;
+				void setCommonName(const std::string& commonName);
+				std::string getState()const;
+				void setState(const std::string& state);
+				std::string getEmail()const;
+				void setEmail(const std::string& email);
+				std::string getSANs()const;
+				void setSANs(const std::string& sANs);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getOrganization()const;
+				void setOrganization(const std::string& organization);
+				std::string getOrganizationUnit()const;
+				void setOrganizationUnit(const std::string& organizationUnit);
+
+            private:
+				std::string country_;
+				std::string city_;
+				std::string commonName_;
+				std::string state_;
+				std::string email_;
+				std::string sANs_;
+				long ownerId_;
+				std::string organization_;
+				std::string organizationUnit_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DCDN_MODEL_CREATEDCDNCERTIFICATESIGNINGREQUESTREQUEST_H_

dcdn/include/alibabacloud/dcdn/model/CreateDcdnCertificateSigningRequestResult.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_DCDN_MODEL_CREATEDCDNCERTIFICATESIGNINGREQUESTRESULT_H_
+#define ALIBABACLOUD_DCDN_MODEL_CREATEDCDNCERTIFICATESIGNINGREQUESTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/dcdn/DcdnExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dcdn
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DCDN_EXPORT CreateDcdnCertificateSigningRequestResult : public ServiceResult
+			{
+			public:
+
+
+				CreateDcdnCertificateSigningRequestResult();
+				explicit CreateDcdnCertificateSigningRequestResult(const std::string &payload);
+				~CreateDcdnCertificateSigningRequestResult();
+				std::string getCsr()const;
+				std::string getPubMd5()const;
+				std::string getCommonName()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string csr_;
+				std::string pubMd5_;
+				std::string commonName_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DCDN_MODEL_CREATEDCDNCERTIFICATESIGNINGREQUESTRESULT_H_

dcdn/include/alibabacloud/dcdn/model/DescribeDcdnVerifyContentRequest.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_DCDN_MODEL_DESCRIBEDCDNVERIFYCONTENTREQUEST_H_
+#define ALIBABACLOUD_DCDN_MODEL_DESCRIBEDCDNVERIFYCONTENTREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/dcdn/DcdnExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dcdn
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DCDN_EXPORT DescribeDcdnVerifyContentRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeDcdnVerifyContentRequest();
+				~DescribeDcdnVerifyContentRequest();
+
+				std::string getDomainName()const;
+				void setDomainName(const std::string& domainName);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+
+            private:
+				std::string domainName_;
+				long ownerId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DCDN_MODEL_DESCRIBEDCDNVERIFYCONTENTREQUEST_H_

dcdn/include/alibabacloud/dcdn/model/DescribeDcdnVerifyContentResult.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_DCDN_MODEL_DESCRIBEDCDNVERIFYCONTENTRESULT_H_
+#define ALIBABACLOUD_DCDN_MODEL_DESCRIBEDCDNVERIFYCONTENTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/dcdn/DcdnExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dcdn
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DCDN_EXPORT DescribeDcdnVerifyContentResult : public ServiceResult
+			{
+			public:
+
+
+				DescribeDcdnVerifyContentResult();
+				explicit DescribeDcdnVerifyContentResult(const std::string &payload);
+				~DescribeDcdnVerifyContentResult();
+				std::string getContent()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string content_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DCDN_MODEL_DESCRIBEDCDNVERIFYCONTENTRESULT_H_

dcdn/include/alibabacloud/dcdn/model/SetDcdnDomainCSRCertificateRequest.h

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_DCDN_MODEL_SETDCDNDOMAINCSRCERTIFICATEREQUEST_H_
+#define ALIBABACLOUD_DCDN_MODEL_SETDCDNDOMAINCSRCERTIFICATEREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/dcdn/DcdnExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dcdn
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DCDN_EXPORT SetDcdnDomainCSRCertificateRequest : public RpcServiceRequest
+			{
+
+			public:
+				SetDcdnDomainCSRCertificateRequest();
+				~SetDcdnDomainCSRCertificateRequest();
+
+				std::string getServerCertificate()const;
+				void setServerCertificate(const std::string& serverCertificate);
+				std::string getDomainName()const;
+				void setDomainName(const std::string& domainName);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+
+            private:
+				std::string serverCertificate_;
+				std::string domainName_;
+				long ownerId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DCDN_MODEL_SETDCDNDOMAINCSRCERTIFICATEREQUEST_H_

dcdn/include/alibabacloud/dcdn/model/SetDcdnDomainCSRCertificateResult.h

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

dcdn/include/alibabacloud/dcdn/model/VerifyDcdnDomainOwnerRequest.h

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_DCDN_MODEL_VERIFYDCDNDOMAINOWNERREQUEST_H_
+#define ALIBABACLOUD_DCDN_MODEL_VERIFYDCDNDOMAINOWNERREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/dcdn/DcdnExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dcdn
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DCDN_EXPORT VerifyDcdnDomainOwnerRequest : public RpcServiceRequest
+			{
+
+			public:
+				VerifyDcdnDomainOwnerRequest();
+				~VerifyDcdnDomainOwnerRequest();
+
+				std::string getVerifyType()const;
+				void setVerifyType(const std::string& verifyType);
+				std::string getDomainName()const;
+				void setDomainName(const std::string& domainName);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+
+            private:
+				std::string verifyType_;
+				std::string domainName_;
+				long ownerId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DCDN_MODEL_VERIFYDCDNDOMAINOWNERREQUEST_H_

dcdn/include/alibabacloud/dcdn/model/VerifyDcdnDomainOwnerResult.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_DCDN_MODEL_VERIFYDCDNDOMAINOWNERRESULT_H_
+#define ALIBABACLOUD_DCDN_MODEL_VERIFYDCDNDOMAINOWNERRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/dcdn/DcdnExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dcdn
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DCDN_EXPORT VerifyDcdnDomainOwnerResult : public ServiceResult
+			{
+			public:
+
+
+				VerifyDcdnDomainOwnerResult();
+				explicit VerifyDcdnDomainOwnerResult(const std::string &payload);
+				~VerifyDcdnDomainOwnerResult();
+				std::string getContent()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string content_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DCDN_MODEL_VERIFYDCDNDOMAINOWNERRESULT_H_

dcdn/src/DcdnClient.cc

@@ -375,6 +375,42 @@ DcdnClient::BatchStopDcdnDomainOutcomeCallable DcdnClient::batchStopDcdnDomainCa
 	return task->get_future();
 }
 
+DcdnClient::CreateDcdnCertificateSigningRequestOutcome DcdnClient::createDcdnCertificateSigningRequest(const CreateDcdnCertificateSigningRequestRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return CreateDcdnCertificateSigningRequestOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return CreateDcdnCertificateSigningRequestOutcome(CreateDcdnCertificateSigningRequestResult(outcome.result()));
+	else
+		return CreateDcdnCertificateSigningRequestOutcome(outcome.error());
+}
+
+void DcdnClient::createDcdnCertificateSigningRequestAsync(const CreateDcdnCertificateSigningRequestRequest& request, const CreateDcdnCertificateSigningRequestAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, createDcdnCertificateSigningRequest(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DcdnClient::CreateDcdnCertificateSigningRequestOutcomeCallable DcdnClient::createDcdnCertificateSigningRequestCallable(const CreateDcdnCertificateSigningRequestRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<CreateDcdnCertificateSigningRequestOutcome()>>(
+			[this, request]()
+			{
+			return this->createDcdnCertificateSigningRequest(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 DcdnClient::DeleteDcdnDomainOutcome DcdnClient::deleteDcdnDomain(const DeleteDcdnDomainRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -2607,6 +2643,42 @@ DcdnClient::DescribeDcdnUserTagsOutcomeCallable DcdnClient::describeDcdnUserTags
 	return task->get_future();
 }
 
+DcdnClient::DescribeDcdnVerifyContentOutcome DcdnClient::describeDcdnVerifyContent(const DescribeDcdnVerifyContentRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeDcdnVerifyContentOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeDcdnVerifyContentOutcome(DescribeDcdnVerifyContentResult(outcome.result()));
+	else
+		return DescribeDcdnVerifyContentOutcome(outcome.error());
+}
+
+void DcdnClient::describeDcdnVerifyContentAsync(const DescribeDcdnVerifyContentRequest& request, const DescribeDcdnVerifyContentAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeDcdnVerifyContent(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DcdnClient::DescribeDcdnVerifyContentOutcomeCallable DcdnClient::describeDcdnVerifyContentCallable(const DescribeDcdnVerifyContentRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeDcdnVerifyContentOutcome()>>(
+			[this, request]()
+			{
+			return this->describeDcdnVerifyContent(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 DcdnClient::DescribeUserDcdnIpaStatusOutcome DcdnClient::describeUserDcdnIpaStatus(const DescribeUserDcdnIpaStatusRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -2895,6 +2967,42 @@ DcdnClient::SetDcdnConfigOfVersionOutcomeCallable DcdnClient::setDcdnConfigOfVer
 	return task->get_future();
 }
 
+DcdnClient::SetDcdnDomainCSRCertificateOutcome DcdnClient::setDcdnDomainCSRCertificate(const SetDcdnDomainCSRCertificateRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return SetDcdnDomainCSRCertificateOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return SetDcdnDomainCSRCertificateOutcome(SetDcdnDomainCSRCertificateResult(outcome.result()));
+	else
+		return SetDcdnDomainCSRCertificateOutcome(outcome.error());
+}
+
+void DcdnClient::setDcdnDomainCSRCertificateAsync(const SetDcdnDomainCSRCertificateRequest& request, const SetDcdnDomainCSRCertificateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, setDcdnDomainCSRCertificate(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DcdnClient::SetDcdnDomainCSRCertificateOutcomeCallable DcdnClient::setDcdnDomainCSRCertificateCallable(const SetDcdnDomainCSRCertificateRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<SetDcdnDomainCSRCertificateOutcome()>>(
+			[this, request]()
+			{
+			return this->setDcdnDomainCSRCertificate(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 DcdnClient::SetDcdnDomainCertificateOutcome DcdnClient::setDcdnDomainCertificate(const SetDcdnDomainCertificateRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -3255,3 +3363,39 @@ DcdnClient::UpdateDcdnIpaDomainOutcomeCallable DcdnClient::updateDcdnIpaDomainCa
 	return task->get_future();
 }
 
+DcdnClient::VerifyDcdnDomainOwnerOutcome DcdnClient::verifyDcdnDomainOwner(const VerifyDcdnDomainOwnerRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return VerifyDcdnDomainOwnerOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return VerifyDcdnDomainOwnerOutcome(VerifyDcdnDomainOwnerResult(outcome.result()));
+	else
+		return VerifyDcdnDomainOwnerOutcome(outcome.error());
+}
+
+void DcdnClient::verifyDcdnDomainOwnerAsync(const VerifyDcdnDomainOwnerRequest& request, const VerifyDcdnDomainOwnerAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, verifyDcdnDomainOwner(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DcdnClient::VerifyDcdnDomainOwnerOutcomeCallable DcdnClient::verifyDcdnDomainOwnerCallable(const VerifyDcdnDomainOwnerRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<VerifyDcdnDomainOwnerOutcome()>>(
+			[this, request]()
+			{
+			return this->verifyDcdnDomainOwner(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+

dcdn/src/model/CreateDcdnCertificateSigningRequestRequest.cc

@@ -0,0 +1,128 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/dcdn/model/CreateDcdnCertificateSigningRequestRequest.h>
+
+using AlibabaCloud::Dcdn::Model::CreateDcdnCertificateSigningRequestRequest;
+
+CreateDcdnCertificateSigningRequestRequest::CreateDcdnCertificateSigningRequestRequest() :
+	RpcServiceRequest("dcdn", "2018-01-15", "CreateDcdnCertificateSigningRequest")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+CreateDcdnCertificateSigningRequestRequest::~CreateDcdnCertificateSigningRequestRequest()
+{}
+
+std::string CreateDcdnCertificateSigningRequestRequest::getCountry()const
+{
+	return country_;
+}
+
+void CreateDcdnCertificateSigningRequestRequest::setCountry(const std::string& country)
+{
+	country_ = country;
+	setParameter("Country", country);
+}
+
+std::string CreateDcdnCertificateSigningRequestRequest::getCity()const
+{
+	return city_;
+}
+
+void CreateDcdnCertificateSigningRequestRequest::setCity(const std::string& city)
+{
+	city_ = city;
+	setParameter("City", city);
+}
+
+std::string CreateDcdnCertificateSigningRequestRequest::getCommonName()const
+{
+	return commonName_;
+}
+
+void CreateDcdnCertificateSigningRequestRequest::setCommonName(const std::string& commonName)
+{
+	commonName_ = commonName;
+	setParameter("CommonName", commonName);
+}
+
+std::string CreateDcdnCertificateSigningRequestRequest::getState()const
+{
+	return state_;
+}
+
+void CreateDcdnCertificateSigningRequestRequest::setState(const std::string& state)
+{
+	state_ = state;
+	setParameter("State", state);
+}
+
+std::string CreateDcdnCertificateSigningRequestRequest::getEmail()const
+{
+	return email_;
+}
+
+void CreateDcdnCertificateSigningRequestRequest::setEmail(const std::string& email)
+{
+	email_ = email;
+	setParameter("Email", email);
+}
+
+std::string CreateDcdnCertificateSigningRequestRequest::getSANs()const
+{
+	return sANs_;
+}
+
+void CreateDcdnCertificateSigningRequestRequest::setSANs(const std::string& sANs)
+{
+	sANs_ = sANs;
+	setParameter("SANs", sANs);
+}
+
+long CreateDcdnCertificateSigningRequestRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void CreateDcdnCertificateSigningRequestRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string CreateDcdnCertificateSigningRequestRequest::getOrganization()const
+{
+	return organization_;
+}
+
+void CreateDcdnCertificateSigningRequestRequest::setOrganization(const std::string& organization)
+{
+	organization_ = organization;
+	setParameter("Organization", organization);
+}
+
+std::string CreateDcdnCertificateSigningRequestRequest::getOrganizationUnit()const
+{
+	return organizationUnit_;
+}
+
+void CreateDcdnCertificateSigningRequestRequest::setOrganizationUnit(const std::string& organizationUnit)
+{
+	organizationUnit_ = organizationUnit;
+	setParameter("OrganizationUnit", organizationUnit);
+}
+

dcdn/src/model/CreateDcdnCertificateSigningRequestResult.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/dcdn/model/CreateDcdnCertificateSigningRequestResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Dcdn;
+using namespace AlibabaCloud::Dcdn::Model;
+
+CreateDcdnCertificateSigningRequestResult::CreateDcdnCertificateSigningRequestResult() :
+	ServiceResult()
+{}
+
+CreateDcdnCertificateSigningRequestResult::CreateDcdnCertificateSigningRequestResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+CreateDcdnCertificateSigningRequestResult::~CreateDcdnCertificateSigningRequestResult()
+{}
+
+void CreateDcdnCertificateSigningRequestResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["CommonName"].isNull())
+		commonName_ = value["CommonName"].asString();
+	if(!value["Csr"].isNull())
+		csr_ = value["Csr"].asString();
+	if(!value["PubMd5"].isNull())
+		pubMd5_ = value["PubMd5"].asString();
+
+}
+
+std::string CreateDcdnCertificateSigningRequestResult::getCsr()const
+{
+	return csr_;
+}
+
+std::string CreateDcdnCertificateSigningRequestResult::getPubMd5()const
+{
+	return pubMd5_;
+}
+
+std::string CreateDcdnCertificateSigningRequestResult::getCommonName()const
+{
+	return commonName_;
+}
+

dcdn/src/model/DescribeDcdnVerifyContentRequest.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/dcdn/model/DescribeDcdnVerifyContentRequest.h>
+
+using AlibabaCloud::Dcdn::Model::DescribeDcdnVerifyContentRequest;
+
+DescribeDcdnVerifyContentRequest::DescribeDcdnVerifyContentRequest() :
+	RpcServiceRequest("dcdn", "2018-01-15", "DescribeDcdnVerifyContent")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeDcdnVerifyContentRequest::~DescribeDcdnVerifyContentRequest()
+{}
+
+std::string DescribeDcdnVerifyContentRequest::getDomainName()const
+{
+	return domainName_;
+}
+
+void DescribeDcdnVerifyContentRequest::setDomainName(const std::string& domainName)
+{
+	domainName_ = domainName;
+	setParameter("DomainName", domainName);
+}
+
+long DescribeDcdnVerifyContentRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeDcdnVerifyContentRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+

dcdn/src/model/DescribeDcdnVerifyContentResult.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/dcdn/model/DescribeDcdnVerifyContentResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Dcdn;
+using namespace AlibabaCloud::Dcdn::Model;
+
+DescribeDcdnVerifyContentResult::DescribeDcdnVerifyContentResult() :
+	ServiceResult()
+{}
+
+DescribeDcdnVerifyContentResult::DescribeDcdnVerifyContentResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeDcdnVerifyContentResult::~DescribeDcdnVerifyContentResult()
+{}
+
+void DescribeDcdnVerifyContentResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["Content"].isNull())
+		content_ = value["Content"].asString();
+
+}
+
+std::string DescribeDcdnVerifyContentResult::getContent()const
+{
+	return content_;
+}
+

dcdn/src/model/SetDcdnDomainCSRCertificateRequest.cc

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

dcdn/src/model/SetDcdnDomainCSRCertificateResult.cc

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

dcdn/src/model/VerifyDcdnDomainOwnerRequest.cc

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

dcdn/src/model/VerifyDcdnDomainOwnerResult.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/dcdn/model/VerifyDcdnDomainOwnerResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Dcdn;
+using namespace AlibabaCloud::Dcdn::Model;
+
+VerifyDcdnDomainOwnerResult::VerifyDcdnDomainOwnerResult() :
+	ServiceResult()
+{}
+
+VerifyDcdnDomainOwnerResult::VerifyDcdnDomainOwnerResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+VerifyDcdnDomainOwnerResult::~VerifyDcdnDomainOwnerResult()
+{}
+
+void VerifyDcdnDomainOwnerResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["Content"].isNull())
+		content_ = value["Content"].asString();
+
+}
+
+std::string VerifyDcdnDomainOwnerResult::getContent()const
+{
+	return content_;
+}
+

hbase/CMakeLists.txt

@@ -45,6 +45,8 @@ set(hbase_public_header_model
 	include/alibabacloud/hbase/model/DeleteInstanceResult.h
 	include/alibabacloud/hbase/model/DeleteMultiZoneClusterRequest.h
 	include/alibabacloud/hbase/model/DeleteMultiZoneClusterResult.h
+	include/alibabacloud/hbase/model/DeleteServerlessClusterRequest.h
+	include/alibabacloud/hbase/model/DeleteServerlessClusterResult.h
 	include/alibabacloud/hbase/model/DeleteUserHdfsInfoRequest.h
 	include/alibabacloud/hbase/model/DeleteUserHdfsInfoResult.h
 	include/alibabacloud/hbase/model/DescribeAvailableResourceRequest.h
@@ -174,6 +176,8 @@ set(hbase_src
 	src/model/DeleteInstanceResult.cc
 	src/model/DeleteMultiZoneClusterRequest.cc
 	src/model/DeleteMultiZoneClusterResult.cc
+	src/model/DeleteServerlessClusterRequest.cc
+	src/model/DeleteServerlessClusterResult.cc
 	src/model/DeleteUserHdfsInfoRequest.cc
 	src/model/DeleteUserHdfsInfoResult.cc
 	src/model/DescribeAvailableResourceRequest.cc

hbase/include/alibabacloud/hbase/HBaseClient.h

@@ -46,6 +46,8 @@
 #include "model/DeleteInstanceResult.h"
 #include "model/DeleteMultiZoneClusterRequest.h"
 #include "model/DeleteMultiZoneClusterResult.h"
+#include "model/DeleteServerlessClusterRequest.h"
+#include "model/DeleteServerlessClusterResult.h"
 #include "model/DeleteUserHdfsInfoRequest.h"
 #include "model/DeleteUserHdfsInfoResult.h"
 #include "model/DescribeAvailableResourceRequest.h"
@@ -193,6 +195,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DeleteMultiZoneClusterResult> DeleteMultiZoneClusterOutcome;
 			typedef std::future<DeleteMultiZoneClusterOutcome> DeleteMultiZoneClusterOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::DeleteMultiZoneClusterRequest&, const DeleteMultiZoneClusterOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteMultiZoneClusterAsyncHandler;
+			typedef Outcome<Error, Model::DeleteServerlessClusterResult> DeleteServerlessClusterOutcome;
+			typedef std::future<DeleteServerlessClusterOutcome> DeleteServerlessClusterOutcomeCallable;
+			typedef std::function<void(const HBaseClient*, const Model::DeleteServerlessClusterRequest&, const DeleteServerlessClusterOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteServerlessClusterAsyncHandler;
 			typedef Outcome<Error, Model::DeleteUserHdfsInfoResult> DeleteUserHdfsInfoOutcome;
 			typedef std::future<DeleteUserHdfsInfoOutcome> DeleteUserHdfsInfoOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::DeleteUserHdfsInfoRequest&, const DeleteUserHdfsInfoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteUserHdfsInfoAsyncHandler;
@@ -387,6 +392,9 @@ namespace AlibabaCloud
 			DeleteMultiZoneClusterOutcome deleteMultiZoneCluster(const Model::DeleteMultiZoneClusterRequest &request)const;
 			void deleteMultiZoneClusterAsync(const Model::DeleteMultiZoneClusterRequest& request, const DeleteMultiZoneClusterAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteMultiZoneClusterOutcomeCallable deleteMultiZoneClusterCallable(const Model::DeleteMultiZoneClusterRequest& request) const;
+			DeleteServerlessClusterOutcome deleteServerlessCluster(const Model::DeleteServerlessClusterRequest &request)const;
+			void deleteServerlessClusterAsync(const Model::DeleteServerlessClusterRequest& request, const DeleteServerlessClusterAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DeleteServerlessClusterOutcomeCallable deleteServerlessClusterCallable(const Model::DeleteServerlessClusterRequest& request) const;
 			DeleteUserHdfsInfoOutcome deleteUserHdfsInfo(const Model::DeleteUserHdfsInfoRequest &request)const;
 			void deleteUserHdfsInfoAsync(const Model::DeleteUserHdfsInfoRequest& request, const DeleteUserHdfsInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteUserHdfsInfoOutcomeCallable deleteUserHdfsInfoCallable(const Model::DeleteUserHdfsInfoRequest& request) const;

hbase/include/alibabacloud/hbase/model/CreateServerlessClusterResult.h

@@ -39,12 +39,14 @@ namespace AlibabaCloud
 				~CreateServerlessClusterResult();
 				std::string getClusterId()const;
 				std::string getOrderId()const;
+				std::string getPassWord()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
 				std::string clusterId_;
 				std::string orderId_;
+				std::string passWord_;
 
 			};
 		}

hbase/include/alibabacloud/hbase/model/DeleteServerlessClusterRequest.h

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

hbase/include/alibabacloud/hbase/model/DeleteServerlessClusterResult.h

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

hbase/src/HBaseClient.cc

@@ -483,6 +483,42 @@ HBaseClient::DeleteMultiZoneClusterOutcomeCallable HBaseClient::deleteMultiZoneC
 	return task->get_future();
 }
 
+HBaseClient::DeleteServerlessClusterOutcome HBaseClient::deleteServerlessCluster(const DeleteServerlessClusterRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DeleteServerlessClusterOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DeleteServerlessClusterOutcome(DeleteServerlessClusterResult(outcome.result()));
+	else
+		return DeleteServerlessClusterOutcome(outcome.error());
+}
+
+void HBaseClient::deleteServerlessClusterAsync(const DeleteServerlessClusterRequest& request, const DeleteServerlessClusterAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, deleteServerlessCluster(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+HBaseClient::DeleteServerlessClusterOutcomeCallable HBaseClient::deleteServerlessClusterCallable(const DeleteServerlessClusterRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DeleteServerlessClusterOutcome()>>(
+			[this, request]()
+			{
+			return this->deleteServerlessCluster(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 HBaseClient::DeleteUserHdfsInfoOutcome HBaseClient::deleteUserHdfsInfo(const DeleteUserHdfsInfoRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

hbase/src/model/CreateServerlessClusterResult.cc

@@ -43,6 +43,8 @@ void CreateServerlessClusterResult::parse(const std::string &payload)
 		clusterId_ = value["ClusterId"].asString();
 	if(!value["OrderId"].isNull())
 		orderId_ = value["OrderId"].asString();
+	if(!value["PassWord"].isNull())
+		passWord_ = value["PassWord"].asString();
 
 }
 
@@ -56,3 +58,8 @@ std::string CreateServerlessClusterResult::getOrderId()const
 	return orderId_;
 }
 
+std::string CreateServerlessClusterResult::getPassWord()const
+{
+	return passWord_;
+}
+

hbase/src/model/DeleteServerlessClusterRequest.cc

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

hbase/src/model/DeleteServerlessClusterResult.cc

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

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

@@ -69,10 +69,12 @@ namespace AlibabaCloud
 					std::string androidXiaoMiNotifyBody;
 					std::string iOSSubtitle;
 					bool iOSRemind;
+					int androidNotificationNotifyId;
 					std::string targetValue;
 					std::string androidMusic;
 					std::string androidXiaoMiActivity;
 					std::string androidXiaoMiNotifyTitle;
+					std::string iOSNotificationCollapseId;
 					std::string pushType;
 				};
 

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

@@ -89,6 +89,8 @@ namespace AlibabaCloud
 				void setIOSRemind(bool iOSRemind);
 				std::string getAndroidMusic()const;
 				void setAndroidMusic(const std::string& androidMusic);
+				std::string getIOSNotificationCollapseId()const;
+				void setIOSNotificationCollapseId(const std::string& iOSNotificationCollapseId);
 				std::string getPushType()const;
 				void setPushType(const std::string& pushType);
 				std::string getAndroidExtParameters()const;
@@ -123,6 +125,8 @@ namespace AlibabaCloud
 				void setAndroidActivity(const std::string& androidActivity);
 				std::string getSmsSignName()const;
 				void setSmsSignName(const std::string& smsSignName);
+				int getAndroidNotificationNotifyId()const;
+				void setAndroidNotificationNotifyId(int androidNotificationNotifyId);
 				long getAppKey()const;
 				void setAppKey(long appKey);
 				std::string getTargetValue()const;
@@ -160,6 +164,7 @@ namespace AlibabaCloud
 				std::string iOSSubtitle_;
 				bool iOSRemind_;
 				std::string androidMusic_;
+				std::string iOSNotificationCollapseId_;
 				std::string pushType_;
 				std::string androidExtParameters_;
 				int iOSBadge_;
@@ -177,6 +182,7 @@ namespace AlibabaCloud
 				bool androidRemind_;
 				std::string androidActivity_;
 				std::string smsSignName_;
+				int androidNotificationNotifyId_;
 				long appKey_;
 				std::string targetValue_;
 				std::string androidXiaoMiActivity_;

push/src/model/MassPushRequest.cc

@@ -85,10 +85,12 @@ void MassPushRequest::setPushTask(const std::vector<PushTask>& pushTask)
 		setParameter(pushTaskObjStr + ".AndroidXiaoMiNotifyBody", pushTaskObj.androidXiaoMiNotifyBody);
 		setParameter(pushTaskObjStr + ".IOSSubtitle", pushTaskObj.iOSSubtitle);
 		setParameter(pushTaskObjStr + ".IOSRemind", pushTaskObj.iOSRemind ? "true" : "false");
+		setParameter(pushTaskObjStr + ".AndroidNotificationNotifyId", std::to_string(pushTaskObj.androidNotificationNotifyId));
 		setParameter(pushTaskObjStr + ".TargetValue", pushTaskObj.targetValue);
 		setParameter(pushTaskObjStr + ".AndroidMusic", pushTaskObj.androidMusic);
 		setParameter(pushTaskObjStr + ".AndroidXiaoMiActivity", pushTaskObj.androidXiaoMiActivity);
 		setParameter(pushTaskObjStr + ".AndroidXiaoMiNotifyTitle", pushTaskObj.androidXiaoMiNotifyTitle);
+		setParameter(pushTaskObjStr + ".IOSNotificationCollapseId", pushTaskObj.iOSNotificationCollapseId);
 		setParameter(pushTaskObjStr + ".PushType", pushTaskObj.pushType);
 	}
 }

push/src/model/PushRequest.cc

@@ -324,6 +324,17 @@ void PushRequest::setAndroidMusic(const std::string& androidMusic)
 	setParameter("AndroidMusic", androidMusic);
 }
 
+std::string PushRequest::getIOSNotificationCollapseId()const
+{
+	return iOSNotificationCollapseId_;
+}
+
+void PushRequest::setIOSNotificationCollapseId(const std::string& iOSNotificationCollapseId)
+{
+	iOSNotificationCollapseId_ = iOSNotificationCollapseId;
+	setParameter("IOSNotificationCollapseId", iOSNotificationCollapseId);
+}
+
 std::string PushRequest::getPushType()const
 {
 	return pushType_;
@@ -511,6 +522,17 @@ void PushRequest::setSmsSignName(const std::string& smsSignName)
 	setParameter("SmsSignName", smsSignName);
 }
 
+int PushRequest::getAndroidNotificationNotifyId()const
+{
+	return androidNotificationNotifyId_;
+}
+
+void PushRequest::setAndroidNotificationNotifyId(int androidNotificationNotifyId)
+{
+	androidNotificationNotifyId_ = androidNotificationNotifyId;
+	setParameter("AndroidNotificationNotifyId", std::to_string(androidNotificationNotifyId));
+}
+
 long PushRequest::getAppKey()const
 {
 	return appKey_;