Forráskód Böngészése

Update OpenDcdnService.

sdk-team 5 éve
szülő
commit
e12cedf04a
33 módosított fájl, 497 hozzáadás és 186 törlés
  1. 3 0
      CHANGELOG
  2. 4 0
      dcdn/CMakeLists.txt
  3. 8 0
      dcdn/include/alibabacloud/dcdn/DcdnClient.h
  4. 3 0
      dcdn/include/alibabacloud/dcdn/model/AddDcdnIpaDomainRequest.h
  5. 3 6
      dcdn/include/alibabacloud/dcdn/model/DescribeDcdnDomainPvDataRequest.h
  6. 2 2
      dcdn/include/alibabacloud/dcdn/model/DescribeDcdnDomainPvDataResult.h
  7. 3 6
      dcdn/include/alibabacloud/dcdn/model/DescribeDcdnDomainUvDataRequest.h
  8. 2 2
      dcdn/include/alibabacloud/dcdn/model/DescribeDcdnDomainUvDataResult.h
  9. 9 0
      dcdn/include/alibabacloud/dcdn/model/DescribeDcdnUserDomainsRequest.h
  10. 54 0
      dcdn/include/alibabacloud/dcdn/model/DescribeDcdnWafDomainRequest.h
  11. 61 0
      dcdn/include/alibabacloud/dcdn/model/DescribeDcdnWafDomainResult.h
  12. 36 0
      dcdn/src/DcdnClient.cc
  13. 11 0
      dcdn/src/model/AddDcdnIpaDomainRequest.cc
  14. 6 6
      dcdn/src/model/DescribeDcdnConfigOfVersionResult.cc
  15. 6 6
      dcdn/src/model/DescribeDcdnDomainConfigsResult.cc
  16. 8 8
      dcdn/src/model/DescribeDcdnDomainHttpCodeDataResult.cc
  17. 12 12
      dcdn/src/model/DescribeDcdnDomainLogResult.cc
  18. 11 22
      dcdn/src/model/DescribeDcdnDomainPvDataRequest.cc
  19. 8 8
      dcdn/src/model/DescribeDcdnDomainPvDataResult.cc
  20. 8 8
      dcdn/src/model/DescribeDcdnDomainRealTimeHttpCodeDataResult.cc
  21. 8 8
      dcdn/src/model/DescribeDcdnDomainRealTimeSrcHttpCodeDataResult.cc
  22. 6 6
      dcdn/src/model/DescribeDcdnDomainStagingConfigResult.cc
  23. 11 22
      dcdn/src/model/DescribeDcdnDomainUvDataRequest.cc
  24. 8 8
      dcdn/src/model/DescribeDcdnDomainUvDataResult.cc
  25. 8 8
      dcdn/src/model/DescribeDcdnDomainWebsocketHttpCodeDataResult.cc
  26. 6 6
      dcdn/src/model/DescribeDcdnIpaDomainConfigsResult.cc
  27. 12 12
      dcdn/src/model/DescribeDcdnIpaUserDomainsResult.cc
  28. 6 6
      dcdn/src/model/DescribeDcdnTagResourcesResult.cc
  29. 12 12
      dcdn/src/model/DescribeDcdnUserBillHistoryResult.cc
  30. 16 0
      dcdn/src/model/DescribeDcdnUserDomainsRequest.cc
  31. 12 12
      dcdn/src/model/DescribeDcdnUserDomainsResult.cc
  32. 62 0
      dcdn/src/model/DescribeDcdnWafDomainRequest.cc
  33. 72 0
      dcdn/src/model/DescribeDcdnWafDomainResult.cc

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2020-11-30 Version: patch
+- Update OpenDcdnService.
+
 2020-11-29 Version: patch
 - Support CPP and Go and PHP.
 

+ 4 - 0
dcdn/CMakeLists.txt

