Browse Source

Support resourceGroup.

sdk-team 3 years ago
parent
commit
9f078db0ce

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.1355
+1.36.1356

+ 12 - 0
cas/include/alibabacloud/cas/model/GetUserCertificateDetailResult.h

@@ -37,11 +37,15 @@ namespace AlibabaCloud
 				GetUserCertificateDetailResult();
 				explicit GetUserCertificateDetailResult(const std::string &payload);
 				~GetUserCertificateDetailResult();
+				std::string getSignCert()const;
 				std::string getFingerprint()const;
+				std::string getResourceGroupId()const;
 				std::string getIssuer()const;
+				std::string getEncryptCert()const;
 				std::string getOrgName()const;
 				bool getExpired()const;
 				std::string getCity()const;
+				long getOrderId()const;
 				std::string getEndDate()const;
 				std::string getProvince()const;
 				std::string getName()const;
@@ -50,18 +54,24 @@ namespace AlibabaCloud
 				std::string getStartDate()const;
 				std::string getSans()const;
 				std::string getCountry()const;
+				std::string getSignPrivateKey()const;
 				std::string getCert()const;
+				std::string getEncryptPrivateKey()const;
 				long getId()const;
 				std::string getKey()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
+				std::string signCert_;
 				std::string fingerprint_;
+				std::string resourceGroupId_;
 				std::string issuer_;
+				std::string encryptCert_;
 				std::string orgName_;
 				bool expired_;
 				std::string city_;
+				long orderId_;
 				std::string endDate_;
 				std::string province_;
 				std::string name_;
@@ -70,7 +80,9 @@ namespace AlibabaCloud
 				std::string startDate_;
 				std::string sans_;
 				std::string country_;
+				std::string signPrivateKey_;
 				std::string cert_;
+				std::string encryptPrivateKey_;
 				long id_;
 				std::string key_;
 

+ 9 - 6
cas/include/alibabacloud/cas/model/ListUserCertificateOrderRequest.h

@@ -30,24 +30,27 @@ class ALIBABACLOUD_CAS_EXPORT ListUserCertificateOrderRequest : public RpcServic
 public:
 	ListUserCertificateOrderRequest();
 	~ListUserCertificateOrderRequest();
-	long getShowSize() const;
-	void setShowSize(long showSize);
-	long getCurrentPage() const;
-	void setCurrentPage(long currentPage);
+	std::string getResourceGroupId() const;
+	void setResourceGroupId(const std::string &resourceGroupId);
 	std::string getSourceIp() const;
 	void setSourceIp(const std::string &sourceIp);
 	std::string getKeyword() const;
 	void setKeyword(const std::string &keyword);
+	long getShowSize() const;
+	void setShowSize(long showSize);
+	long getCurrentPage() const;
+	void setCurrentPage(long currentPage);
 	std::string getStatus() const;
 	void setStatus(const std::string &status);
 	std::string getOrderType() const;
 	void setOrderType(const std::string &orderType);
 
 private:
-	long showSize_;
-	long currentPage_;
+	std::string resourceGroupId_;
 	std::string sourceIp_;
 	std::string keyword_;
+	long showSize_;
+	long currentPage_;
 	std::string status_;
 	std::string orderType_;
 };

+ 1 - 0
cas/include/alibabacloud/cas/model/ListUserCertificateOrderResult.h

@@ -36,6 +36,7 @@ namespace AlibabaCloud
 				{
 					std::string sha2;
 					std::string productName;
+					std::string resourceGroupId;
 					std::string issuer;
 					long certificateId;
 					std::string sourceType;

+ 3 - 0
cas/include/alibabacloud/cas/model/UploadUserCertificateRequest.h

@@ -34,6 +34,8 @@ public:
 	void setEncryptCert(const std::string &encryptCert);
 	std::string getCert() const;
 	void setCert(const std::string &cert);
+	std::string getResourceGroupId() const;
+	void setResourceGroupId(const std::string &resourceGroupId);
 	std::string getSourceIp() const;
 	void setSourceIp(const std::string &sourceIp);
 	std::string getKey() const;
@@ -50,6 +52,7 @@ public:
 private:
 	std::string encryptCert_;
 	std::string cert_;
+	std::string resourceGroupId_;
 	std::string sourceIp_;
 	std::string key_;
 	std::string encryptPrivateKey_;

+ 42 - 0
cas/src/model/GetUserCertificateDetailResult.cc

@@ -43,6 +43,14 @@ void GetUserCertificateDetailResult::parse(const std::string &payload)
 		cert_ = value["Cert"].asString();
 	if(!value["Key"].isNull())
 		key_ = value["Key"].asString();
+	if(!value["EncryptCert"].isNull())
+		encryptCert_ = value["EncryptCert"].asString();
+	if(!value["EncryptPrivateKey"].isNull())
+		encryptPrivateKey_ = value["EncryptPrivateKey"].asString();
+	if(!value["SignCert"].isNull())
+		signCert_ = value["SignCert"].asString();
+	if(!value["SignPrivateKey"].isNull())
+		signPrivateKey_ = value["SignPrivateKey"].asString();
 	if(!value["Id"].isNull())
 		id_ = std::stol(value["Id"].asString());
 	if(!value["Name"].isNull())
@@ -71,19 +79,38 @@ void GetUserCertificateDetailResult::parse(const std::string &payload)
 		expired_ = value["Expired"].asString() == "true";
 	if(!value["BuyInAliyun"].isNull())
 		buyInAliyun_ = value["BuyInAliyun"].asString() == "true";
+	if(!value["OrderId"].isNull())
+		orderId_ = std::stol(value["OrderId"].asString());
+	if(!value["ResourceGroupId"].isNull())
+		resourceGroupId_ = value["ResourceGroupId"].asString();
 
 }
 
