From a70be0a97aea4f31e39f3b5a1140b0dbb8ccffba Mon Sep 17 00:00:00 2001 From: sdk-team Date: Tue, 22 Aug 2023 06:20:01 +0000 Subject: [PATCH] Upgrade SDK. --- VERSION | 2 +- .../CreateCertificateByCertificateIdRequest.h | 12 +- .../waf-openapi/model/CreateDomainRequest.h | 60 +++--- .../model/DescribeCertificatesRequest.h | 12 +- .../model/DescribeCertificatesResult.h | 1 + .../waf-openapi/model/DescribeDomainResult.h | 32 ++-- .../waf-openapi/model/ModifyDomainRequest.h | 60 +++--- ...CreateCertificateByCertificateIdRequest.cc | 36 ++-- waf-openapi/src/model/CreateDomainRequest.cc | 172 +++++++++++------- .../src/model/DescribeCertificatesRequest.cc | 36 ++-- .../src/model/DescribeCertificatesResult.cc | 2 + waf-openapi/src/model/DescribeDomainResult.cc | 18 +- waf-openapi/src/model/ModifyDomainRequest.cc | 172 +++++++++++------- 13 files changed, 364 insertions(+), 251 deletions(-) diff --git a/VERSION b/VERSION index 987755cb4..cd1a82cf5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1728 \ No newline at end of file +1.36.1729 \ No newline at end of file diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/CreateCertificateByCertificateIdRequest.h b/waf-openapi/include/alibabacloud/waf-openapi/model/CreateCertificateByCertificateIdRequest.h index f57fbd415..d0d33bb4f 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/CreateCertificateByCertificateIdRequest.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/CreateCertificateByCertificateIdRequest.h @@ -30,23 +30,23 @@ class ALIBABACLOUD_WAF_OPENAPI_EXPORT CreateCertificateByCertificateIdRequest : public: CreateCertificateByCertificateIdRequest(); ~CreateCertificateByCertificateIdRequest(); + std::string getSourceIp() const; + void setSourceIp(const std::string &sourceIp); + std::string getLang() const; + void setLang(const std::string &lang); long getCertificateId() const; void setCertificateId(long certificateId); std::string getInstanceId() const; void setInstanceId(const std::string &instanceId); - std::string getSourceIp() const; - void setSourceIp(const std::string &sourceIp); std::string getDomain() const; void setDomain(const std::string &domain); - std::string getLang() const; - void setLang(const std::string &lang); private: + std::string sourceIp_; + std::string lang_; long certificateId_; std::string instanceId_; - std::string sourceIp_; std::string domain_; - std::string lang_; }; } // namespace Model } // namespace Waf_openapi diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/CreateDomainRequest.h b/waf-openapi/include/alibabacloud/waf-openapi/model/CreateDomainRequest.h index fd7e56b5f..477427017 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/CreateDomainRequest.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/CreateDomainRequest.h @@ -32,6 +32,8 @@ public: ~CreateDomainRequest(); int getIpFollowStatus() const; void setIpFollowStatus(int ipFollowStatus); + bool getKeepalive() const; + void setKeepalive(bool keepalive); std::string getSniHost() const; void setSniHost(const std::string &sniHost); std::string getResourceGroupId() const; @@ -44,38 +46,44 @@ public: void setHttp2Port(const std::string &http2Port); int getWriteTime() const; void setWriteTime(int writeTime); - int getSniStatus() const; - void setSniStatus(int sniStatus); - std::string getLang() const; - void setLang(const std::string &lang); int getAccessHeaderMode() const; void setAccessHeaderMode(int accessHeaderMode); - std::string getAccessType() const; - void setAccessType(const std::string &accessType); - std::string getLogHeaders() const; - void setLogHeaders(const std::string &logHeaders); std::string getAccessHeaders() const; void setAccessHeaders(const std::string &accessHeaders); - int getConnectionTime() const; - void setConnectionTime(int connectionTime); + int getKeepaliveTimeout() const; + void setKeepaliveTimeout(int keepaliveTimeout); int getClusterType() const; void setClusterType(int clusterType); - std::string getCloudNativeInstances() const; - void setCloudNativeInstances(const std::string &cloudNativeInstances); int getHttpsRedirect() const; void setHttpsRedirect(int httpsRedirect); std::string getInstanceId() const; void setInstanceId(const std::string &instanceId); - std::string getSourceIps() const; - void setSourceIps(const std::string &sourceIps); std::string getDomain() const; void setDomain(const std::string &domain); - int getIsAccessProduct() const; - void setIsAccessProduct(int isAccessProduct); int getReadTime() const; void setReadTime(int readTime); std::string getHttpsPort() const; void setHttpsPort(const std::string &httpsPort); + int getSniStatus() const; + void setSniStatus(int sniStatus); + std::string getLang() const; + void setLang(const std::string &lang); + bool getRetry() const; + void setRetry(bool retry); + int getKeepaliveRequests() const; + void setKeepaliveRequests(int keepaliveRequests); + std::string getAccessType() const; + void setAccessType(const std::string &accessType); + std::string getLogHeaders() const; + void setLogHeaders(const std::string &logHeaders); + int getConnectionTime() const; + void setConnectionTime(int connectionTime); + std::string getCloudNativeInstances() const; + void setCloudNativeInstances(const std::string &cloudNativeInstances); + std::string getSourceIps() const; + void setSourceIps(const std::string &sourceIps); + int getIsAccessProduct() const; + void setIsAccessProduct(int isAccessProduct); int getLoadBalancing() const; void setLoadBalancing(int loadBalancing); int getHttpToUserIp() const; @@ -83,28 +91,32 @@ public: private: int ipFollowStatus_; + bool keepalive_; std::string sniHost_; std::string resourceGroupId_; std::string sourceIp_; std::string httpPort_; std::string http2Port_; int writeTime_; - int sniStatus_; - std::string lang_; int accessHeaderMode_; - std::string accessType_; - std::string logHeaders_; std::string accessHeaders_; - int connectionTime_; + int keepaliveTimeout_; int clusterType_; - std::string cloudNativeInstances_; int httpsRedirect_; std::string instanceId_; - std::string sourceIps_; std::string domain_; - int isAccessProduct_; int readTime_; std::string httpsPort_; + int sniStatus_; + std::string lang_; + bool retry_; + int keepaliveRequests_; + std::string accessType_; + std::string logHeaders_; + int connectionTime_; + std::string cloudNativeInstances_; + std::string sourceIps_; + int isAccessProduct_; int loadBalancing_; int httpToUserIp_; }; diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeCertificatesRequest.h b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeCertificatesRequest.h index b614e17ee..e41cf43aa 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeCertificatesRequest.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeCertificatesRequest.h @@ -30,20 +30,20 @@ class ALIBABACLOUD_WAF_OPENAPI_EXPORT DescribeCertificatesRequest : public RpcSe public: DescribeCertificatesRequest(); ~DescribeCertificatesRequest(); - std::string getInstanceId() const; - void setInstanceId(const std::string &instanceId); std::string getSourceIp() const; void setSourceIp(const std::string &sourceIp); - std::string getDomain() const; - void setDomain(const std::string &domain); std::string getLang() const; void setLang(const std::string &lang); + std::string getInstanceId() const; + void setInstanceId(const std::string &instanceId); + std::string getDomain() const; + void setDomain(const std::string &domain); private: - std::string instanceId_; std::string sourceIp_; - std::string domain_; std::string lang_; + std::string instanceId_; + std::string domain_; }; } // namespace Model } // namespace Waf_openapi diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeCertificatesResult.h b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeCertificatesResult.h index f45f6fd51..23ffa04a5 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeCertificatesResult.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeCertificatesResult.h @@ -34,6 +34,7 @@ namespace AlibabaCloud public: struct Certificate { + long endTime; std::vector sans; long certificateId; std::string certificateName; diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainResult.h b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainResult.h index 50abd1655..4d64ce959 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainResult.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/DescribeDomainResult.h @@ -43,38 +43,42 @@ namespace AlibabaCloud { struct ProtocolPortConfigsItem { - std::string ports; + std::vector ports; std::string protocol; }; std::vector protocolPortConfigs; std::string redirectionTypeName; std::string instanceId; - std::string iPAddressList; + std::vector iPAddressList; std::string cloudNativeProductName; }; - int httpToUserIp; - std::vector httpPort; int isAccessProduct; - int accessHeaderMode; std::string resourceGroupId; std::vector accessHeaders; int readTime; std::vector sourceIps; - int ipFollowStatus; - int clusterType; - int loadBalancing; - std::string cname; - std::vector logHeaders; - int sniStatus; std::string sniHost; - int writeTime; - std::vector http2Port; long version; - int httpsRedirect; int connectionTime; std::vector cloudNativeInstances; std::string accessType; std::vector httpsPort; + int httpToUserIp; + std::vector httpPort; + int accessHeaderMode; + bool keepalive; + int ipFollowStatus; + int clusterType; + int loadBalancing; + std::string cname; + int keepaliveTimeout; + std::vector logHeaders; + int sniStatus; + int writeTime; + std::vector http2Port; + int httpsRedirect; + bool retry; + int keepaliveRequests; }; diff --git a/waf-openapi/include/alibabacloud/waf-openapi/model/ModifyDomainRequest.h b/waf-openapi/include/alibabacloud/waf-openapi/model/ModifyDomainRequest.h index 79988accb..452f7650d 100644 --- a/waf-openapi/include/alibabacloud/waf-openapi/model/ModifyDomainRequest.h +++ b/waf-openapi/include/alibabacloud/waf-openapi/model/ModifyDomainRequest.h @@ -32,6 +32,8 @@ public: ~ModifyDomainRequest(); int getIpFollowStatus() const; void setIpFollowStatus(int ipFollowStatus); + bool getKeepalive() const; + void setKeepalive(bool keepalive); std::string getSniHost() const; void setSniHost(const std::string &sniHost); int getHybridCloudType() const; @@ -44,40 +46,46 @@ public: void setHttp2Port(const std::string &http2Port); int getWriteTime() const; void setWriteTime(int writeTime); + int getAccessHeaderMode() const; + void setAccessHeaderMode(int accessHeaderMode); + std::string getAccessHeaders() const; + void setAccessHeaders(const std::string &accessHeaders); + int getKeepaliveTimeout() const; + void setKeepaliveTimeout(int keepaliveTimeout); + int getClusterType() const; + void setClusterType(int clusterType); + int getHttpsRedirect() const; + void setHttpsRedirect(int httpsRedirect); + std::string getInstanceId() const; + void setInstanceId(const std::string &instanceId); + std::string getDomain() const; + void setDomain(const std::string &domain); + int getReadTime() const; + void setReadTime(int readTime); + std::string getHttpsPort() const; + void setHttpsPort(const std::string &httpsPort); int getSniStatus() const; void setSniStatus(int sniStatus); std::string getLang() const; void setLang(const std::string &lang); - int getAccessHeaderMode() const; - void setAccessHeaderMode(int accessHeaderMode); + bool getRetry() const; + void setRetry(bool retry); + int getKeepaliveRequests() const; + void setKeepaliveRequests(int keepaliveRequests); std::string getAccessType() const; void setAccessType(const std::string &accessType); int getBindingIpv6() const; void setBindingIpv6(int bindingIpv6); std::string getLogHeaders() const; void setLogHeaders(const std::string &logHeaders); - std::string getAccessHeaders() const; - void setAccessHeaders(const std::string &accessHeaders); int getConnectionTime() const; void setConnectionTime(int connectionTime); - int getClusterType() const; - void setClusterType(int clusterType); std::string getCloudNativeInstances() const; void setCloudNativeInstances(const std::string &cloudNativeInstances); - int getHttpsRedirect() const; - void setHttpsRedirect(int httpsRedirect); - std::string getInstanceId() const; - void setInstanceId(const std::string &instanceId); std::string getSourceIps() const; void setSourceIps(const std::string &sourceIps); - std::string getDomain() const; - void setDomain(const std::string &domain); int getIsAccessProduct() const; void setIsAccessProduct(int isAccessProduct); - int getReadTime() const; - void setReadTime(int readTime); - std::string getHttpsPort() const; - void setHttpsPort(const std::string &httpsPort); int getLoadBalancing() const; void setLoadBalancing(int loadBalancing); int getHttpToUserIp() const; @@ -85,29 +93,33 @@ public: private: int ipFollowStatus_; + bool keepalive_; std::string sniHost_; int hybridCloudType_; std::string sourceIp_; std::string httpPort_; std::string http2Port_; int writeTime_; + int accessHeaderMode_; + std::string accessHeaders_; + int keepaliveTimeout_; + int clusterType_; + int httpsRedirect_; + std::string instanceId_; + std::string domain_; + int readTime_; + std::string httpsPort_; int sniStatus_; std::string lang_; - int accessHeaderMode_; + bool retry_; + int keepaliveRequests_; std::string accessType_; int bindingIpv6_; std::string logHeaders_; - std::string accessHeaders_; int connectionTime_; - int clusterType_; std::string cloudNativeInstances_; - int httpsRedirect_; - std::string instanceId_; std::string sourceIps_; - std::string domain_; int isAccessProduct_; - int readTime_; - std::string httpsPort_; int loadBalancing_; int httpToUserIp_; }; diff --git a/waf-openapi/src/model/CreateCertificateByCertificateIdRequest.cc b/waf-openapi/src/model/CreateCertificateByCertificateIdRequest.cc index e56e3cdc4..46f2e9ce8 100644 --- a/waf-openapi/src/model/CreateCertificateByCertificateIdRequest.cc +++ b/waf-openapi/src/model/CreateCertificateByCertificateIdRequest.cc @@ -25,6 +25,24 @@ CreateCertificateByCertificateIdRequest::CreateCertificateByCertificateIdRequest CreateCertificateByCertificateIdRequest::~CreateCertificateByCertificateIdRequest() {} +std::string CreateCertificateByCertificateIdRequest::getSourceIp() const { + return sourceIp_; +} + +void CreateCertificateByCertificateIdRequest::setSourceIp(const std::string &sourceIp) { + sourceIp_ = sourceIp; + setParameter(std::string("SourceIp"), sourceIp); +} + +std::string CreateCertificateByCertificateIdRequest::getLang() const { + return lang_; +} + +void CreateCertificateByCertificateIdRequest::setLang(const std::string &lang) { + lang_ = lang; + setParameter(std::string("Lang"), lang); +} + long CreateCertificateByCertificateIdRequest::getCertificateId() const { return certificateId_; } @@ -43,15 +61,6 @@ void CreateCertificateByCertificateIdRequest::setInstanceId(const std::string &i setParameter(std::string("InstanceId"), instanceId); } -std::string CreateCertificateByCertificateIdRequest::getSourceIp() const { - return sourceIp_; -} - -void CreateCertificateByCertificateIdRequest::setSourceIp(const std::string &sourceIp) { - sourceIp_ = sourceIp; - setParameter(std::string("SourceIp"), sourceIp); -} - std::string CreateCertificateByCertificateIdRequest::getDomain() const { return domain_; } @@ -61,12 +70,3 @@ void CreateCertificateByCertificateIdRequest::setDomain(const std::string &domai setParameter(std::string("Domain"), domain); } -std::string CreateCertificateByCertificateIdRequest::getLang() const { - return lang_; -} - -void CreateCertificateByCertificateIdRequest::setLang(const std::string &lang) { - lang_ = lang; - setParameter(std::string("Lang"), lang); -} - diff --git a/waf-openapi/src/model/CreateDomainRequest.cc b/waf-openapi/src/model/CreateDomainRequest.cc index cdc98044b..6bc34fe1f 100644 --- a/waf-openapi/src/model/CreateDomainRequest.cc +++ b/waf-openapi/src/model/CreateDomainRequest.cc @@ -34,6 +34,15 @@ void CreateDomainRequest::setIpFollowStatus(int ipFollowStatus) { setParameter(std::string("IpFollowStatus"), std::to_string(ipFollowStatus)); } +bool CreateDomainRequest::getKeepalive() const { + return keepalive_; +} + +void CreateDomainRequest::setKeepalive(bool keepalive) { + keepalive_ = keepalive; + setParameter(std::string("Keepalive"), keepalive ? "true" : "false"); +} + std::string CreateDomainRequest::getSniHost() const { return sniHost_; } @@ -88,24 +97,6 @@ void CreateDomainRequest::setWriteTime(int writeTime) { setParameter(std::string("WriteTime"), std::to_string(writeTime)); } -int CreateDomainRequest::getSniStatus() const { - return sniStatus_; -} - -void CreateDomainRequest::setSniStatus(int sniStatus) { - sniStatus_ = sniStatus; - setParameter(std::string("SniStatus"), std::to_string(sniStatus)); -} - -std::string CreateDomainRequest::getLang() const { - return lang_; -} - -void CreateDomainRequest::setLang(const std::string &lang) { - lang_ = lang; - setParameter(std::string("Lang"), lang); -} - int CreateDomainRequest::getAccessHeaderMode() const { return accessHeaderMode_; } @@ -115,24 +106,6 @@ void CreateDomainRequest::setAccessHeaderMode(int accessHeaderMode) { setParameter(std::string("AccessHeaderMode"), std::to_string(accessHeaderMode)); } -std::string CreateDomainRequest::getAccessType() const { - return accessType_; -} - -void CreateDomainRequest::setAccessType(const std::string &accessType) { - accessType_ = accessType; - setParameter(std::string("AccessType"), accessType); -} - -std::string CreateDomainRequest::getLogHeaders() const { - return logHeaders_; -} - -void CreateDomainRequest::setLogHeaders(const std::string &logHeaders) { - logHeaders_ = logHeaders; - setParameter(std::string("LogHeaders"), logHeaders); -} - std::string CreateDomainRequest::getAccessHeaders() const { return accessHeaders_; } @@ -142,13 +115,13 @@ void CreateDomainRequest::setAccessHeaders(const std::string &accessHeaders) { setParameter(std::string("AccessHeaders"), accessHeaders); } -int CreateDomainRequest::getConnectionTime() const { - return connectionTime_; +int CreateDomainRequest::getKeepaliveTimeout() const { + return keepaliveTimeout_; } -void CreateDomainRequest::setConnectionTime(int connectionTime) { - connectionTime_ = connectionTime; - setParameter(std::string("ConnectionTime"), std::to_string(connectionTime)); +void CreateDomainRequest::setKeepaliveTimeout(int keepaliveTimeout) { + keepaliveTimeout_ = keepaliveTimeout; + setParameter(std::string("KeepaliveTimeout"), std::to_string(keepaliveTimeout)); } int CreateDomainRequest::getClusterType() const { @@ -160,15 +133,6 @@ void CreateDomainRequest::setClusterType(int clusterType) { setParameter(std::string("ClusterType"), std::to_string(clusterType)); } -std::string CreateDomainRequest::getCloudNativeInstances() const { - return cloudNativeInstances_; -} - -void CreateDomainRequest::setCloudNativeInstances(const std::string &cloudNativeInstances) { - cloudNativeInstances_ = cloudNativeInstances; - setParameter(std::string("CloudNativeInstances"), cloudNativeInstances); -} - int CreateDomainRequest::getHttpsRedirect() const { return httpsRedirect_; } @@ -187,15 +151,6 @@ void CreateDomainRequest::setInstanceId(const std::string &instanceId) { setParameter(std::string("InstanceId"), instanceId); } -std::string CreateDomainRequest::getSourceIps() const { - return sourceIps_; -} - -void CreateDomainRequest::setSourceIps(const std::string &sourceIps) { - sourceIps_ = sourceIps; - setParameter(std::string("SourceIps"), sourceIps); -} - std::string CreateDomainRequest::getDomain() const { return domain_; } @@ -205,15 +160,6 @@ void CreateDomainRequest::setDomain(const std::string &domain) { setParameter(std::string("Domain"), domain); } -int CreateDomainRequest::getIsAccessProduct() const { - return isAccessProduct_; -} - -void CreateDomainRequest::setIsAccessProduct(int isAccessProduct) { - isAccessProduct_ = isAccessProduct; - setParameter(std::string("IsAccessProduct"), std::to_string(isAccessProduct)); -} - int CreateDomainRequest::getReadTime() const { return readTime_; } @@ -232,6 +178,96 @@ void CreateDomainRequest::setHttpsPort(const std::string &httpsPort) { setParameter(std::string("HttpsPort"), httpsPort); } +int CreateDomainRequest::getSniStatus() const { + return sniStatus_; +} + +void CreateDomainRequest::setSniStatus(int sniStatus) { + sniStatus_ = sniStatus; + setParameter(std::string("SniStatus"), std::to_string(sniStatus)); +} + +std::string CreateDomainRequest::getLang() const { + return lang_; +} + +void CreateDomainRequest::setLang(const std::string &lang) { + lang_ = lang; + setParameter(std::string("Lang"), lang); +} + +bool CreateDomainRequest::getRetry() const { + return retry_; +} + +void CreateDomainRequest::setRetry(bool retry) { + retry_ = retry; + setParameter(std::string("Retry"), retry ? "true" : "false"); +} + +int CreateDomainRequest::getKeepaliveRequests() const { + return keepaliveRequests_; +} + +void CreateDomainRequest::setKeepaliveRequests(int keepaliveRequests) { + keepaliveRequests_ = keepaliveRequests; + setParameter(std::string("KeepaliveRequests"), std::to_string(keepaliveRequests)); +} + +std::string CreateDomainRequest::getAccessType() const { + return accessType_; +} + +void CreateDomainRequest::setAccessType(const std::string &accessType) { + accessType_ = accessType; + setParameter(std::string("AccessType"), accessType); +} + +std::string CreateDomainRequest::getLogHeaders() const { + return logHeaders_; +} + +void CreateDomainRequest::setLogHeaders(const std::string &logHeaders) { + logHeaders_ = logHeaders; + setParameter(std::string("LogHeaders"), logHeaders); +} + +int CreateDomainRequest::getConnectionTime() const { + return connectionTime_; +} + +void CreateDomainRequest::setConnectionTime(int connectionTime) { + connectionTime_ = connectionTime; + setParameter(std::string("ConnectionTime"), std::to_string(connectionTime)); +} + +std::string CreateDomainRequest::getCloudNativeInstances() const { + return cloudNativeInstances_; +} + +void CreateDomainRequest::setCloudNativeInstances(const std::string &cloudNativeInstances) { + cloudNativeInstances_ = cloudNativeInstances; + setParameter(std::string("CloudNativeInstances"), cloudNativeInstances); +} + +std::string CreateDomainRequest::getSourceIps() const { + return sourceIps_; +} + +void CreateDomainRequest::setSourceIps(const std::string &sourceIps) { + sourceIps_ = sourceIps; + setParameter(std::string("SourceIps"), sourceIps); +} + +int CreateDomainRequest::getIsAccessProduct() const { + return isAccessProduct_; +} + +void CreateDomainRequest::setIsAccessProduct(int isAccessProduct) { + isAccessProduct_ = isAccessProduct; + setParameter(std::string("IsAccessProduct"), std::to_string(isAccessProduct)); +} + int CreateDomainRequest::getLoadBalancing() const { return loadBalancing_; } diff --git a/waf-openapi/src/model/DescribeCertificatesRequest.cc b/waf-openapi/src/model/DescribeCertificatesRequest.cc index ef6edd653..c8286f780 100644 --- a/waf-openapi/src/model/DescribeCertificatesRequest.cc +++ b/waf-openapi/src/model/DescribeCertificatesRequest.cc @@ -25,15 +25,6 @@ DescribeCertificatesRequest::DescribeCertificatesRequest() DescribeCertificatesRequest::~DescribeCertificatesRequest() {} -std::string DescribeCertificatesRequest::getInstanceId() const { - return instanceId_; -} - -void DescribeCertificatesRequest::setInstanceId(const std::string &instanceId) { - instanceId_ = instanceId; - setParameter(std::string("InstanceId"), instanceId); -} - std::string DescribeCertificatesRequest::getSourceIp() const { return sourceIp_; } @@ -43,15 +34,6 @@ void DescribeCertificatesRequest::setSourceIp(const std::string &sourceIp) { setParameter(std::string("SourceIp"), sourceIp); } -std::string DescribeCertificatesRequest::getDomain() const { - return domain_; -} - -void DescribeCertificatesRequest::setDomain(const std::string &domain) { - domain_ = domain; - setParameter(std::string("Domain"), domain); -} - std::string DescribeCertificatesRequest::getLang() const { return lang_; } @@ -61,3 +43,21 @@ void DescribeCertificatesRequest::setLang(const std::string &lang) { setParameter(std::string("Lang"), lang); } +std::string DescribeCertificatesRequest::getInstanceId() const { + return instanceId_; +} + +void DescribeCertificatesRequest::setInstanceId(const std::string &instanceId) { + instanceId_ = instanceId; + setParameter(std::string("InstanceId"), instanceId); +} + +std::string DescribeCertificatesRequest::getDomain() const { + return domain_; +} + +void DescribeCertificatesRequest::setDomain(const std::string &domain) { + domain_ = domain; + setParameter(std::string("Domain"), domain); +} + diff --git a/waf-openapi/src/model/DescribeCertificatesResult.cc b/waf-openapi/src/model/DescribeCertificatesResult.cc index 5de79dd85..7d1b5a3b2 100644 --- a/waf-openapi/src/model/DescribeCertificatesResult.cc +++ b/waf-openapi/src/model/DescribeCertificatesResult.cc @@ -51,6 +51,8 @@ void DescribeCertificatesResult::parse(const std::string &payload) certificatesObject.certificateId = std::stol(valueCertificatesCertificate["CertificateId"].asString()); if(!valueCertificatesCertificate["CommonName"].isNull()) certificatesObject.commonName = valueCertificatesCertificate["CommonName"].asString(); + if(!valueCertificatesCertificate["EndTime"].isNull()) + certificatesObject.endTime = std::stol(valueCertificatesCertificate["EndTime"].asString()); auto allSans = value["Sans"]["San"]; for (auto value : allSans) certificatesObject.sans.push_back(value.asString()); diff --git a/waf-openapi/src/model/DescribeDomainResult.cc b/waf-openapi/src/model/DescribeDomainResult.cc index 280766597..2f2450f8c 100644 --- a/waf-openapi/src/model/DescribeDomainResult.cc +++ b/waf-openapi/src/model/DescribeDomainResult.cc @@ -72,6 +72,14 @@ void DescribeDomainResult::parse(const std::string &payload) domain_.cname = domainNode["Cname"].asString(); if(!domainNode["ConnectionTime"].isNull()) domain_.connectionTime = std::stoi(domainNode["ConnectionTime"].asString()); + if(!domainNode["Retry"].isNull()) + domain_.retry = domainNode["Retry"].asString() == "true"; + if(!domainNode["Keepalive"].isNull()) + domain_.keepalive = domainNode["Keepalive"].asString() == "true"; + if(!domainNode["KeepaliveRequests"].isNull()) + domain_.keepaliveRequests = std::stoi(domainNode["KeepaliveRequests"].asString()); + if(!domainNode["KeepaliveTimeout"].isNull()) + domain_.keepaliveTimeout = std::stoi(domainNode["KeepaliveTimeout"].asString()); auto allLogHeadersNode = domainNode["LogHeaders"]["LogHeader"]; for (auto domainNodeLogHeadersLogHeader : allLogHeadersNode) { @@ -92,18 +100,20 @@ void DescribeDomainResult::parse(const std::string &payload) cloudNativeInstancesItemObject.cloudNativeProductName = domainNodeCloudNativeInstancesCloudNativeInstancesItem["CloudNativeProductName"].asString(); if(!domainNodeCloudNativeInstancesCloudNativeInstancesItem["InstanceId"].isNull()) cloudNativeInstancesItemObject.instanceId = domainNodeCloudNativeInstancesCloudNativeInstancesItem["InstanceId"].asString(); - if(!domainNodeCloudNativeInstancesCloudNativeInstancesItem["IPAddressList"].isNull()) - cloudNativeInstancesItemObject.iPAddressList = domainNodeCloudNativeInstancesCloudNativeInstancesItem["IPAddressList"].asString(); auto allProtocolPortConfigsNode = domainNodeCloudNativeInstancesCloudNativeInstancesItem["ProtocolPortConfigs"]["ProtocolPortConfigsItem"]; for (auto domainNodeCloudNativeInstancesCloudNativeInstancesItemProtocolPortConfigsProtocolPortConfigsItem : allProtocolPortConfigsNode) { Domain::CloudNativeInstancesItem::ProtocolPortConfigsItem protocolPortConfigsObject; - if(!domainNodeCloudNativeInstancesCloudNativeInstancesItemProtocolPortConfigsProtocolPortConfigsItem["Ports"].isNull()) - protocolPortConfigsObject.ports = domainNodeCloudNativeInstancesCloudNativeInstancesItemProtocolPortConfigsProtocolPortConfigsItem["Ports"].asString(); if(!domainNodeCloudNativeInstancesCloudNativeInstancesItemProtocolPortConfigsProtocolPortConfigsItem["Protocol"].isNull()) protocolPortConfigsObject.protocol = domainNodeCloudNativeInstancesCloudNativeInstancesItemProtocolPortConfigsProtocolPortConfigsItem["Protocol"].asString(); + auto allPorts = value["Ports"]["Port"]; + for (auto value : allPorts) + protocolPortConfigsObject.ports.push_back(value.asString()); cloudNativeInstancesItemObject.protocolPortConfigs.push_back(protocolPortConfigsObject); } + auto allIPAddressList = value["IPAddressList"]["Ip"]; + for (auto value : allIPAddressList) + cloudNativeInstancesItemObject.iPAddressList.push_back(value.asString()); domain_.cloudNativeInstances.push_back(cloudNativeInstancesItemObject); } auto allHttpPort = domainNode["HttpPort"]["HttpPort"]; diff --git a/waf-openapi/src/model/ModifyDomainRequest.cc b/waf-openapi/src/model/ModifyDomainRequest.cc index 0b1f8ef5f..6d32bd92d 100644 --- a/waf-openapi/src/model/ModifyDomainRequest.cc +++ b/waf-openapi/src/model/ModifyDomainRequest.cc @@ -34,6 +34,15 @@ void ModifyDomainRequest::setIpFollowStatus(int ipFollowStatus) { setParameter(std::string("IpFollowStatus"), std::to_string(ipFollowStatus)); } +bool ModifyDomainRequest::getKeepalive() const { + return keepalive_; +} + +void ModifyDomainRequest::setKeepalive(bool keepalive) { + keepalive_ = keepalive; + setParameter(std::string("Keepalive"), keepalive ? "true" : "false"); +} + std::string ModifyDomainRequest::getSniHost() const { return sniHost_; } @@ -88,6 +97,87 @@ void ModifyDomainRequest::setWriteTime(int writeTime) { setParameter(std::string("WriteTime"), std::to_string(writeTime)); } +int ModifyDomainRequest::getAccessHeaderMode() const { + return accessHeaderMode_; +} + +void ModifyDomainRequest::setAccessHeaderMode(int accessHeaderMode) { + accessHeaderMode_ = accessHeaderMode; + setParameter(std::string("AccessHeaderMode"), std::to_string(accessHeaderMode)); +} + +std::string ModifyDomainRequest::getAccessHeaders() const { + return accessHeaders_; +} + +void ModifyDomainRequest::setAccessHeaders(const std::string &accessHeaders) { + accessHeaders_ = accessHeaders; + setParameter(std::string("AccessHeaders"), accessHeaders); +} + +int ModifyDomainRequest::getKeepaliveTimeout() const { + return keepaliveTimeout_; +} + +void ModifyDomainRequest::setKeepaliveTimeout(int keepaliveTimeout) { + keepaliveTimeout_ = keepaliveTimeout; + setParameter(std::string("KeepaliveTimeout"), std::to_string(keepaliveTimeout)); +} + +int ModifyDomainRequest::getClusterType() const { + return clusterType_; +} + +void ModifyDomainRequest::setClusterType(int clusterType) { + clusterType_ = clusterType; + setParameter(std::string("ClusterType"), std::to_string(clusterType)); +} + +int ModifyDomainRequest::getHttpsRedirect() const { + return httpsRedirect_; +} + +void ModifyDomainRequest::setHttpsRedirect(int httpsRedirect) { + httpsRedirect_ = httpsRedirect; + setParameter(std::string("HttpsRedirect"), std::to_string(httpsRedirect)); +} + +std::string ModifyDomainRequest::getInstanceId() const { + return instanceId_; +} + +void ModifyDomainRequest::setInstanceId(const std::string &instanceId) { + instanceId_ = instanceId; + setParameter(std::string("InstanceId"), instanceId); +} + +std::string ModifyDomainRequest::getDomain() const { + return domain_; +} + +void ModifyDomainRequest::setDomain(const std::string &domain) { + domain_ = domain; + setParameter(std::string("Domain"), domain); +} + +int ModifyDomainRequest::getReadTime() const { + return readTime_; +} + +void ModifyDomainRequest::setReadTime(int readTime) { + readTime_ = readTime; + setParameter(std::string("ReadTime"), std::to_string(readTime)); +} + +std::string ModifyDomainRequest::getHttpsPort() const { + return httpsPort_; +} + +void ModifyDomainRequest::setHttpsPort(const std::string &httpsPort) { + httpsPort_ = httpsPort; + setParameter(std::string("HttpsPort"), httpsPort); +} + int ModifyDomainRequest::getSniStatus() const { return sniStatus_; } @@ -106,13 +196,22 @@ void ModifyDomainRequest::setLang(const std::string &lang) { setParameter(std::string("Lang"), lang); } -int ModifyDomainRequest::getAccessHeaderMode() const { - return accessHeaderMode_; +bool ModifyDomainRequest::getRetry() const { + return retry_; } -void ModifyDomainRequest::setAccessHeaderMode(int accessHeaderMode) { - accessHeaderMode_ = accessHeaderMode; - setParameter(std::string("AccessHeaderMode"), std::to_string(accessHeaderMode)); +void ModifyDomainRequest::setRetry(bool retry) { + retry_ = retry; + setParameter(std::string("Retry"), retry ? "true" : "false"); +} + +int ModifyDomainRequest::getKeepaliveRequests() const { + return keepaliveRequests_; +} + +void ModifyDomainRequest::setKeepaliveRequests(int keepaliveRequests) { + keepaliveRequests_ = keepaliveRequests; + setParameter(std::string("KeepaliveRequests"), std::to_string(keepaliveRequests)); } std::string ModifyDomainRequest::getAccessType() const { @@ -142,15 +241,6 @@ void ModifyDomainRequest::setLogHeaders(const std::string &logHeaders) { setParameter(std::string("LogHeaders"), logHeaders); } -std::string ModifyDomainRequest::getAccessHeaders() const { - return accessHeaders_; -} - -void ModifyDomainRequest::setAccessHeaders(const std::string &accessHeaders) { - accessHeaders_ = accessHeaders; - setParameter(std::string("AccessHeaders"), accessHeaders); -} - int ModifyDomainRequest::getConnectionTime() const { return connectionTime_; } @@ -160,15 +250,6 @@ void ModifyDomainRequest::setConnectionTime(int connectionTime) { setParameter(std::string("ConnectionTime"), std::to_string(connectionTime)); } -int ModifyDomainRequest::getClusterType() const { - return clusterType_; -} - -void ModifyDomainRequest::setClusterType(int clusterType) { - clusterType_ = clusterType; - setParameter(std::string("ClusterType"), std::to_string(clusterType)); -} - std::string ModifyDomainRequest::getCloudNativeInstances() const { return cloudNativeInstances_; } @@ -178,24 +259,6 @@ void ModifyDomainRequest::setCloudNativeInstances(const std::string &cloudNative setParameter(std::string("CloudNativeInstances"), cloudNativeInstances); } -int ModifyDomainRequest::getHttpsRedirect() const { - return httpsRedirect_; -} - -void ModifyDomainRequest::setHttpsRedirect(int httpsRedirect) { - httpsRedirect_ = httpsRedirect; - setParameter(std::string("HttpsRedirect"), std::to_string(httpsRedirect)); -} - -std::string ModifyDomainRequest::getInstanceId() const { - return instanceId_; -} - -void ModifyDomainRequest::setInstanceId(const std::string &instanceId) { - instanceId_ = instanceId; - setParameter(std::string("InstanceId"), instanceId); -} - std::string ModifyDomainRequest::getSourceIps() const { return sourceIps_; } @@ -205,15 +268,6 @@ void ModifyDomainRequest::setSourceIps(const std::string &sourceIps) { setParameter(std::string("SourceIps"), sourceIps); } -std::string ModifyDomainRequest::getDomain() const { - return domain_; -} - -void ModifyDomainRequest::setDomain(const std::string &domain) { - domain_ = domain; - setParameter(std::string("Domain"), domain); -} - int ModifyDomainRequest::getIsAccessProduct() const { return isAccessProduct_; } @@ -223,24 +277,6 @@ void ModifyDomainRequest::setIsAccessProduct(int isAccessProduct) { setParameter(std::string("IsAccessProduct"), std::to_string(isAccessProduct)); } -int ModifyDomainRequest::getReadTime() const { - return readTime_; -} - -void ModifyDomainRequest::setReadTime(int readTime) { - readTime_ = readTime; - setParameter(std::string("ReadTime"), std::to_string(readTime)); -} - -std::string ModifyDomainRequest::getHttpsPort() const { - return httpsPort_; -} - -void ModifyDomainRequest::setHttpsPort(const std::string &httpsPort) { - httpsPort_ = httpsPort; - setParameter(std::string("HttpsPort"), httpsPort); -} - int ModifyDomainRequest::getLoadBalancing() const { return loadBalancing_; }