@@ -171,6 +171,8 @@ set(dcdn_public_header_model
 	include/alibabacloud/dcdn/model/DescribeDcdnUserTagsResult.h
 	include/alibabacloud/dcdn/model/DescribeDcdnVerifyContentRequest.h
 	include/alibabacloud/dcdn/model/DescribeDcdnVerifyContentResult.h
+	include/alibabacloud/dcdn/model/DescribeDcdnWafDomainRequest.h
+	include/alibabacloud/dcdn/model/DescribeDcdnWafDomainResult.h
 	include/alibabacloud/dcdn/model/DescribeUserDcdnIpaStatusRequest.h
 	include/alibabacloud/dcdn/model/DescribeUserDcdnIpaStatusResult.h
 	include/alibabacloud/dcdn/model/DescribeUserDcdnStatusRequest.h
@@ -364,6 +366,8 @@ set(dcdn_src
 	src/model/DescribeDcdnUserTagsResult.cc
 	src/model/DescribeDcdnVerifyContentRequest.cc
 	src/model/DescribeDcdnVerifyContentResult.cc
+	src/model/DescribeDcdnWafDomainRequest.cc
+	src/model/DescribeDcdnWafDomainResult.cc
 	src/model/DescribeUserDcdnIpaStatusRequest.cc
 	src/model/DescribeUserDcdnIpaStatusResult.cc
 	src/model/DescribeUserDcdnStatusRequest.cc

+ 8 - 0
dcdn/include/alibabacloud/dcdn/DcdnClient.h

@@ -172,6 +172,8 @@
 #include "model/DescribeDcdnUserTagsResult.h"
 #include "model/DescribeDcdnVerifyContentRequest.h"
 #include "model/DescribeDcdnVerifyContentResult.h"
+#include "model/DescribeDcdnWafDomainRequest.h"
+#include "model/DescribeDcdnWafDomainResult.h"
 #include "model/DescribeUserDcdnIpaStatusRequest.h"
 #include "model/DescribeUserDcdnIpaStatusResult.h"
 #include "model/DescribeUserDcdnStatusRequest.h"
@@ -446,6 +448,9 @@ namespace AlibabaCloud
 			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::DescribeDcdnWafDomainResult> DescribeDcdnWafDomainOutcome;
+			typedef std::future<DescribeDcdnWafDomainOutcome> DescribeDcdnWafDomainOutcomeCallable;
+			typedef std::function<void(const DcdnClient*, const Model::DescribeDcdnWafDomainRequest&, const DescribeDcdnWafDomainOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDcdnWafDomainAsyncHandler;
 			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;
@@ -736,6 +741,9 @@ namespace AlibabaCloud
 			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;
+			DescribeDcdnWafDomainOutcome describeDcdnWafDomain(const Model::DescribeDcdnWafDomainRequest &request)const;
+			void describeDcdnWafDomainAsync(const Model::DescribeDcdnWafDomainRequest& request, const DescribeDcdnWafDomainAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDcdnWafDomainOutcomeCallable describeDcdnWafDomainCallable(const Model::DescribeDcdnWafDomainRequest& 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;

+ 3 - 0
dcdn/include/alibabacloud/dcdn/model/AddDcdnIpaDomainRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setSources(const std::string& sources);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
+				std::string getProtocol()const;
+				void setProtocol(const std::string& protocol);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getScope()const;
@@ -57,6 +59,7 @@ namespace AlibabaCloud
             private:
 				std::string sources_;
 				std::string resourceGroupId_;
+				std::string protocol_;
 				std::string securityToken_;
 				std::string scope_;
 				std::string topLevelDomain_;

+ 3 - 6
dcdn/include/alibabacloud/dcdn/model/DescribeDcdnDomainPvDataRequest.h

@@ -35,23 +35,20 @@ namespace AlibabaCloud
 				DescribeDcdnDomainPvDataRequest();
 				~DescribeDcdnDomainPvDataRequest();
 
+				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);
-				std::string getStartTime()const;
-				void setStartTime(const std::string& startTime);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getSecurityToken()const;
-				void setSecurityToken(const std::string& securityToken);
 
             private:
+				std::string startTime_;
 				std::string domainName_;
 				std::string endTime_;
-				std::string startTime_;
 				long ownerId_;
-				std::string securityToken_;
 
 			};
 		}

+ 2 - 2
dcdn/include/alibabacloud/dcdn/model/DescribeDcdnDomainPvDataResult.h

@@ -44,8 +44,8 @@ namespace AlibabaCloud
 				~DescribeDcdnDomainPvDataResult();
 				std::string getEndTime()const;
 				std::string getDomainName()const;
-				std::string getDataInterval()const;
 				std::string getStartTime()const;
+				std::string getDataInterval()const;
 				std::vector<UsageData> getPvDataInterval()const;
 
 			protected:
@@ -53,8 +53,8 @@ namespace AlibabaCloud
 			private:
 				std::string endTime_;
 				std::string domainName_;
-				std::string dataInterval_;
 				std::string startTime_;
+				std::string dataInterval_;
 				std::vector<UsageData> pvDataInterval_;
 
 			};

+ 3 - 6
dcdn/include/alibabacloud/dcdn/model/DescribeDcdnDomainUvDataRequest.h

@@ -35,23 +35,20 @@ namespace AlibabaCloud
 				DescribeDcdnDomainUvDataRequest();
 				~DescribeDcdnDomainUvDataRequest();
 
+				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);
-				std::string getStartTime()const;
-				void setStartTime(const std::string& startTime);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getSecurityToken()const;
-				void setSecurityToken(const std::string& securityToken);
 
             private:
+				std::string startTime_;
 				std::string domainName_;
 				std::string endTime_;
-				std::string startTime_;
 				long ownerId_;
-				std::string securityToken_;
 
 			};
 		}

+ 2 - 2
dcdn/include/alibabacloud/dcdn/model/DescribeDcdnDomainUvDataResult.h

@@ -45,8 +45,8 @@ namespace AlibabaCloud
 				std::vector<UsageData> getUvDataInterval()const;
 				std::string getEndTime()const;
 				std::string getDomainName()const;
-				std::string getDataInterval()const;
 				std::string getStartTime()const;
+				std::string getDataInterval()const;
 
 			protected:
 				void parse(const std::string &payload);
@@ -54,8 +54,8 @@ namespace AlibabaCloud
 				std::vector<UsageData> uvDataInterval_;
 				std::string endTime_;
 				std::string domainName_;
-				std::string dataInterval_;
 				std::string startTime_;
+				std::string dataInterval_;
 
 			};
 		}

+ 9 - 0
dcdn/include/alibabacloud/dcdn/model/DescribeDcdnUserDomainsRequest.h

