diff --git a/CHANGELOG b/CHANGELOG index 27336ba9a..470a7dd3b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-11-25 Version: patch +- Update DescribeScdnDomainCertificateInfo. + 2020-11-25 Version: patch - Update SetVideoSeekConfig. diff --git a/scdn/include/alibabacloud/scdn/model/DescribeScdnDomainPvDataResult.h b/scdn/include/alibabacloud/scdn/model/DescribeScdnDomainPvDataResult.h index cd457b05e..4005b1e08 100644 --- a/scdn/include/alibabacloud/scdn/model/DescribeScdnDomainPvDataResult.h +++ b/scdn/include/alibabacloud/scdn/model/DescribeScdnDomainPvDataResult.h @@ -42,15 +42,19 @@ namespace AlibabaCloud DescribeScdnDomainPvDataResult(); explicit DescribeScdnDomainPvDataResult(const std::string &payload); ~DescribeScdnDomainPvDataResult(); + std::string getEndTime()const; std::string getDomainName()const; std::string getStartTime()const; + std::string getDataInterval()const; std::vector getPvDataInterval()const; protected: void parse(const std::string &payload); private: + std::string endTime_; std::string domainName_; std::string startTime_; + std::string dataInterval_; std::vector pvDataInterval_; }; diff --git a/scdn/include/alibabacloud/scdn/model/DescribeScdnDomainUvDataResult.h b/scdn/include/alibabacloud/scdn/model/DescribeScdnDomainUvDataResult.h index 149b20b3f..4e0dec8c8 100644 --- a/scdn/include/alibabacloud/scdn/model/DescribeScdnDomainUvDataResult.h +++ b/scdn/include/alibabacloud/scdn/model/DescribeScdnDomainUvDataResult.h @@ -43,15 +43,19 @@ namespace AlibabaCloud explicit DescribeScdnDomainUvDataResult(const std::string &payload); ~DescribeScdnDomainUvDataResult(); std::vector getUvDataInterval()const; + std::string getEndTime()const; std::string getDomainName()const; std::string getStartTime()const; + std::string getDataInterval()const; protected: void parse(const std::string &payload); private: std::vector uvDataInterval_; + std::string endTime_; std::string domainName_; std::string startTime_; + std::string dataInterval_; }; } diff --git a/scdn/src/model/DescribeScdnDomainConfigsResult.cc b/scdn/src/model/DescribeScdnDomainConfigsResult.cc index 82b76ce28..2b4d6b5a8 100644 --- a/scdn/src/model/DescribeScdnDomainConfigsResult.cc +++ b/scdn/src/model/DescribeScdnDomainConfigsResult.cc @@ -49,14 +49,14 @@ void DescribeScdnDomainConfigsResult::parse(const std::string &payload) domainConfigsObject.configId = valueDomainConfigsDomainConfig["ConfigId"].asString(); if(!valueDomainConfigsDomainConfig["Status"].isNull()) domainConfigsObject.status = valueDomainConfigsDomainConfig["Status"].asString(); - auto allFunctionArgsNode = allDomainConfigsNode["FunctionArgs"]["FunctionArg"]; - for (auto allDomainConfigsNodeFunctionArgsFunctionArg : allFunctionArgsNode) + auto allFunctionArgsNode = valueDomainConfigsDomainConfig["FunctionArgs"]["FunctionArg"]; + for (auto valueDomainConfigsDomainConfigFunctionArgsFunctionArg : allFunctionArgsNode) { DomainConfig::FunctionArg functionArgsObject; - if(!allDomainConfigsNodeFunctionArgsFunctionArg["ArgName"].isNull()) - functionArgsObject.argName = allDomainConfigsNodeFunctionArgsFunctionArg["ArgName"].asString(); - if(!allDomainConfigsNodeFunctionArgsFunctionArg["ArgValue"].isNull()) - functionArgsObject.argValue = allDomainConfigsNodeFunctionArgsFunctionArg["ArgValue"].asString(); + if(!valueDomainConfigsDomainConfigFunctionArgsFunctionArg["ArgName"].isNull()) + functionArgsObject.argName = valueDomainConfigsDomainConfigFunctionArgsFunctionArg["ArgName"].asString(); + if(!valueDomainConfigsDomainConfigFunctionArgsFunctionArg["ArgValue"].isNull()) + functionArgsObject.argValue = valueDomainConfigsDomainConfigFunctionArgsFunctionArg["ArgValue"].asString(); domainConfigsObject.functionArgs.push_back(functionArgsObject); } domainConfigs_.push_back(domainConfigsObject); diff --git a/scdn/src/model/DescribeScdnDomainHttpCodeDataResult.cc b/scdn/src/model/DescribeScdnDomainHttpCodeDataResult.cc index 30338cfa5..0767b52ff 100644 --- a/scdn/src/model/DescribeScdnDomainHttpCodeDataResult.cc +++ b/scdn/src/model/DescribeScdnDomainHttpCodeDataResult.cc @@ -45,16 +45,16 @@ void DescribeScdnDomainHttpCodeDataResult::parse(const std::string &payload) DataModule dataPerIntervalObject; if(!valueDataPerIntervalDataModule["TimeStamp"].isNull()) dataPerIntervalObject.timeStamp = valueDataPerIntervalDataModule["TimeStamp"].asString(); - auto allHttpCodeDataPerIntervalNode = allDataPerIntervalNode["HttpCodeDataPerInterval"]["HttpCodeDataModule"]; - for (auto allDataPerIntervalNodeHttpCodeDataPerIntervalHttpCodeDataModule : allHttpCodeDataPerIntervalNode) + auto allHttpCodeDataPerIntervalNode = valueDataPerIntervalDataModule["HttpCodeDataPerInterval"]["HttpCodeDataModule"]; + for (auto valueDataPerIntervalDataModuleHttpCodeDataPerIntervalHttpCodeDataModule : allHttpCodeDataPerIntervalNode) { DataModule::HttpCodeDataModule httpCodeDataPerIntervalObject; - if(!allDataPerIntervalNodeHttpCodeDataPerIntervalHttpCodeDataModule["Code"].isNull()) - httpCodeDataPerIntervalObject.code = allDataPerIntervalNodeHttpCodeDataPerIntervalHttpCodeDataModule["Code"].asString(); - if(!allDataPerIntervalNodeHttpCodeDataPerIntervalHttpCodeDataModule["Proportion"].isNull()) - httpCodeDataPerIntervalObject.proportion = allDataPerIntervalNodeHttpCodeDataPerIntervalHttpCodeDataModule["Proportion"].asString(); - if(!allDataPerIntervalNodeHttpCodeDataPerIntervalHttpCodeDataModule["Count"].isNull()) - httpCodeDataPerIntervalObject.count = allDataPerIntervalNodeHttpCodeDataPerIntervalHttpCodeDataModule["Count"].asString(); + if(!valueDataPerIntervalDataModuleHttpCodeDataPerIntervalHttpCodeDataModule["Code"].isNull()) + httpCodeDataPerIntervalObject.code = valueDataPerIntervalDataModuleHttpCodeDataPerIntervalHttpCodeDataModule["Code"].asString(); + if(!valueDataPerIntervalDataModuleHttpCodeDataPerIntervalHttpCodeDataModule["Proportion"].isNull()) + httpCodeDataPerIntervalObject.proportion = valueDataPerIntervalDataModuleHttpCodeDataPerIntervalHttpCodeDataModule["Proportion"].asString(); + if(!valueDataPerIntervalDataModuleHttpCodeDataPerIntervalHttpCodeDataModule["Count"].isNull()) + httpCodeDataPerIntervalObject.count = valueDataPerIntervalDataModuleHttpCodeDataPerIntervalHttpCodeDataModule["Count"].asString(); dataPerIntervalObject.httpCodeDataPerInterval.push_back(httpCodeDataPerIntervalObject); } dataPerInterval_.push_back(dataPerIntervalObject); diff --git a/scdn/src/model/DescribeScdnDomainLogResult.cc b/scdn/src/model/DescribeScdnDomainLogResult.cc index 164a1b0b2..e78ee5c2b 100644 --- a/scdn/src/model/DescribeScdnDomainLogResult.cc +++ b/scdn/src/model/DescribeScdnDomainLogResult.cc @@ -45,20 +45,20 @@ void DescribeScdnDomainLogResult::parse(const std::string &payload) DomainLogDetail domainLogDetailsObject; if(!valueDomainLogDetailsDomainLogDetail["LogCount"].isNull()) domainLogDetailsObject.logCount = std::stol(valueDomainLogDetailsDomainLogDetail["LogCount"].asString()); - auto allLogInfosNode = allDomainLogDetailsNode["LogInfos"]["LogInfoDetail"]; - for (auto allDomainLogDetailsNodeLogInfosLogInfoDetail : allLogInfosNode) + auto allLogInfosNode = valueDomainLogDetailsDomainLogDetail["LogInfos"]["LogInfoDetail"]; + for (auto valueDomainLogDetailsDomainLogDetailLogInfosLogInfoDetail : allLogInfosNode) { DomainLogDetail::LogInfoDetail logInfosObject; - if(!allDomainLogDetailsNodeLogInfosLogInfoDetail["LogName"].isNull()) - logInfosObject.logName = allDomainLogDetailsNodeLogInfosLogInfoDetail["LogName"].asString(); - if(!allDomainLogDetailsNodeLogInfosLogInfoDetail["LogPath"].isNull()) - logInfosObject.logPath = allDomainLogDetailsNodeLogInfosLogInfoDetail["LogPath"].asString(); - if(!allDomainLogDetailsNodeLogInfosLogInfoDetail["LogSize"].isNull()) - logInfosObject.logSize = std::stol(allDomainLogDetailsNodeLogInfosLogInfoDetail["LogSize"].asString()); - if(!allDomainLogDetailsNodeLogInfosLogInfoDetail["StartTime"].isNull()) - logInfosObject.startTime = allDomainLogDetailsNodeLogInfosLogInfoDetail["StartTime"].asString(); - if(!allDomainLogDetailsNodeLogInfosLogInfoDetail["EndTime"].isNull()) - logInfosObject.endTime = allDomainLogDetailsNodeLogInfosLogInfoDetail["EndTime"].asString(); + if(!valueDomainLogDetailsDomainLogDetailLogInfosLogInfoDetail["LogName"].isNull()) + logInfosObject.logName = valueDomainLogDetailsDomainLogDetailLogInfosLogInfoDetail["LogName"].asString(); + if(!valueDomainLogDetailsDomainLogDetailLogInfosLogInfoDetail["LogPath"].isNull()) + logInfosObject.logPath = valueDomainLogDetailsDomainLogDetailLogInfosLogInfoDetail["LogPath"].asString(); + if(!valueDomainLogDetailsDomainLogDetailLogInfosLogInfoDetail["LogSize"].isNull()) + logInfosObject.logSize = std::stol(valueDomainLogDetailsDomainLogDetailLogInfosLogInfoDetail["LogSize"].asString()); + if(!valueDomainLogDetailsDomainLogDetailLogInfosLogInfoDetail["StartTime"].isNull()) + logInfosObject.startTime = valueDomainLogDetailsDomainLogDetailLogInfosLogInfoDetail["StartTime"].asString(); + if(!valueDomainLogDetailsDomainLogDetailLogInfosLogInfoDetail["EndTime"].isNull()) + logInfosObject.endTime = valueDomainLogDetailsDomainLogDetailLogInfosLogInfoDetail["EndTime"].asString(); domainLogDetailsObject.logInfos.push_back(logInfosObject); } auto pageInfosNode = value["PageInfos"]; diff --git a/scdn/src/model/DescribeScdnDomainPvDataResult.cc b/scdn/src/model/DescribeScdnDomainPvDataResult.cc index 3cf629319..1864282f4 100644 --- a/scdn/src/model/DescribeScdnDomainPvDataResult.cc +++ b/scdn/src/model/DescribeScdnDomainPvDataResult.cc @@ -53,9 +53,18 @@ void DescribeScdnDomainPvDataResult::parse(const std::string &payload) domainName_ = value["DomainName"].asString(); if(!value["StartTime"].isNull()) startTime_ = value["StartTime"].asString(); + if(!value["EndTime"].isNull()) + endTime_ = value["EndTime"].asString(); + if(!value["DataInterval"].isNull()) + dataInterval_ = value["DataInterval"].asString(); } +std::string DescribeScdnDomainPvDataResult::getEndTime()const +{ + return endTime_; +} + std::string DescribeScdnDomainPvDataResult::getDomainName()const { return domainName_; @@ -66,6 +75,11 @@ std::string DescribeScdnDomainPvDataResult::getStartTime()const return startTime_; } +std::string DescribeScdnDomainPvDataResult::getDataInterval()const +{ + return dataInterval_; +} + std::vector DescribeScdnDomainPvDataResult::getPvDataInterval()const { return pvDataInterval_; diff --git a/scdn/src/model/DescribeScdnDomainRealTimeHttpCodeDataResult.cc b/scdn/src/model/DescribeScdnDomainRealTimeHttpCodeDataResult.cc index c9153993d..e2176560a 100644 --- a/scdn/src/model/DescribeScdnDomainRealTimeHttpCodeDataResult.cc +++ b/scdn/src/model/DescribeScdnDomainRealTimeHttpCodeDataResult.cc @@ -45,16 +45,16 @@ void DescribeScdnDomainRealTimeHttpCodeDataResult::parse(const std::string &payl UsageData realTimeHttpCodeDataObject; if(!valueRealTimeHttpCodeDataUsageData["TimeStamp"].isNull()) realTimeHttpCodeDataObject.timeStamp = valueRealTimeHttpCodeDataUsageData["TimeStamp"].asString(); - auto allValueNode = allRealTimeHttpCodeDataNode["Value"]["RealTimeCodeProportionData"]; - for (auto allRealTimeHttpCodeDataNodeValueRealTimeCodeProportionData : allValueNode) + auto allValueNode = valueRealTimeHttpCodeDataUsageData["Value"]["RealTimeCodeProportionData"]; + for (auto valueRealTimeHttpCodeDataUsageDataValueRealTimeCodeProportionData : allValueNode) { UsageData::RealTimeCodeProportionData valueObject; - if(!allRealTimeHttpCodeDataNodeValueRealTimeCodeProportionData["Code"].isNull()) - valueObject.code = allRealTimeHttpCodeDataNodeValueRealTimeCodeProportionData["Code"].asString(); - if(!allRealTimeHttpCodeDataNodeValueRealTimeCodeProportionData["Proportion"].isNull()) - valueObject.proportion = allRealTimeHttpCodeDataNodeValueRealTimeCodeProportionData["Proportion"].asString(); - if(!allRealTimeHttpCodeDataNodeValueRealTimeCodeProportionData["Count"].isNull()) - valueObject.count = allRealTimeHttpCodeDataNodeValueRealTimeCodeProportionData["Count"].asString(); + if(!valueRealTimeHttpCodeDataUsageDataValueRealTimeCodeProportionData["Code"].isNull()) + valueObject.code = valueRealTimeHttpCodeDataUsageDataValueRealTimeCodeProportionData["Code"].asString(); + if(!valueRealTimeHttpCodeDataUsageDataValueRealTimeCodeProportionData["Proportion"].isNull()) + valueObject.proportion = valueRealTimeHttpCodeDataUsageDataValueRealTimeCodeProportionData["Proportion"].asString(); + if(!valueRealTimeHttpCodeDataUsageDataValueRealTimeCodeProportionData["Count"].isNull()) + valueObject.count = valueRealTimeHttpCodeDataUsageDataValueRealTimeCodeProportionData["Count"].asString(); realTimeHttpCodeDataObject.value.push_back(valueObject); } realTimeHttpCodeData_.push_back(realTimeHttpCodeDataObject); diff --git a/scdn/src/model/DescribeScdnDomainUvDataResult.cc b/scdn/src/model/DescribeScdnDomainUvDataResult.cc index 2853fe88c..a952f5dbd 100644 --- a/scdn/src/model/DescribeScdnDomainUvDataResult.cc +++ b/scdn/src/model/DescribeScdnDomainUvDataResult.cc @@ -53,6 +53,10 @@ void DescribeScdnDomainUvDataResult::parse(const std::string &payload) domainName_ = value["DomainName"].asString(); if(!value["StartTime"].isNull()) startTime_ = value["StartTime"].asString(); + if(!value["EndTime"].isNull()) + endTime_ = value["EndTime"].asString(); + if(!value["DataInterval"].isNull()) + dataInterval_ = value["DataInterval"].asString(); } @@ -61,6 +65,11 @@ std::vector DescribeScdnDomainUvDataR return uvDataInterval_; } +std::string DescribeScdnDomainUvDataResult::getEndTime()const +{ + return endTime_; +} + std::string DescribeScdnDomainUvDataResult::getDomainName()const { return domainName_; @@ -71,3 +80,8 @@ std::string DescribeScdnDomainUvDataResult::getStartTime()const return startTime_; } +std::string DescribeScdnDomainUvDataResult::getDataInterval()const +{ + return dataInterval_; +} + diff --git a/scdn/src/model/DescribeScdnUserDomainsResult.cc b/scdn/src/model/DescribeScdnUserDomainsResult.cc index 23a34bf9c..0e98b494d 100644 --- a/scdn/src/model/DescribeScdnUserDomainsResult.cc +++ b/scdn/src/model/DescribeScdnUserDomainsResult.cc @@ -61,18 +61,18 @@ void DescribeScdnUserDomainsResult::parse(const std::string &payload) domainsObject.resourceGroupId = valueDomainsPageData["ResourceGroupId"].asString(); if(!valueDomainsPageData["Sandbox"].isNull()) domainsObject.sandbox = valueDomainsPageData["Sandbox"].asString(); - auto allSourcesNode = allDomainsNode["Sources"]["Source"]; - for (auto allDomainsNodeSourcesSource : allSourcesNode) + auto allSourcesNode = valueDomainsPageData["Sources"]["Source"]; + for (auto valueDomainsPageDataSourcesSource : allSourcesNode) { PageData::Source sourcesObject; - if(!allDomainsNodeSourcesSource["Type"].isNull()) - sourcesObject.type = allDomainsNodeSourcesSource["Type"].asString(); - if(!allDomainsNodeSourcesSource["Content"].isNull()) - sourcesObject.content = allDomainsNodeSourcesSource["Content"].asString(); - if(!allDomainsNodeSourcesSource["Port"].isNull()) - sourcesObject.port = std::stoi(allDomainsNodeSourcesSource["Port"].asString()); - if(!allDomainsNodeSourcesSource["Priority"].isNull()) - sourcesObject.priority = allDomainsNodeSourcesSource["Priority"].asString(); + if(!valueDomainsPageDataSourcesSource["Type"].isNull()) + sourcesObject.type = valueDomainsPageDataSourcesSource["Type"].asString(); + if(!valueDomainsPageDataSourcesSource["Content"].isNull()) + sourcesObject.content = valueDomainsPageDataSourcesSource["Content"].asString(); + if(!valueDomainsPageDataSourcesSource["Port"].isNull()) + sourcesObject.port = std::stoi(valueDomainsPageDataSourcesSource["Port"].asString()); + if(!valueDomainsPageDataSourcesSource["Priority"].isNull()) + sourcesObject.priority = valueDomainsPageDataSourcesSource["Priority"].asString(); domainsObject.sources.push_back(sourcesObject); } domains_.push_back(domainsObject);