Add return fields to UploadStreamByURL.

vod/CMakeLists.txt

@@ -121,6 +121,8 @@ set(vod_public_header_model
 	include/alibabacloud/vod/model/DescribeVodDomainRealtimeLogDeliveryResult.h
 	include/alibabacloud/vod/model/DescribeVodDomainSrcBpsDataRequest.h
 	include/alibabacloud/vod/model/DescribeVodDomainSrcBpsDataResult.h
+	include/alibabacloud/vod/model/DescribeVodDomainSrcTrafficDataRequest.h
+	include/alibabacloud/vod/model/DescribeVodDomainSrcTrafficDataResult.h
 	include/alibabacloud/vod/model/DescribeVodDomainTrafficDataRequest.h
 	include/alibabacloud/vod/model/DescribeVodDomainTrafficDataResult.h
 	include/alibabacloud/vod/model/DescribeVodDomainUsageDataRequest.h
@@ -434,6 +436,8 @@ set(vod_src
 	src/model/DescribeVodDomainRealtimeLogDeliveryResult.cc
 	src/model/DescribeVodDomainSrcBpsDataRequest.cc
 	src/model/DescribeVodDomainSrcBpsDataResult.cc
+	src/model/DescribeVodDomainSrcTrafficDataRequest.cc
+	src/model/DescribeVodDomainSrcTrafficDataResult.cc
 	src/model/DescribeVodDomainTrafficDataRequest.cc
 	src/model/DescribeVodDomainTrafficDataResult.cc
 	src/model/DescribeVodDomainUsageDataRequest.cc

vod/include/alibabacloud/vod/VodClient.h

@@ -122,6 +122,8 @@
 #include "model/DescribeVodDomainRealtimeLogDeliveryResult.h"
 #include "model/DescribeVodDomainSrcBpsDataRequest.h"
 #include "model/DescribeVodDomainSrcBpsDataResult.h"
+#include "model/DescribeVodDomainSrcTrafficDataRequest.h"
+#include "model/DescribeVodDomainSrcTrafficDataResult.h"
 #include "model/DescribeVodDomainTrafficDataRequest.h"
 #include "model/DescribeVodDomainTrafficDataResult.h"
 #include "model/DescribeVodDomainUsageDataRequest.h"
@@ -491,6 +493,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeVodDomainSrcBpsDataResult> DescribeVodDomainSrcBpsDataOutcome;
 			typedef std::future<DescribeVodDomainSrcBpsDataOutcome> DescribeVodDomainSrcBpsDataOutcomeCallable;
 			typedef std::function<void(const VodClient*, const Model::DescribeVodDomainSrcBpsDataRequest&, const DescribeVodDomainSrcBpsDataOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeVodDomainSrcBpsDataAsyncHandler;
+			typedef Outcome<Error, Model::DescribeVodDomainSrcTrafficDataResult> DescribeVodDomainSrcTrafficDataOutcome;
+			typedef std::future<DescribeVodDomainSrcTrafficDataOutcome> DescribeVodDomainSrcTrafficDataOutcomeCallable;
+			typedef std::function<void(const VodClient*, const Model::DescribeVodDomainSrcTrafficDataRequest&, const DescribeVodDomainSrcTrafficDataOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeVodDomainSrcTrafficDataAsyncHandler;
 			typedef Outcome<Error, Model::DescribeVodDomainTrafficDataResult> DescribeVodDomainTrafficDataOutcome;
 			typedef std::future<DescribeVodDomainTrafficDataOutcome> DescribeVodDomainTrafficDataOutcomeCallable;
 			typedef std::function<void(const VodClient*, const Model::DescribeVodDomainTrafficDataRequest&, const DescribeVodDomainTrafficDataOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeVodDomainTrafficDataAsyncHandler;
@@ -961,6 +966,9 @@ namespace AlibabaCloud
 			DescribeVodDomainSrcBpsDataOutcome describeVodDomainSrcBpsData(const Model::DescribeVodDomainSrcBpsDataRequest &request)const;
 			void describeVodDomainSrcBpsDataAsync(const Model::DescribeVodDomainSrcBpsDataRequest& request, const DescribeVodDomainSrcBpsDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeVodDomainSrcBpsDataOutcomeCallable describeVodDomainSrcBpsDataCallable(const Model::DescribeVodDomainSrcBpsDataRequest& request) const;
+			DescribeVodDomainSrcTrafficDataOutcome describeVodDomainSrcTrafficData(const Model::DescribeVodDomainSrcTrafficDataRequest &request)const;
+			void describeVodDomainSrcTrafficDataAsync(const Model::DescribeVodDomainSrcTrafficDataRequest& request, const DescribeVodDomainSrcTrafficDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeVodDomainSrcTrafficDataOutcomeCallable describeVodDomainSrcTrafficDataCallable(const Model::DescribeVodDomainSrcTrafficDataRequest& request) const;
 			DescribeVodDomainTrafficDataOutcome describeVodDomainTrafficData(const Model::DescribeVodDomainTrafficDataRequest &request)const;
 			void describeVodDomainTrafficDataAsync(const Model::DescribeVodDomainTrafficDataRequest& request, const DescribeVodDomainTrafficDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeVodDomainTrafficDataOutcomeCallable describeVodDomainTrafficDataCallable(const Model::DescribeVodDomainTrafficDataRequest& request) const;

vod/include/alibabacloud/vod/model/DescribeVodDomainSrcTrafficDataRequest.h

@@ -0,0 +1,60 @@
+/*
+ * 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_DESCRIBEVODDOMAINSRCTRAFFICDATAREQUEST_H_
+#define ALIBABACLOUD_VOD_MODEL_DESCRIBEVODDOMAINSRCTRAFFICDATAREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/vod/VodExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Vod
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_VOD_EXPORT DescribeVodDomainSrcTrafficDataRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeVodDomainSrcTrafficDataRequest();
+				~DescribeVodDomainSrcTrafficDataRequest();
+
+				std::string getStartTime()const;
+				void setStartTime(const std::string& startTime);
+				std::string getDomainName()const;
+				void setDomainName(const std::string& domainName);
+				std::string getEndTime()const;
+				void setEndTime(const std::string& endTime);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getInterval()const;
+				void setInterval(const std::string& interval);
+
+            private:
+				std::string startTime_;
+				std::string domainName_;
+				std::string endTime_;
+				long ownerId_;
+				std::string interval_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_VOD_MODEL_DESCRIBEVODDOMAINSRCTRAFFICDATAREQUEST_H_

vod/include/alibabacloud/vod/model/DescribeVodDomainSrcTrafficDataResult.h

@@ -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.
+ */
+
+#ifndef ALIBABACLOUD_VOD_MODEL_DESCRIBEVODDOMAINSRCTRAFFICDATARESULT_H_
+#define ALIBABACLOUD_VOD_MODEL_DESCRIBEVODDOMAINSRCTRAFFICDATARESULT_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 DescribeVodDomainSrcTrafficDataResult : public ServiceResult
+			{
+			public:
+				struct DataModule
+				{
+					std::string httpsValue;
+					std::string value;
+					std::string timeStamp;
+				};
+
+
+				DescribeVodDomainSrcTrafficDataResult();
+				explicit DescribeVodDomainSrcTrafficDataResult(const std::string &payload);
+				~DescribeVodDomainSrcTrafficDataResult();
+				std::string getEndTime()const;
+				std::string getDomainName()const;
+				std::string getStartTime()const;
+				std::string getDataInterval()const;
+				std::vector<DataModule> getSrcTrafficDataPerInterval()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string endTime_;
+				std::string domainName_;
+				std::string startTime_;
+				std::string dataInterval_;
+				std::vector<DataModule> srcTrafficDataPerInterval_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_VOD_MODEL_DESCRIBEVODDOMAINSRCTRAFFICDATARESULT_H_

vod/include/alibabacloud/vod/model/UploadStreamByURLResult.h

@@ -37,11 +37,15 @@ namespace AlibabaCloud
 				UploadStreamByURLResult();
 				explicit UploadStreamByURLResult(const std::string &payload);
 				~UploadStreamByURLResult();
+				std::string getFileURL()const;
+				std::string getSourceURL()const;
 				std::string getStreamJobId()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
+				std::string fileURL_;
+				std::string sourceURL_;
 				std::string streamJobId_;
 
 			};

vod/src/VodClient.cc

@@ -1851,6 +1851,42 @@ VodClient::DescribeVodDomainSrcBpsDataOutcomeCallable VodClient::describeVodDoma
 	return task->get_future();
 }
 
+VodClient::DescribeVodDomainSrcTrafficDataOutcome VodClient::describeVodDomainSrcTrafficData(const DescribeVodDomainSrcTrafficDataRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeVodDomainSrcTrafficDataOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeVodDomainSrcTrafficDataOutcome(DescribeVodDomainSrcTrafficDataResult(outcome.result()));
+	else
+		return DescribeVodDomainSrcTrafficDataOutcome(outcome.error());
+}
+
+void VodClient::describeVodDomainSrcTrafficDataAsync(const DescribeVodDomainSrcTrafficDataRequest& request, const DescribeVodDomainSrcTrafficDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeVodDomainSrcTrafficData(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+VodClient::DescribeVodDomainSrcTrafficDataOutcomeCallable VodClient::describeVodDomainSrcTrafficDataCallable(const DescribeVodDomainSrcTrafficDataRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeVodDomainSrcTrafficDataOutcome()>>(
+			[this, request]()
+			{
+			return this->describeVodDomainSrcTrafficData(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 VodClient::DescribeVodDomainTrafficDataOutcome VodClient::describeVodDomainTrafficData(const DescribeVodDomainTrafficDataRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

vod/src/model/DescribeVodDomainSrcTrafficDataRequest.cc

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/vod/model/DescribeVodDomainSrcTrafficDataRequest.h>
+
+using AlibabaCloud::Vod::Model::DescribeVodDomainSrcTrafficDataRequest;
+
+DescribeVodDomainSrcTrafficDataRequest::DescribeVodDomainSrcTrafficDataRequest() :
+	RpcServiceRequest("vod", "2017-03-21", "DescribeVodDomainSrcTrafficData")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeVodDomainSrcTrafficDataRequest::~DescribeVodDomainSrcTrafficDataRequest()
+{}
+
+std::string DescribeVodDomainSrcTrafficDataRequest::getStartTime()const
+{
+	return startTime_;
+}
+
+void DescribeVodDomainSrcTrafficDataRequest::setStartTime(const std::string& startTime)
+{
+	startTime_ = startTime;
+	setParameter("StartTime", startTime);
+}
+
+std::string DescribeVodDomainSrcTrafficDataRequest::getDomainName()const
+{
+	return domainName_;
+}
+
+void DescribeVodDomainSrcTrafficDataRequest::setDomainName(const std::string& domainName)
+{
+	domainName_ = domainName;
+	setParameter("DomainName", domainName);
+}
+
+std::string DescribeVodDomainSrcTrafficDataRequest::getEndTime()const
+{
+	return endTime_;
+}
+
+void DescribeVodDomainSrcTrafficDataRequest::setEndTime(const std::string& endTime)
+{
+	endTime_ = endTime;
+	setParameter("EndTime", endTime);
+}
+
+long DescribeVodDomainSrcTrafficDataRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeVodDomainSrcTrafficDataRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string DescribeVodDomainSrcTrafficDataRequest::getInterval()const
+{
+	return interval_;
+}
+
+void DescribeVodDomainSrcTrafficDataRequest::setInterval(const std::string& interval)
+{
+	interval_ = interval;
+	setParameter("Interval", interval);
+}
+

vod/src/model/DescribeVodDomainSrcTrafficDataResult.cc

@@ -0,0 +1,89 @@
+/*
+ * 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/DescribeVodDomainSrcTrafficDataResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Vod;
+using namespace AlibabaCloud::Vod::Model;
+
+DescribeVodDomainSrcTrafficDataResult::DescribeVodDomainSrcTrafficDataResult() :
+	ServiceResult()
+{}
+
+DescribeVodDomainSrcTrafficDataResult::DescribeVodDomainSrcTrafficDataResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeVodDomainSrcTrafficDataResult::~DescribeVodDomainSrcTrafficDataResult()
+{}
+
+void DescribeVodDomainSrcTrafficDataResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allSrcTrafficDataPerIntervalNode = value["SrcTrafficDataPerInterval"]["DataModule"];
+	for (auto valueSrcTrafficDataPerIntervalDataModule : allSrcTrafficDataPerIntervalNode)
+	{
+		DataModule srcTrafficDataPerIntervalObject;
+		if(!valueSrcTrafficDataPerIntervalDataModule["Value"].isNull())
+			srcTrafficDataPerIntervalObject.value = valueSrcTrafficDataPerIntervalDataModule["Value"].asString();
+		if(!valueSrcTrafficDataPerIntervalDataModule["TimeStamp"].isNull())
+			srcTrafficDataPerIntervalObject.timeStamp = valueSrcTrafficDataPerIntervalDataModule["TimeStamp"].asString();
+		if(!valueSrcTrafficDataPerIntervalDataModule["HttpsValue"].isNull())
+			srcTrafficDataPerIntervalObject.httpsValue = valueSrcTrafficDataPerIntervalDataModule["HttpsValue"].asString();
+		srcTrafficDataPerInterval_.push_back(srcTrafficDataPerIntervalObject);
+	}
+	if(!value["EndTime"].isNull())
+		endTime_ = value["EndTime"].asString();
+	if(!value["StartTime"].isNull())
+		startTime_ = value["StartTime"].asString();
+	if(!value["DomainName"].isNull())
+		domainName_ = value["DomainName"].asString();
+	if(!value["DataInterval"].isNull())
+		dataInterval_ = value["DataInterval"].asString();
+
+}
+
+std::string DescribeVodDomainSrcTrafficDataResult::getEndTime()const
+{
+	return endTime_;
+}
+
+std::string DescribeVodDomainSrcTrafficDataResult::getDomainName()const
+{
+	return domainName_;
+}
+
+std::string DescribeVodDomainSrcTrafficDataResult::getStartTime()const
+{
+	return startTime_;
+}
+
+std::string DescribeVodDomainSrcTrafficDataResult::getDataInterval()const
+{
+	return dataInterval_;
+}
+
+std::vector<DescribeVodDomainSrcTrafficDataResult::DataModule> DescribeVodDomainSrcTrafficDataResult::getSrcTrafficDataPerInterval()const
+{
+	return srcTrafficDataPerInterval_;
+}
+

vod/src/model/GetMediaAuditAudioResultDetailResult.cc

@@ -48,10 +48,10 @@ void GetMediaAuditAudioResultDetailResult::parse(const std::string &payload)
 	for (auto mediaAuditAudioResultDetailNodeListListItem : allListNode)
 	{
 		MediaAuditAudioResultDetail::ListItem listItemObject;
-		if(!mediaAuditAudioResultDetailNodeListListItem["StartTime"].isNull())
-			listItemObject.startTime = std::stol(mediaAuditAudioResultDetailNodeListListItem["StartTime"].asString());
 		if(!mediaAuditAudioResultDetailNodeListListItem["EndTime"].isNull())
 			listItemObject.endTime = std::stol(mediaAuditAudioResultDetailNodeListListItem["EndTime"].asString());
+		if(!mediaAuditAudioResultDetailNodeListListItem["StartTime"].isNull())
+			listItemObject.startTime = std::stol(mediaAuditAudioResultDetailNodeListListItem["StartTime"].asString());
 		if(!mediaAuditAudioResultDetailNodeListListItem["Text"].isNull())
 			listItemObject.text = mediaAuditAudioResultDetailNodeListListItem["Text"].asString();
 		if(!mediaAuditAudioResultDetailNodeListListItem["Label"].isNull())

vod/src/model/UploadStreamByURLResult.cc

@@ -41,9 +41,23 @@ void UploadStreamByURLResult::parse(const std::string &payload)
 	setRequestId(value["RequestId"].asString());
 	if(!value["StreamJobId"].isNull())
 		streamJobId_ = value["StreamJobId"].asString();
+	if(!value["FileURL"].isNull())
+		fileURL_ = value["FileURL"].asString();
+	if(!value["SourceURL"].isNull())
+		sourceURL_ = value["SourceURL"].asString();
 
 }
 
+std::string UploadStreamByURLResult::getFileURL()const
+{
+	return fileURL_;
+}
+
+std::string UploadStreamByURLResult::getSourceURL()const
+{
+	return sourceURL_;
+}
+
 std::string UploadStreamByURLResult::getStreamJobId()const
 {
 	return streamJobId_;