@@ -30,6 +30,12 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_DCDN_EXPORT DescribeDcdnUserDomainsRequest : public RpcServiceRequest
 			{
+			public:
+				struct Tag
+				{
+					std::string value;
+					std::string key;
+				};
 
 			public:
 				DescribeDcdnUserDomainsRequest();
@@ -47,6 +53,8 @@ namespace AlibabaCloud
 				void setChangeEndTime(const std::string& changeEndTime);
 				int getPageSize()const;
 				void setPageSize(int pageSize);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				std::string getFuncFilter()const;
 				void setFuncFilter(const std::string& funcFilter);
 				std::string getDomainName()const;
@@ -69,6 +77,7 @@ namespace AlibabaCloud
 				std::string securityToken_;
 				std::string changeEndTime_;
 				int pageSize_;
+				std::vector<Tag> tag_;
 				std::string funcFilter_;
 				std::string domainName_;
 				long ownerId_;

+ 54 - 0
dcdn/include/alibabacloud/dcdn/model/DescribeDcdnWafDomainRequest.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_DESCRIBEDCDNWAFDOMAINREQUEST_H_
+#define ALIBABACLOUD_DCDN_MODEL_DESCRIBEDCDNWAFDOMAINREQUEST_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 DescribeDcdnWafDomainRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeDcdnWafDomainRequest();
+				~DescribeDcdnWafDomainRequest();
+
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getDomainName()const;
+				void setDomainName(const std::string& domainName);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+
+            private:
+				std::string regionId_;
+				std::string domainName_;
+				long ownerId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DCDN_MODEL_DESCRIBEDCDNWAFDOMAINREQUEST_H_

+ 61 - 0
dcdn/include/alibabacloud/dcdn/model/DescribeDcdnWafDomainResult.h

@@ -0,0 +1,61 @@
+/*
+ * 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_DESCRIBEDCDNWAFDOMAINRESULT_H_
+#define ALIBABACLOUD_DCDN_MODEL_DESCRIBEDCDNWAFDOMAINRESULT_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 DescribeDcdnWafDomainResult : public ServiceResult
+			{
+			public:
+				struct OutPutDomain
+				{
+					int status;
+					int aclStatus;
+					int ccStatus;
+					std::string domain;
+					int wafStatus;
+				};
+
+
+				DescribeDcdnWafDomainResult();
+				explicit DescribeDcdnWafDomainResult(const std::string &payload);
+				~DescribeDcdnWafDomainResult();
+				int getTotalCount()const;
+				std::vector<OutPutDomain> getOutPutDomains()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				int totalCount_;
+				std::vector<OutPutDomain> outPutDomains_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DCDN_MODEL_DESCRIBEDCDNWAFDOMAINRESULT_H_

+ 36 - 0
dcdn/src/DcdnClient.cc

@@ -2751,6 +2751,42 @@ DcdnClient::DescribeDcdnVerifyContentOutcomeCallable DcdnClient::describeDcdnVer
 	return task->get_future();
 }
 
+DcdnClient::DescribeDcdnWafDomainOutcome DcdnClient::describeDcdnWafDomain(const DescribeDcdnWafDomainRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeDcdnWafDomainOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeDcdnWafDomainOutcome(DescribeDcdnWafDomainResult(outcome.result()));
+	else
+		return DescribeDcdnWafDomainOutcome(outcome.error());
+}
+
+void DcdnClient::describeDcdnWafDomainAsync(const DescribeDcdnWafDomainRequest& request, const DescribeDcdnWafDomainAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeDcdnWafDomain(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DcdnClient::DescribeDcdnWafDomainOutcomeCallable DcdnClient::describeDcdnWafDomainCallable(const DescribeDcdnWafDomainRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeDcdnWafDomainOutcome()>>(
+			[this, request]()
+			{
+			return this->describeDcdnWafDomain(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 DcdnClient::DescribeUserDcdnIpaStatusOutcome DcdnClient::describeUserDcdnIpaStatus(const DescribeUserDcdnIpaStatusRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

+ 11 - 0
dcdn/src/model/AddDcdnIpaDomainRequest.cc

@@ -49,6 +49,17 @@ void AddDcdnIpaDomainRequest::setResourceGroupId(const std::string& resourceGrou
 	setParameter("ResourceGroupId", resourceGroupId);
 }
 
+std::string AddDcdnIpaDomainRequest::getProtocol()const
+{
+	return protocol_;
+}
+
+void AddDcdnIpaDomainRequest::setProtocol(const std::string& protocol)
+{
+	protocol_ = protocol;
+	setParameter("Protocol", protocol);
+}
+
 std::string AddDcdnIpaDomainRequest::getSecurityToken()const
 {
 	return securityToken_;

+ 6 - 6
dcdn/src/model/DescribeDcdnConfigOfVersionResult.cc

@@ -49,14 +49,14 @@ void DescribeDcdnConfigOfVersionResult::parse(const std::string &payload)
 			versionConfigsObject.configId = valueVersionConfigsVersionConfig["ConfigId"].asString();
 		if(!valueVersionConfigsVersionConfig["FunctionName"].isNull())
 			versionConfigsObject.functionName = valueVersionConfigsVersionConfig["FunctionName"].asString();
-		auto allFunctionArgsNode = allVersionConfigsNode["FunctionArgs"]["FunctionArg"];
-		for (auto allVersionConfigsNodeFunctionArgsFunctionArg : allFunctionArgsNode)
+		auto allFunctionArgsNode = valueVersionConfigsVersionConfig["FunctionArgs"]["FunctionArg"];
+		for (auto valueVersionConfigsVersionConfigFunctionArgsFunctionArg : allFunctionArgsNode)
 		{
 			VersionConfig::FunctionArg functionArgsObject;
-			if(!allVersionConfigsNodeFunctionArgsFunctionArg["ArgName"].isNull())
-				functionArgsObject.argName = allVersionConfigsNodeFunctionArgsFunctionArg["ArgName"].asString();
-			if(!allVersionConfigsNodeFunctionArgsFunctionArg["ArgValue"].isNull())
-				functionArgsObject.argValue = allVersionConfigsNodeFunctionArgsFunctionArg["ArgValue"].asString();
+			if(!valueVersionConfigsVersionConfigFunctionArgsFunctionArg["ArgName"].isNull())
+				functionArgsObject.argName = valueVersionConfigsVersionConfigFunctionArgsFunctionArg["ArgName"].asString();
+			if(!valueVersionConfigsVersionConfigFunctionArgsFunctionArg["ArgValue"].isNull())
+				functionArgsObject.argValue = valueVersionConfigsVersionConfigFunctionArgsFunctionArg["ArgValue"].asString();
 			versionConfigsObject.functionArgs.push_back(functionArgsObject);
 		}
 		versionConfigs_.push_back(versionConfigsObject);

+ 6 - 6
dcdn/src/model/DescribeDcdnDomainConfigsResult.cc

@@ -49,14 +49,14 @@ void DescribeDcdnDomainConfigsResult::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);

+ 8 - 8
dcdn/src/model/DescribeDcdnDomainHttpCodeDataResult.cc

@@ -45,16 +45,16 @@ void DescribeDcdnDomainHttpCodeDataResult::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 = std::stoi(allDataPerIntervalNodeHttpCodeDataPerIntervalHttpCodeDataModule["Code"].asString());
-			if(!allDataPerIntervalNodeHttpCodeDataPerIntervalHttpCodeDataModule["Proportion"].isNull())
-				httpCodeDataPerIntervalObject.proportion = std::stof(allDataPerIntervalNodeHttpCodeDataPerIntervalHttpCodeDataModule["Proportion"].asString());
-			if(!allDataPerIntervalNodeHttpCodeDataPerIntervalHttpCodeDataModule["Count"].isNull())
-				httpCodeDataPerIntervalObject.count = std::stof(allDataPerIntervalNodeHttpCodeDataPerIntervalHttpCodeDataModule["Count"].asString());
+			if(!valueDataPerIntervalDataModuleHttpCodeDataPerIntervalHttpCodeDataModule["Code"].isNull())
+				httpCodeDataPerIntervalObject.code = std::stoi(valueDataPerIntervalDataModuleHttpCodeDataPerIntervalHttpCodeDataModule["Code"].asString());
+			if(!valueDataPerIntervalDataModuleHttpCodeDataPerIntervalHttpCodeDataModule["Proportion"].isNull())
+				httpCodeDataPerIntervalObject.proportion = std::stof(valueDataPerIntervalDataModuleHttpCodeDataPerIntervalHttpCodeDataModule["Proportion"].asString());
+			if(!valueDataPerIntervalDataModuleHttpCodeDataPerIntervalHttpCodeDataModule["Count"].isNull())
+				httpCodeDataPerIntervalObject.count = std::stof(valueDataPerIntervalDataModuleHttpCodeDataPerIntervalHttpCodeDataModule["Count"].asString());
 			dataPerIntervalObject.httpCodeDataPerInterval.push_back(httpCodeDataPerIntervalObject);
 		}
 		dataPerInterval_.push_back(dataPerIntervalObject);

+ 12 - 12
dcdn/src/model/DescribeDcdnDomainLogResult.cc

@@ -45,20 +45,20 @@ void DescribeDcdnDomainLogResult::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"];

+ 11 - 22
dcdn/src/model/DescribeDcdnDomainPvDataRequest.cc

@@ -27,6 +27,17 @@ DescribeDcdnDomainPvDataRequest::DescribeDcdnDomainPvDataRequest() :
 DescribeDcdnDomainPvDataRequest::~DescribeDcdnDomainPvDataRequest()
 {}
 
+std::string DescribeDcdnDomainPvDataRequest::getStartTime()const
+{
+	return startTime_;
+}
+
+void DescribeDcdnDomainPvDataRequest::setStartTime(const std::string& startTime)
+{
+	startTime_ = startTime;
+	setParameter("StartTime", startTime);
+}
+
 std::string DescribeDcdnDomainPvDataRequest::getDomainName()const
 {
 	return domainName_;
@@ -49,17 +60,6 @@ void DescribeDcdnDomainPvDataRequest::setEndTime(const std::string& endTime)
 	setParameter("EndTime", endTime);
 }
 
-std::string DescribeDcdnDomainPvDataRequest::getStartTime()const
-{
-	return startTime_;
-}
-
-void DescribeDcdnDomainPvDataRequest::setStartTime(const std::string& startTime)
-{
-	startTime_ = startTime;
-	setParameter("StartTime", startTime);
-}
-
 long DescribeDcdnDomainPvDataRequest::getOwnerId()const
 {
 	return ownerId_;
@@ -71,14 +71,3 @@ void DescribeDcdnDomainPvDataRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
-std::string DescribeDcdnDomainPvDataRequest::getSecurityToken()const
-{
-	return securityToken_;
-}
-
-void DescribeDcdnDomainPvDataRequest::setSecurityToken(const std::string& securityToken)
-{
-	securityToken_ = securityToken;
-	setParameter("SecurityToken", securityToken);
-}
-

+ 8 - 8
dcdn/src/model/DescribeDcdnDomainPvDataResult.cc

@@ -43,20 +43,20 @@ void DescribeDcdnDomainPvDataResult::parse(const std::string &payload)
 	for (auto valuePvDataIntervalUsageData : allPvDataIntervalNode)
 	{
 		UsageData pvDataIntervalObject;
-		if(!valuePvDataIntervalUsageData["TimeStamp"].isNull())
-			pvDataIntervalObject.timeStamp = valuePvDataIntervalUsageData["TimeStamp"].asString();
 		if(!valuePvDataIntervalUsageData["Value"].isNull())
 			pvDataIntervalObject.value = valuePvDataIntervalUsageData["Value"].asString();
+		if(!valuePvDataIntervalUsageData["TimeStamp"].isNull())
+			pvDataIntervalObject.timeStamp = valuePvDataIntervalUsageData["TimeStamp"].asString();
 		pvDataInterval_.push_back(pvDataIntervalObject);
 	}
 	if(!value["DomainName"].isNull())
 		domainName_ = value["DomainName"].asString();
-	if(!value["DataInterval"].isNull())
-		dataInterval_ = value["DataInterval"].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();
 
 }
 
@@ -70,14 +70,14 @@ std::string DescribeDcdnDomainPvDataResult::getDomainName()const
 	return domainName_;
 }
 
-std::string DescribeDcdnDomainPvDataResult::getDataInterval()const
+std::string DescribeDcdnDomainPvDataResult::getStartTime()const
 {
-	return dataInterval_;
+	return startTime_;
 }
 
-std::string DescribeDcdnDomainPvDataResult::getStartTime()const
+std::string DescribeDcdnDomainPvDataResult::getDataInterval()const
 {
-	return startTime_;
+	return dataInterval_;
 }
 
 std::vector<DescribeDcdnDomainPvDataResult::UsageData> DescribeDcdnDomainPvDataResult::getPvDataInterval()const

+ 8 - 8
dcdn/src/model/DescribeDcdnDomainRealTimeHttpCodeDataResult.cc

@@ -45,16 +45,16 @@ void DescribeDcdnDomainRealTimeHttpCodeDataResult::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);

+ 8 - 8
dcdn/src/model/DescribeDcdnDomainRealTimeSrcHttpCodeDataResult.cc

@@ -45,16 +45,16 @@ void DescribeDcdnDomainRealTimeSrcHttpCodeDataResult::parse(const std::string &p
 		UsageData realTimeSrcHttpCodeDataObject;
 		if(!valueRealTimeSrcHttpCodeDataUsageData["TimeStamp"].isNull())
 			realTimeSrcHttpCodeDataObject.timeStamp = valueRealTimeSrcHttpCodeDataUsageData["TimeStamp"].asString();
-		auto allValueNode = allRealTimeSrcHttpCodeDataNode["Value"]["RealTimeSrcCodeProportionData"];
-		for (auto allRealTimeSrcHttpCodeDataNodeValueRealTimeSrcCodeProportionData : allValueNode)
+		auto allValueNode = valueRealTimeSrcHttpCodeDataUsageData["Value"]["RealTimeSrcCodeProportionData"];
+		for (auto valueRealTimeSrcHttpCodeDataUsageDataValueRealTimeSrcCodeProportionData : allValueNode)
 		{
 			UsageData::RealTimeSrcCodeProportionData valueObject;
-			if(!allRealTimeSrcHttpCodeDataNodeValueRealTimeSrcCodeProportionData["Code"].isNull())
-				valueObject.code = allRealTimeSrcHttpCodeDataNodeValueRealTimeSrcCodeProportionData["Code"].asString();
-			if(!allRealTimeSrcHttpCodeDataNodeValueRealTimeSrcCodeProportionData["Proportion"].isNull())
-				valueObject.proportion = allRealTimeSrcHttpCodeDataNodeValueRealTimeSrcCodeProportionData["Proportion"].asString();
-			if(!allRealTimeSrcHttpCodeDataNodeValueRealTimeSrcCodeProportionData["Count"].isNull())
-				valueObject.count = allRealTimeSrcHttpCodeDataNodeValueRealTimeSrcCodeProportionData["Count"].asString();
+			if(!valueRealTimeSrcHttpCodeDataUsageDataValueRealTimeSrcCodeProportionData["Code"].isNull())
+				valueObject.code = valueRealTimeSrcHttpCodeDataUsageDataValueRealTimeSrcCodeProportionData["Code"].asString();
+			if(!valueRealTimeSrcHttpCodeDataUsageDataValueRealTimeSrcCodeProportionData["Proportion"].isNull())
+				valueObject.proportion = valueRealTimeSrcHttpCodeDataUsageDataValueRealTimeSrcCodeProportionData["Proportion"].asString();
+			if(!valueRealTimeSrcHttpCodeDataUsageDataValueRealTimeSrcCodeProportionData["Count"].isNull())
+				valueObject.count = valueRealTimeSrcHttpCodeDataUsageDataValueRealTimeSrcCodeProportionData["Count"].asString();
 			realTimeSrcHttpCodeDataObject.value.push_back(valueObject);
 		}
 		realTimeSrcHttpCodeData_.push_back(realTimeSrcHttpCodeDataObject);

+ 6 - 6
dcdn/src/model/DescribeDcdnDomainStagingConfigResult.cc

@@ -49,14 +49,14 @@ void DescribeDcdnDomainStagingConfigResult::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);

+ 11 - 22
dcdn/src/model/DescribeDcdnDomainUvDataRequest.cc

@@ -27,6 +27,17 @@ DescribeDcdnDomainUvDataRequest::DescribeDcdnDomainUvDataRequest() :
 DescribeDcdnDomainUvDataRequest::~DescribeDcdnDomainUvDataRequest()
 {}
 
+std::string DescribeDcdnDomainUvDataRequest::getStartTime()const
+{
+	return startTime_;
+}
+
+void DescribeDcdnDomainUvDataRequest::setStartTime(const std::string& startTime)
+{
+	startTime_ = startTime;
+	setParameter("StartTime", startTime);
+}
+
 std::string DescribeDcdnDomainUvDataRequest::getDomainName()const
 {
 	return domainName_;
@@ -49,17 +60,6 @@ void DescribeDcdnDomainUvDataRequest::setEndTime(const std::string& endTime)
 	setParameter("EndTime", endTime);
 }
 
-std::string DescribeDcdnDomainUvDataRequest::getStartTime()const
-{
-	return startTime_;
-}
-
-void DescribeDcdnDomainUvDataRequest::setStartTime(const std::string& startTime)
-{
-	startTime_ = startTime;
-	setParameter("StartTime", startTime);
-}
-
 long DescribeDcdnDomainUvDataRequest::getOwnerId()const
 {
 	return ownerId_;
@@ -71,14 +71,3 @@ void DescribeDcdnDomainUvDataRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
-std::string DescribeDcdnDomainUvDataRequest::getSecurityToken()const
-{
-	return securityToken_;
-}
-
-void DescribeDcdnDomainUvDataRequest::setSecurityToken(const std::string& securityToken)
-{
-	securityToken_ = securityToken;
-	setParameter("SecurityToken", securityToken);
-}
-

+ 8 - 8
dcdn/src/model/DescribeDcdnDomainUvDataResult.cc

@@ -43,20 +43,20 @@ void DescribeDcdnDomainUvDataResult::parse(const std::string &payload)
 	for (auto valueUvDataIntervalUsageData : allUvDataIntervalNode)
 	{
 		UsageData uvDataIntervalObject;
-		if(!valueUvDataIntervalUsageData["TimeStamp"].isNull())
-			uvDataIntervalObject.timeStamp = valueUvDataIntervalUsageData["TimeStamp"].asString();
 		if(!valueUvDataIntervalUsageData["Value"].isNull())
 			uvDataIntervalObject.value = valueUvDataIntervalUsageData["Value"].asString();
+		if(!valueUvDataIntervalUsageData["TimeStamp"].isNull())
+			uvDataIntervalObject.timeStamp = valueUvDataIntervalUsageData["TimeStamp"].asString();
 		uvDataInterval_.push_back(uvDataIntervalObject);
 	}
 	if(!value["DomainName"].isNull())
 		domainName_ = value["DomainName"].asString();
-	if(!value["DataInterval"].isNull())
-		dataInterval_ = value["DataInterval"].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();
 
 }
 
@@ -75,13 +75,13 @@ std::string DescribeDcdnDomainUvDataResult::getDomainName()const
 	return domainName_;
 }
 
-std::string DescribeDcdnDomainUvDataResult::getDataInterval()const
+std::string DescribeDcdnDomainUvDataResult::getStartTime()const
 {
-	return dataInterval_;
+	return startTime_;
 }
 
-std::string DescribeDcdnDomainUvDataResult::getStartTime()const
+std::string DescribeDcdnDomainUvDataResult::getDataInterval()const
 {
-	return startTime_;
+	return dataInterval_;
 }
 

+ 8 - 8
dcdn/src/model/DescribeDcdnDomainWebsocketHttpCodeDataResult.cc

@@ -45,16 +45,16 @@ void DescribeDcdnDomainWebsocketHttpCodeDataResult::parse(const std::string &pay
 		DataModule dataPerIntervalObject;
 		if(!valueDataPerIntervalDataModule["TimeStamp"].isNull())
 			dataPerIntervalObject.timeStamp = valueDataPerIntervalDataModule["TimeStamp"].asString();
-		auto allWebsocketHttpCodeDataPerIntervalNode = allDataPerIntervalNode["WebsocketHttpCodeDataPerInterval"]["HttpCodeDataModule"];
-		for (auto allDataPerIntervalNodeWebsocketHttpCodeDataPerIntervalHttpCodeDataModule : allWebsocketHttpCodeDataPerIntervalNode)
+		auto allWebsocketHttpCodeDataPerIntervalNode = valueDataPerIntervalDataModule["WebsocketHttpCodeDataPerInterval"]["HttpCodeDataModule"];
+		for (auto valueDataPerIntervalDataModuleWebsocketHttpCodeDataPerIntervalHttpCodeDataModule : allWebsocketHttpCodeDataPerIntervalNode)
 		{
 			DataModule::HttpCodeDataModule websocketHttpCodeDataPerIntervalObject;
-			if(!allDataPerIntervalNodeWebsocketHttpCodeDataPerIntervalHttpCodeDataModule["Code"].isNull())
-				websocketHttpCodeDataPerIntervalObject.code = std::stoi(allDataPerIntervalNodeWebsocketHttpCodeDataPerIntervalHttpCodeDataModule["Code"].asString());
-			if(!allDataPerIntervalNodeWebsocketHttpCodeDataPerIntervalHttpCodeDataModule["Proportion"].isNull())
-				websocketHttpCodeDataPerIntervalObject.proportion = std::stof(allDataPerIntervalNodeWebsocketHttpCodeDataPerIntervalHttpCodeDataModule["Proportion"].asString());
-			if(!allDataPerIntervalNodeWebsocketHttpCodeDataPerIntervalHttpCodeDataModule["Count"].isNull())
-				websocketHttpCodeDataPerIntervalObject.count = std::stof(allDataPerIntervalNodeWebsocketHttpCodeDataPerIntervalHttpCodeDataModule["Count"].asString());
+			if(!valueDataPerIntervalDataModuleWebsocketHttpCodeDataPerIntervalHttpCodeDataModule["Code"].isNull())
+				websocketHttpCodeDataPerIntervalObject.code = std::stoi(valueDataPerIntervalDataModuleWebsocketHttpCodeDataPerIntervalHttpCodeDataModule["Code"].asString());
+			if(!valueDataPerIntervalDataModuleWebsocketHttpCodeDataPerIntervalHttpCodeDataModule["Proportion"].isNull())
+				websocketHttpCodeDataPerIntervalObject.proportion = std::stof(valueDataPerIntervalDataModuleWebsocketHttpCodeDataPerIntervalHttpCodeDataModule["Proportion"].asString());
+			if(!valueDataPerIntervalDataModuleWebsocketHttpCodeDataPerIntervalHttpCodeDataModule["Count"].isNull())
+				websocketHttpCodeDataPerIntervalObject.count = std::stof(valueDataPerIntervalDataModuleWebsocketHttpCodeDataPerIntervalHttpCodeDataModule["Count"].asString());
 			dataPerIntervalObject.websocketHttpCodeDataPerInterval.push_back(websocketHttpCodeDataPerIntervalObject);
 		}
 		dataPerInterval_.push_back(dataPerIntervalObject);

+ 6 - 6
dcdn/src/model/DescribeDcdnIpaDomainConfigsResult.cc

@@ -49,14 +49,14 @@ void DescribeDcdnIpaDomainConfigsResult::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);

+ 12 - 12
dcdn/src/model/DescribeDcdnIpaUserDomainsResult.cc

@@ -61,20 +61,20 @@ void DescribeDcdnIpaUserDomainsResult::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(!allDomainsNodeSourcesSource["Weight"].isNull())
-				sourcesObject.weight = allDomainsNodeSourcesSource["Weight"].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();
+			if(!valueDomainsPageDataSourcesSource["Weight"].isNull())
+				sourcesObject.weight = valueDomainsPageDataSourcesSource["Weight"].asString();
 			domainsObject.sources.push_back(sourcesObject);
 		}
 		domains_.push_back(domainsObject);

+ 6 - 6
dcdn/src/model/DescribeDcdnTagResourcesResult.cc

@@ -45,14 +45,14 @@ void DescribeDcdnTagResourcesResult::parse(const std::string &payload)
 		TagResource tagResourcesObject;
 		if(!valueTagResourcesTagResource["ResourceId"].isNull())
 			tagResourcesObject.resourceId = valueTagResourcesTagResource["ResourceId"].asString();
-		auto allTagNode = allTagResourcesNode["Tag"]["TagItem"];
-		for (auto allTagResourcesNodeTagTagItem : allTagNode)
+		auto allTagNode = valueTagResourcesTagResource["Tag"]["TagItem"];
+		for (auto valueTagResourcesTagResourceTagTagItem : allTagNode)
 		{
 			TagResource::TagItem tagObject;
-			if(!allTagResourcesNodeTagTagItem["Key"].isNull())
-				tagObject.key = allTagResourcesNodeTagTagItem["Key"].asString();
-			if(!allTagResourcesNodeTagTagItem["Value"].isNull())
-				tagObject.value = allTagResourcesNodeTagTagItem["Value"].asString();
+			if(!valueTagResourcesTagResourceTagTagItem["Key"].isNull())
+				tagObject.key = valueTagResourcesTagResourceTagTagItem["Key"].asString();
+			if(!valueTagResourcesTagResourceTagTagItem["Value"].isNull())
+				tagObject.value = valueTagResourcesTagResourceTagTagItem["Value"].asString();
 			tagResourcesObject.tag.push_back(tagObject);
 		}
 		tagResources_.push_back(tagResourcesObject);

+ 12 - 12
dcdn/src/model/DescribeDcdnUserBillHistoryResult.cc

@@ -49,20 +49,20 @@ void DescribeDcdnUserBillHistoryResult::parse(const std::string &payload)
 			billHistoryDataObject.billType = valueBillHistoryDataBillHistoryDataItem["BillType"].asString();
 		if(!valueBillHistoryDataBillHistoryDataItem["BillTime"].isNull())
 			billHistoryDataObject.billTime = valueBillHistoryDataBillHistoryDataItem["BillTime"].asString();
-		auto allBillingDataNode = allBillHistoryDataNode["BillingData"]["BillingDataItem"];
-		for (auto allBillHistoryDataNodeBillingDataBillingDataItem : allBillingDataNode)
+		auto allBillingDataNode = valueBillHistoryDataBillHistoryDataItem["BillingData"]["BillingDataItem"];
+		for (auto valueBillHistoryDataBillHistoryDataItemBillingDataBillingDataItem : allBillingDataNode)
 		{
 			BillHistoryDataItem::BillingDataItem billingDataObject;
-			if(!allBillHistoryDataNodeBillingDataBillingDataItem["ChargeType"].isNull())
-				billingDataObject.chargeType = allBillHistoryDataNodeBillingDataBillingDataItem["ChargeType"].asString();
-			if(!allBillHistoryDataNodeBillingDataBillingDataItem["CdnRegion"].isNull())
-				billingDataObject.cdnRegion = allBillHistoryDataNodeBillingDataBillingDataItem["CdnRegion"].asString();
-			if(!allBillHistoryDataNodeBillingDataBillingDataItem["Bandwidth"].isNull())
-				billingDataObject.bandwidth = std::stof(allBillHistoryDataNodeBillingDataBillingDataItem["Bandwidth"].asString());
-			if(!allBillHistoryDataNodeBillingDataBillingDataItem["Flow"].isNull())
-				billingDataObject.flow = std::stof(allBillHistoryDataNodeBillingDataBillingDataItem["Flow"].asString());
-			if(!allBillHistoryDataNodeBillingDataBillingDataItem["Count"].isNull())
-				billingDataObject.count = std::stof(allBillHistoryDataNodeBillingDataBillingDataItem["Count"].asString());
+			if(!valueBillHistoryDataBillHistoryDataItemBillingDataBillingDataItem["ChargeType"].isNull())
+				billingDataObject.chargeType = valueBillHistoryDataBillHistoryDataItemBillingDataBillingDataItem["ChargeType"].asString();
+			if(!valueBillHistoryDataBillHistoryDataItemBillingDataBillingDataItem["CdnRegion"].isNull())
+				billingDataObject.cdnRegion = valueBillHistoryDataBillHistoryDataItemBillingDataBillingDataItem["CdnRegion"].asString();
+			if(!valueBillHistoryDataBillHistoryDataItemBillingDataBillingDataItem["Bandwidth"].isNull())
+				billingDataObject.bandwidth = std::stof(valueBillHistoryDataBillHistoryDataItemBillingDataBillingDataItem["Bandwidth"].asString());
+			if(!valueBillHistoryDataBillHistoryDataItemBillingDataBillingDataItem["Flow"].isNull())
+				billingDataObject.flow = std::stof(valueBillHistoryDataBillHistoryDataItemBillingDataBillingDataItem["Flow"].asString());
+			if(!valueBillHistoryDataBillHistoryDataItemBillingDataBillingDataItem["Count"].isNull())
+				billingDataObject.count = std::stof(valueBillHistoryDataBillHistoryDataItemBillingDataBillingDataItem["Count"].asString());
 			billHistoryDataObject.billingData.push_back(billingDataObject);
 		}
 		billHistoryData_.push_back(billHistoryDataObject);

+ 16 - 0
dcdn/src/model/DescribeDcdnUserDomainsRequest.cc

@@ -93,6 +93,22 @@ void DescribeDcdnUserDomainsRequest::setPageSize(int pageSize)
 	setParameter("PageSize", std::to_string(pageSize));
 }
 
+std::vector<DescribeDcdnUserDomainsRequest::Tag> DescribeDcdnUserDomainsRequest::getTag()const
+{
+	return tag_;
+}
+
+void DescribeDcdnUserDomainsRequest::setTag(const std::vector<Tag>& tag)
+{
+	tag_ = tag;
+	for(int dep1 = 0; dep1!= tag.size(); dep1++) {
+		auto tagObj = tag.at(dep1);
+		std::string tagObjStr = "Tag." + std::to_string(dep1 + 1);
+		setParameter(tagObjStr + ".Value", tagObj.value);
+		setParameter(tagObjStr + ".Key", tagObj.key);
+	}
+}
+
 std::string DescribeDcdnUserDomainsRequest::getFuncFilter()const
 {
 	return funcFilter_;

+ 12 - 12
dcdn/src/model/DescribeDcdnUserDomainsResult.cc

@@ -61,20 +61,20 @@ void DescribeDcdnUserDomainsResult::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(!allDomainsNodeSourcesSource["Weight"].isNull())
-				sourcesObject.weight = allDomainsNodeSourcesSource["Weight"].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();
+			if(!valueDomainsPageDataSourcesSource["Weight"].isNull())
+				sourcesObject.weight = valueDomainsPageDataSourcesSource["Weight"].asString();
 			domainsObject.sources.push_back(sourcesObject);
 		}
 		domains_.push_back(domainsObject);

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

+ 72 - 0
dcdn/src/model/DescribeDcdnWafDomainResult.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/dcdn/model/DescribeDcdnWafDomainResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Dcdn;
+using namespace AlibabaCloud::Dcdn::Model;
+
+DescribeDcdnWafDomainResult::DescribeDcdnWafDomainResult() :
+	ServiceResult()
+{}
+
+DescribeDcdnWafDomainResult::DescribeDcdnWafDomainResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeDcdnWafDomainResult::~DescribeDcdnWafDomainResult()
+{}
+
+void DescribeDcdnWafDomainResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allOutPutDomainsNode = value["OutPutDomains"]["OutPutDomain"];
+	for (auto valueOutPutDomainsOutPutDomain : allOutPutDomainsNode)
+	{
+		OutPutDomain outPutDomainsObject;
+		if(!valueOutPutDomainsOutPutDomain["Status"].isNull())
+			outPutDomainsObject.status = std::stoi(valueOutPutDomainsOutPutDomain["Status"].asString());
+		if(!valueOutPutDomainsOutPutDomain["Domain"].isNull())
+			outPutDomainsObject.domain = valueOutPutDomainsOutPutDomain["Domain"].asString();
+		if(!valueOutPutDomainsOutPutDomain["WafStatus"].isNull())
+			outPutDomainsObject.wafStatus = std::stoi(valueOutPutDomainsOutPutDomain["WafStatus"].asString());
+		if(!valueOutPutDomainsOutPutDomain["CcStatus"].isNull())
+			outPutDomainsObject.ccStatus = std::stoi(valueOutPutDomainsOutPutDomain["CcStatus"].asString());
+		if(!valueOutPutDomainsOutPutDomain["AclStatus"].isNull())
+			outPutDomainsObject.aclStatus = std::stoi(valueOutPutDomainsOutPutDomain["AclStatus"].asString());
+		outPutDomains_.push_back(outPutDomainsObject);
+	}
+	if(!value["TotalCount"].isNull())
+		totalCount_ = std::stoi(value["TotalCount"].asString());
+
+}
+
+int DescribeDcdnWafDomainResult::getTotalCount()const
+{
+	return totalCount_;
+}
+
+std::vector<DescribeDcdnWafDomainResult::OutPutDomain> DescribeDcdnWafDomainResult::getOutPutDomains()const
+{
+	return outPutDomains_;
+}
+