+std::string GetUserCertificateDetailResult::getSignCert()const
+{
+	return signCert_;
+}
+
 std::string GetUserCertificateDetailResult::getFingerprint()const
 {
 	return fingerprint_;
 }
 
+std::string GetUserCertificateDetailResult::getResourceGroupId()const
+{
+	return resourceGroupId_;
+}
+
 std::string GetUserCertificateDetailResult::getIssuer()const
 {
 	return issuer_;
 }
 
+std::string GetUserCertificateDetailResult::getEncryptCert()const
+{
+	return encryptCert_;
+}
+
 std::string GetUserCertificateDetailResult::getOrgName()const
 {
 	return orgName_;
@@ -99,6 +126,11 @@ std::string GetUserCertificateDetailResult::getCity()const
 	return city_;
 }
 
+long GetUserCertificateDetailResult::getOrderId()const
+{
+	return orderId_;
+}
+
 std::string GetUserCertificateDetailResult::getEndDate()const
 {
 	return endDate_;
@@ -139,11 +171,21 @@ std::string GetUserCertificateDetailResult::getCountry()const
 	return country_;
 }
 
+std::string GetUserCertificateDetailResult::getSignPrivateKey()const
+{
+	return signPrivateKey_;
+}
+
 std::string GetUserCertificateDetailResult::getCert()const
 {
 	return cert_;
 }
 
+std::string GetUserCertificateDetailResult::getEncryptPrivateKey()const
+{
+	return encryptPrivateKey_;
+}
+
 long GetUserCertificateDetailResult::getId()const
 {
 	return id_;

+ 23 - 14
cas/src/model/ListUserCertificateOrderRequest.cc

@@ -25,22 +25,13 @@ ListUserCertificateOrderRequest::ListUserCertificateOrderRequest()
 
 ListUserCertificateOrderRequest::~ListUserCertificateOrderRequest() {}
 
-long ListUserCertificateOrderRequest::getShowSize() const {
-  return showSize_;
-}
-
-void ListUserCertificateOrderRequest::setShowSize(long showSize) {
-  showSize_ = showSize;
-  setParameter(std::string("ShowSize"), std::to_string(showSize));
-}
-
-long ListUserCertificateOrderRequest::getCurrentPage() const {
-  return currentPage_;
+std::string ListUserCertificateOrderRequest::getResourceGroupId() const {
+  return resourceGroupId_;
 }
 
-void ListUserCertificateOrderRequest::setCurrentPage(long currentPage) {
-  currentPage_ = currentPage;
-  setParameter(std::string("CurrentPage"), std::to_string(currentPage));
+void ListUserCertificateOrderRequest::setResourceGroupId(const std::string &resourceGroupId) {
+  resourceGroupId_ = resourceGroupId;
+  setParameter(std::string("ResourceGroupId"), resourceGroupId);
 }
 
 std::string ListUserCertificateOrderRequest::getSourceIp() const {
@@ -61,6 +52,24 @@ void ListUserCertificateOrderRequest::setKeyword(const std::string &keyword) {
   setParameter(std::string("Keyword"), keyword);
 }
 
+long ListUserCertificateOrderRequest::getShowSize() const {
+  return showSize_;
+}
+
+void ListUserCertificateOrderRequest::setShowSize(long showSize) {
+  showSize_ = showSize;
+  setParameter(std::string("ShowSize"), std::to_string(showSize));
+}
+
+long ListUserCertificateOrderRequest::getCurrentPage() const {
+  return currentPage_;
+}
+
+void ListUserCertificateOrderRequest::setCurrentPage(long currentPage) {
+  currentPage_ = currentPage;
+  setParameter(std::string("CurrentPage"), std::to_string(currentPage));
+}
+
 std::string ListUserCertificateOrderRequest::getStatus() const {
   return status_;
 }

+ 2 - 0
cas/src/model/ListUserCertificateOrderResult.cc

@@ -113,6 +113,8 @@ void ListUserCertificateOrderResult::parse(const std::string &payload)
 			certificateOrderListObject.startDate = valueCertificateOrderListCertificateOrderListItem["StartDate"].asString();
 		if(!valueCertificateOrderListCertificateOrderListItem["EndDate"].isNull())
 			certificateOrderListObject.endDate = valueCertificateOrderListCertificateOrderListItem["EndDate"].asString();
+		if(!valueCertificateOrderListCertificateOrderListItem["ResourceGroupId"].isNull())
+			certificateOrderListObject.resourceGroupId = valueCertificateOrderListCertificateOrderListItem["ResourceGroupId"].asString();
 		certificateOrderList_.push_back(certificateOrderListObject);
 	}
 	if(!value["ShowSize"].isNull())

+ 9 - 0
cas/src/model/UploadUserCertificateRequest.cc

@@ -43,6 +43,15 @@ void UploadUserCertificateRequest::setCert(const std::string &cert) {
   setParameter(std::string("Cert"), cert);
 }
 
+std::string UploadUserCertificateRequest::getResourceGroupId() const {
+  return resourceGroupId_;
+}
+
+void UploadUserCertificateRequest::setResourceGroupId(const std::string &resourceGroupId) {
+  resourceGroupId_ = resourceGroupId;
+  setParameter(std::string("ResourceGroupId"), resourceGroupId);
+}
+
 std::string UploadUserCertificateRequest::getSourceIp() const {
   return sourceIp_;
 }