sdk-team 1 год назад
Родитель
Сommit
52c309ecd7

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.1997
+1.36.1998

+ 12 - 0
vod/CMakeLists.txt

@@ -49,6 +49,8 @@ set(vod_public_header_model
 	include/alibabacloud/vod/model/BatchStopVodDomainResult.h
 	include/alibabacloud/vod/model/CancelUrlUploadJobsRequest.h
 	include/alibabacloud/vod/model/CancelUrlUploadJobsResult.h
+	include/alibabacloud/vod/model/ChangeResourceGroupRequest.h
+	include/alibabacloud/vod/model/ChangeResourceGroupResult.h
 	include/alibabacloud/vod/model/CreateAppInfoRequest.h
 	include/alibabacloud/vod/model/CreateAppInfoResult.h
 	include/alibabacloud/vod/model/CreateAuditRequest.h
@@ -161,6 +163,8 @@ set(vod_public_header_model
 	include/alibabacloud/vod/model/DescribeVodRefreshQuotaResult.h
 	include/alibabacloud/vod/model/DescribeVodRefreshTasksRequest.h
 	include/alibabacloud/vod/model/DescribeVodRefreshTasksResult.h
+	include/alibabacloud/vod/model/DescribeVodSSLCertificateListRequest.h
+	include/alibabacloud/vod/model/DescribeVodSSLCertificateListResult.h
 	include/alibabacloud/vod/model/DescribeVodStorageDataRequest.h
 	include/alibabacloud/vod/model/DescribeVodStorageDataResult.h
 	include/alibabacloud/vod/model/DescribeVodTieringStorageDataRequest.h
@@ -309,6 +313,8 @@ set(vod_public_header_model
 	include/alibabacloud/vod/model/SetMessageCallbackResult.h
 	include/alibabacloud/vod/model/SetVodDomainCertificateRequest.h
 	include/alibabacloud/vod/model/SetVodDomainCertificateResult.h
+	include/alibabacloud/vod/model/SetVodDomainSSLCertificateRequest.h
+	include/alibabacloud/vod/model/SetVodDomainSSLCertificateResult.h
 	include/alibabacloud/vod/model/SubmitAIImageAuditJobRequest.h
 	include/alibabacloud/vod/model/SubmitAIImageAuditJobResult.h
 	include/alibabacloud/vod/model/SubmitAIImageJobRequest.h
@@ -394,6 +400,8 @@ set(vod_src
 	src/model/BatchStopVodDomainResult.cc
 	src/model/CancelUrlUploadJobsRequest.cc
 	src/model/CancelUrlUploadJobsResult.cc
+	src/model/ChangeResourceGroupRequest.cc
+	src/model/ChangeResourceGroupResult.cc
 	src/model/CreateAppInfoRequest.cc
 	src/model/CreateAppInfoResult.cc
 	src/model/CreateAuditRequest.cc
@@ -506,6 +514,8 @@ set(vod_src
 	src/model/DescribeVodRefreshQuotaResult.cc
 	src/model/DescribeVodRefreshTasksRequest.cc
 	src/model/DescribeVodRefreshTasksResult.cc
+	src/model/DescribeVodSSLCertificateListRequest.cc
+	src/model/DescribeVodSSLCertificateListResult.cc
 	src/model/DescribeVodStorageDataRequest.cc
 	src/model/DescribeVodStorageDataResult.cc
 	src/model/DescribeVodTieringStorageDataRequest.cc
@@ -654,6 +664,8 @@ set(vod_src
 	src/model/SetMessageCallbackResult.cc
 	src/model/SetVodDomainCertificateRequest.cc
 	src/model/SetVodDomainCertificateResult.cc
+	src/model/SetVodDomainSSLCertificateRequest.cc
+	src/model/SetVodDomainSSLCertificateResult.cc
 	src/model/SubmitAIImageAuditJobRequest.cc
 	src/model/SubmitAIImageAuditJobResult.cc
 	src/model/SubmitAIImageJobRequest.cc

+ 24 - 0
vod/include/alibabacloud/vod/VodClient.h

@@ -50,6 +50,8 @@
 #include "model/BatchStopVodDomainResult.h"
 #include "model/CancelUrlUploadJobsRequest.h"
 #include "model/CancelUrlUploadJobsResult.h"
+#include "model/ChangeResourceGroupRequest.h"
+#include "model/ChangeResourceGroupResult.h"
 #include "model/CreateAppInfoRequest.h"
 #include "model/CreateAppInfoResult.h"
 #include "model/CreateAuditRequest.h"
@@ -162,6 +164,8 @@
 #include "model/DescribeVodRefreshQuotaResult.h"
 #include "model/DescribeVodRefreshTasksRequest.h"
 #include "model/DescribeVodRefreshTasksResult.h"
+#include "model/DescribeVodSSLCertificateListRequest.h"
+#include "model/DescribeVodSSLCertificateListResult.h"
 #include "model/DescribeVodStorageDataRequest.h"
 #include "model/DescribeVodStorageDataResult.h"
 #include "model/DescribeVodTieringStorageDataRequest.h"
@@ -310,6 +314,8 @@
 #include "model/SetMessageCallbackResult.h"
 #include "model/SetVodDomainCertificateRequest.h"
 #include "model/SetVodDomainCertificateResult.h"
+#include "model/SetVodDomainSSLCertificateRequest.h"
+#include "model/SetVodDomainSSLCertificateResult.h"
 #include "model/SubmitAIImageAuditJobRequest.h"
 #include "model/SubmitAIImageAuditJobResult.h"
 #include "model/SubmitAIImageJobRequest.h"
@@ -415,6 +421,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CancelUrlUploadJobsResult> CancelUrlUploadJobsOutcome;
 			typedef std::future<CancelUrlUploadJobsOutcome> CancelUrlUploadJobsOutcomeCallable;
 			typedef std::function<void(const VodClient*, const Model::CancelUrlUploadJobsRequest&, const CancelUrlUploadJobsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CancelUrlUploadJobsAsyncHandler;
+			typedef Outcome<Error, Model::ChangeResourceGroupResult> ChangeResourceGroupOutcome;
+			typedef std::future<ChangeResourceGroupOutcome> ChangeResourceGroupOutcomeCallable;
+			typedef std::function<void(const VodClient*, const Model::ChangeResourceGroupRequest&, const ChangeResourceGroupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ChangeResourceGroupAsyncHandler;
 			typedef Outcome<Error, Model::CreateAppInfoResult> CreateAppInfoOutcome;
 			typedef std::future<CreateAppInfoOutcome> CreateAppInfoOutcomeCallable;
 			typedef std::function<void(const VodClient*, const Model::CreateAppInfoRequest&, const CreateAppInfoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateAppInfoAsyncHandler;
@@ -583,6 +592,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeVodRefreshTasksResult> DescribeVodRefreshTasksOutcome;
 			typedef std::future<DescribeVodRefreshTasksOutcome> DescribeVodRefreshTasksOutcomeCallable;
 			typedef std::function<void(const VodClient*, const Model::DescribeVodRefreshTasksRequest&, const DescribeVodRefreshTasksOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeVodRefreshTasksAsyncHandler;
+			typedef Outcome<Error, Model::DescribeVodSSLCertificateListResult> DescribeVodSSLCertificateListOutcome;
+			typedef std::future<DescribeVodSSLCertificateListOutcome> DescribeVodSSLCertificateListOutcomeCallable;
+			typedef std::function<void(const VodClient*, const Model::DescribeVodSSLCertificateListRequest&, const DescribeVodSSLCertificateListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeVodSSLCertificateListAsyncHandler;
 			typedef Outcome<Error, Model::DescribeVodStorageDataResult> DescribeVodStorageDataOutcome;
 			typedef std::future<DescribeVodStorageDataOutcome> DescribeVodStorageDataOutcomeCallable;
 			typedef std::function<void(const VodClient*, const Model::DescribeVodStorageDataRequest&, const DescribeVodStorageDataOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeVodStorageDataAsyncHandler;
@@ -805,6 +817,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::SetVodDomainCertificateResult> SetVodDomainCertificateOutcome;
 			typedef std::future<SetVodDomainCertificateOutcome> SetVodDomainCertificateOutcomeCallable;
 			typedef std::function<void(const VodClient*, const Model::SetVodDomainCertificateRequest&, const SetVodDomainCertificateOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SetVodDomainCertificateAsyncHandler;
+			typedef Outcome<Error, Model::SetVodDomainSSLCertificateResult> SetVodDomainSSLCertificateOutcome;
+			typedef std::future<SetVodDomainSSLCertificateOutcome> SetVodDomainSSLCertificateOutcomeCallable;
+			typedef std::function<void(const VodClient*, const Model::SetVodDomainSSLCertificateRequest&, const SetVodDomainSSLCertificateOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SetVodDomainSSLCertificateAsyncHandler;
 			typedef Outcome<Error, Model::SubmitAIImageAuditJobResult> SubmitAIImageAuditJobOutcome;
 			typedef std::future<SubmitAIImageAuditJobOutcome> SubmitAIImageAuditJobOutcomeCallable;
 			typedef std::function<void(const VodClient*, const Model::SubmitAIImageAuditJobRequest&, const SubmitAIImageAuditJobOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SubmitAIImageAuditJobAsyncHandler;
@@ -933,6 +948,9 @@ namespace AlibabaCloud
 			CancelUrlUploadJobsOutcome cancelUrlUploadJobs(const Model::CancelUrlUploadJobsRequest &request)const;
 			void cancelUrlUploadJobsAsync(const Model::CancelUrlUploadJobsRequest& request, const CancelUrlUploadJobsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CancelUrlUploadJobsOutcomeCallable cancelUrlUploadJobsCallable(const Model::CancelUrlUploadJobsRequest& request) const;
+			ChangeResourceGroupOutcome changeResourceGroup(const Model::ChangeResourceGroupRequest &request)const;
+			void changeResourceGroupAsync(const Model::ChangeResourceGroupRequest& request, const ChangeResourceGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ChangeResourceGroupOutcomeCallable changeResourceGroupCallable(const Model::ChangeResourceGroupRequest& request) const;
 			CreateAppInfoOutcome createAppInfo(const Model::CreateAppInfoRequest &request)const;
 			void createAppInfoAsync(const Model::CreateAppInfoRequest& request, const CreateAppInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateAppInfoOutcomeCallable createAppInfoCallable(const Model::CreateAppInfoRequest& request) const;
@@ -1101,6 +1119,9 @@ namespace AlibabaCloud
 			DescribeVodRefreshTasksOutcome describeVodRefreshTasks(const Model::DescribeVodRefreshTasksRequest &request)const;
 			void describeVodRefreshTasksAsync(const Model::DescribeVodRefreshTasksRequest& request, const DescribeVodRefreshTasksAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeVodRefreshTasksOutcomeCallable describeVodRefreshTasksCallable(const Model::DescribeVodRefreshTasksRequest& request) const;
+			DescribeVodSSLCertificateListOutcome describeVodSSLCertificateList(const Model::DescribeVodSSLCertificateListRequest &request)const;
+			void describeVodSSLCertificateListAsync(const Model::DescribeVodSSLCertificateListRequest& request, const DescribeVodSSLCertificateListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeVodSSLCertificateListOutcomeCallable describeVodSSLCertificateListCallable(const Model::DescribeVodSSLCertificateListRequest& request) const;
 			DescribeVodStorageDataOutcome describeVodStorageData(const Model::DescribeVodStorageDataRequest &request)const;
 			void describeVodStorageDataAsync(const Model::DescribeVodStorageDataRequest& request, const DescribeVodStorageDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeVodStorageDataOutcomeCallable describeVodStorageDataCallable(const Model::DescribeVodStorageDataRequest& request) const;
@@ -1323,6 +1344,9 @@ namespace AlibabaCloud
 			SetVodDomainCertificateOutcome setVodDomainCertificate(const Model::SetVodDomainCertificateRequest &request)const;
 			void setVodDomainCertificateAsync(const Model::SetVodDomainCertificateRequest& request, const SetVodDomainCertificateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			SetVodDomainCertificateOutcomeCallable setVodDomainCertificateCallable(const Model::SetVodDomainCertificateRequest& request) const;
+			SetVodDomainSSLCertificateOutcome setVodDomainSSLCertificate(const Model::SetVodDomainSSLCertificateRequest &request)const;
+			void setVodDomainSSLCertificateAsync(const Model::SetVodDomainSSLCertificateRequest& request, const SetVodDomainSSLCertificateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			SetVodDomainSSLCertificateOutcomeCallable setVodDomainSSLCertificateCallable(const Model::SetVodDomainSSLCertificateRequest& request) const;
 			SubmitAIImageAuditJobOutcome submitAIImageAuditJob(const Model::SubmitAIImageAuditJobRequest &request)const;
 			void submitAIImageAuditJobAsync(const Model::SubmitAIImageAuditJobRequest& request, const SubmitAIImageAuditJobAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			SubmitAIImageAuditJobOutcomeCallable submitAIImageAuditJobCallable(const Model::SubmitAIImageAuditJobRequest& request) const;

+ 54 - 0
vod/include/alibabacloud/vod/model/ChangeResourceGroupRequest.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_VOD_MODEL_CHANGERESOURCEGROUPREQUEST_H_
+#define ALIBABACLOUD_VOD_MODEL_CHANGERESOURCEGROUPREQUEST_H_
+
+#include <alibabacloud/vod/VodExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Vod {
+namespace Model {
+class ALIBABACLOUD_VOD_EXPORT ChangeResourceGroupRequest : public RpcServiceRequest {
+public:
+	ChangeResourceGroupRequest();
+	~ChangeResourceGroupRequest();
+	std::string getResourceGroupId() const;
+	void setResourceGroupId(const std::string &resourceGroupId);
+	std::string getResourceRegionId() const;
+	void setResourceRegionId(const std::string &resourceRegionId);
+	std::string getResourceId() const;
+	void setResourceId(const std::string &resourceId);
+	std::string getResourceType() const;
+	void setResourceType(const std::string &resourceType);
+	std::string getService() const;
+	void setService(const std::string &service);
+
+private:
+	std::string resourceGroupId_;
+	std::string resourceRegionId_;
+	std::string resourceId_;
+	std::string resourceType_;
+	std::string service_;
+};
+} // namespace Model
+} // namespace Vod
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_VOD_MODEL_CHANGERESOURCEGROUPREQUEST_H_

+ 49 - 0
vod/include/alibabacloud/vod/model/ChangeResourceGroupResult.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_VOD_MODEL_CHANGERESOURCEGROUPRESULT_H_
+#define ALIBABACLOUD_VOD_MODEL_CHANGERESOURCEGROUPRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/vod/VodExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Vod
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_VOD_EXPORT ChangeResourceGroupResult : public ServiceResult
+			{
+			public:
+
+
+				ChangeResourceGroupResult();
+				explicit ChangeResourceGroupResult(const std::string &payload);
+				~ChangeResourceGroupResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_VOD_MODEL_CHANGERESOURCEGROUPRESULT_H_

+ 9 - 3
vod/include/alibabacloud/vod/model/DescribeVodDomainCertificateInfoResult.h

@@ -35,14 +35,20 @@ namespace AlibabaCloud
 				struct CertInfo
 				{
 					std::string status;
-					std::string certLife;
 					std::string domainName;
+					std::string certId;
+					std::string certRegion;
+					std::string certType;
+					std::string certStartTime;
+					std::string serverCertificateStatus;
+					std::string serverCertificate;
+					std::string certUpdateTime;
+					std::string certLife;
 					std::string certDomainName;
 					std::string certOrg;
-					std::string certType;
 					std::string certExpireTime;
+					std::string domainCnameStatus;
 					std::string certName;
-					std::string serverCertificateStatus;
 				};
 
 

+ 63 - 0
vod/include/alibabacloud/vod/model/DescribeVodSSLCertificateListRequest.h

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_VOD_MODEL_DESCRIBEVODSSLCERTIFICATELISTREQUEST_H_
+#define ALIBABACLOUD_VOD_MODEL_DESCRIBEVODSSLCERTIFICATELISTREQUEST_H_
+
+#include <alibabacloud/vod/VodExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Vod {
+namespace Model {
+class ALIBABACLOUD_VOD_EXPORT DescribeVodSSLCertificateListRequest : public RpcServiceRequest {
+public:
+	DescribeVodSSLCertificateListRequest();
+	~DescribeVodSSLCertificateListRequest();
+	long getPageNumber() const;
+	void setPageNumber(long pageNumber);
+	std::string getSecurityToken() const;
+	void setSecurityToken(const std::string &securityToken);
+	long getPageSize() const;
+	void setPageSize(long pageSize);
+	std::string getMatchType() const;
+	void setMatchType(const std::string &matchType);
+	std::string getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+	std::string getDomainName() const;
+	void setDomainName(const std::string &domainName);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getSearchKeyword() const;
+	void setSearchKeyword(const std::string &searchKeyword);
+
+private:
+	long pageNumber_;
+	std::string securityToken_;
+	long pageSize_;
+	std::string matchType_;
+	std::string algorithm_;
+	std::string domainName_;
+	long ownerId_;
+	std::string searchKeyword_;
+};
+} // namespace Model
+} // namespace Vod
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_VOD_MODEL_DESCRIBEVODSSLCERTIFICATELISTREQUEST_H_

+ 68 - 0
vod/include/alibabacloud/vod/model/DescribeVodSSLCertificateListResult.h

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_VOD_MODEL_DESCRIBEVODSSLCERTIFICATELISTRESULT_H_
+#define ALIBABACLOUD_VOD_MODEL_DESCRIBEVODSSLCERTIFICATELISTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/vod/VodExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Vod
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_VOD_EXPORT DescribeVodSSLCertificateListResult : public ServiceResult
+			{
+			public:
+				struct CertificateListModel
+				{
+					struct Cert
+					{
+						std::string fingerprint;
+						std::string issuer;
+						long certId;
+						std::string certRegion;
+						std::string certName;
+						long lastTime;
+						std::string common;
+					};
+					std::vector<Cert> certList;
+					long pageSize;
+					long pageNumber;
+					int count;
+				};
+
+
+				DescribeVodSSLCertificateListResult();
+				explicit DescribeVodSSLCertificateListResult(const std::string &payload);
+				~DescribeVodSSLCertificateListResult();
+				CertificateListModel getCertificateListModel()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				CertificateListModel certificateListModel_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_VOD_MODEL_DESCRIBEVODSSLCERTIFICATELISTRESULT_H_

+ 1 - 0
vod/include/alibabacloud/vod/model/GetPlayInfoResult.h

@@ -76,6 +76,7 @@ namespace AlibabaCloud
 					std::string duration;
 					std::string bitrate;
 					long encrypt;
+					std::string encryptMode;
 					int jobType;
 					std::string encryptType;
 					std::string playURL;

+ 72 - 0
vod/include/alibabacloud/vod/model/SetVodDomainSSLCertificateRequest.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_VOD_MODEL_SETVODDOMAINSSLCERTIFICATEREQUEST_H_
+#define ALIBABACLOUD_VOD_MODEL_SETVODDOMAINSSLCERTIFICATEREQUEST_H_
+
+#include <alibabacloud/vod/VodExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Vod {
+namespace Model {
+class ALIBABACLOUD_VOD_EXPORT SetVodDomainSSLCertificateRequest : public RpcServiceRequest {
+public:
+	SetVodDomainSSLCertificateRequest();
+	~SetVodDomainSSLCertificateRequest();
+	std::string getSSLProtocol() const;
+	void setSSLProtocol(const std::string &sSLProtocol);
+	long getCertId() const;
+	void setCertId(long certId);
+	std::string getSecurityToken() const;
+	void setSecurityToken(const std::string &securityToken);
+	std::string getCertType() const;
+	void setCertType(const std::string &certType);
+	std::string getSSLPri() const;
+	void setSSLPri(const std::string &sSLPri);
+	std::string getCertRegion() const;
+	void setCertRegion(const std::string &certRegion);
+	std::string getCertName() const;
+	void setCertName(const std::string &certName);
+	std::string getDomainName() const;
+	void setDomainName(const std::string &domainName);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	std::string getEnv() const;
+	void setEnv(const std::string &env);
+	std::string getSSLPub() const;
+	void setSSLPub(const std::string &sSLPub);
+
+private:
+	std::string sSLProtocol_;
+	long certId_;
+	std::string securityToken_;
+	std::string certType_;
+	std::string sSLPri_;
+	std::string certRegion_;
+	std::string certName_;
+	std::string domainName_;
+	long ownerId_;
+	std::string env_;
+	std::string sSLPub_;
+};
+} // namespace Model
+} // namespace Vod
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_VOD_MODEL_SETVODDOMAINSSLCERTIFICATEREQUEST_H_

+ 49 - 0
vod/include/alibabacloud/vod/model/SetVodDomainSSLCertificateResult.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_VOD_MODEL_SETVODDOMAINSSLCERTIFICATERESULT_H_
+#define ALIBABACLOUD_VOD_MODEL_SETVODDOMAINSSLCERTIFICATERESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/vod/VodExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Vod
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_VOD_EXPORT SetVodDomainSSLCertificateResult : public ServiceResult
+			{
+			public:
+
+
+				SetVodDomainSSLCertificateResult();
+				explicit SetVodDomainSSLCertificateResult(const std::string &payload);
+				~SetVodDomainSSLCertificateResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_VOD_MODEL_SETVODDOMAINSSLCERTIFICATERESULT_H_

+ 108 - 0
vod/src/VodClient.cc

@@ -555,6 +555,42 @@ VodClient::CancelUrlUploadJobsOutcomeCallable VodClient::cancelUrlUploadJobsCall
 	return task->get_future();
 }
 
+VodClient::ChangeResourceGroupOutcome VodClient::changeResourceGroup(const ChangeResourceGroupRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ChangeResourceGroupOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ChangeResourceGroupOutcome(ChangeResourceGroupResult(outcome.result()));
+	else
+		return ChangeResourceGroupOutcome(outcome.error());
+}
+
+void VodClient::changeResourceGroupAsync(const ChangeResourceGroupRequest& request, const ChangeResourceGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, changeResourceGroup(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+VodClient::ChangeResourceGroupOutcomeCallable VodClient::changeResourceGroupCallable(const ChangeResourceGroupRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ChangeResourceGroupOutcome()>>(
+			[this, request]()
+			{
+			return this->changeResourceGroup(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 VodClient::CreateAppInfoOutcome VodClient::createAppInfo(const CreateAppInfoRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -2571,6 +2607,42 @@ VodClient::DescribeVodRefreshTasksOutcomeCallable VodClient::describeVodRefreshT
 	return task->get_future();
 }
 
+VodClient::DescribeVodSSLCertificateListOutcome VodClient::describeVodSSLCertificateList(const DescribeVodSSLCertificateListRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeVodSSLCertificateListOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeVodSSLCertificateListOutcome(DescribeVodSSLCertificateListResult(outcome.result()));
+	else
+		return DescribeVodSSLCertificateListOutcome(outcome.error());
+}
+
+void VodClient::describeVodSSLCertificateListAsync(const DescribeVodSSLCertificateListRequest& request, const DescribeVodSSLCertificateListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeVodSSLCertificateList(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+VodClient::DescribeVodSSLCertificateListOutcomeCallable VodClient::describeVodSSLCertificateListCallable(const DescribeVodSSLCertificateListRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeVodSSLCertificateListOutcome()>>(
+			[this, request]()
+			{
+			return this->describeVodSSLCertificateList(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 VodClient::DescribeVodStorageDataOutcome VodClient::describeVodStorageData(const DescribeVodStorageDataRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -5235,6 +5307,42 @@ VodClient::SetVodDomainCertificateOutcomeCallable VodClient::setVodDomainCertifi
 	return task->get_future();
 }
 
+VodClient::SetVodDomainSSLCertificateOutcome VodClient::setVodDomainSSLCertificate(const SetVodDomainSSLCertificateRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return SetVodDomainSSLCertificateOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return SetVodDomainSSLCertificateOutcome(SetVodDomainSSLCertificateResult(outcome.result()));
+	else
+		return SetVodDomainSSLCertificateOutcome(outcome.error());
+}
+
+void VodClient::setVodDomainSSLCertificateAsync(const SetVodDomainSSLCertificateRequest& request, const SetVodDomainSSLCertificateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, setVodDomainSSLCertificate(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+VodClient::SetVodDomainSSLCertificateOutcomeCallable VodClient::setVodDomainSSLCertificateCallable(const SetVodDomainSSLCertificateRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<SetVodDomainSSLCertificateOutcome()>>(
+			[this, request]()
+			{
+			return this->setVodDomainSSLCertificate(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 VodClient::SubmitAIImageAuditJobOutcome VodClient::submitAIImageAuditJob(const SubmitAIImageAuditJobRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

+ 72 - 0
vod/src/model/ChangeResourceGroupRequest.cc

@@ -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.
+ */
+
+#include <alibabacloud/vod/model/ChangeResourceGroupRequest.h>
+
+using AlibabaCloud::Vod::Model::ChangeResourceGroupRequest;
+
+ChangeResourceGroupRequest::ChangeResourceGroupRequest()
+    : RpcServiceRequest("vod", "2017-03-21", "ChangeResourceGroup") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+ChangeResourceGroupRequest::~ChangeResourceGroupRequest() {}
+
+std::string ChangeResourceGroupRequest::getResourceGroupId() const {
+  return resourceGroupId_;
+}
+
+void ChangeResourceGroupRequest::setResourceGroupId(const std::string &resourceGroupId) {
+  resourceGroupId_ = resourceGroupId;
+  setParameter(std::string("ResourceGroupId"), resourceGroupId);
+}
+
+std::string ChangeResourceGroupRequest::getResourceRegionId() const {
+  return resourceRegionId_;
+}
+
+void ChangeResourceGroupRequest::setResourceRegionId(const std::string &resourceRegionId) {
+  resourceRegionId_ = resourceRegionId;
+  setParameter(std::string("ResourceRegionId"), resourceRegionId);
+}
+
+std::string ChangeResourceGroupRequest::getResourceId() const {
+  return resourceId_;
+}
+
+void ChangeResourceGroupRequest::setResourceId(const std::string &resourceId) {
+  resourceId_ = resourceId;
+  setParameter(std::string("ResourceId"), resourceId);
+}
+
+std::string ChangeResourceGroupRequest::getResourceType() const {
+  return resourceType_;
+}
+
+void ChangeResourceGroupRequest::setResourceType(const std::string &resourceType) {
+  resourceType_ = resourceType;
+  setParameter(std::string("ResourceType"), resourceType);
+}
+
+std::string ChangeResourceGroupRequest::getService() const {
+  return service_;
+}
+
+void ChangeResourceGroupRequest::setService(const std::string &service) {
+  service_ = service;
+  setParameter(std::string("Service"), service);
+}
+

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

+ 22 - 10
vod/src/model/DescribeVodDomainCertificateInfoResult.cc

@@ -43,24 +43,36 @@ void DescribeVodDomainCertificateInfoResult::parse(const std::string &payload)
 	for (auto valueCertInfosCertInfo : allCertInfosNode)
 	{
 		CertInfo certInfosObject;
-		if(!valueCertInfosCertInfo["Status"].isNull())
-			certInfosObject.status = valueCertInfosCertInfo["Status"].asString();
-		if(!valueCertInfosCertInfo["CertLife"].isNull())
-			certInfosObject.certLife = valueCertInfosCertInfo["CertLife"].asString();
 		if(!valueCertInfosCertInfo["CertExpireTime"].isNull())
 			certInfosObject.certExpireTime = valueCertInfosCertInfo["CertExpireTime"].asString();
-		if(!valueCertInfosCertInfo["CertType"].isNull())
-			certInfosObject.certType = valueCertInfosCertInfo["CertType"].asString();
-		if(!valueCertInfosCertInfo["ServerCertificateStatus"].isNull())
-			certInfosObject.serverCertificateStatus = valueCertInfosCertInfo["ServerCertificateStatus"].asString();
+		if(!valueCertInfosCertInfo["CertLife"].isNull())
+			certInfosObject.certLife = valueCertInfosCertInfo["CertLife"].asString();
+		if(!valueCertInfosCertInfo["Status"].isNull())
+			certInfosObject.status = valueCertInfosCertInfo["Status"].asString();
+		if(!valueCertInfosCertInfo["CertUpdateTime"].isNull())
+			certInfosObject.certUpdateTime = valueCertInfosCertInfo["CertUpdateTime"].asString();
 		if(!valueCertInfosCertInfo["CertDomainName"].isNull())
 			certInfosObject.certDomainName = valueCertInfosCertInfo["CertDomainName"].asString();
-		if(!valueCertInfosCertInfo["CertName"].isNull())
-			certInfosObject.certName = valueCertInfosCertInfo["CertName"].asString();
+		if(!valueCertInfosCertInfo["ServerCertificateStatus"].isNull())
+			certInfosObject.serverCertificateStatus = valueCertInfosCertInfo["ServerCertificateStatus"].asString();
 		if(!valueCertInfosCertInfo["CertOrg"].isNull())
 			certInfosObject.certOrg = valueCertInfosCertInfo["CertOrg"].asString();
 		if(!valueCertInfosCertInfo["DomainName"].isNull())
 			certInfosObject.domainName = valueCertInfosCertInfo["DomainName"].asString();
+		if(!valueCertInfosCertInfo["CertStartTime"].isNull())
+			certInfosObject.certStartTime = valueCertInfosCertInfo["CertStartTime"].asString();
+		if(!valueCertInfosCertInfo["CertType"].isNull())
+			certInfosObject.certType = valueCertInfosCertInfo["CertType"].asString();
+		if(!valueCertInfosCertInfo["CertName"].isNull())
+			certInfosObject.certName = valueCertInfosCertInfo["CertName"].asString();
+		if(!valueCertInfosCertInfo["DomainCnameStatus"].isNull())
+			certInfosObject.domainCnameStatus = valueCertInfosCertInfo["DomainCnameStatus"].asString();
+		if(!valueCertInfosCertInfo["ServerCertificate"].isNull())
+			certInfosObject.serverCertificate = valueCertInfosCertInfo["ServerCertificate"].asString();
+		if(!valueCertInfosCertInfo["CertId"].isNull())
+			certInfosObject.certId = valueCertInfosCertInfo["CertId"].asString();
+		if(!valueCertInfosCertInfo["CertRegion"].isNull())
+			certInfosObject.certRegion = valueCertInfosCertInfo["CertRegion"].asString();
 		certInfos_.push_back(certInfosObject);
 	}
 

+ 99 - 0
vod/src/model/DescribeVodSSLCertificateListRequest.cc

@@ -0,0 +1,99 @@
+/*
+ * 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/vod/model/DescribeVodSSLCertificateListRequest.h>
+
+using AlibabaCloud::Vod::Model::DescribeVodSSLCertificateListRequest;
+
+DescribeVodSSLCertificateListRequest::DescribeVodSSLCertificateListRequest()
+    : RpcServiceRequest("vod", "2017-03-21", "DescribeVodSSLCertificateList") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+DescribeVodSSLCertificateListRequest::~DescribeVodSSLCertificateListRequest() {}
+
+long DescribeVodSSLCertificateListRequest::getPageNumber() const {
+  return pageNumber_;
+}
+
+void DescribeVodSSLCertificateListRequest::setPageNumber(long pageNumber) {
+  pageNumber_ = pageNumber;
+  setParameter(std::string("PageNumber"), std::to_string(pageNumber));
+}
+
+std::string DescribeVodSSLCertificateListRequest::getSecurityToken() const {
+  return securityToken_;
+}
+
+void DescribeVodSSLCertificateListRequest::setSecurityToken(const std::string &securityToken) {
+  securityToken_ = securityToken;
+  setParameter(std::string("SecurityToken"), securityToken);
+}
+
+long DescribeVodSSLCertificateListRequest::getPageSize() const {
+  return pageSize_;
+}
+
+void DescribeVodSSLCertificateListRequest::setPageSize(long pageSize) {
+  pageSize_ = pageSize;
+  setParameter(std::string("PageSize"), std::to_string(pageSize));
+}
+
+std::string DescribeVodSSLCertificateListRequest::getMatchType() const {
+  return matchType_;
+}
+
+void DescribeVodSSLCertificateListRequest::setMatchType(const std::string &matchType) {
+  matchType_ = matchType;
+  setParameter(std::string("MatchType"), matchType);
+}
+
+std::string DescribeVodSSLCertificateListRequest::getAlgorithm() const {
+  return algorithm_;
+}
+
+void DescribeVodSSLCertificateListRequest::setAlgorithm(const std::string &algorithm) {
+  algorithm_ = algorithm;
+  setParameter(std::string("Algorithm"), algorithm);
+}
+
+std::string DescribeVodSSLCertificateListRequest::getDomainName() const {
+  return domainName_;
+}
+
+void DescribeVodSSLCertificateListRequest::setDomainName(const std::string &domainName) {
+  domainName_ = domainName;
+  setParameter(std::string("DomainName"), domainName);
+}
+
+long DescribeVodSSLCertificateListRequest::getOwnerId() const {
+  return ownerId_;
+}
+
+void DescribeVodSSLCertificateListRequest::setOwnerId(long ownerId) {
+  ownerId_ = ownerId;
+  setParameter(std::string("OwnerId"), std::to_string(ownerId));
+}
+
+std::string DescribeVodSSLCertificateListRequest::getSearchKeyword() const {
+  return searchKeyword_;
+}
+
+void DescribeVodSSLCertificateListRequest::setSearchKeyword(const std::string &searchKeyword) {
+  searchKeyword_ = searchKeyword;
+  setParameter(std::string("SearchKeyword"), searchKeyword);
+}
+

+ 76 - 0
vod/src/model/DescribeVodSSLCertificateListResult.cc

@@ -0,0 +1,76 @@
+/*
+ * 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/vod/model/DescribeVodSSLCertificateListResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Vod;
+using namespace AlibabaCloud::Vod::Model;
+
+DescribeVodSSLCertificateListResult::DescribeVodSSLCertificateListResult() :
+	ServiceResult()
+{}
+
+DescribeVodSSLCertificateListResult::DescribeVodSSLCertificateListResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeVodSSLCertificateListResult::~DescribeVodSSLCertificateListResult()
+{}
+
+void DescribeVodSSLCertificateListResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto certificateListModelNode = value["CertificateListModel"];
+	if(!certificateListModelNode["Count"].isNull())
+		certificateListModel_.count = std::stoi(certificateListModelNode["Count"].asString());
+	if(!certificateListModelNode["PageNumber"].isNull())
+		certificateListModel_.pageNumber = std::stol(certificateListModelNode["PageNumber"].asString());
+	if(!certificateListModelNode["PageSize"].isNull())
+		certificateListModel_.pageSize = std::stol(certificateListModelNode["PageSize"].asString());
+	auto allCertListNode = certificateListModelNode["CertList"]["Cert"];
+	for (auto certificateListModelNodeCertListCert : allCertListNode)
+	{
+		CertificateListModel::Cert certObject;
+		if(!certificateListModelNodeCertListCert["LastTime"].isNull())
+			certObject.lastTime = std::stol(certificateListModelNodeCertListCert["LastTime"].asString());
+		if(!certificateListModelNodeCertListCert["Fingerprint"].isNull())
+			certObject.fingerprint = certificateListModelNodeCertListCert["Fingerprint"].asString();
+		if(!certificateListModelNodeCertListCert["CertName"].isNull())
+			certObject.certName = certificateListModelNodeCertListCert["CertName"].asString();
+		if(!certificateListModelNodeCertListCert["Issuer"].isNull())
+			certObject.issuer = certificateListModelNodeCertListCert["Issuer"].asString();
+		if(!certificateListModelNodeCertListCert["CertId"].isNull())
+			certObject.certId = std::stol(certificateListModelNodeCertListCert["CertId"].asString());
+		if(!certificateListModelNodeCertListCert["Common"].isNull())
+			certObject.common = certificateListModelNodeCertListCert["Common"].asString();
+		if(!certificateListModelNodeCertListCert["CertRegion"].isNull())
+			certObject.certRegion = certificateListModelNodeCertListCert["CertRegion"].asString();
+		certificateListModel_.certList.push_back(certObject);
+	}
+
+}
+
+DescribeVodSSLCertificateListResult::CertificateListModel DescribeVodSSLCertificateListResult::getCertificateListModel()const
+{
+	return certificateListModel_;
+}
+

+ 2 - 0
vod/src/model/GetPlayInfoResult.cc

@@ -69,6 +69,8 @@ void GetPlayInfoResult::parse(const std::string &payload)
 			playInfoListObject.rand = valuePlayInfoListPlayInfo["Rand"].asString();
 		if(!valuePlayInfoListPlayInfo["EncryptType"].isNull())
 			playInfoListObject.encryptType = valuePlayInfoListPlayInfo["EncryptType"].asString();
+		if(!valuePlayInfoListPlayInfo["EncryptMode"].isNull())
+			playInfoListObject.encryptMode = valuePlayInfoListPlayInfo["EncryptMode"].asString();
 		if(!valuePlayInfoListPlayInfo["PreprocessStatus"].isNull())
 			playInfoListObject.preprocessStatus = valuePlayInfoListPlayInfo["PreprocessStatus"].asString();
 		if(!valuePlayInfoListPlayInfo["StreamType"].isNull())

+ 126 - 0
vod/src/model/SetVodDomainSSLCertificateRequest.cc

@@ -0,0 +1,126 @@
+/*
+ * 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/vod/model/SetVodDomainSSLCertificateRequest.h>
+
+using AlibabaCloud::Vod::Model::SetVodDomainSSLCertificateRequest;
+
+SetVodDomainSSLCertificateRequest::SetVodDomainSSLCertificateRequest()
+    : RpcServiceRequest("vod", "2017-03-21", "SetVodDomainSSLCertificate") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+SetVodDomainSSLCertificateRequest::~SetVodDomainSSLCertificateRequest() {}
+
+std::string SetVodDomainSSLCertificateRequest::getSSLProtocol() const {
+  return sSLProtocol_;
+}
+
+void SetVodDomainSSLCertificateRequest::setSSLProtocol(const std::string &sSLProtocol) {
+  sSLProtocol_ = sSLProtocol;
+  setParameter(std::string("SSLProtocol"), sSLProtocol);
+}
+
+long SetVodDomainSSLCertificateRequest::getCertId() const {
+  return certId_;
+}
+
+void SetVodDomainSSLCertificateRequest::setCertId(long certId) {
+  certId_ = certId;
+  setParameter(std::string("CertId"), std::to_string(certId));
+}
+
+std::string SetVodDomainSSLCertificateRequest::getSecurityToken() const {
+  return securityToken_;
+}
+
+void SetVodDomainSSLCertificateRequest::setSecurityToken(const std::string &securityToken) {
+  securityToken_ = securityToken;
+  setParameter(std::string("SecurityToken"), securityToken);
+}
+
+std::string SetVodDomainSSLCertificateRequest::getCertType() const {
+  return certType_;
+}
+
+void SetVodDomainSSLCertificateRequest::setCertType(const std::string &certType) {
+  certType_ = certType;
+  setParameter(std::string("CertType"), certType);
+}
+
+std::string SetVodDomainSSLCertificateRequest::getSSLPri() const {
+  return sSLPri_;
+}
+
+void SetVodDomainSSLCertificateRequest::setSSLPri(const std::string &sSLPri) {
+  sSLPri_ = sSLPri;
+  setParameter(std::string("SSLPri"), sSLPri);
+}
+
+std::string SetVodDomainSSLCertificateRequest::getCertRegion() const {
+  return certRegion_;
+}
+
+void SetVodDomainSSLCertificateRequest::setCertRegion(const std::string &certRegion) {
+  certRegion_ = certRegion;
+  setParameter(std::string("CertRegion"), certRegion);
+}
+
+std::string SetVodDomainSSLCertificateRequest::getCertName() const {
+  return certName_;
+}
+
+void SetVodDomainSSLCertificateRequest::setCertName(const std::string &certName) {
+  certName_ = certName;
+  setParameter(std::string("CertName"), certName);
+}
+
+std::string SetVodDomainSSLCertificateRequest::getDomainName() const {
+  return domainName_;
+}
+
+void SetVodDomainSSLCertificateRequest::setDomainName(const std::string &domainName) {
+  domainName_ = domainName;
+  setParameter(std::string("DomainName"), domainName);
+}
+
+long SetVodDomainSSLCertificateRequest::getOwnerId() const {
+  return ownerId_;
+}
+
+void SetVodDomainSSLCertificateRequest::setOwnerId(long ownerId) {
+  ownerId_ = ownerId;
+  setParameter(std::string("OwnerId"), std::to_string(ownerId));
+}
+
+std::string SetVodDomainSSLCertificateRequest::getEnv() const {
+  return env_;
+}
+
+void SetVodDomainSSLCertificateRequest::setEnv(const std::string &env) {
+  env_ = env;
+  setParameter(std::string("Env"), env);
+}
+
+std::string SetVodDomainSSLCertificateRequest::getSSLPub() const {
+  return sSLPub_;
+}
+
+void SetVodDomainSSLCertificateRequest::setSSLPub(const std::string &sSLPub) {
+  sSLPub_ = sSLPub;
+  setParameter(std::string("SSLPub"), sSLPub);
+}
+

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