Przeglądaj źródła

Update CreateKey and CreateSecret.

sdk-team 4 lat temu
rodzic
commit
192d947607
100 zmienionych plików z 2698 dodań i 3956 usunięć
  1. 3 0
      CHANGELOG
  2. 1 1
      VERSION
  3. 0 20
      kms/CMakeLists.txt
  4. 0 40
      kms/include/alibabacloud/kms/KmsClient.h
  5. 40 46
      kms/include/alibabacloud/kms/model/AsymmetricDecryptRequest.h
  6. 40 46
      kms/include/alibabacloud/kms/model/AsymmetricEncryptRequest.h
  7. 40 46
      kms/include/alibabacloud/kms/model/AsymmetricSignRequest.h
  8. 43 49
      kms/include/alibabacloud/kms/model/AsymmetricVerifyRequest.h
  9. 31 37
      kms/include/alibabacloud/kms/model/CancelKeyDeletionRequest.h
  10. 37 43
      kms/include/alibabacloud/kms/model/CertificatePrivateKeyDecryptRequest.h
  11. 40 46
      kms/include/alibabacloud/kms/model/CertificatePrivateKeySignRequest.h
  12. 37 43
      kms/include/alibabacloud/kms/model/CertificatePublicKeyEncryptRequest.h
  13. 2 2
      kms/include/alibabacloud/kms/model/CertificatePublicKeyEncryptResult.h
  14. 43 49
      kms/include/alibabacloud/kms/model/CertificatePublicKeyVerifyRequest.h
  15. 34 40
      kms/include/alibabacloud/kms/model/CreateAliasRequest.h
  16. 46 52
      kms/include/alibabacloud/kms/model/CreateCertificateRequest.h
  17. 52 55
      kms/include/alibabacloud/kms/model/CreateKeyRequest.h
  18. 3 2
      kms/include/alibabacloud/kms/model/CreateKeyResult.h
  19. 31 37
      kms/include/alibabacloud/kms/model/CreateKeyVersionRequest.h
  20. 64 67
      kms/include/alibabacloud/kms/model/CreateSecretRequest.h
  21. 4 2
      kms/include/alibabacloud/kms/model/CreateSecretResult.h
  22. 34 40
      kms/include/alibabacloud/kms/model/DecryptRequest.h
  23. 31 37
      kms/include/alibabacloud/kms/model/DeleteAliasRequest.h
  24. 31 37
      kms/include/alibabacloud/kms/model/DeleteCertificateRequest.h
  25. 31 37
      kms/include/alibabacloud/kms/model/DeleteKeyMaterialRequest.h
  26. 37 43
      kms/include/alibabacloud/kms/model/DeleteSecretRequest.h
  27. 28 34
      kms/include/alibabacloud/kms/model/DescribeAccountKmsStatusRequest.h
  28. 31 37
      kms/include/alibabacloud/kms/model/DescribeCertificateRequest.h
  29. 2 2
      kms/include/alibabacloud/kms/model/DescribeCertificateResult.h
  30. 31 37
      kms/include/alibabacloud/kms/model/DescribeKeyRequest.h
  31. 4 3
      kms/include/alibabacloud/kms/model/DescribeKeyResult.h
  32. 34 40
      kms/include/alibabacloud/kms/model/DescribeKeyVersionRequest.h
  33. 28 34
      kms/include/alibabacloud/kms/model/DescribeRegionsRequest.h
  34. 34 40
      kms/include/alibabacloud/kms/model/DescribeSecretRequest.h
  35. 6 4
      kms/include/alibabacloud/kms/model/DescribeSecretResult.h
  36. 0 45
      kms/include/alibabacloud/kms/model/DescribeServiceRequest.h
  37. 0 63
      kms/include/alibabacloud/kms/model/DescribeServiceResult.h
  38. 31 37
      kms/include/alibabacloud/kms/model/DisableKeyRequest.h
  39. 31 37
      kms/include/alibabacloud/kms/model/EnableKeyRequest.h
  40. 37 43
      kms/include/alibabacloud/kms/model/EncryptRequest.h
  41. 0 54
      kms/include/alibabacloud/kms/model/ExportCertificateRequest.h
  42. 0 59
      kms/include/alibabacloud/kms/model/ExportCertificateResult.h
  43. 43 49
      kms/include/alibabacloud/kms/model/ExportDataKeyRequest.h
  44. 49 55
      kms/include/alibabacloud/kms/model/GenerateAndExportDataKeyRequest.h
  45. 40 46
      kms/include/alibabacloud/kms/model/GenerateDataKeyRequest.h
  46. 40 46
      kms/include/alibabacloud/kms/model/GenerateDataKeyWithoutPlaintextRequest.h
  47. 31 37
      kms/include/alibabacloud/kms/model/GetCertificateRequest.h
  48. 37 43
      kms/include/alibabacloud/kms/model/GetParametersForImportRequest.h
  49. 34 40
      kms/include/alibabacloud/kms/model/GetPublicKeyRequest.h
  50. 49 55
      kms/include/alibabacloud/kms/model/GetRandomPasswordRequest.h
  51. 40 46
      kms/include/alibabacloud/kms/model/GetSecretValueRequest.h
  52. 2 2
      kms/include/alibabacloud/kms/model/GetSecretValueResult.h
  53. 0 51
      kms/include/alibabacloud/kms/model/ImportCertificateRequest.h
  54. 0 53
      kms/include/alibabacloud/kms/model/ImportCertificateResult.h
  55. 0 66
      kms/include/alibabacloud/kms/model/ImportEncryptionCertificateRequest.h
  56. 0 53
      kms/include/alibabacloud/kms/model/ImportEncryptionCertificateResult.h
  57. 40 46
      kms/include/alibabacloud/kms/model/ImportKeyMaterialRequest.h
  58. 37 43
      kms/include/alibabacloud/kms/model/ListAliasesByKeyIdRequest.h
  59. 34 40
      kms/include/alibabacloud/kms/model/ListAliasesRequest.h
  60. 0 60
      kms/include/alibabacloud/kms/model/ListCertificatesRequest.h
  61. 0 67
      kms/include/alibabacloud/kms/model/ListCertificatesResult.h
  62. 37 43
      kms/include/alibabacloud/kms/model/ListKeyVersionsRequest.h
  63. 37 43
      kms/include/alibabacloud/kms/model/ListKeysRequest.h
  64. 31 37
      kms/include/alibabacloud/kms/model/ListResourceTagsRequest.h
  65. 40 46
      kms/include/alibabacloud/kms/model/ListSecretVersionIdsRequest.h
  66. 40 46
      kms/include/alibabacloud/kms/model/ListSecretsRequest.h
  67. 28 34
      kms/include/alibabacloud/kms/model/OpenKmsServiceRequest.h
  68. 43 49
      kms/include/alibabacloud/kms/model/PutSecretValueRequest.h
  69. 49 55
      kms/include/alibabacloud/kms/model/ReEncryptRequest.h
  70. 31 37
      kms/include/alibabacloud/kms/model/RestoreSecretRequest.h
  71. 34 40
      kms/include/alibabacloud/kms/model/RotateSecretRequest.h
  72. 34 40
      kms/include/alibabacloud/kms/model/ScheduleKeyDeletionRequest.h
  73. 37 43
      kms/include/alibabacloud/kms/model/SetDeletionProtectionRequest.h
  74. 40 46
      kms/include/alibabacloud/kms/model/TagResourceRequest.h
  75. 40 46
      kms/include/alibabacloud/kms/model/UntagResourceRequest.h
  76. 34 40
      kms/include/alibabacloud/kms/model/UpdateAliasRequest.h
  77. 34 40
      kms/include/alibabacloud/kms/model/UpdateCertificateStatusRequest.h
  78. 34 40
      kms/include/alibabacloud/kms/model/UpdateKeyDescriptionRequest.h
  79. 37 43
      kms/include/alibabacloud/kms/model/UpdateRotationPolicyRequest.h
  80. 37 43
      kms/include/alibabacloud/kms/model/UpdateSecretRequest.h
  81. 37 43
      kms/include/alibabacloud/kms/model/UpdateSecretRotationPolicyRequest.h
  82. 40 46
      kms/include/alibabacloud/kms/model/UpdateSecretVersionStageRequest.h
  83. 37 43
      kms/include/alibabacloud/kms/model/UploadCertificateRequest.h
  84. 0 180
      kms/src/KmsClient.cc
  85. 36 46
      kms/src/model/AsymmetricDecryptRequest.cc
  86. 4 4
      kms/src/model/AsymmetricDecryptResult.cc
  87. 36 46
      kms/src/model/AsymmetricEncryptRequest.cc
  88. 4 4
      kms/src/model/AsymmetricEncryptResult.cc
  89. 36 46
      kms/src/model/AsymmetricSignRequest.cc
  90. 4 4
      kms/src/model/AsymmetricSignResult.cc
  91. 41 53
      kms/src/model/AsymmetricVerifyRequest.cc
  92. 4 4
      kms/src/model/AsymmetricVerifyResult.cc
  93. 21 25
      kms/src/model/CancelKeyDeletionRequest.cc
  94. 31 39
      kms/src/model/CertificatePrivateKeyDecryptRequest.cc
  95. 36 46
      kms/src/model/CertificatePrivateKeySignRequest.cc
  96. 2 2
      kms/src/model/CertificatePrivateKeySignResult.cc
  97. 31 39
      kms/src/model/CertificatePublicKeyEncryptRequest.cc
  98. 6 6
      kms/src/model/CertificatePublicKeyEncryptResult.cc
  99. 41 53
      kms/src/model/CertificatePublicKeyVerifyRequest.cc
  100. 26 32
      kms/src/model/CreateAliasRequest.cc

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2022-08-01 Version: 1.36.1215
+- Update CreateKey and CreateSecret.
+
 2022-07-29 Version: 1.36.1213
 2022-07-29 Version: 1.36.1213
 - Change ListCheckInstanceResult Public.
 - Change ListCheckInstanceResult Public.
 
 

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.1214
+1.36.1215

+ 0 - 20
kms/CMakeLists.txt

@@ -71,16 +71,12 @@ set(kms_public_header_model
 	include/alibabacloud/kms/model/DescribeRegionsResult.h
 	include/alibabacloud/kms/model/DescribeRegionsResult.h
 	include/alibabacloud/kms/model/DescribeSecretRequest.h
 	include/alibabacloud/kms/model/DescribeSecretRequest.h
 	include/alibabacloud/kms/model/DescribeSecretResult.h
 	include/alibabacloud/kms/model/DescribeSecretResult.h
-	include/alibabacloud/kms/model/DescribeServiceRequest.h
-	include/alibabacloud/kms/model/DescribeServiceResult.h
 	include/alibabacloud/kms/model/DisableKeyRequest.h
 	include/alibabacloud/kms/model/DisableKeyRequest.h
 	include/alibabacloud/kms/model/DisableKeyResult.h
 	include/alibabacloud/kms/model/DisableKeyResult.h
 	include/alibabacloud/kms/model/EnableKeyRequest.h
 	include/alibabacloud/kms/model/EnableKeyRequest.h
 	include/alibabacloud/kms/model/EnableKeyResult.h
 	include/alibabacloud/kms/model/EnableKeyResult.h
 	include/alibabacloud/kms/model/EncryptRequest.h
 	include/alibabacloud/kms/model/EncryptRequest.h
 	include/alibabacloud/kms/model/EncryptResult.h
 	include/alibabacloud/kms/model/EncryptResult.h
-	include/alibabacloud/kms/model/ExportCertificateRequest.h
-	include/alibabacloud/kms/model/ExportCertificateResult.h
 	include/alibabacloud/kms/model/ExportDataKeyRequest.h
 	include/alibabacloud/kms/model/ExportDataKeyRequest.h
 	include/alibabacloud/kms/model/ExportDataKeyResult.h
 	include/alibabacloud/kms/model/ExportDataKeyResult.h
 	include/alibabacloud/kms/model/GenerateAndExportDataKeyRequest.h
 	include/alibabacloud/kms/model/GenerateAndExportDataKeyRequest.h
@@ -99,18 +95,12 @@ set(kms_public_header_model
 	include/alibabacloud/kms/model/GetRandomPasswordResult.h
 	include/alibabacloud/kms/model/GetRandomPasswordResult.h
 	include/alibabacloud/kms/model/GetSecretValueRequest.h
 	include/alibabacloud/kms/model/GetSecretValueRequest.h
 	include/alibabacloud/kms/model/GetSecretValueResult.h
 	include/alibabacloud/kms/model/GetSecretValueResult.h
-	include/alibabacloud/kms/model/ImportCertificateRequest.h
-	include/alibabacloud/kms/model/ImportCertificateResult.h
-	include/alibabacloud/kms/model/ImportEncryptionCertificateRequest.h
-	include/alibabacloud/kms/model/ImportEncryptionCertificateResult.h
 	include/alibabacloud/kms/model/ImportKeyMaterialRequest.h
 	include/alibabacloud/kms/model/ImportKeyMaterialRequest.h
 	include/alibabacloud/kms/model/ImportKeyMaterialResult.h
 	include/alibabacloud/kms/model/ImportKeyMaterialResult.h
 	include/alibabacloud/kms/model/ListAliasesRequest.h
 	include/alibabacloud/kms/model/ListAliasesRequest.h
 	include/alibabacloud/kms/model/ListAliasesResult.h
 	include/alibabacloud/kms/model/ListAliasesResult.h
 	include/alibabacloud/kms/model/ListAliasesByKeyIdRequest.h
 	include/alibabacloud/kms/model/ListAliasesByKeyIdRequest.h
 	include/alibabacloud/kms/model/ListAliasesByKeyIdResult.h
 	include/alibabacloud/kms/model/ListAliasesByKeyIdResult.h
-	include/alibabacloud/kms/model/ListCertificatesRequest.h
-	include/alibabacloud/kms/model/ListCertificatesResult.h
 	include/alibabacloud/kms/model/ListKeyVersionsRequest.h
 	include/alibabacloud/kms/model/ListKeyVersionsRequest.h
 	include/alibabacloud/kms/model/ListKeyVersionsResult.h
 	include/alibabacloud/kms/model/ListKeyVersionsResult.h
 	include/alibabacloud/kms/model/ListKeysRequest.h
 	include/alibabacloud/kms/model/ListKeysRequest.h
@@ -208,16 +198,12 @@ set(kms_src
 	src/model/DescribeRegionsResult.cc
 	src/model/DescribeRegionsResult.cc
 	src/model/DescribeSecretRequest.cc
 	src/model/DescribeSecretRequest.cc
 	src/model/DescribeSecretResult.cc
 	src/model/DescribeSecretResult.cc
-	src/model/DescribeServiceRequest.cc
-	src/model/DescribeServiceResult.cc
 	src/model/DisableKeyRequest.cc
 	src/model/DisableKeyRequest.cc
 	src/model/DisableKeyResult.cc
 	src/model/DisableKeyResult.cc
 	src/model/EnableKeyRequest.cc
 	src/model/EnableKeyRequest.cc
 	src/model/EnableKeyResult.cc
 	src/model/EnableKeyResult.cc
 	src/model/EncryptRequest.cc
 	src/model/EncryptRequest.cc
 	src/model/EncryptResult.cc
 	src/model/EncryptResult.cc
-	src/model/ExportCertificateRequest.cc
-	src/model/ExportCertificateResult.cc
 	src/model/ExportDataKeyRequest.cc
 	src/model/ExportDataKeyRequest.cc
 	src/model/ExportDataKeyResult.cc
 	src/model/ExportDataKeyResult.cc
 	src/model/GenerateAndExportDataKeyRequest.cc
 	src/model/GenerateAndExportDataKeyRequest.cc
@@ -236,18 +222,12 @@ set(kms_src
 	src/model/GetRandomPasswordResult.cc
 	src/model/GetRandomPasswordResult.cc
 	src/model/GetSecretValueRequest.cc
 	src/model/GetSecretValueRequest.cc
 	src/model/GetSecretValueResult.cc
 	src/model/GetSecretValueResult.cc
-	src/model/ImportCertificateRequest.cc
-	src/model/ImportCertificateResult.cc
-	src/model/ImportEncryptionCertificateRequest.cc
-	src/model/ImportEncryptionCertificateResult.cc
 	src/model/ImportKeyMaterialRequest.cc
 	src/model/ImportKeyMaterialRequest.cc
 	src/model/ImportKeyMaterialResult.cc
 	src/model/ImportKeyMaterialResult.cc
 	src/model/ListAliasesRequest.cc
 	src/model/ListAliasesRequest.cc
 	src/model/ListAliasesResult.cc
 	src/model/ListAliasesResult.cc
 	src/model/ListAliasesByKeyIdRequest.cc
 	src/model/ListAliasesByKeyIdRequest.cc
 	src/model/ListAliasesByKeyIdResult.cc
 	src/model/ListAliasesByKeyIdResult.cc
-	src/model/ListCertificatesRequest.cc
-	src/model/ListCertificatesResult.cc
 	src/model/ListKeyVersionsRequest.cc
 	src/model/ListKeyVersionsRequest.cc
 	src/model/ListKeyVersionsResult.cc
 	src/model/ListKeyVersionsResult.cc
 	src/model/ListKeysRequest.cc
 	src/model/ListKeysRequest.cc

+ 0 - 40
kms/include/alibabacloud/kms/KmsClient.h

@@ -72,16 +72,12 @@
 #include "model/DescribeRegionsResult.h"
 #include "model/DescribeRegionsResult.h"
 #include "model/DescribeSecretRequest.h"
 #include "model/DescribeSecretRequest.h"
 #include "model/DescribeSecretResult.h"
 #include "model/DescribeSecretResult.h"
-#include "model/DescribeServiceRequest.h"
-#include "model/DescribeServiceResult.h"
 #include "model/DisableKeyRequest.h"
 #include "model/DisableKeyRequest.h"
 #include "model/DisableKeyResult.h"
 #include "model/DisableKeyResult.h"
 #include "model/EnableKeyRequest.h"
 #include "model/EnableKeyRequest.h"
 #include "model/EnableKeyResult.h"
 #include "model/EnableKeyResult.h"
 #include "model/EncryptRequest.h"
 #include "model/EncryptRequest.h"
 #include "model/EncryptResult.h"
 #include "model/EncryptResult.h"
-#include "model/ExportCertificateRequest.h"
-#include "model/ExportCertificateResult.h"
 #include "model/ExportDataKeyRequest.h"
 #include "model/ExportDataKeyRequest.h"
 #include "model/ExportDataKeyResult.h"
 #include "model/ExportDataKeyResult.h"
 #include "model/GenerateAndExportDataKeyRequest.h"
 #include "model/GenerateAndExportDataKeyRequest.h"
@@ -100,18 +96,12 @@
 #include "model/GetRandomPasswordResult.h"
 #include "model/GetRandomPasswordResult.h"
 #include "model/GetSecretValueRequest.h"
 #include "model/GetSecretValueRequest.h"
 #include "model/GetSecretValueResult.h"
 #include "model/GetSecretValueResult.h"
-#include "model/ImportCertificateRequest.h"
-#include "model/ImportCertificateResult.h"
-#include "model/ImportEncryptionCertificateRequest.h"
-#include "model/ImportEncryptionCertificateResult.h"
 #include "model/ImportKeyMaterialRequest.h"
 #include "model/ImportKeyMaterialRequest.h"
 #include "model/ImportKeyMaterialResult.h"
 #include "model/ImportKeyMaterialResult.h"
 #include "model/ListAliasesRequest.h"
 #include "model/ListAliasesRequest.h"
 #include "model/ListAliasesResult.h"
 #include "model/ListAliasesResult.h"
 #include "model/ListAliasesByKeyIdRequest.h"
 #include "model/ListAliasesByKeyIdRequest.h"
 #include "model/ListAliasesByKeyIdResult.h"
 #include "model/ListAliasesByKeyIdResult.h"
-#include "model/ListCertificatesRequest.h"
-#include "model/ListCertificatesResult.h"
 #include "model/ListKeyVersionsRequest.h"
 #include "model/ListKeyVersionsRequest.h"
 #include "model/ListKeyVersionsResult.h"
 #include "model/ListKeyVersionsResult.h"
 #include "model/ListKeysRequest.h"
 #include "model/ListKeysRequest.h"
@@ -240,9 +230,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeSecretResult> DescribeSecretOutcome;
 			typedef Outcome<Error, Model::DescribeSecretResult> DescribeSecretOutcome;
 			typedef std::future<DescribeSecretOutcome> DescribeSecretOutcomeCallable;
 			typedef std::future<DescribeSecretOutcome> DescribeSecretOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::DescribeSecretRequest&, const DescribeSecretOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSecretAsyncHandler;
 			typedef std::function<void(const KmsClient*, const Model::DescribeSecretRequest&, const DescribeSecretOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSecretAsyncHandler;
-			typedef Outcome<Error, Model::DescribeServiceResult> DescribeServiceOutcome;
-			typedef std::future<DescribeServiceOutcome> DescribeServiceOutcomeCallable;
-			typedef std::function<void(const KmsClient*, const Model::DescribeServiceRequest&, const DescribeServiceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeServiceAsyncHandler;
 			typedef Outcome<Error, Model::DisableKeyResult> DisableKeyOutcome;
 			typedef Outcome<Error, Model::DisableKeyResult> DisableKeyOutcome;
 			typedef std::future<DisableKeyOutcome> DisableKeyOutcomeCallable;
 			typedef std::future<DisableKeyOutcome> DisableKeyOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::DisableKeyRequest&, const DisableKeyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DisableKeyAsyncHandler;
 			typedef std::function<void(const KmsClient*, const Model::DisableKeyRequest&, const DisableKeyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DisableKeyAsyncHandler;
@@ -252,9 +239,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::EncryptResult> EncryptOutcome;
 			typedef Outcome<Error, Model::EncryptResult> EncryptOutcome;
 			typedef std::future<EncryptOutcome> EncryptOutcomeCallable;
 			typedef std::future<EncryptOutcome> EncryptOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::EncryptRequest&, const EncryptOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> EncryptAsyncHandler;
 			typedef std::function<void(const KmsClient*, const Model::EncryptRequest&, const EncryptOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> EncryptAsyncHandler;
-			typedef Outcome<Error, Model::ExportCertificateResult> ExportCertificateOutcome;
-			typedef std::future<ExportCertificateOutcome> ExportCertificateOutcomeCallable;
-			typedef std::function<void(const KmsClient*, const Model::ExportCertificateRequest&, const ExportCertificateOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ExportCertificateAsyncHandler;
 			typedef Outcome<Error, Model::ExportDataKeyResult> ExportDataKeyOutcome;
 			typedef Outcome<Error, Model::ExportDataKeyResult> ExportDataKeyOutcome;
 			typedef std::future<ExportDataKeyOutcome> ExportDataKeyOutcomeCallable;
 			typedef std::future<ExportDataKeyOutcome> ExportDataKeyOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::ExportDataKeyRequest&, const ExportDataKeyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ExportDataKeyAsyncHandler;
 			typedef std::function<void(const KmsClient*, const Model::ExportDataKeyRequest&, const ExportDataKeyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ExportDataKeyAsyncHandler;
@@ -282,12 +266,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::GetSecretValueResult> GetSecretValueOutcome;
 			typedef Outcome<Error, Model::GetSecretValueResult> GetSecretValueOutcome;
 			typedef std::future<GetSecretValueOutcome> GetSecretValueOutcomeCallable;
 			typedef std::future<GetSecretValueOutcome> GetSecretValueOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::GetSecretValueRequest&, const GetSecretValueOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetSecretValueAsyncHandler;
 			typedef std::function<void(const KmsClient*, const Model::GetSecretValueRequest&, const GetSecretValueOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetSecretValueAsyncHandler;
-			typedef Outcome<Error, Model::ImportCertificateResult> ImportCertificateOutcome;
-			typedef std::future<ImportCertificateOutcome> ImportCertificateOutcomeCallable;
-			typedef std::function<void(const KmsClient*, const Model::ImportCertificateRequest&, const ImportCertificateOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ImportCertificateAsyncHandler;
-			typedef Outcome<Error, Model::ImportEncryptionCertificateResult> ImportEncryptionCertificateOutcome;
-			typedef std::future<ImportEncryptionCertificateOutcome> ImportEncryptionCertificateOutcomeCallable;
-			typedef std::function<void(const KmsClient*, const Model::ImportEncryptionCertificateRequest&, const ImportEncryptionCertificateOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ImportEncryptionCertificateAsyncHandler;
 			typedef Outcome<Error, Model::ImportKeyMaterialResult> ImportKeyMaterialOutcome;
 			typedef Outcome<Error, Model::ImportKeyMaterialResult> ImportKeyMaterialOutcome;
 			typedef std::future<ImportKeyMaterialOutcome> ImportKeyMaterialOutcomeCallable;
 			typedef std::future<ImportKeyMaterialOutcome> ImportKeyMaterialOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::ImportKeyMaterialRequest&, const ImportKeyMaterialOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ImportKeyMaterialAsyncHandler;
 			typedef std::function<void(const KmsClient*, const Model::ImportKeyMaterialRequest&, const ImportKeyMaterialOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ImportKeyMaterialAsyncHandler;
@@ -297,9 +275,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ListAliasesByKeyIdResult> ListAliasesByKeyIdOutcome;
 			typedef Outcome<Error, Model::ListAliasesByKeyIdResult> ListAliasesByKeyIdOutcome;
 			typedef std::future<ListAliasesByKeyIdOutcome> ListAliasesByKeyIdOutcomeCallable;
 			typedef std::future<ListAliasesByKeyIdOutcome> ListAliasesByKeyIdOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::ListAliasesByKeyIdRequest&, const ListAliasesByKeyIdOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListAliasesByKeyIdAsyncHandler;
 			typedef std::function<void(const KmsClient*, const Model::ListAliasesByKeyIdRequest&, const ListAliasesByKeyIdOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListAliasesByKeyIdAsyncHandler;
-			typedef Outcome<Error, Model::ListCertificatesResult> ListCertificatesOutcome;
-			typedef std::future<ListCertificatesOutcome> ListCertificatesOutcomeCallable;
-			typedef std::function<void(const KmsClient*, const Model::ListCertificatesRequest&, const ListCertificatesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListCertificatesAsyncHandler;
 			typedef Outcome<Error, Model::ListKeyVersionsResult> ListKeyVersionsOutcome;
 			typedef Outcome<Error, Model::ListKeyVersionsResult> ListKeyVersionsOutcome;
 			typedef std::future<ListKeyVersionsOutcome> ListKeyVersionsOutcomeCallable;
 			typedef std::future<ListKeyVersionsOutcome> ListKeyVersionsOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::ListKeyVersionsRequest&, const ListKeyVersionsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListKeyVersionsAsyncHandler;
 			typedef std::function<void(const KmsClient*, const Model::ListKeyVersionsRequest&, const ListKeyVersionsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListKeyVersionsAsyncHandler;
@@ -446,9 +421,6 @@ namespace AlibabaCloud
 			DescribeSecretOutcome describeSecret(const Model::DescribeSecretRequest &request)const;
 			DescribeSecretOutcome describeSecret(const Model::DescribeSecretRequest &request)const;
 			void describeSecretAsync(const Model::DescribeSecretRequest& request, const DescribeSecretAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			void describeSecretAsync(const Model::DescribeSecretRequest& request, const DescribeSecretAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeSecretOutcomeCallable describeSecretCallable(const Model::DescribeSecretRequest& request) const;
 			DescribeSecretOutcomeCallable describeSecretCallable(const Model::DescribeSecretRequest& request) const;
-			DescribeServiceOutcome describeService(const Model::DescribeServiceRequest &request)const;
-			void describeServiceAsync(const Model::DescribeServiceRequest& request, const DescribeServiceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeServiceOutcomeCallable describeServiceCallable(const Model::DescribeServiceRequest& request) const;
 			DisableKeyOutcome disableKey(const Model::DisableKeyRequest &request)const;
 			DisableKeyOutcome disableKey(const Model::DisableKeyRequest &request)const;
 			void disableKeyAsync(const Model::DisableKeyRequest& request, const DisableKeyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			void disableKeyAsync(const Model::DisableKeyRequest& request, const DisableKeyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DisableKeyOutcomeCallable disableKeyCallable(const Model::DisableKeyRequest& request) const;
 			DisableKeyOutcomeCallable disableKeyCallable(const Model::DisableKeyRequest& request) const;
@@ -458,9 +430,6 @@ namespace AlibabaCloud
 			EncryptOutcome encrypt(const Model::EncryptRequest &request)const;
 			EncryptOutcome encrypt(const Model::EncryptRequest &request)const;
 			void encryptAsync(const Model::EncryptRequest& request, const EncryptAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			void encryptAsync(const Model::EncryptRequest& request, const EncryptAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			EncryptOutcomeCallable encryptCallable(const Model::EncryptRequest& request) const;
 			EncryptOutcomeCallable encryptCallable(const Model::EncryptRequest& request) const;
-			ExportCertificateOutcome exportCertificate(const Model::ExportCertificateRequest &request)const;
-			void exportCertificateAsync(const Model::ExportCertificateRequest& request, const ExportCertificateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			ExportCertificateOutcomeCallable exportCertificateCallable(const Model::ExportCertificateRequest& request) const;
 			ExportDataKeyOutcome exportDataKey(const Model::ExportDataKeyRequest &request)const;
 			ExportDataKeyOutcome exportDataKey(const Model::ExportDataKeyRequest &request)const;
 			void exportDataKeyAsync(const Model::ExportDataKeyRequest& request, const ExportDataKeyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			void exportDataKeyAsync(const Model::ExportDataKeyRequest& request, const ExportDataKeyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ExportDataKeyOutcomeCallable exportDataKeyCallable(const Model::ExportDataKeyRequest& request) const;
 			ExportDataKeyOutcomeCallable exportDataKeyCallable(const Model::ExportDataKeyRequest& request) const;
@@ -488,12 +457,6 @@ namespace AlibabaCloud
 			GetSecretValueOutcome getSecretValue(const Model::GetSecretValueRequest &request)const;
 			GetSecretValueOutcome getSecretValue(const Model::GetSecretValueRequest &request)const;
 			void getSecretValueAsync(const Model::GetSecretValueRequest& request, const GetSecretValueAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			void getSecretValueAsync(const Model::GetSecretValueRequest& request, const GetSecretValueAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			GetSecretValueOutcomeCallable getSecretValueCallable(const Model::GetSecretValueRequest& request) const;
 			GetSecretValueOutcomeCallable getSecretValueCallable(const Model::GetSecretValueRequest& request) const;
-			ImportCertificateOutcome importCertificate(const Model::ImportCertificateRequest &request)const;
-			void importCertificateAsync(const Model::ImportCertificateRequest& request, const ImportCertificateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			ImportCertificateOutcomeCallable importCertificateCallable(const Model::ImportCertificateRequest& request) const;
-			ImportEncryptionCertificateOutcome importEncryptionCertificate(const Model::ImportEncryptionCertificateRequest &request)const;
-			void importEncryptionCertificateAsync(const Model::ImportEncryptionCertificateRequest& request, const ImportEncryptionCertificateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			ImportEncryptionCertificateOutcomeCallable importEncryptionCertificateCallable(const Model::ImportEncryptionCertificateRequest& request) const;
 			ImportKeyMaterialOutcome importKeyMaterial(const Model::ImportKeyMaterialRequest &request)const;
 			ImportKeyMaterialOutcome importKeyMaterial(const Model::ImportKeyMaterialRequest &request)const;
 			void importKeyMaterialAsync(const Model::ImportKeyMaterialRequest& request, const ImportKeyMaterialAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			void importKeyMaterialAsync(const Model::ImportKeyMaterialRequest& request, const ImportKeyMaterialAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ImportKeyMaterialOutcomeCallable importKeyMaterialCallable(const Model::ImportKeyMaterialRequest& request) const;
 			ImportKeyMaterialOutcomeCallable importKeyMaterialCallable(const Model::ImportKeyMaterialRequest& request) const;
@@ -503,9 +466,6 @@ namespace AlibabaCloud
 			ListAliasesByKeyIdOutcome listAliasesByKeyId(const Model::ListAliasesByKeyIdRequest &request)const;
 			ListAliasesByKeyIdOutcome listAliasesByKeyId(const Model::ListAliasesByKeyIdRequest &request)const;
 			void listAliasesByKeyIdAsync(const Model::ListAliasesByKeyIdRequest& request, const ListAliasesByKeyIdAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			void listAliasesByKeyIdAsync(const Model::ListAliasesByKeyIdRequest& request, const ListAliasesByKeyIdAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListAliasesByKeyIdOutcomeCallable listAliasesByKeyIdCallable(const Model::ListAliasesByKeyIdRequest& request) const;
 			ListAliasesByKeyIdOutcomeCallable listAliasesByKeyIdCallable(const Model::ListAliasesByKeyIdRequest& request) const;
-			ListCertificatesOutcome listCertificates(const Model::ListCertificatesRequest &request)const;
-			void listCertificatesAsync(const Model::ListCertificatesRequest& request, const ListCertificatesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			ListCertificatesOutcomeCallable listCertificatesCallable(const Model::ListCertificatesRequest& request) const;
 			ListKeyVersionsOutcome listKeyVersions(const Model::ListKeyVersionsRequest &request)const;
 			ListKeyVersionsOutcome listKeyVersions(const Model::ListKeyVersionsRequest &request)const;
 			void listKeyVersionsAsync(const Model::ListKeyVersionsRequest& request, const ListKeyVersionsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			void listKeyVersionsAsync(const Model::ListKeyVersionsRequest& request, const ListKeyVersionsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListKeyVersionsOutcomeCallable listKeyVersionsCallable(const Model::ListKeyVersionsRequest& request) const;
 			ListKeyVersionsOutcomeCallable listKeyVersionsCallable(const Model::ListKeyVersionsRequest& request) const;

+ 40 - 46
kms/include/alibabacloud/kms/model/AsymmetricDecryptRequest.h

@@ -1,57 +1,51 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_ASYMMETRICDECRYPTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICDECRYPTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT AsymmetricDecryptRequest : public RpcServiceRequest
-			{
-
-			public:
-				AsymmetricDecryptRequest();
-				~AsymmetricDecryptRequest();
-
-				std::string getKeyVersionId()const;
-				void setKeyVersionId(const std::string& keyVersionId);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getCiphertextBlob()const;
-				void setCiphertextBlob(const std::string& ciphertextBlob);
-				std::string getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-
-            private:
-				std::string keyVersionId_;
-				std::string keyId_;
-				std::string ciphertextBlob_;
-				std::string algorithm_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICDECRYPTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_ASYMMETRICDECRYPTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICDECRYPTREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT AsymmetricDecryptRequest : public RpcServiceRequest {
+public:
+	AsymmetricDecryptRequest();
+	~AsymmetricDecryptRequest();
+	std::string getKeyVersionId() const;
+	void setKeyVersionId(const std::string &keyVersionId);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getCiphertextBlob() const;
+	void setCiphertextBlob(const std::string &ciphertextBlob);
+	std::string getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+
+private:
+	std::string keyVersionId_;
+	std::string keyId_;
+	std::string ciphertextBlob_;
+	std::string algorithm_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICDECRYPTREQUEST_H_

+ 40 - 46
kms/include/alibabacloud/kms/model/AsymmetricEncryptRequest.h

@@ -1,57 +1,51 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_ASYMMETRICENCRYPTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICENCRYPTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT AsymmetricEncryptRequest : public RpcServiceRequest
-			{
-
-			public:
-				AsymmetricEncryptRequest();
-				~AsymmetricEncryptRequest();
-
-				std::string getKeyVersionId()const;
-				void setKeyVersionId(const std::string& keyVersionId);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getPlaintext()const;
-				void setPlaintext(const std::string& plaintext);
-				std::string getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-
-            private:
-				std::string keyVersionId_;
-				std::string keyId_;
-				std::string plaintext_;
-				std::string algorithm_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICENCRYPTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_ASYMMETRICENCRYPTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICENCRYPTREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT AsymmetricEncryptRequest : public RpcServiceRequest {
+public:
+	AsymmetricEncryptRequest();
+	~AsymmetricEncryptRequest();
+	std::string getKeyVersionId() const;
+	void setKeyVersionId(const std::string &keyVersionId);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getPlaintext() const;
+	void setPlaintext(const std::string &plaintext);
+	std::string getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+
+private:
+	std::string keyVersionId_;
+	std::string keyId_;
+	std::string plaintext_;
+	std::string algorithm_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICENCRYPTREQUEST_H_

+ 40 - 46
kms/include/alibabacloud/kms/model/AsymmetricSignRequest.h

@@ -1,57 +1,51 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_ASYMMETRICSIGNREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICSIGNREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT AsymmetricSignRequest : public RpcServiceRequest
-			{
-
-			public:
-				AsymmetricSignRequest();
-				~AsymmetricSignRequest();
-
-				std::string getKeyVersionId()const;
-				void setKeyVersionId(const std::string& keyVersionId);
-				std::string getDigest()const;
-				void setDigest(const std::string& digest);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-
-            private:
-				std::string keyVersionId_;
-				std::string digest_;
-				std::string keyId_;
-				std::string algorithm_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICSIGNREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_ASYMMETRICSIGNREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICSIGNREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT AsymmetricSignRequest : public RpcServiceRequest {
+public:
+	AsymmetricSignRequest();
+	~AsymmetricSignRequest();
+	std::string getKeyVersionId() const;
+	void setKeyVersionId(const std::string &keyVersionId);
+	std::string getDigest() const;
+	void setDigest(const std::string &digest);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+
+private:
+	std::string keyVersionId_;
+	std::string digest_;
+	std::string keyId_;
+	std::string algorithm_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICSIGNREQUEST_H_

+ 43 - 49
kms/include/alibabacloud/kms/model/AsymmetricVerifyRequest.h

@@ -1,60 +1,54 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_ASYMMETRICVERIFYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICVERIFYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT AsymmetricVerifyRequest : public RpcServiceRequest
-			{
-
-			public:
-				AsymmetricVerifyRequest();
-				~AsymmetricVerifyRequest();
-
-				std::string getKeyVersionId()const;
-				void setKeyVersionId(const std::string& keyVersionId);
-				std::string getDigest()const;
-				void setDigest(const std::string& digest);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getValue()const;
-				void setValue(const std::string& value);
-				std::string getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-
-            private:
-				std::string keyVersionId_;
-				std::string digest_;
-				std::string keyId_;
-				std::string value_;
-				std::string algorithm_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICVERIFYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_ASYMMETRICVERIFYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_ASYMMETRICVERIFYREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT AsymmetricVerifyRequest : public RpcServiceRequest {
+public:
+	AsymmetricVerifyRequest();
+	~AsymmetricVerifyRequest();
+	std::string getKeyVersionId() const;
+	void setKeyVersionId(const std::string &keyVersionId);
+	std::string getDigest() const;
+	void setDigest(const std::string &digest);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getValue() const;
+	void setValue(const std::string &value);
+	std::string getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+
+private:
+	std::string keyVersionId_;
+	std::string digest_;
+	std::string keyId_;
+	std::string value_;
+	std::string algorithm_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_ASYMMETRICVERIFYREQUEST_H_

+ 31 - 37
kms/include/alibabacloud/kms/model/CancelKeyDeletionRequest.h

@@ -1,48 +1,42 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_CANCELKEYDELETIONREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CANCELKEYDELETIONREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CancelKeyDeletionRequest : public RpcServiceRequest
-			{
-
-			public:
-				CancelKeyDeletionRequest();
-				~CancelKeyDeletionRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CANCELKEYDELETIONREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CANCELKEYDELETIONREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CANCELKEYDELETIONREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT CancelKeyDeletionRequest : public RpcServiceRequest {
+public:
+	CancelKeyDeletionRequest();
+	~CancelKeyDeletionRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CANCELKEYDELETIONREQUEST_H_

+ 37 - 43
kms/include/alibabacloud/kms/model/CertificatePrivateKeyDecryptRequest.h

@@ -1,54 +1,48 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYDECRYPTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYDECRYPTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CertificatePrivateKeyDecryptRequest : public RpcServiceRequest
-			{
-
-			public:
-				CertificatePrivateKeyDecryptRequest();
-				~CertificatePrivateKeyDecryptRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-				std::string getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-				std::string getCiphertextBlob()const;
-				void setCiphertextBlob(const std::string& ciphertextBlob);
-
-            private:
-				std::string certificateId_;
-				std::string algorithm_;
-				std::string ciphertextBlob_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYDECRYPTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYDECRYPTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYDECRYPTREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT CertificatePrivateKeyDecryptRequest : public RpcServiceRequest {
+public:
+	CertificatePrivateKeyDecryptRequest();
+	~CertificatePrivateKeyDecryptRequest();
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+	std::string getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+	std::string getCiphertextBlob() const;
+	void setCiphertextBlob(const std::string &ciphertextBlob);
+
+private:
+	std::string certificateId_;
+	std::string algorithm_;
+	std::string ciphertextBlob_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYDECRYPTREQUEST_H_

+ 40 - 46
kms/include/alibabacloud/kms/model/CertificatePrivateKeySignRequest.h

@@ -1,57 +1,51 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYSIGNREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYSIGNREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CertificatePrivateKeySignRequest : public RpcServiceRequest
-			{
-
-			public:
-				CertificatePrivateKeySignRequest();
-				~CertificatePrivateKeySignRequest();
-
-				std::string getMessageType()const;
-				void setMessageType(const std::string& messageType);
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-				std::string getMessage()const;
-				void setMessage(const std::string& message);
-				std::string getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-
-            private:
-				std::string messageType_;
-				std::string certificateId_;
-				std::string message_;
-				std::string algorithm_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYSIGNREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYSIGNREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYSIGNREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT CertificatePrivateKeySignRequest : public RpcServiceRequest {
+public:
+	CertificatePrivateKeySignRequest();
+	~CertificatePrivateKeySignRequest();
+	std::string getMessageType() const;
+	void setMessageType(const std::string &messageType);
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+	std::string getMessage() const;
+	void setMessage(const std::string &message);
+	std::string getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+
+private:
+	std::string messageType_;
+	std::string certificateId_;
+	std::string message_;
+	std::string algorithm_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPRIVATEKEYSIGNREQUEST_H_

+ 37 - 43
kms/include/alibabacloud/kms/model/CertificatePublicKeyEncryptRequest.h

@@ -1,54 +1,48 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYENCRYPTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYENCRYPTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CertificatePublicKeyEncryptRequest : public RpcServiceRequest
-			{
-
-			public:
-				CertificatePublicKeyEncryptRequest();
-				~CertificatePublicKeyEncryptRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-				std::string getPlaintext()const;
-				void setPlaintext(const std::string& plaintext);
-				std::string getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-
-            private:
-				std::string certificateId_;
-				std::string plaintext_;
-				std::string algorithm_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYENCRYPTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYENCRYPTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYENCRYPTREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT CertificatePublicKeyEncryptRequest : public RpcServiceRequest {
+public:
+	CertificatePublicKeyEncryptRequest();
+	~CertificatePublicKeyEncryptRequest();
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+	std::string getPlaintext() const;
+	void setPlaintext(const std::string &plaintext);
+	std::string getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+
+private:
+	std::string certificateId_;
+	std::string plaintext_;
+	std::string algorithm_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYENCRYPTREQUEST_H_

+ 2 - 2
kms/include/alibabacloud/kms/model/CertificatePublicKeyEncryptResult.h

@@ -37,14 +37,14 @@ namespace AlibabaCloud
 				CertificatePublicKeyEncryptResult();
 				CertificatePublicKeyEncryptResult();
 				explicit CertificatePublicKeyEncryptResult(const std::string &payload);
 				explicit CertificatePublicKeyEncryptResult(const std::string &payload);
 				~CertificatePublicKeyEncryptResult();
 				~CertificatePublicKeyEncryptResult();
-				std::string getCertificateId()const;
 				std::string getCiphertextBlob()const;
 				std::string getCiphertextBlob()const;
+				std::string getCertificateId()const;
 
 
 			protected:
 			protected:
 				void parse(const std::string &payload);
 				void parse(const std::string &payload);
 			private:
 			private:
-				std::string certificateId_;
 				std::string ciphertextBlob_;
 				std::string ciphertextBlob_;
+				std::string certificateId_;
 
 
 			};
 			};
 		}
 		}

+ 43 - 49
kms/include/alibabacloud/kms/model/CertificatePublicKeyVerifyRequest.h

@@ -1,60 +1,54 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYVERIFYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYVERIFYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CertificatePublicKeyVerifyRequest : public RpcServiceRequest
-			{
-
-			public:
-				CertificatePublicKeyVerifyRequest();
-				~CertificatePublicKeyVerifyRequest();
-
-				std::string getSignatureValue()const;
-				void setSignatureValue(const std::string& signatureValue);
-				std::string getMessageType()const;
-				void setMessageType(const std::string& messageType);
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-				std::string getMessage()const;
-				void setMessage(const std::string& message);
-				std::string getAlgorithm()const;
-				void setAlgorithm(const std::string& algorithm);
-
-            private:
-				std::string signatureValue_;
-				std::string messageType_;
-				std::string certificateId_;
-				std::string message_;
-				std::string algorithm_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYVERIFYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYVERIFYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYVERIFYREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT CertificatePublicKeyVerifyRequest : public RpcServiceRequest {
+public:
+	CertificatePublicKeyVerifyRequest();
+	~CertificatePublicKeyVerifyRequest();
+	std::string getSignatureValue() const;
+	void setSignatureValue(const std::string &signatureValue);
+	std::string getMessageType() const;
+	void setMessageType(const std::string &messageType);
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+	std::string getMessage() const;
+	void setMessage(const std::string &message);
+	std::string getAlgorithm() const;
+	void setAlgorithm(const std::string &algorithm);
+
+private:
+	std::string signatureValue_;
+	std::string messageType_;
+	std::string certificateId_;
+	std::string message_;
+	std::string algorithm_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CERTIFICATEPUBLICKEYVERIFYREQUEST_H_

+ 34 - 40
kms/include/alibabacloud/kms/model/CreateAliasRequest.h

@@ -1,51 +1,45 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_CREATEALIASREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CREATEALIASREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CreateAliasRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateAliasRequest();
-				~CreateAliasRequest();
-
-				std::string getAliasName()const;
-				void setAliasName(const std::string& aliasName);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string aliasName_;
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CREATEALIASREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CREATEALIASREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CREATEALIASREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT CreateAliasRequest : public RpcServiceRequest {
+public:
+	CreateAliasRequest();
+	~CreateAliasRequest();
+	std::string getAliasName() const;
+	void setAliasName(const std::string &aliasName);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string aliasName_;
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CREATEALIASREQUEST_H_

+ 46 - 52
kms/include/alibabacloud/kms/model/CreateCertificateRequest.h

@@ -1,63 +1,57 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_CREATECERTIFICATEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CREATECERTIFICATEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CreateCertificateRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateCertificateRequest();
-				~CreateCertificateRequest();
-
-				std::string getProtectionLevel()const;
-				void setProtectionLevel(const std::string& protectionLevel);
-				bool getExportablePrivateKey()const;
-				void setExportablePrivateKey(bool exportablePrivateKey);
-				std::string getClientToken()const;
-				void setClientToken(const std::string& clientToken);
-				std::string getSubject()const;
-				void setSubject(const std::string& subject);
-				std::map<std::string, std::string> getSubjectAlternativeNames()const;
-				void setSubjectAlternativeNames(const std::map<std::string, std::string>& subjectAlternativeNames);
-				std::string getKeySpec()const;
-				void setKeySpec(const std::string& keySpec);
-
-            private:
-				std::string protectionLevel_;
-				bool exportablePrivateKey_;
-				std::string clientToken_;
-				std::string subject_;
-				std::map<std::string, std::string> subjectAlternativeNames_;
-				std::string keySpec_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CREATECERTIFICATEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CREATECERTIFICATEREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CREATECERTIFICATEREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT CreateCertificateRequest : public RpcServiceRequest {
+public:
+	CreateCertificateRequest();
+	~CreateCertificateRequest();
+	std::string getProtectionLevel() const;
+	void setProtectionLevel(const std::string &protectionLevel);
+	bool getExportablePrivateKey() const;
+	void setExportablePrivateKey(bool exportablePrivateKey);
+	std::string getClientToken() const;
+	void setClientToken(const std::string &clientToken);
+	std::string getSubject() const;
+	void setSubject(const std::string &subject);
+	std::map<std::string, std::string> getSubjectAlternativeNames() const;
+	void setSubjectAlternativeNames(std::map<std::string, std::string> subjectAlternativeNames);
+	std::string getKeySpec() const;
+	void setKeySpec(const std::string &keySpec);
+
+private:
+	std::string protectionLevel_;
+	bool exportablePrivateKey_;
+	std::string clientToken_;
+	std::string subject_;
+	std::map<std::string, std::string> subjectAlternativeNames_;
+	std::string keySpec_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CREATECERTIFICATEREQUEST_H_

+ 52 - 55
kms/include/alibabacloud/kms/model/CreateKeyRequest.h

@@ -1,66 +1,63 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_CREATEKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CREATEKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CreateKeyRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateKeyRequest();
-				~CreateKeyRequest();
-
-				std::string getProtectionLevel()const;
-				void setProtectionLevel(const std::string& protectionLevel);
-				std::string getKeyUsage()const;
-				void setKeyUsage(const std::string& keyUsage);
-				std::string getOrigin()const;
-				void setOrigin(const std::string& origin);
-				std::string getDescription()const;
-				void setDescription(const std::string& description);
-				std::string getKeySpec()const;
-				void setKeySpec(const std::string& keySpec);
-				std::string getRotationInterval()const;
-				void setRotationInterval(const std::string& rotationInterval);
-				bool getEnableAutomaticRotation()const;
-				void setEnableAutomaticRotation(bool enableAutomaticRotation);
-
-            private:
-				std::string protectionLevel_;
-				std::string keyUsage_;
-				std::string origin_;
-				std::string description_;
-				std::string keySpec_;
-				std::string rotationInterval_;
-				bool enableAutomaticRotation_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CREATEKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CREATEKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CREATEKEYREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT CreateKeyRequest : public RpcServiceRequest {
+public:
+	CreateKeyRequest();
+	~CreateKeyRequest();
+	std::string getProtectionLevel() const;
+	void setProtectionLevel(const std::string &protectionLevel);
+	std::string getKeyUsage() const;
+	void setKeyUsage(const std::string &keyUsage);
+	std::string getOrigin() const;
+	void setOrigin(const std::string &origin);
+	std::string getDKMSInstanceId() const;
+	void setDKMSInstanceId(const std::string &dKMSInstanceId);
+	std::string getDescription() const;
+	void setDescription(const std::string &description);
+	std::string getKeySpec() const;
+	void setKeySpec(const std::string &keySpec);
+	std::string getRotationInterval() const;
+	void setRotationInterval(const std::string &rotationInterval);
+	bool getEnableAutomaticRotation() const;
+	void setEnableAutomaticRotation(bool enableAutomaticRotation);
+
+private:
+	std::string protectionLevel_;
+	std::string keyUsage_;
+	std::string origin_;
+	std::string dKMSInstanceId_;
+	std::string description_;
+	std::string keySpec_;
+	std::string rotationInterval_;
+	bool enableAutomaticRotation_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CREATEKEYREQUEST_H_

+ 3 - 2
kms/include/alibabacloud/kms/model/CreateKeyResult.h

@@ -35,16 +35,17 @@ namespace AlibabaCloud
 				struct KeyMetadata
 				struct KeyMetadata
 				{
 				{
 					std::string origin;
 					std::string origin;
-					std::string creationDate;
 					std::string protectionLevel;
 					std::string protectionLevel;
+					std::string creationDate;
 					std::string description;
 					std::string description;
-					std::string lastRotationDate;
 					std::string rotationInterval;
 					std::string rotationInterval;
+					std::string lastRotationDate;
 					std::string keySpec;
 					std::string keySpec;
 					std::string keyUsage;
 					std::string keyUsage;
 					std::string keyId;
 					std::string keyId;
 					std::string primaryKeyVersion;
 					std::string primaryKeyVersion;
 					std::string creator;
 					std::string creator;
+					std::string dKMSInstanceId;
 					std::string deleteDate;
 					std::string deleteDate;
 					std::string automaticRotation;
 					std::string automaticRotation;
 					std::string nextRotationDate;
 					std::string nextRotationDate;

+ 31 - 37
kms/include/alibabacloud/kms/model/CreateKeyVersionRequest.h

@@ -1,48 +1,42 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_CREATEKEYVERSIONREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CREATEKEYVERSIONREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CreateKeyVersionRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateKeyVersionRequest();
-				~CreateKeyVersionRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CREATEKEYVERSIONREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CREATEKEYVERSIONREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CREATEKEYVERSIONREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT CreateKeyVersionRequest : public RpcServiceRequest {
+public:
+	CreateKeyVersionRequest();
+	~CreateKeyVersionRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CREATEKEYVERSIONREQUEST_H_

+ 64 - 67
kms/include/alibabacloud/kms/model/CreateSecretRequest.h

@@ -1,78 +1,75 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_CREATESECRETREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_CREATESECRETREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT CreateSecretRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateSecretRequest();
-				~CreateSecretRequest();
-
-				std::string getSecretType()const;
-				void setSecretType(const std::string& secretType);
-				std::string getVersionId()const;
-				void setVersionId(const std::string& versionId);
-				std::string getSecretData()const;
-				void setSecretData(const std::string& secretData);
-				std::string getDescription()const;
-				void setDescription(const std::string& description);
-				std::string getRotationInterval()const;
-				void setRotationInterval(const std::string& rotationInterval);
-				std::string getSecretName()const;
-				void setSecretName(const std::string& secretName);
-				bool getEnableAutomaticRotation()const;
-				void setEnableAutomaticRotation(bool enableAutomaticRotation);
-				std::string getEncryptionKeyId()const;
-				void setEncryptionKeyId(const std::string& encryptionKeyId);
-				std::string getSecretDataType()const;
-				void setSecretDataType(const std::string& secretDataType);
-				std::string getTags()const;
-				void setTags(const std::string& tags);
-				std::string getExtendedConfig()const;
-				void setExtendedConfig(const std::string& extendedConfig);
-
-            private:
-				std::string secretType_;
-				std::string versionId_;
-				std::string secretData_;
-				std::string description_;
-				std::string rotationInterval_;
-				std::string secretName_;
-				bool enableAutomaticRotation_;
-				std::string encryptionKeyId_;
-				std::string secretDataType_;
-				std::string tags_;
-				std::string extendedConfig_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_CREATESECRETREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_CREATESECRETREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_CREATESECRETREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT CreateSecretRequest : public RpcServiceRequest {
+public:
+	CreateSecretRequest();
+	~CreateSecretRequest();
+	std::string getSecretType() const;
+	void setSecretType(const std::string &secretType);
+	std::string getVersionId() const;
+	void setVersionId(const std::string &versionId);
+	std::string getDKMSInstanceId() const;
+	void setDKMSInstanceId(const std::string &dKMSInstanceId);
+	std::string getSecretData() const;
+	void setSecretData(const std::string &secretData);
+	std::string getDescription() const;
+	void setDescription(const std::string &description);
+	std::string getRotationInterval() const;
+	void setRotationInterval(const std::string &rotationInterval);
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+	bool getEnableAutomaticRotation() const;
+	void setEnableAutomaticRotation(bool enableAutomaticRotation);
+	std::string getEncryptionKeyId() const;
+	void setEncryptionKeyId(const std::string &encryptionKeyId);
+	std::string getSecretDataType() const;
+	void setSecretDataType(const std::string &secretDataType);
+	std::string getTags() const;
+	void setTags(const std::string &tags);
+	std::string getExtendedConfig() const;
+	void setExtendedConfig(const std::string &extendedConfig);
+
+private:
+	std::string secretType_;
+	std::string versionId_;
+	std::string dKMSInstanceId_;
+	std::string secretData_;
+	std::string description_;
+	std::string rotationInterval_;
+	std::string secretName_;
+	bool enableAutomaticRotation_;
+	std::string encryptionKeyId_;
+	std::string secretDataType_;
+	std::string tags_;
+	std::string extendedConfig_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_CREATESECRETREQUEST_H_

+ 4 - 2
kms/include/alibabacloud/kms/model/CreateSecretResult.h

@@ -37,24 +37,26 @@ namespace AlibabaCloud
 				CreateSecretResult();
 				CreateSecretResult();
 				explicit CreateSecretResult(const std::string &payload);
 				explicit CreateSecretResult(const std::string &payload);
 				~CreateSecretResult();
 				~CreateSecretResult();
-				std::string getVersionId()const;
 				std::string getSecretName()const;
 				std::string getSecretName()const;
+				std::string getVersionId()const;
 				std::string getNextRotationDate()const;
 				std::string getNextRotationDate()const;
 				std::string getSecretType()const;
 				std::string getSecretType()const;
 				std::string getRotationInterval()const;
 				std::string getRotationInterval()const;
 				std::string getExtendedConfig()const;
 				std::string getExtendedConfig()const;
+				std::string getDKMSInstanceId()const;
 				std::string getArn()const;
 				std::string getArn()const;
 				std::string getAutomaticRotation()const;
 				std::string getAutomaticRotation()const;
 
 
 			protected:
 			protected:
 				void parse(const std::string &payload);
 				void parse(const std::string &payload);
 			private:
 			private:
-				std::string versionId_;
 				std::string secretName_;
 				std::string secretName_;
+				std::string versionId_;
 				std::string nextRotationDate_;
 				std::string nextRotationDate_;
 				std::string secretType_;
 				std::string secretType_;
 				std::string rotationInterval_;
 				std::string rotationInterval_;
 				std::string extendedConfig_;
 				std::string extendedConfig_;
+				std::string dKMSInstanceId_;
 				std::string arn_;
 				std::string arn_;
 				std::string automaticRotation_;
 				std::string automaticRotation_;
 
 

+ 34 - 40
kms/include/alibabacloud/kms/model/DecryptRequest.h

@@ -1,51 +1,45 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_DECRYPTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DECRYPTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DecryptRequest : public RpcServiceRequest
-			{
-
-			public:
-				DecryptRequest();
-				~DecryptRequest();
-
-				std::string getEncryptionContext()const;
-				void setEncryptionContext(const std::string& encryptionContext);
-				std::string getCiphertextBlob()const;
-				void setCiphertextBlob(const std::string& ciphertextBlob);
-
-            private:
-				std::string encryptionContext_;
-				std::string ciphertextBlob_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DECRYPTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DECRYPTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DECRYPTREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT DecryptRequest : public RpcServiceRequest {
+public:
+	DecryptRequest();
+	~DecryptRequest();
+	std::string getEncryptionContext() const;
+	void setEncryptionContext(const std::string &encryptionContext);
+	std::string getCiphertextBlob() const;
+	void setCiphertextBlob(const std::string &ciphertextBlob);
+
+private:
+	std::string encryptionContext_;
+	std::string ciphertextBlob_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DECRYPTREQUEST_H_

+ 31 - 37
kms/include/alibabacloud/kms/model/DeleteAliasRequest.h

@@ -1,48 +1,42 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_DELETEALIASREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DELETEALIASREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DeleteAliasRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteAliasRequest();
-				~DeleteAliasRequest();
-
-				std::string getAliasName()const;
-				void setAliasName(const std::string& aliasName);
-
-            private:
-				std::string aliasName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DELETEALIASREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DELETEALIASREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DELETEALIASREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT DeleteAliasRequest : public RpcServiceRequest {
+public:
+	DeleteAliasRequest();
+	~DeleteAliasRequest();
+	std::string getAliasName() const;
+	void setAliasName(const std::string &aliasName);
+
+private:
+	std::string aliasName_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DELETEALIASREQUEST_H_

+ 31 - 37
kms/include/alibabacloud/kms/model/DeleteCertificateRequest.h

@@ -1,48 +1,42 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_DELETECERTIFICATEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DELETECERTIFICATEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DeleteCertificateRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteCertificateRequest();
-				~DeleteCertificateRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-
-            private:
-				std::string certificateId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DELETECERTIFICATEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DELETECERTIFICATEREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DELETECERTIFICATEREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT DeleteCertificateRequest : public RpcServiceRequest {
+public:
+	DeleteCertificateRequest();
+	~DeleteCertificateRequest();
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+
+private:
+	std::string certificateId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DELETECERTIFICATEREQUEST_H_

+ 31 - 37
kms/include/alibabacloud/kms/model/DeleteKeyMaterialRequest.h

@@ -1,48 +1,42 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_DELETEKEYMATERIALREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DELETEKEYMATERIALREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DeleteKeyMaterialRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteKeyMaterialRequest();
-				~DeleteKeyMaterialRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DELETEKEYMATERIALREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DELETEKEYMATERIALREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DELETEKEYMATERIALREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT DeleteKeyMaterialRequest : public RpcServiceRequest {
+public:
+	DeleteKeyMaterialRequest();
+	~DeleteKeyMaterialRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DELETEKEYMATERIALREQUEST_H_

+ 37 - 43
kms/include/alibabacloud/kms/model/DeleteSecretRequest.h

@@ -1,54 +1,48 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_DELETESECRETREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DELETESECRETREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DeleteSecretRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteSecretRequest();
-				~DeleteSecretRequest();
-
-				std::string getForceDeleteWithoutRecovery()const;
-				void setForceDeleteWithoutRecovery(const std::string& forceDeleteWithoutRecovery);
-				std::string getRecoveryWindowInDays()const;
-				void setRecoveryWindowInDays(const std::string& recoveryWindowInDays);
-				std::string getSecretName()const;
-				void setSecretName(const std::string& secretName);
-
-            private:
-				std::string forceDeleteWithoutRecovery_;
-				std::string recoveryWindowInDays_;
-				std::string secretName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DELETESECRETREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DELETESECRETREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DELETESECRETREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT DeleteSecretRequest : public RpcServiceRequest {
+public:
+	DeleteSecretRequest();
+	~DeleteSecretRequest();
+	std::string getForceDeleteWithoutRecovery() const;
+	void setForceDeleteWithoutRecovery(const std::string &forceDeleteWithoutRecovery);
+	std::string getRecoveryWindowInDays() const;
+	void setRecoveryWindowInDays(const std::string &recoveryWindowInDays);
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+
+private:
+	std::string forceDeleteWithoutRecovery_;
+	std::string recoveryWindowInDays_;
+	std::string secretName_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DELETESECRETREQUEST_H_

+ 28 - 34
kms/include/alibabacloud/kms/model/DescribeAccountKmsStatusRequest.h

@@ -1,45 +1,39 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBEACCOUNTKMSSTATUSREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DESCRIBEACCOUNTKMSSTATUSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DescribeAccountKmsStatusRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAccountKmsStatusRequest();
-				~DescribeAccountKmsStatusRequest();
-
-
-            private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEACCOUNTKMSSTATUSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBEACCOUNTKMSSTATUSREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DESCRIBEACCOUNTKMSSTATUSREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT DescribeAccountKmsStatusRequest : public RpcServiceRequest {
+public:
+	DescribeAccountKmsStatusRequest();
+	~DescribeAccountKmsStatusRequest();
+
+private:
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEACCOUNTKMSSTATUSREQUEST_H_

+ 31 - 37
kms/include/alibabacloud/kms/model/DescribeCertificateRequest.h

@@ -1,48 +1,42 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBECERTIFICATEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DESCRIBECERTIFICATEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DescribeCertificateRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeCertificateRequest();
-				~DescribeCertificateRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-
-            private:
-				std::string certificateId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBECERTIFICATEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBECERTIFICATEREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DESCRIBECERTIFICATEREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT DescribeCertificateRequest : public RpcServiceRequest {
+public:
+	DescribeCertificateRequest();
+	~DescribeCertificateRequest();
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+
+private:
+	std::string certificateId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBECERTIFICATEREQUEST_H_

+ 2 - 2
kms/include/alibabacloud/kms/model/DescribeCertificateResult.h

@@ -41,8 +41,8 @@ namespace AlibabaCloud
 				std::string getProtectionLevel()const;
 				std::string getProtectionLevel()const;
 				std::string getIssuer()const;
 				std::string getIssuer()const;
 				std::string getCertificateId()const;
 				std::string getCertificateId()const;
-				std::string getKeySpec()const;
 				std::string getCreatedAt()const;
 				std::string getCreatedAt()const;
+				std::string getKeySpec()const;
 				std::vector<std::string> getSubjectAlternativeNames()const;
 				std::vector<std::string> getSubjectAlternativeNames()const;
 				std::string getSignatureAlgorithm()const;
 				std::string getSignatureAlgorithm()const;
 				std::string getSubjectKeyIdentifier()const;
 				std::string getSubjectKeyIdentifier()const;
@@ -63,8 +63,8 @@ namespace AlibabaCloud
 				std::string protectionLevel_;
 				std::string protectionLevel_;
 				std::string issuer_;
 				std::string issuer_;
 				std::string certificateId_;
 				std::string certificateId_;
-				std::string keySpec_;
 				std::string createdAt_;
 				std::string createdAt_;
+				std::string keySpec_;
 				std::vector<std::string> subjectAlternativeNames_;
 				std::vector<std::string> subjectAlternativeNames_;
 				std::string signatureAlgorithm_;
 				std::string signatureAlgorithm_;
 				std::string subjectKeyIdentifier_;
 				std::string subjectKeyIdentifier_;

+ 31 - 37
kms/include/alibabacloud/kms/model/DescribeKeyRequest.h

@@ -1,48 +1,42 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DescribeKeyRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeKeyRequest();
-				~DescribeKeyRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT DescribeKeyRequest : public RpcServiceRequest {
+public:
+	DescribeKeyRequest();
+	~DescribeKeyRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYREQUEST_H_

+ 4 - 3
kms/include/alibabacloud/kms/model/DescribeKeyResult.h

@@ -35,17 +35,18 @@ namespace AlibabaCloud
 				struct KeyMetadata
 				struct KeyMetadata
 				{
 				{
 					std::string origin;
 					std::string origin;
-					std::string creationDate;
 					std::string protectionLevel;
 					std::string protectionLevel;
+					std::string creationDate;
 					std::string description;
 					std::string description;
-					std::string lastRotationDate;
 					std::string rotationInterval;
 					std::string rotationInterval;
+					std::string lastRotationDate;
 					std::string keySpec;
 					std::string keySpec;
 					std::string keyUsage;
 					std::string keyUsage;
 					std::string keyId;
 					std::string keyId;
 					std::string primaryKeyVersion;
 					std::string primaryKeyVersion;
-					std::string creator;
 					std::string deletionProtection;
 					std::string deletionProtection;
+					std::string creator;
+					std::string dKMSInstanceId;
 					std::string deleteDate;
 					std::string deleteDate;
 					std::string automaticRotation;
 					std::string automaticRotation;
 					std::string nextRotationDate;
 					std::string nextRotationDate;

+ 34 - 40
kms/include/alibabacloud/kms/model/DescribeKeyVersionRequest.h

@@ -1,51 +1,45 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYVERSIONREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYVERSIONREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DescribeKeyVersionRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeKeyVersionRequest();
-				~DescribeKeyVersionRequest();
-
-				std::string getKeyVersionId()const;
-				void setKeyVersionId(const std::string& keyVersionId);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyVersionId_;
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYVERSIONREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYVERSIONREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYVERSIONREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT DescribeKeyVersionRequest : public RpcServiceRequest {
+public:
+	DescribeKeyVersionRequest();
+	~DescribeKeyVersionRequest();
+	std::string getKeyVersionId() const;
+	void setKeyVersionId(const std::string &keyVersionId);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyVersionId_;
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEKEYVERSIONREQUEST_H_

+ 28 - 34
kms/include/alibabacloud/kms/model/DescribeRegionsRequest.h

@@ -1,45 +1,39 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBEREGIONSREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DESCRIBEREGIONSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DescribeRegionsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeRegionsRequest();
-				~DescribeRegionsRequest();
-
-
-            private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEREGIONSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBEREGIONSREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DESCRIBEREGIONSREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT DescribeRegionsRequest : public RpcServiceRequest {
+public:
+	DescribeRegionsRequest();
+	~DescribeRegionsRequest();
+
+private:
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBEREGIONSREQUEST_H_

+ 34 - 40
kms/include/alibabacloud/kms/model/DescribeSecretRequest.h

@@ -1,51 +1,45 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBESECRETREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DESCRIBESECRETREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DescribeSecretRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeSecretRequest();
-				~DescribeSecretRequest();
-
-				std::string getSecretName()const;
-				void setSecretName(const std::string& secretName);
-				std::string getFetchTags()const;
-				void setFetchTags(const std::string& fetchTags);
-
-            private:
-				std::string secretName_;
-				std::string fetchTags_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBESECRETREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DESCRIBESECRETREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DESCRIBESECRETREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT DescribeSecretRequest : public RpcServiceRequest {
+public:
+	DescribeSecretRequest();
+	~DescribeSecretRequest();
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+	std::string getFetchTags() const;
+	void setFetchTags(const std::string &fetchTags);
+
+private:
+	std::string secretName_;
+	std::string fetchTags_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBESECRETREQUEST_H_

+ 6 - 4
kms/include/alibabacloud/kms/model/DescribeSecretResult.h

@@ -43,16 +43,17 @@ namespace AlibabaCloud
 				explicit DescribeSecretResult(const std::string &payload);
 				explicit DescribeSecretResult(const std::string &payload);
 				~DescribeSecretResult();
 				~DescribeSecretResult();
 				std::string getDescription()const;
 				std::string getDescription()const;
-				std::string getLastRotationDate()const;
 				std::string getRotationInterval()const;
 				std::string getRotationInterval()const;
+				std::string getLastRotationDate()const;
 				std::string getSecretType()const;
 				std::string getSecretType()const;
 				std::string getCreateTime()const;
 				std::string getCreateTime()const;
+				std::string getDKMSInstanceId()const;
 				std::string getAutomaticRotation()const;
 				std::string getAutomaticRotation()const;
 				std::string getSecretName()const;
 				std::string getSecretName()const;
 				std::string getNextRotationDate()const;
 				std::string getNextRotationDate()const;
 				std::string getUpdateTime()const;
 				std::string getUpdateTime()const;
-				std::string getPlannedDeleteTime()const;
 				std::string getExtendedConfig()const;
 				std::string getExtendedConfig()const;
+				std::string getPlannedDeleteTime()const;
 				std::string getArn()const;
 				std::string getArn()const;
 				std::vector<Tag> getTags()const;
 				std::vector<Tag> getTags()const;
 				std::string getEncryptionKeyId()const;
 				std::string getEncryptionKeyId()const;
@@ -61,16 +62,17 @@ namespace AlibabaCloud
 				void parse(const std::string &payload);
 				void parse(const std::string &payload);
 			private:
 			private:
 				std::string description_;
 				std::string description_;
-				std::string lastRotationDate_;
 				std::string rotationInterval_;
 				std::string rotationInterval_;
+				std::string lastRotationDate_;
 				std::string secretType_;
 				std::string secretType_;
 				std::string createTime_;
 				std::string createTime_;
+				std::string dKMSInstanceId_;
 				std::string automaticRotation_;
 				std::string automaticRotation_;
 				std::string secretName_;
 				std::string secretName_;
 				std::string nextRotationDate_;
 				std::string nextRotationDate_;
 				std::string updateTime_;
 				std::string updateTime_;
-				std::string plannedDeleteTime_;
 				std::string extendedConfig_;
 				std::string extendedConfig_;
+				std::string plannedDeleteTime_;
 				std::string arn_;
 				std::string arn_;
 				std::vector<Tag> tags_;
 				std::vector<Tag> tags_;
 				std::string encryptionKeyId_;
 				std::string encryptionKeyId_;

+ 0 - 45
kms/include/alibabacloud/kms/model/DescribeServiceRequest.h

@@ -1,45 +0,0 @@
-/*
- * 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_KMS_MODEL_DESCRIBESERVICEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DESCRIBESERVICEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DescribeServiceRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeServiceRequest();
-				~DescribeServiceRequest();
-
-
-            private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBESERVICEREQUEST_H_

+ 0 - 63
kms/include/alibabacloud/kms/model/DescribeServiceResult.h

@@ -1,63 +0,0 @@
-/*
- * 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_KMS_MODEL_DESCRIBESERVICERESULT_H_
-#define ALIBABACLOUD_KMS_MODEL_DESCRIBESERVICERESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DescribeServiceResult : public ServiceResult
-			{
-			public:
-				struct ProtectionLevel
-				{
-					std::string type;
-				};
-				struct KeySpec
-				{
-					std::vector<std::string> supportedProtectionLevels;
-					std::vector<std::string> usages;
-					std::string name;
-				};
-
-
-				DescribeServiceResult();
-				explicit DescribeServiceResult(const std::string &payload);
-				~DescribeServiceResult();
-				std::vector<ProtectionLevel> getProtectionLevels()const;
-				std::vector<KeySpec> getKeySpecs()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::vector<ProtectionLevel> protectionLevels_;
-				std::vector<KeySpec> keySpecs_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DESCRIBESERVICERESULT_H_

+ 31 - 37
kms/include/alibabacloud/kms/model/DisableKeyRequest.h

@@ -1,48 +1,42 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_DISABLEKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_DISABLEKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT DisableKeyRequest : public RpcServiceRequest
-			{
-
-			public:
-				DisableKeyRequest();
-				~DisableKeyRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_DISABLEKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_DISABLEKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_DISABLEKEYREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT DisableKeyRequest : public RpcServiceRequest {
+public:
+	DisableKeyRequest();
+	~DisableKeyRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_DISABLEKEYREQUEST_H_

+ 31 - 37
kms/include/alibabacloud/kms/model/EnableKeyRequest.h

@@ -1,48 +1,42 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_ENABLEKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_ENABLEKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT EnableKeyRequest : public RpcServiceRequest
-			{
-
-			public:
-				EnableKeyRequest();
-				~EnableKeyRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_ENABLEKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_ENABLEKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_ENABLEKEYREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT EnableKeyRequest : public RpcServiceRequest {
+public:
+	EnableKeyRequest();
+	~EnableKeyRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_ENABLEKEYREQUEST_H_

+ 37 - 43
kms/include/alibabacloud/kms/model/EncryptRequest.h

@@ -1,54 +1,48 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_ENCRYPTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_ENCRYPTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT EncryptRequest : public RpcServiceRequest
-			{
-
-			public:
-				EncryptRequest();
-				~EncryptRequest();
-
-				std::string getEncryptionContext()const;
-				void setEncryptionContext(const std::string& encryptionContext);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getPlaintext()const;
-				void setPlaintext(const std::string& plaintext);
-
-            private:
-				std::string encryptionContext_;
-				std::string keyId_;
-				std::string plaintext_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_ENCRYPTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_ENCRYPTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_ENCRYPTREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT EncryptRequest : public RpcServiceRequest {
+public:
+	EncryptRequest();
+	~EncryptRequest();
+	std::string getEncryptionContext() const;
+	void setEncryptionContext(const std::string &encryptionContext);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getPlaintext() const;
+	void setPlaintext(const std::string &plaintext);
+
+private:
+	std::string encryptionContext_;
+	std::string keyId_;
+	std::string plaintext_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_ENCRYPTREQUEST_H_

+ 0 - 54
kms/include/alibabacloud/kms/model/ExportCertificateRequest.h

@@ -1,54 +0,0 @@
-/*
- * 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_KMS_MODEL_EXPORTCERTIFICATEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_EXPORTCERTIFICATEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ExportCertificateRequest : public RpcServiceRequest
-			{
-
-			public:
-				ExportCertificateRequest();
-				~ExportCertificateRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-				std::string getPassphrase()const;
-				void setPassphrase(const std::string& passphrase);
-				std::string getExportFormat()const;
-				void setExportFormat(const std::string& exportFormat);
-
-            private:
-				std::string certificateId_;
-				std::string passphrase_;
-				std::string exportFormat_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_EXPORTCERTIFICATEREQUEST_H_

+ 0 - 59
kms/include/alibabacloud/kms/model/ExportCertificateResult.h

@@ -1,59 +0,0 @@
-/*
- * 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_KMS_MODEL_EXPORTCERTIFICATERESULT_H_
-#define ALIBABACLOUD_KMS_MODEL_EXPORTCERTIFICATERESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ExportCertificateResult : public ServiceResult
-			{
-			public:
-
-
-				ExportCertificateResult();
-				explicit ExportCertificateResult(const std::string &payload);
-				~ExportCertificateResult();
-				std::string getPrivateKey()const;
-				std::string getCertificateId()const;
-				std::string getCertificateChain()const;
-				std::string getPKCS12Blob()const;
-				std::string getCertificate()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string privateKey_;
-				std::string certificateId_;
-				std::string certificateChain_;
-				std::string pKCS12Blob_;
-				std::string certificate_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_EXPORTCERTIFICATERESULT_H_

+ 43 - 49
kms/include/alibabacloud/kms/model/ExportDataKeyRequest.h

@@ -1,60 +1,54 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_EXPORTDATAKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_EXPORTDATAKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ExportDataKeyRequest : public RpcServiceRequest
-			{
-
-			public:
-				ExportDataKeyRequest();
-				~ExportDataKeyRequest();
-
-				std::string getEncryptionContext()const;
-				void setEncryptionContext(const std::string& encryptionContext);
-				std::string getWrappingAlgorithm()const;
-				void setWrappingAlgorithm(const std::string& wrappingAlgorithm);
-				std::string getCiphertextBlob()const;
-				void setCiphertextBlob(const std::string& ciphertextBlob);
-				std::string getPublicKeyBlob()const;
-				void setPublicKeyBlob(const std::string& publicKeyBlob);
-				std::string getWrappingKeySpec()const;
-				void setWrappingKeySpec(const std::string& wrappingKeySpec);
-
-            private:
-				std::string encryptionContext_;
-				std::string wrappingAlgorithm_;
-				std::string ciphertextBlob_;
-				std::string publicKeyBlob_;
-				std::string wrappingKeySpec_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_EXPORTDATAKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_EXPORTDATAKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_EXPORTDATAKEYREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT ExportDataKeyRequest : public RpcServiceRequest {
+public:
+	ExportDataKeyRequest();
+	~ExportDataKeyRequest();
+	std::string getEncryptionContext() const;
+	void setEncryptionContext(const std::string &encryptionContext);
+	std::string getWrappingAlgorithm() const;
+	void setWrappingAlgorithm(const std::string &wrappingAlgorithm);
+	std::string getCiphertextBlob() const;
+	void setCiphertextBlob(const std::string &ciphertextBlob);
+	std::string getPublicKeyBlob() const;
+	void setPublicKeyBlob(const std::string &publicKeyBlob);
+	std::string getWrappingKeySpec() const;
+	void setWrappingKeySpec(const std::string &wrappingKeySpec);
+
+private:
+	std::string encryptionContext_;
+	std::string wrappingAlgorithm_;
+	std::string ciphertextBlob_;
+	std::string publicKeyBlob_;
+	std::string wrappingKeySpec_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_EXPORTDATAKEYREQUEST_H_

+ 49 - 55
kms/include/alibabacloud/kms/model/GenerateAndExportDataKeyRequest.h

@@ -1,66 +1,60 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_GENERATEANDEXPORTDATAKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_GENERATEANDEXPORTDATAKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT GenerateAndExportDataKeyRequest : public RpcServiceRequest
-			{
-
-			public:
-				GenerateAndExportDataKeyRequest();
-				~GenerateAndExportDataKeyRequest();
-
-				std::string getEncryptionContext()const;
-				void setEncryptionContext(const std::string& encryptionContext);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getKeySpec()const;
-				void setKeySpec(const std::string& keySpec);
-				int getNumberOfBytes()const;
-				void setNumberOfBytes(int numberOfBytes);
-				std::string getWrappingAlgorithm()const;
-				void setWrappingAlgorithm(const std::string& wrappingAlgorithm);
-				std::string getPublicKeyBlob()const;
-				void setPublicKeyBlob(const std::string& publicKeyBlob);
-				std::string getWrappingKeySpec()const;
-				void setWrappingKeySpec(const std::string& wrappingKeySpec);
-
-            private:
-				std::string encryptionContext_;
-				std::string keyId_;
-				std::string keySpec_;
-				int numberOfBytes_;
-				std::string wrappingAlgorithm_;
-				std::string publicKeyBlob_;
-				std::string wrappingKeySpec_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_GENERATEANDEXPORTDATAKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_GENERATEANDEXPORTDATAKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_GENERATEANDEXPORTDATAKEYREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT GenerateAndExportDataKeyRequest : public RpcServiceRequest {
+public:
+	GenerateAndExportDataKeyRequest();
+	~GenerateAndExportDataKeyRequest();
+	std::string getEncryptionContext() const;
+	void setEncryptionContext(const std::string &encryptionContext);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getKeySpec() const;
+	void setKeySpec(const std::string &keySpec);
+	int getNumberOfBytes() const;
+	void setNumberOfBytes(int numberOfBytes);
+	std::string getWrappingAlgorithm() const;
+	void setWrappingAlgorithm(const std::string &wrappingAlgorithm);
+	std::string getPublicKeyBlob() const;
+	void setPublicKeyBlob(const std::string &publicKeyBlob);
+	std::string getWrappingKeySpec() const;
+	void setWrappingKeySpec(const std::string &wrappingKeySpec);
+
+private:
+	std::string encryptionContext_;
+	std::string keyId_;
+	std::string keySpec_;
+	int numberOfBytes_;
+	std::string wrappingAlgorithm_;
+	std::string publicKeyBlob_;
+	std::string wrappingKeySpec_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_GENERATEANDEXPORTDATAKEYREQUEST_H_

+ 40 - 46
kms/include/alibabacloud/kms/model/GenerateDataKeyRequest.h

@@ -1,57 +1,51 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT GenerateDataKeyRequest : public RpcServiceRequest
-			{
-
-			public:
-				GenerateDataKeyRequest();
-				~GenerateDataKeyRequest();
-
-				std::string getEncryptionContext()const;
-				void setEncryptionContext(const std::string& encryptionContext);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getKeySpec()const;
-				void setKeySpec(const std::string& keySpec);
-				int getNumberOfBytes()const;
-				void setNumberOfBytes(int numberOfBytes);
-
-            private:
-				std::string encryptionContext_;
-				std::string keyId_;
-				std::string keySpec_;
-				int numberOfBytes_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT GenerateDataKeyRequest : public RpcServiceRequest {
+public:
+	GenerateDataKeyRequest();
+	~GenerateDataKeyRequest();
+	std::string getEncryptionContext() const;
+	void setEncryptionContext(const std::string &encryptionContext);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getKeySpec() const;
+	void setKeySpec(const std::string &keySpec);
+	int getNumberOfBytes() const;
+	void setNumberOfBytes(int numberOfBytes);
+
+private:
+	std::string encryptionContext_;
+	std::string keyId_;
+	std::string keySpec_;
+	int numberOfBytes_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYREQUEST_H_

+ 40 - 46
kms/include/alibabacloud/kms/model/GenerateDataKeyWithoutPlaintextRequest.h

@@ -1,57 +1,51 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYWITHOUTPLAINTEXTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYWITHOUTPLAINTEXTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT GenerateDataKeyWithoutPlaintextRequest : public RpcServiceRequest
-			{
-
-			public:
-				GenerateDataKeyWithoutPlaintextRequest();
-				~GenerateDataKeyWithoutPlaintextRequest();
-
-				std::string getEncryptionContext()const;
-				void setEncryptionContext(const std::string& encryptionContext);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getKeySpec()const;
-				void setKeySpec(const std::string& keySpec);
-				int getNumberOfBytes()const;
-				void setNumberOfBytes(int numberOfBytes);
-
-            private:
-				std::string encryptionContext_;
-				std::string keyId_;
-				std::string keySpec_;
-				int numberOfBytes_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYWITHOUTPLAINTEXTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYWITHOUTPLAINTEXTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYWITHOUTPLAINTEXTREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT GenerateDataKeyWithoutPlaintextRequest : public RpcServiceRequest {
+public:
+	GenerateDataKeyWithoutPlaintextRequest();
+	~GenerateDataKeyWithoutPlaintextRequest();
+	std::string getEncryptionContext() const;
+	void setEncryptionContext(const std::string &encryptionContext);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getKeySpec() const;
+	void setKeySpec(const std::string &keySpec);
+	int getNumberOfBytes() const;
+	void setNumberOfBytes(int numberOfBytes);
+
+private:
+	std::string encryptionContext_;
+	std::string keyId_;
+	std::string keySpec_;
+	int numberOfBytes_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_GENERATEDATAKEYWITHOUTPLAINTEXTREQUEST_H_

+ 31 - 37
kms/include/alibabacloud/kms/model/GetCertificateRequest.h

@@ -1,48 +1,42 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_GETCERTIFICATEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_GETCERTIFICATEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT GetCertificateRequest : public RpcServiceRequest
-			{
-
-			public:
-				GetCertificateRequest();
-				~GetCertificateRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-
-            private:
-				std::string certificateId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_GETCERTIFICATEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_GETCERTIFICATEREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_GETCERTIFICATEREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT GetCertificateRequest : public RpcServiceRequest {
+public:
+	GetCertificateRequest();
+	~GetCertificateRequest();
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+
+private:
+	std::string certificateId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_GETCERTIFICATEREQUEST_H_

+ 37 - 43
kms/include/alibabacloud/kms/model/GetParametersForImportRequest.h

@@ -1,54 +1,48 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_GETPARAMETERSFORIMPORTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_GETPARAMETERSFORIMPORTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT GetParametersForImportRequest : public RpcServiceRequest
-			{
-
-			public:
-				GetParametersForImportRequest();
-				~GetParametersForImportRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getWrappingAlgorithm()const;
-				void setWrappingAlgorithm(const std::string& wrappingAlgorithm);
-				std::string getWrappingKeySpec()const;
-				void setWrappingKeySpec(const std::string& wrappingKeySpec);
-
-            private:
-				std::string keyId_;
-				std::string wrappingAlgorithm_;
-				std::string wrappingKeySpec_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_GETPARAMETERSFORIMPORTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_GETPARAMETERSFORIMPORTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_GETPARAMETERSFORIMPORTREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT GetParametersForImportRequest : public RpcServiceRequest {
+public:
+	GetParametersForImportRequest();
+	~GetParametersForImportRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getWrappingAlgorithm() const;
+	void setWrappingAlgorithm(const std::string &wrappingAlgorithm);
+	std::string getWrappingKeySpec() const;
+	void setWrappingKeySpec(const std::string &wrappingKeySpec);
+
+private:
+	std::string keyId_;
+	std::string wrappingAlgorithm_;
+	std::string wrappingKeySpec_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_GETPARAMETERSFORIMPORTREQUEST_H_

+ 34 - 40
kms/include/alibabacloud/kms/model/GetPublicKeyRequest.h

@@ -1,51 +1,45 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_GETPUBLICKEYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_GETPUBLICKEYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT GetPublicKeyRequest : public RpcServiceRequest
-			{
-
-			public:
-				GetPublicKeyRequest();
-				~GetPublicKeyRequest();
-
-				std::string getKeyVersionId()const;
-				void setKeyVersionId(const std::string& keyVersionId);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyVersionId_;
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_GETPUBLICKEYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_GETPUBLICKEYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_GETPUBLICKEYREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT GetPublicKeyRequest : public RpcServiceRequest {
+public:
+	GetPublicKeyRequest();
+	~GetPublicKeyRequest();
+	std::string getKeyVersionId() const;
+	void setKeyVersionId(const std::string &keyVersionId);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyVersionId_;
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_GETPUBLICKEYREQUEST_H_

+ 49 - 55
kms/include/alibabacloud/kms/model/GetRandomPasswordRequest.h

@@ -1,66 +1,60 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_GETRANDOMPASSWORDREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_GETRANDOMPASSWORDREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT GetRandomPasswordRequest : public RpcServiceRequest
-			{
-
-			public:
-				GetRandomPasswordRequest();
-				~GetRandomPasswordRequest();
-
-				std::string getExcludeLowercase()const;
-				void setExcludeLowercase(const std::string& excludeLowercase);
-				std::string getExcludeCharacters()const;
-				void setExcludeCharacters(const std::string& excludeCharacters);
-				std::string getPasswordLength()const;
-				void setPasswordLength(const std::string& passwordLength);
-				std::string getExcludePunctuation()const;
-				void setExcludePunctuation(const std::string& excludePunctuation);
-				std::string getExcludeUppercase()const;
-				void setExcludeUppercase(const std::string& excludeUppercase);
-				std::string getRequireEachIncludedType()const;
-				void setRequireEachIncludedType(const std::string& requireEachIncludedType);
-				std::string getExcludeNumbers()const;
-				void setExcludeNumbers(const std::string& excludeNumbers);
-
-            private:
-				std::string excludeLowercase_;
-				std::string excludeCharacters_;
-				std::string passwordLength_;
-				std::string excludePunctuation_;
-				std::string excludeUppercase_;
-				std::string requireEachIncludedType_;
-				std::string excludeNumbers_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_GETRANDOMPASSWORDREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_GETRANDOMPASSWORDREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_GETRANDOMPASSWORDREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT GetRandomPasswordRequest : public RpcServiceRequest {
+public:
+	GetRandomPasswordRequest();
+	~GetRandomPasswordRequest();
+	std::string getExcludeLowercase() const;
+	void setExcludeLowercase(const std::string &excludeLowercase);
+	std::string getExcludeCharacters() const;
+	void setExcludeCharacters(const std::string &excludeCharacters);
+	std::string getPasswordLength() const;
+	void setPasswordLength(const std::string &passwordLength);
+	std::string getExcludePunctuation() const;
+	void setExcludePunctuation(const std::string &excludePunctuation);
+	std::string getExcludeUppercase() const;
+	void setExcludeUppercase(const std::string &excludeUppercase);
+	std::string getRequireEachIncludedType() const;
+	void setRequireEachIncludedType(const std::string &requireEachIncludedType);
+	std::string getExcludeNumbers() const;
+	void setExcludeNumbers(const std::string &excludeNumbers);
+
+private:
+	std::string excludeLowercase_;
+	std::string excludeCharacters_;
+	std::string passwordLength_;
+	std::string excludePunctuation_;
+	std::string excludeUppercase_;
+	std::string requireEachIncludedType_;
+	std::string excludeNumbers_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_GETRANDOMPASSWORDREQUEST_H_

+ 40 - 46
kms/include/alibabacloud/kms/model/GetSecretValueRequest.h

@@ -1,57 +1,51 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_GETSECRETVALUEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_GETSECRETVALUEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT GetSecretValueRequest : public RpcServiceRequest
-			{
-
-			public:
-				GetSecretValueRequest();
-				~GetSecretValueRequest();
-
-				std::string getVersionId()const;
-				void setVersionId(const std::string& versionId);
-				std::string getVersionStage()const;
-				void setVersionStage(const std::string& versionStage);
-				std::string getSecretName()const;
-				void setSecretName(const std::string& secretName);
-				bool getFetchExtendedConfig()const;
-				void setFetchExtendedConfig(bool fetchExtendedConfig);
-
-            private:
-				std::string versionId_;
-				std::string versionStage_;
-				std::string secretName_;
-				bool fetchExtendedConfig_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_GETSECRETVALUEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_GETSECRETVALUEREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_GETSECRETVALUEREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT GetSecretValueRequest : public RpcServiceRequest {
+public:
+	GetSecretValueRequest();
+	~GetSecretValueRequest();
+	std::string getVersionId() const;
+	void setVersionId(const std::string &versionId);
+	std::string getVersionStage() const;
+	void setVersionStage(const std::string &versionStage);
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+	bool getFetchExtendedConfig() const;
+	void setFetchExtendedConfig(bool fetchExtendedConfig);
+
+private:
+	std::string versionId_;
+	std::string versionStage_;
+	std::string secretName_;
+	bool fetchExtendedConfig_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_GETSECRETVALUEREQUEST_H_

+ 2 - 2
kms/include/alibabacloud/kms/model/GetSecretValueResult.h

@@ -37,8 +37,8 @@ namespace AlibabaCloud
 				GetSecretValueResult();
 				GetSecretValueResult();
 				explicit GetSecretValueResult(const std::string &payload);
 				explicit GetSecretValueResult(const std::string &payload);
 				~GetSecretValueResult();
 				~GetSecretValueResult();
-				std::string getSecretName()const;
 				std::string getVersionId()const;
 				std::string getVersionId()const;
+				std::string getSecretName()const;
 				std::string getNextRotationDate()const;
 				std::string getNextRotationDate()const;
 				std::string getRotationInterval()const;
 				std::string getRotationInterval()const;
 				std::string getLastRotationDate()const;
 				std::string getLastRotationDate()const;
@@ -53,8 +53,8 @@ namespace AlibabaCloud
 			protected:
 			protected:
 				void parse(const std::string &payload);
 				void parse(const std::string &payload);
 			private:
 			private:
-				std::string secretName_;
 				std::string versionId_;
 				std::string versionId_;
+				std::string secretName_;
 				std::string nextRotationDate_;
 				std::string nextRotationDate_;
 				std::string rotationInterval_;
 				std::string rotationInterval_;
 				std::string lastRotationDate_;
 				std::string lastRotationDate_;

+ 0 - 51
kms/include/alibabacloud/kms/model/ImportCertificateRequest.h

@@ -1,51 +0,0 @@
-/*
- * 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_KMS_MODEL_IMPORTCERTIFICATEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_IMPORTCERTIFICATEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ImportCertificateRequest : public RpcServiceRequest
-			{
-
-			public:
-				ImportCertificateRequest();
-				~ImportCertificateRequest();
-
-				std::string getPKCS12Blob()const;
-				void setPKCS12Blob(const std::string& pKCS12Blob);
-				std::string getPassphrase()const;
-				void setPassphrase(const std::string& passphrase);
-
-            private:
-				std::string pKCS12Blob_;
-				std::string passphrase_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_IMPORTCERTIFICATEREQUEST_H_

+ 0 - 53
kms/include/alibabacloud/kms/model/ImportCertificateResult.h

@@ -1,53 +0,0 @@
-/*
- * 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_KMS_MODEL_IMPORTCERTIFICATERESULT_H_
-#define ALIBABACLOUD_KMS_MODEL_IMPORTCERTIFICATERESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ImportCertificateResult : public ServiceResult
-			{
-			public:
-
-
-				ImportCertificateResult();
-				explicit ImportCertificateResult(const std::string &payload);
-				~ImportCertificateResult();
-				std::string getCertificateId()const;
-				std::string getArn()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string certificateId_;
-				std::string arn_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_IMPORTCERTIFICATERESULT_H_

+ 0 - 66
kms/include/alibabacloud/kms/model/ImportEncryptionCertificateRequest.h

@@ -1,66 +0,0 @@
-/*
- * 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_KMS_MODEL_IMPORTENCRYPTIONCERTIFICATEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_IMPORTENCRYPTIONCERTIFICATEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ImportEncryptionCertificateRequest : public RpcServiceRequest
-			{
-
-			public:
-				ImportEncryptionCertificateRequest();
-				~ImportEncryptionCertificateRequest();
-
-				std::string getAsymmetricAlgorithm()const;
-				void setAsymmetricAlgorithm(const std::string& asymmetricAlgorithm);
-				std::string getSymmetricAlgorithm()const;
-				void setSymmetricAlgorithm(const std::string& symmetricAlgorithm);
-				std::string getEncryptedPrivateKey()const;
-				void setEncryptedPrivateKey(const std::string& encryptedPrivateKey);
-				std::string getEncryptedSymmetricKey()const;
-				void setEncryptedSymmetricKey(const std::string& encryptedSymmetricKey);
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-				std::string getCertificate()const;
-				void setCertificate(const std::string& certificate);
-				std::string getCertificateChain()const;
-				void setCertificateChain(const std::string& certificateChain);
-
-            private:
-				std::string asymmetricAlgorithm_;
-				std::string symmetricAlgorithm_;
-				std::string encryptedPrivateKey_;
-				std::string encryptedSymmetricKey_;
-				std::string certificateId_;
-				std::string certificate_;
-				std::string certificateChain_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_IMPORTENCRYPTIONCERTIFICATEREQUEST_H_

+ 0 - 53
kms/include/alibabacloud/kms/model/ImportEncryptionCertificateResult.h

@@ -1,53 +0,0 @@
-/*
- * 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_KMS_MODEL_IMPORTENCRYPTIONCERTIFICATERESULT_H_
-#define ALIBABACLOUD_KMS_MODEL_IMPORTENCRYPTIONCERTIFICATERESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ImportEncryptionCertificateResult : public ServiceResult
-			{
-			public:
-
-
-				ImportEncryptionCertificateResult();
-				explicit ImportEncryptionCertificateResult(const std::string &payload);
-				~ImportEncryptionCertificateResult();
-				std::string getCertificateId()const;
-				std::string getArn()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string certificateId_;
-				std::string arn_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_IMPORTENCRYPTIONCERTIFICATERESULT_H_

+ 40 - 46
kms/include/alibabacloud/kms/model/ImportKeyMaterialRequest.h

@@ -1,57 +1,51 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_IMPORTKEYMATERIALREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_IMPORTKEYMATERIALREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ImportKeyMaterialRequest : public RpcServiceRequest
-			{
-
-			public:
-				ImportKeyMaterialRequest();
-				~ImportKeyMaterialRequest();
-
-				std::string getImportToken()const;
-				void setImportToken(const std::string& importToken);
-				std::string getEncryptedKeyMaterial()const;
-				void setEncryptedKeyMaterial(const std::string& encryptedKeyMaterial);
-				long getKeyMaterialExpireUnix()const;
-				void setKeyMaterialExpireUnix(long keyMaterialExpireUnix);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string importToken_;
-				std::string encryptedKeyMaterial_;
-				long keyMaterialExpireUnix_;
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_IMPORTKEYMATERIALREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_IMPORTKEYMATERIALREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_IMPORTKEYMATERIALREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT ImportKeyMaterialRequest : public RpcServiceRequest {
+public:
+	ImportKeyMaterialRequest();
+	~ImportKeyMaterialRequest();
+	std::string getImportToken() const;
+	void setImportToken(const std::string &importToken);
+	std::string getEncryptedKeyMaterial() const;
+	void setEncryptedKeyMaterial(const std::string &encryptedKeyMaterial);
+	long getKeyMaterialExpireUnix() const;
+	void setKeyMaterialExpireUnix(long keyMaterialExpireUnix);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string importToken_;
+	std::string encryptedKeyMaterial_;
+	long keyMaterialExpireUnix_;
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_IMPORTKEYMATERIALREQUEST_H_

+ 37 - 43
kms/include/alibabacloud/kms/model/ListAliasesByKeyIdRequest.h

@@ -1,54 +1,48 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_LISTALIASESBYKEYIDREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_LISTALIASESBYKEYIDREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ListAliasesByKeyIdRequest : public RpcServiceRequest
-			{
-
-			public:
-				ListAliasesByKeyIdRequest();
-				~ListAliasesByKeyIdRequest();
-
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-
-            private:
-				int pageSize_;
-				std::string keyId_;
-				int pageNumber_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_LISTALIASESBYKEYIDREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_LISTALIASESBYKEYIDREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_LISTALIASESBYKEYIDREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT ListAliasesByKeyIdRequest : public RpcServiceRequest {
+public:
+	ListAliasesByKeyIdRequest();
+	~ListAliasesByKeyIdRequest();
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	int getPageNumber() const;
+	void setPageNumber(int pageNumber);
+
+private:
+	int pageSize_;
+	std::string keyId_;
+	int pageNumber_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_LISTALIASESBYKEYIDREQUEST_H_

+ 34 - 40
kms/include/alibabacloud/kms/model/ListAliasesRequest.h

@@ -1,51 +1,45 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_LISTALIASESREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_LISTALIASESREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ListAliasesRequest : public RpcServiceRequest
-			{
-
-			public:
-				ListAliasesRequest();
-				~ListAliasesRequest();
-
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-
-            private:
-				int pageSize_;
-				int pageNumber_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_LISTALIASESREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_LISTALIASESREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_LISTALIASESREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT ListAliasesRequest : public RpcServiceRequest {
+public:
+	ListAliasesRequest();
+	~ListAliasesRequest();
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	int getPageNumber() const;
+	void setPageNumber(int pageNumber);
+
+private:
+	int pageSize_;
+	int pageNumber_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_LISTALIASESREQUEST_H_

+ 0 - 60
kms/include/alibabacloud/kms/model/ListCertificatesRequest.h

@@ -1,60 +0,0 @@
-/*
- * 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_KMS_MODEL_LISTCERTIFICATESREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_LISTCERTIFICATESREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ListCertificatesRequest : public RpcServiceRequest
-			{
-
-			public:
-				ListCertificatesRequest();
-				~ListCertificatesRequest();
-
-				std::string getSubject()const;
-				void setSubject(const std::string& subject);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getIssuer()const;
-				void setIssuer(const std::string& issuer);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				std::string getStatus()const;
-				void setStatus(const std::string& status);
-
-            private:
-				std::string subject_;
-				int pageSize_;
-				std::string issuer_;
-				int pageNumber_;
-				std::string status_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_LISTCERTIFICATESREQUEST_H_

+ 0 - 67
kms/include/alibabacloud/kms/model/ListCertificatesResult.h

@@ -1,67 +0,0 @@
-/*
- * 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_KMS_MODEL_LISTCERTIFICATESRESULT_H_
-#define ALIBABACLOUD_KMS_MODEL_LISTCERTIFICATESRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ListCertificatesResult : public ServiceResult
-			{
-			public:
-				struct CertificateSummary
-				{
-					std::string certificateId;
-				};
-				struct Certificate
-				{
-					std::string certificateId;
-				};
-
-
-				ListCertificatesResult();
-				explicit ListCertificatesResult(const std::string &payload);
-				~ListCertificatesResult();
-				int getPageSize()const;
-				int getPageNumber()const;
-				std::vector<CertificateSummary> getCertificateSummaryList()const;
-				std::vector<Certificate> getCertificates()const;
-				int getTotalSize()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				int pageSize_;
-				int pageNumber_;
-				std::vector<CertificateSummary> certificateSummaryList_;
-				std::vector<Certificate> certificates_;
-				int totalSize_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_LISTCERTIFICATESRESULT_H_

+ 37 - 43
kms/include/alibabacloud/kms/model/ListKeyVersionsRequest.h

@@ -1,54 +1,48 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_LISTKEYVERSIONSREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_LISTKEYVERSIONSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ListKeyVersionsRequest : public RpcServiceRequest
-			{
-
-			public:
-				ListKeyVersionsRequest();
-				~ListKeyVersionsRequest();
-
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-
-            private:
-				int pageSize_;
-				std::string keyId_;
-				int pageNumber_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_LISTKEYVERSIONSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_LISTKEYVERSIONSREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_LISTKEYVERSIONSREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT ListKeyVersionsRequest : public RpcServiceRequest {
+public:
+	ListKeyVersionsRequest();
+	~ListKeyVersionsRequest();
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	int getPageNumber() const;
+	void setPageNumber(int pageNumber);
+
+private:
+	int pageSize_;
+	std::string keyId_;
+	int pageNumber_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_LISTKEYVERSIONSREQUEST_H_

+ 37 - 43
kms/include/alibabacloud/kms/model/ListKeysRequest.h

@@ -1,54 +1,48 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_LISTKEYSREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_LISTKEYSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ListKeysRequest : public RpcServiceRequest
-			{
-
-			public:
-				ListKeysRequest();
-				~ListKeysRequest();
-
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getFilters()const;
-				void setFilters(const std::string& filters);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-
-            private:
-				int pageSize_;
-				std::string filters_;
-				int pageNumber_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_LISTKEYSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_LISTKEYSREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_LISTKEYSREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT ListKeysRequest : public RpcServiceRequest {
+public:
+	ListKeysRequest();
+	~ListKeysRequest();
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getFilters() const;
+	void setFilters(const std::string &filters);
+	int getPageNumber() const;
+	void setPageNumber(int pageNumber);
+
+private:
+	int pageSize_;
+	std::string filters_;
+	int pageNumber_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_LISTKEYSREQUEST_H_

+ 31 - 37
kms/include/alibabacloud/kms/model/ListResourceTagsRequest.h

@@ -1,48 +1,42 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_LISTRESOURCETAGSREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_LISTRESOURCETAGSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ListResourceTagsRequest : public RpcServiceRequest
-			{
-
-			public:
-				ListResourceTagsRequest();
-				~ListResourceTagsRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_LISTRESOURCETAGSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_LISTRESOURCETAGSREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_LISTRESOURCETAGSREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT ListResourceTagsRequest : public RpcServiceRequest {
+public:
+	ListResourceTagsRequest();
+	~ListResourceTagsRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_LISTRESOURCETAGSREQUEST_H_

+ 40 - 46
kms/include/alibabacloud/kms/model/ListSecretVersionIdsRequest.h

@@ -1,57 +1,51 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_LISTSECRETVERSIONIDSREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_LISTSECRETVERSIONIDSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ListSecretVersionIdsRequest : public RpcServiceRequest
-			{
-
-			public:
-				ListSecretVersionIdsRequest();
-				~ListSecretVersionIdsRequest();
-
-				std::string getIncludeDeprecated()const;
-				void setIncludeDeprecated(const std::string& includeDeprecated);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getSecretName()const;
-				void setSecretName(const std::string& secretName);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-
-            private:
-				std::string includeDeprecated_;
-				int pageSize_;
-				std::string secretName_;
-				int pageNumber_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_LISTSECRETVERSIONIDSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_LISTSECRETVERSIONIDSREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_LISTSECRETVERSIONIDSREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT ListSecretVersionIdsRequest : public RpcServiceRequest {
+public:
+	ListSecretVersionIdsRequest();
+	~ListSecretVersionIdsRequest();
+	std::string getIncludeDeprecated() const;
+	void setIncludeDeprecated(const std::string &includeDeprecated);
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+	int getPageNumber() const;
+	void setPageNumber(int pageNumber);
+
+private:
+	std::string includeDeprecated_;
+	int pageSize_;
+	std::string secretName_;
+	int pageNumber_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_LISTSECRETVERSIONIDSREQUEST_H_

+ 40 - 46
kms/include/alibabacloud/kms/model/ListSecretsRequest.h

@@ -1,57 +1,51 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_LISTSECRETSREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_LISTSECRETSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ListSecretsRequest : public RpcServiceRequest
-			{
-
-			public:
-				ListSecretsRequest();
-				~ListSecretsRequest();
-
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getFilters()const;
-				void setFilters(const std::string& filters);
-				std::string getFetchTags()const;
-				void setFetchTags(const std::string& fetchTags);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-
-            private:
-				int pageSize_;
-				std::string filters_;
-				std::string fetchTags_;
-				int pageNumber_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_LISTSECRETSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_LISTSECRETSREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_LISTSECRETSREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT ListSecretsRequest : public RpcServiceRequest {
+public:
+	ListSecretsRequest();
+	~ListSecretsRequest();
+	int getPageSize() const;
+	void setPageSize(int pageSize);
+	std::string getFilters() const;
+	void setFilters(const std::string &filters);
+	std::string getFetchTags() const;
+	void setFetchTags(const std::string &fetchTags);
+	int getPageNumber() const;
+	void setPageNumber(int pageNumber);
+
+private:
+	int pageSize_;
+	std::string filters_;
+	std::string fetchTags_;
+	int pageNumber_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_LISTSECRETSREQUEST_H_

+ 28 - 34
kms/include/alibabacloud/kms/model/OpenKmsServiceRequest.h

@@ -1,45 +1,39 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_OPENKMSSERVICEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_OPENKMSSERVICEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT OpenKmsServiceRequest : public RpcServiceRequest
-			{
-
-			public:
-				OpenKmsServiceRequest();
-				~OpenKmsServiceRequest();
-
-
-            private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_OPENKMSSERVICEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_OPENKMSSERVICEREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_OPENKMSSERVICEREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT OpenKmsServiceRequest : public RpcServiceRequest {
+public:
+	OpenKmsServiceRequest();
+	~OpenKmsServiceRequest();
+
+private:
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_OPENKMSSERVICEREQUEST_H_

+ 43 - 49
kms/include/alibabacloud/kms/model/PutSecretValueRequest.h

@@ -1,60 +1,54 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_PUTSECRETVALUEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_PUTSECRETVALUEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT PutSecretValueRequest : public RpcServiceRequest
-			{
-
-			public:
-				PutSecretValueRequest();
-				~PutSecretValueRequest();
-
-				std::string getVersionId()const;
-				void setVersionId(const std::string& versionId);
-				std::string getVersionStages()const;
-				void setVersionStages(const std::string& versionStages);
-				std::string getSecretData()const;
-				void setSecretData(const std::string& secretData);
-				std::string getSecretName()const;
-				void setSecretName(const std::string& secretName);
-				std::string getSecretDataType()const;
-				void setSecretDataType(const std::string& secretDataType);
-
-            private:
-				std::string versionId_;
-				std::string versionStages_;
-				std::string secretData_;
-				std::string secretName_;
-				std::string secretDataType_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_PUTSECRETVALUEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_PUTSECRETVALUEREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_PUTSECRETVALUEREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT PutSecretValueRequest : public RpcServiceRequest {
+public:
+	PutSecretValueRequest();
+	~PutSecretValueRequest();
+	std::string getVersionId() const;
+	void setVersionId(const std::string &versionId);
+	std::string getVersionStages() const;
+	void setVersionStages(const std::string &versionStages);
+	std::string getSecretData() const;
+	void setSecretData(const std::string &secretData);
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+	std::string getSecretDataType() const;
+	void setSecretDataType(const std::string &secretDataType);
+
+private:
+	std::string versionId_;
+	std::string versionStages_;
+	std::string secretData_;
+	std::string secretName_;
+	std::string secretDataType_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_PUTSECRETVALUEREQUEST_H_

+ 49 - 55
kms/include/alibabacloud/kms/model/ReEncryptRequest.h

@@ -1,66 +1,60 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_REENCRYPTREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_REENCRYPTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ReEncryptRequest : public RpcServiceRequest
-			{
-
-			public:
-				ReEncryptRequest();
-				~ReEncryptRequest();
-
-				std::string getDestinationEncryptionContext()const;
-				void setDestinationEncryptionContext(const std::string& destinationEncryptionContext);
-				std::string getSourceEncryptionAlgorithm()const;
-				void setSourceEncryptionAlgorithm(const std::string& sourceEncryptionAlgorithm);
-				std::string getSourceKeyVersionId()const;
-				void setSourceKeyVersionId(const std::string& sourceKeyVersionId);
-				std::string getDestinationKeyId()const;
-				void setDestinationKeyId(const std::string& destinationKeyId);
-				std::string getSourceKeyId()const;
-				void setSourceKeyId(const std::string& sourceKeyId);
-				std::string getSourceEncryptionContext()const;
-				void setSourceEncryptionContext(const std::string& sourceEncryptionContext);
-				std::string getCiphertextBlob()const;
-				void setCiphertextBlob(const std::string& ciphertextBlob);
-
-            private:
-				std::string destinationEncryptionContext_;
-				std::string sourceEncryptionAlgorithm_;
-				std::string sourceKeyVersionId_;
-				std::string destinationKeyId_;
-				std::string sourceKeyId_;
-				std::string sourceEncryptionContext_;
-				std::string ciphertextBlob_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_REENCRYPTREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_REENCRYPTREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_REENCRYPTREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT ReEncryptRequest : public RpcServiceRequest {
+public:
+	ReEncryptRequest();
+	~ReEncryptRequest();
+	std::string getDestinationEncryptionContext() const;
+	void setDestinationEncryptionContext(const std::string &destinationEncryptionContext);
+	std::string getSourceEncryptionAlgorithm() const;
+	void setSourceEncryptionAlgorithm(const std::string &sourceEncryptionAlgorithm);
+	std::string getSourceKeyVersionId() const;
+	void setSourceKeyVersionId(const std::string &sourceKeyVersionId);
+	std::string getDestinationKeyId() const;
+	void setDestinationKeyId(const std::string &destinationKeyId);
+	std::string getSourceKeyId() const;
+	void setSourceKeyId(const std::string &sourceKeyId);
+	std::string getSourceEncryptionContext() const;
+	void setSourceEncryptionContext(const std::string &sourceEncryptionContext);
+	std::string getCiphertextBlob() const;
+	void setCiphertextBlob(const std::string &ciphertextBlob);
+
+private:
+	std::string destinationEncryptionContext_;
+	std::string sourceEncryptionAlgorithm_;
+	std::string sourceKeyVersionId_;
+	std::string destinationKeyId_;
+	std::string sourceKeyId_;
+	std::string sourceEncryptionContext_;
+	std::string ciphertextBlob_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_REENCRYPTREQUEST_H_

+ 31 - 37
kms/include/alibabacloud/kms/model/RestoreSecretRequest.h

@@ -1,48 +1,42 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_RESTORESECRETREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_RESTORESECRETREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT RestoreSecretRequest : public RpcServiceRequest
-			{
-
-			public:
-				RestoreSecretRequest();
-				~RestoreSecretRequest();
-
-				std::string getSecretName()const;
-				void setSecretName(const std::string& secretName);
-
-            private:
-				std::string secretName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_RESTORESECRETREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_RESTORESECRETREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_RESTORESECRETREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT RestoreSecretRequest : public RpcServiceRequest {
+public:
+	RestoreSecretRequest();
+	~RestoreSecretRequest();
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+
+private:
+	std::string secretName_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_RESTORESECRETREQUEST_H_

+ 34 - 40
kms/include/alibabacloud/kms/model/RotateSecretRequest.h

@@ -1,51 +1,45 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_ROTATESECRETREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_ROTATESECRETREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT RotateSecretRequest : public RpcServiceRequest
-			{
-
-			public:
-				RotateSecretRequest();
-				~RotateSecretRequest();
-
-				std::string getVersionId()const;
-				void setVersionId(const std::string& versionId);
-				std::string getSecretName()const;
-				void setSecretName(const std::string& secretName);
-
-            private:
-				std::string versionId_;
-				std::string secretName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_ROTATESECRETREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_ROTATESECRETREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_ROTATESECRETREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT RotateSecretRequest : public RpcServiceRequest {
+public:
+	RotateSecretRequest();
+	~RotateSecretRequest();
+	std::string getVersionId() const;
+	void setVersionId(const std::string &versionId);
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+
+private:
+	std::string versionId_;
+	std::string secretName_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_ROTATESECRETREQUEST_H_

+ 34 - 40
kms/include/alibabacloud/kms/model/ScheduleKeyDeletionRequest.h

@@ -1,51 +1,45 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_SCHEDULEKEYDELETIONREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_SCHEDULEKEYDELETIONREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT ScheduleKeyDeletionRequest : public RpcServiceRequest
-			{
-
-			public:
-				ScheduleKeyDeletionRequest();
-				~ScheduleKeyDeletionRequest();
-
-				int getPendingWindowInDays()const;
-				void setPendingWindowInDays(int pendingWindowInDays);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				int pendingWindowInDays_;
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_SCHEDULEKEYDELETIONREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_SCHEDULEKEYDELETIONREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_SCHEDULEKEYDELETIONREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT ScheduleKeyDeletionRequest : public RpcServiceRequest {
+public:
+	ScheduleKeyDeletionRequest();
+	~ScheduleKeyDeletionRequest();
+	int getPendingWindowInDays() const;
+	void setPendingWindowInDays(int pendingWindowInDays);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	int pendingWindowInDays_;
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_SCHEDULEKEYDELETIONREQUEST_H_

+ 37 - 43
kms/include/alibabacloud/kms/model/SetDeletionProtectionRequest.h

@@ -1,54 +1,48 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_SETDELETIONPROTECTIONREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_SETDELETIONPROTECTIONREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT SetDeletionProtectionRequest : public RpcServiceRequest
-			{
-
-			public:
-				SetDeletionProtectionRequest();
-				~SetDeletionProtectionRequest();
-
-				bool getEnableDeletionProtection()const;
-				void setEnableDeletionProtection(bool enableDeletionProtection);
-				std::string getProtectedResourceArn()const;
-				void setProtectedResourceArn(const std::string& protectedResourceArn);
-				std::string getDeletionProtectionDescription()const;
-				void setDeletionProtectionDescription(const std::string& deletionProtectionDescription);
-
-            private:
-				bool enableDeletionProtection_;
-				std::string protectedResourceArn_;
-				std::string deletionProtectionDescription_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_SETDELETIONPROTECTIONREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_SETDELETIONPROTECTIONREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_SETDELETIONPROTECTIONREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT SetDeletionProtectionRequest : public RpcServiceRequest {
+public:
+	SetDeletionProtectionRequest();
+	~SetDeletionProtectionRequest();
+	bool getEnableDeletionProtection() const;
+	void setEnableDeletionProtection(bool enableDeletionProtection);
+	std::string getProtectedResourceArn() const;
+	void setProtectedResourceArn(const std::string &protectedResourceArn);
+	std::string getDeletionProtectionDescription() const;
+	void setDeletionProtectionDescription(const std::string &deletionProtectionDescription);
+
+private:
+	bool enableDeletionProtection_;
+	std::string protectedResourceArn_;
+	std::string deletionProtectionDescription_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_SETDELETIONPROTECTIONREQUEST_H_

+ 40 - 46
kms/include/alibabacloud/kms/model/TagResourceRequest.h

@@ -1,57 +1,51 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_TAGRESOURCEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_TAGRESOURCEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT TagResourceRequest : public RpcServiceRequest
-			{
-
-			public:
-				TagResourceRequest();
-				~TagResourceRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getSecretName()const;
-				void setSecretName(const std::string& secretName);
-				std::string getTags()const;
-				void setTags(const std::string& tags);
-
-            private:
-				std::string certificateId_;
-				std::string keyId_;
-				std::string secretName_;
-				std::string tags_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_TAGRESOURCEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_TAGRESOURCEREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_TAGRESOURCEREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT TagResourceRequest : public RpcServiceRequest {
+public:
+	TagResourceRequest();
+	~TagResourceRequest();
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+	std::string getTags() const;
+	void setTags(const std::string &tags);
+
+private:
+	std::string certificateId_;
+	std::string keyId_;
+	std::string secretName_;
+	std::string tags_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_TAGRESOURCEREQUEST_H_

+ 40 - 46
kms/include/alibabacloud/kms/model/UntagResourceRequest.h

@@ -1,57 +1,51 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_UNTAGRESOURCEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_UNTAGRESOURCEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT UntagResourceRequest : public RpcServiceRequest
-			{
-
-			public:
-				UntagResourceRequest();
-				~UntagResourceRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-				std::string getTagKeys()const;
-				void setTagKeys(const std::string& tagKeys);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getSecretName()const;
-				void setSecretName(const std::string& secretName);
-
-            private:
-				std::string certificateId_;
-				std::string tagKeys_;
-				std::string keyId_;
-				std::string secretName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_UNTAGRESOURCEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_UNTAGRESOURCEREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_UNTAGRESOURCEREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT UntagResourceRequest : public RpcServiceRequest {
+public:
+	UntagResourceRequest();
+	~UntagResourceRequest();
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+	std::string getTagKeys() const;
+	void setTagKeys(const std::string &tagKeys);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+
+private:
+	std::string certificateId_;
+	std::string tagKeys_;
+	std::string keyId_;
+	std::string secretName_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_UNTAGRESOURCEREQUEST_H_

+ 34 - 40
kms/include/alibabacloud/kms/model/UpdateAliasRequest.h

@@ -1,51 +1,45 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_UPDATEALIASREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_UPDATEALIASREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT UpdateAliasRequest : public RpcServiceRequest
-			{
-
-			public:
-				UpdateAliasRequest();
-				~UpdateAliasRequest();
-
-				std::string getAliasName()const;
-				void setAliasName(const std::string& aliasName);
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-
-            private:
-				std::string aliasName_;
-				std::string keyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_UPDATEALIASREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_UPDATEALIASREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_UPDATEALIASREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT UpdateAliasRequest : public RpcServiceRequest {
+public:
+	UpdateAliasRequest();
+	~UpdateAliasRequest();
+	std::string getAliasName() const;
+	void setAliasName(const std::string &aliasName);
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+
+private:
+	std::string aliasName_;
+	std::string keyId_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_UPDATEALIASREQUEST_H_

+ 34 - 40
kms/include/alibabacloud/kms/model/UpdateCertificateStatusRequest.h

@@ -1,51 +1,45 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_UPDATECERTIFICATESTATUSREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_UPDATECERTIFICATESTATUSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT UpdateCertificateStatusRequest : public RpcServiceRequest
-			{
-
-			public:
-				UpdateCertificateStatusRequest();
-				~UpdateCertificateStatusRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-				std::string getStatus()const;
-				void setStatus(const std::string& status);
-
-            private:
-				std::string certificateId_;
-				std::string status_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_UPDATECERTIFICATESTATUSREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_UPDATECERTIFICATESTATUSREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_UPDATECERTIFICATESTATUSREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT UpdateCertificateStatusRequest : public RpcServiceRequest {
+public:
+	UpdateCertificateStatusRequest();
+	~UpdateCertificateStatusRequest();
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+	std::string getStatus() const;
+	void setStatus(const std::string &status);
+
+private:
+	std::string certificateId_;
+	std::string status_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_UPDATECERTIFICATESTATUSREQUEST_H_

+ 34 - 40
kms/include/alibabacloud/kms/model/UpdateKeyDescriptionRequest.h

@@ -1,51 +1,45 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_UPDATEKEYDESCRIPTIONREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_UPDATEKEYDESCRIPTIONREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT UpdateKeyDescriptionRequest : public RpcServiceRequest
-			{
-
-			public:
-				UpdateKeyDescriptionRequest();
-				~UpdateKeyDescriptionRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getDescription()const;
-				void setDescription(const std::string& description);
-
-            private:
-				std::string keyId_;
-				std::string description_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_UPDATEKEYDESCRIPTIONREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_UPDATEKEYDESCRIPTIONREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_UPDATEKEYDESCRIPTIONREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT UpdateKeyDescriptionRequest : public RpcServiceRequest {
+public:
+	UpdateKeyDescriptionRequest();
+	~UpdateKeyDescriptionRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getDescription() const;
+	void setDescription(const std::string &description);
+
+private:
+	std::string keyId_;
+	std::string description_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_UPDATEKEYDESCRIPTIONREQUEST_H_

+ 37 - 43
kms/include/alibabacloud/kms/model/UpdateRotationPolicyRequest.h

@@ -1,54 +1,48 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_UPDATEROTATIONPOLICYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_UPDATEROTATIONPOLICYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT UpdateRotationPolicyRequest : public RpcServiceRequest
-			{
-
-			public:
-				UpdateRotationPolicyRequest();
-				~UpdateRotationPolicyRequest();
-
-				std::string getKeyId()const;
-				void setKeyId(const std::string& keyId);
-				std::string getRotationInterval()const;
-				void setRotationInterval(const std::string& rotationInterval);
-				bool getEnableAutomaticRotation()const;
-				void setEnableAutomaticRotation(bool enableAutomaticRotation);
-
-            private:
-				std::string keyId_;
-				std::string rotationInterval_;
-				bool enableAutomaticRotation_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_UPDATEROTATIONPOLICYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_UPDATEROTATIONPOLICYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_UPDATEROTATIONPOLICYREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT UpdateRotationPolicyRequest : public RpcServiceRequest {
+public:
+	UpdateRotationPolicyRequest();
+	~UpdateRotationPolicyRequest();
+	std::string getKeyId() const;
+	void setKeyId(const std::string &keyId);
+	std::string getRotationInterval() const;
+	void setRotationInterval(const std::string &rotationInterval);
+	bool getEnableAutomaticRotation() const;
+	void setEnableAutomaticRotation(bool enableAutomaticRotation);
+
+private:
+	std::string keyId_;
+	std::string rotationInterval_;
+	bool enableAutomaticRotation_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_UPDATEROTATIONPOLICYREQUEST_H_

+ 37 - 43
kms/include/alibabacloud/kms/model/UpdateSecretRequest.h

@@ -1,54 +1,48 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_UPDATESECRETREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_UPDATESECRETREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT UpdateSecretRequest : public RpcServiceRequest
-			{
-
-			public:
-				UpdateSecretRequest();
-				~UpdateSecretRequest();
-
-				std::string getDescription()const;
-				void setDescription(const std::string& description);
-				std::string getSecretName()const;
-				void setSecretName(const std::string& secretName);
-				std::string getExtendedConfigCustomData()const;
-				void setExtendedConfigCustomData(const std::string& extendedConfigCustomData);
-
-            private:
-				std::string description_;
-				std::string secretName_;
-				std::string extendedConfigCustomData_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_UPDATESECRETREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_UPDATESECRETREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_UPDATESECRETREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT UpdateSecretRequest : public RpcServiceRequest {
+public:
+	UpdateSecretRequest();
+	~UpdateSecretRequest();
+	std::string getDescription() const;
+	void setDescription(const std::string &description);
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+	std::string getExtendedConfigCustomData() const;
+	void setExtendedConfigCustomData(const std::string &extendedConfigCustomData);
+
+private:
+	std::string description_;
+	std::string secretName_;
+	std::string extendedConfigCustomData_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_UPDATESECRETREQUEST_H_

+ 37 - 43
kms/include/alibabacloud/kms/model/UpdateSecretRotationPolicyRequest.h

@@ -1,54 +1,48 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_UPDATESECRETROTATIONPOLICYREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_UPDATESECRETROTATIONPOLICYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT UpdateSecretRotationPolicyRequest : public RpcServiceRequest
-			{
-
-			public:
-				UpdateSecretRotationPolicyRequest();
-				~UpdateSecretRotationPolicyRequest();
-
-				std::string getRotationInterval()const;
-				void setRotationInterval(const std::string& rotationInterval);
-				std::string getSecretName()const;
-				void setSecretName(const std::string& secretName);
-				bool getEnableAutomaticRotation()const;
-				void setEnableAutomaticRotation(bool enableAutomaticRotation);
-
-            private:
-				std::string rotationInterval_;
-				std::string secretName_;
-				bool enableAutomaticRotation_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_UPDATESECRETROTATIONPOLICYREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_UPDATESECRETROTATIONPOLICYREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_UPDATESECRETROTATIONPOLICYREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT UpdateSecretRotationPolicyRequest : public RpcServiceRequest {
+public:
+	UpdateSecretRotationPolicyRequest();
+	~UpdateSecretRotationPolicyRequest();
+	std::string getRotationInterval() const;
+	void setRotationInterval(const std::string &rotationInterval);
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+	bool getEnableAutomaticRotation() const;
+	void setEnableAutomaticRotation(bool enableAutomaticRotation);
+
+private:
+	std::string rotationInterval_;
+	std::string secretName_;
+	bool enableAutomaticRotation_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_UPDATESECRETROTATIONPOLICYREQUEST_H_

+ 40 - 46
kms/include/alibabacloud/kms/model/UpdateSecretVersionStageRequest.h

@@ -1,57 +1,51 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_UPDATESECRETVERSIONSTAGEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_UPDATESECRETVERSIONSTAGEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT UpdateSecretVersionStageRequest : public RpcServiceRequest
-			{
-
-			public:
-				UpdateSecretVersionStageRequest();
-				~UpdateSecretVersionStageRequest();
-
-				std::string getRemoveFromVersion()const;
-				void setRemoveFromVersion(const std::string& removeFromVersion);
-				std::string getMoveToVersion()const;
-				void setMoveToVersion(const std::string& moveToVersion);
-				std::string getVersionStage()const;
-				void setVersionStage(const std::string& versionStage);
-				std::string getSecretName()const;
-				void setSecretName(const std::string& secretName);
-
-            private:
-				std::string removeFromVersion_;
-				std::string moveToVersion_;
-				std::string versionStage_;
-				std::string secretName_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_UPDATESECRETVERSIONSTAGEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_UPDATESECRETVERSIONSTAGEREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_UPDATESECRETVERSIONSTAGEREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT UpdateSecretVersionStageRequest : public RpcServiceRequest {
+public:
+	UpdateSecretVersionStageRequest();
+	~UpdateSecretVersionStageRequest();
+	std::string getRemoveFromVersion() const;
+	void setRemoveFromVersion(const std::string &removeFromVersion);
+	std::string getMoveToVersion() const;
+	void setMoveToVersion(const std::string &moveToVersion);
+	std::string getVersionStage() const;
+	void setVersionStage(const std::string &versionStage);
+	std::string getSecretName() const;
+	void setSecretName(const std::string &secretName);
+
+private:
+	std::string removeFromVersion_;
+	std::string moveToVersion_;
+	std::string versionStage_;
+	std::string secretName_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_UPDATESECRETVERSIONSTAGEREQUEST_H_

+ 37 - 43
kms/include/alibabacloud/kms/model/UploadCertificateRequest.h

@@ -1,54 +1,48 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_KMS_MODEL_UPLOADCERTIFICATEREQUEST_H_
-#define ALIBABACLOUD_KMS_MODEL_UPLOADCERTIFICATEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/kms/KmsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Kms
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_KMS_EXPORT UploadCertificateRequest : public RpcServiceRequest
-			{
-
-			public:
-				UploadCertificateRequest();
-				~UploadCertificateRequest();
-
-				std::string getCertificateId()const;
-				void setCertificateId(const std::string& certificateId);
-				std::string getCertificate()const;
-				void setCertificate(const std::string& certificate);
-				std::string getCertificateChain()const;
-				void setCertificateChain(const std::string& certificateChain);
-
-            private:
-				std::string certificateId_;
-				std::string certificate_;
-				std::string certificateChain_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_KMS_MODEL_UPLOADCERTIFICATEREQUEST_H_
+ */
+
+#ifndef ALIBABACLOUD_KMS_MODEL_UPLOADCERTIFICATEREQUEST_H_
+#define ALIBABACLOUD_KMS_MODEL_UPLOADCERTIFICATEREQUEST_H_
+
+#include <alibabacloud/kms/KmsExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Kms {
+namespace Model {
+class ALIBABACLOUD_KMS_EXPORT UploadCertificateRequest : public RpcServiceRequest {
+public:
+	UploadCertificateRequest();
+	~UploadCertificateRequest();
+	std::string getCertificateId() const;
+	void setCertificateId(const std::string &certificateId);
+	std::string getCertificate() const;
+	void setCertificate(const std::string &certificate);
+	std::string getCertificateChain() const;
+	void setCertificateChain(const std::string &certificateChain);
+
+private:
+	std::string certificateId_;
+	std::string certificate_;
+	std::string certificateChain_;
+};
+} // namespace Model
+} // namespace Kms
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_KMS_MODEL_UPLOADCERTIFICATEREQUEST_H_

+ 0 - 180
kms/src/KmsClient.cc

@@ -951,42 +951,6 @@ KmsClient::DescribeSecretOutcomeCallable KmsClient::describeSecretCallable(const
 	return task->get_future();
 	return task->get_future();
 }
 }
 
 
-KmsClient::DescribeServiceOutcome KmsClient::describeService(const DescribeServiceRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeServiceOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeServiceOutcome(DescribeServiceResult(outcome.result()));
-	else
-		return DescribeServiceOutcome(outcome.error());
-}
-
-void KmsClient::describeServiceAsync(const DescribeServiceRequest& request, const DescribeServiceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeService(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-KmsClient::DescribeServiceOutcomeCallable KmsClient::describeServiceCallable(const DescribeServiceRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeServiceOutcome()>>(
-			[this, request]()
-			{
-			return this->describeService(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 KmsClient::DisableKeyOutcome KmsClient::disableKey(const DisableKeyRequest &request) const
 KmsClient::DisableKeyOutcome KmsClient::disableKey(const DisableKeyRequest &request) const
 {
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1095,42 +1059,6 @@ KmsClient::EncryptOutcomeCallable KmsClient::encryptCallable(const EncryptReques
 	return task->get_future();
 	return task->get_future();
 }
 }
 
 
-KmsClient::ExportCertificateOutcome KmsClient::exportCertificate(const ExportCertificateRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return ExportCertificateOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return ExportCertificateOutcome(ExportCertificateResult(outcome.result()));
-	else
-		return ExportCertificateOutcome(outcome.error());
-}
-
-void KmsClient::exportCertificateAsync(const ExportCertificateRequest& request, const ExportCertificateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, exportCertificate(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-KmsClient::ExportCertificateOutcomeCallable KmsClient::exportCertificateCallable(const ExportCertificateRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<ExportCertificateOutcome()>>(
-			[this, request]()
-			{
-			return this->exportCertificate(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 KmsClient::ExportDataKeyOutcome KmsClient::exportDataKey(const ExportDataKeyRequest &request) const
 KmsClient::ExportDataKeyOutcome KmsClient::exportDataKey(const ExportDataKeyRequest &request) const
 {
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1455,78 +1383,6 @@ KmsClient::GetSecretValueOutcomeCallable KmsClient::getSecretValueCallable(const
 	return task->get_future();
 	return task->get_future();
 }
 }
 
 
-KmsClient::ImportCertificateOutcome KmsClient::importCertificate(const ImportCertificateRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return ImportCertificateOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return ImportCertificateOutcome(ImportCertificateResult(outcome.result()));
-	else
-		return ImportCertificateOutcome(outcome.error());
-}
-
-void KmsClient::importCertificateAsync(const ImportCertificateRequest& request, const ImportCertificateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, importCertificate(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-KmsClient::ImportCertificateOutcomeCallable KmsClient::importCertificateCallable(const ImportCertificateRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<ImportCertificateOutcome()>>(
-			[this, request]()
-			{
-			return this->importCertificate(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
-KmsClient::ImportEncryptionCertificateOutcome KmsClient::importEncryptionCertificate(const ImportEncryptionCertificateRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return ImportEncryptionCertificateOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return ImportEncryptionCertificateOutcome(ImportEncryptionCertificateResult(outcome.result()));
-	else
-		return ImportEncryptionCertificateOutcome(outcome.error());
-}
-
-void KmsClient::importEncryptionCertificateAsync(const ImportEncryptionCertificateRequest& request, const ImportEncryptionCertificateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, importEncryptionCertificate(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-KmsClient::ImportEncryptionCertificateOutcomeCallable KmsClient::importEncryptionCertificateCallable(const ImportEncryptionCertificateRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<ImportEncryptionCertificateOutcome()>>(
-			[this, request]()
-			{
-			return this->importEncryptionCertificate(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 KmsClient::ImportKeyMaterialOutcome KmsClient::importKeyMaterial(const ImportKeyMaterialRequest &request) const
 KmsClient::ImportKeyMaterialOutcome KmsClient::importKeyMaterial(const ImportKeyMaterialRequest &request) const
 {
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1635,42 +1491,6 @@ KmsClient::ListAliasesByKeyIdOutcomeCallable KmsClient::listAliasesByKeyIdCallab
 	return task->get_future();
 	return task->get_future();
 }
 }
 
 
-KmsClient::ListCertificatesOutcome KmsClient::listCertificates(const ListCertificatesRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return ListCertificatesOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return ListCertificatesOutcome(ListCertificatesResult(outcome.result()));
-	else
-		return ListCertificatesOutcome(outcome.error());
-}
-
-void KmsClient::listCertificatesAsync(const ListCertificatesRequest& request, const ListCertificatesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, listCertificates(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-KmsClient::ListCertificatesOutcomeCallable KmsClient::listCertificatesCallable(const ListCertificatesRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<ListCertificatesOutcome()>>(
-			[this, request]()
-			{
-			return this->listCertificates(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 KmsClient::ListKeyVersionsOutcome KmsClient::listKeyVersions(const ListKeyVersionsRequest &request) const
 KmsClient::ListKeyVersionsOutcome KmsClient::listKeyVersions(const ListKeyVersionsRequest &request) const
 {
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
 	auto endpointOutcome = endpointProvider_->getEndpoint();

+ 36 - 46
kms/src/model/AsymmetricDecryptRequest.cc

@@ -1,73 +1,63 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#include <alibabacloud/kms/model/AsymmetricDecryptRequest.h>
-
-using AlibabaCloud::Kms::Model::AsymmetricDecryptRequest;
-
-AsymmetricDecryptRequest::AsymmetricDecryptRequest() :
-	RpcServiceRequest("kms", "2016-01-20", "AsymmetricDecrypt")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-AsymmetricDecryptRequest::~AsymmetricDecryptRequest()
-{}
-
-std::string AsymmetricDecryptRequest::getKeyVersionId()const
-{
-	return keyVersionId_;
+ */
+
+#include <alibabacloud/kms/model/AsymmetricDecryptRequest.h>
+
+using AlibabaCloud::Kms::Model::AsymmetricDecryptRequest;
+
+AsymmetricDecryptRequest::AsymmetricDecryptRequest()
+    : RpcServiceRequest("kms", "2016-01-20", "AsymmetricDecrypt") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+AsymmetricDecryptRequest::~AsymmetricDecryptRequest() {}
+
+std::string AsymmetricDecryptRequest::getKeyVersionId() const {
+  return keyVersionId_;
 }
 }
 
 
-void AsymmetricDecryptRequest::setKeyVersionId(const std::string& keyVersionId)
-{
-	keyVersionId_ = keyVersionId;
-	setParameter("KeyVersionId", keyVersionId);
+void AsymmetricDecryptRequest::setKeyVersionId(const std::string &keyVersionId) {
+  keyVersionId_ = keyVersionId;
+  setParameter(std::string("KeyVersionId"), keyVersionId);
 }
 }
 
 
-std::string AsymmetricDecryptRequest::getKeyId()const
-{
-	return keyId_;
+std::string AsymmetricDecryptRequest::getKeyId() const {
+  return keyId_;
 }
 }
 
 
-void AsymmetricDecryptRequest::setKeyId(const std::string& keyId)
-{
-	keyId_ = keyId;
-	setParameter("KeyId", keyId);
+void AsymmetricDecryptRequest::setKeyId(const std::string &keyId) {
+  keyId_ = keyId;
+  setParameter(std::string("KeyId"), keyId);
 }
 }
 
 
-std::string AsymmetricDecryptRequest::getCiphertextBlob()const
-{
-	return ciphertextBlob_;
+std::string AsymmetricDecryptRequest::getCiphertextBlob() const {
+  return ciphertextBlob_;
 }
 }
 
 
-void AsymmetricDecryptRequest::setCiphertextBlob(const std::string& ciphertextBlob)
-{
-	ciphertextBlob_ = ciphertextBlob;
-	setParameter("CiphertextBlob", ciphertextBlob);
+void AsymmetricDecryptRequest::setCiphertextBlob(const std::string &ciphertextBlob) {
+  ciphertextBlob_ = ciphertextBlob;
+  setParameter(std::string("CiphertextBlob"), ciphertextBlob);
 }
 }
 
 
-std::string AsymmetricDecryptRequest::getAlgorithm()const
-{
-	return algorithm_;
+std::string AsymmetricDecryptRequest::getAlgorithm() const {
+  return algorithm_;
 }
 }
 
 
-void AsymmetricDecryptRequest::setAlgorithm(const std::string& algorithm)
-{
-	algorithm_ = algorithm;
-	setParameter("Algorithm", algorithm);
+void AsymmetricDecryptRequest::setAlgorithm(const std::string &algorithm) {
+  algorithm_ = algorithm;
+  setParameter(std::string("Algorithm"), algorithm);
 }
 }
 
 

+ 4 - 4
kms/src/model/AsymmetricDecryptResult.cc

@@ -39,12 +39,12 @@ void AsymmetricDecryptResult::parse(const std::string &payload)
 	Json::Value value;
 	Json::Value value;
 	reader.parse(payload, value);
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	setRequestId(value["RequestId"].asString());
-	if(!value["Plaintext"].isNull())
-		plaintext_ = value["Plaintext"].asString();
-	if(!value["KeyId"].isNull())
-		keyId_ = value["KeyId"].asString();
 	if(!value["KeyVersionId"].isNull())
 	if(!value["KeyVersionId"].isNull())
 		keyVersionId_ = value["KeyVersionId"].asString();
 		keyVersionId_ = value["KeyVersionId"].asString();
+	if(!value["KeyId"].isNull())
+		keyId_ = value["KeyId"].asString();
+	if(!value["Plaintext"].isNull())
+		plaintext_ = value["Plaintext"].asString();
 
 
 }
 }
 
 

+ 36 - 46
kms/src/model/AsymmetricEncryptRequest.cc

@@ -1,73 +1,63 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#include <alibabacloud/kms/model/AsymmetricEncryptRequest.h>
-
-using AlibabaCloud::Kms::Model::AsymmetricEncryptRequest;
-
-AsymmetricEncryptRequest::AsymmetricEncryptRequest() :
-	RpcServiceRequest("kms", "2016-01-20", "AsymmetricEncrypt")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-AsymmetricEncryptRequest::~AsymmetricEncryptRequest()
-{}
-
-std::string AsymmetricEncryptRequest::getKeyVersionId()const
-{
-	return keyVersionId_;
+ */
+
+#include <alibabacloud/kms/model/AsymmetricEncryptRequest.h>
+
+using AlibabaCloud::Kms::Model::AsymmetricEncryptRequest;
+
+AsymmetricEncryptRequest::AsymmetricEncryptRequest()
+    : RpcServiceRequest("kms", "2016-01-20", "AsymmetricEncrypt") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+AsymmetricEncryptRequest::~AsymmetricEncryptRequest() {}
+
+std::string AsymmetricEncryptRequest::getKeyVersionId() const {
+  return keyVersionId_;
 }
 }
 
 
-void AsymmetricEncryptRequest::setKeyVersionId(const std::string& keyVersionId)
-{
-	keyVersionId_ = keyVersionId;
-	setParameter("KeyVersionId", keyVersionId);
+void AsymmetricEncryptRequest::setKeyVersionId(const std::string &keyVersionId) {
+  keyVersionId_ = keyVersionId;
+  setParameter(std::string("KeyVersionId"), keyVersionId);
 }
 }
 
 
-std::string AsymmetricEncryptRequest::getKeyId()const
-{
-	return keyId_;
+std::string AsymmetricEncryptRequest::getKeyId() const {
+  return keyId_;
 }
 }
 
 
-void AsymmetricEncryptRequest::setKeyId(const std::string& keyId)
-{
-	keyId_ = keyId;
-	setParameter("KeyId", keyId);
+void AsymmetricEncryptRequest::setKeyId(const std::string &keyId) {
+  keyId_ = keyId;
+  setParameter(std::string("KeyId"), keyId);
 }
 }
 
 
-std::string AsymmetricEncryptRequest::getPlaintext()const
-{
-	return plaintext_;
+std::string AsymmetricEncryptRequest::getPlaintext() const {
+  return plaintext_;
 }
 }
 
 
-void AsymmetricEncryptRequest::setPlaintext(const std::string& plaintext)
-{
-	plaintext_ = plaintext;
-	setParameter("Plaintext", plaintext);
+void AsymmetricEncryptRequest::setPlaintext(const std::string &plaintext) {
+  plaintext_ = plaintext;
+  setParameter(std::string("Plaintext"), plaintext);
 }
 }
 
 
-std::string AsymmetricEncryptRequest::getAlgorithm()const
-{
-	return algorithm_;
+std::string AsymmetricEncryptRequest::getAlgorithm() const {
+  return algorithm_;
 }
 }
 
 
-void AsymmetricEncryptRequest::setAlgorithm(const std::string& algorithm)
-{
-	algorithm_ = algorithm;
-	setParameter("Algorithm", algorithm);
+void AsymmetricEncryptRequest::setAlgorithm(const std::string &algorithm) {
+  algorithm_ = algorithm;
+  setParameter(std::string("Algorithm"), algorithm);
 }
 }
 
 

+ 4 - 4
kms/src/model/AsymmetricEncryptResult.cc

@@ -39,12 +39,12 @@ void AsymmetricEncryptResult::parse(const std::string &payload)
 	Json::Value value;
 	Json::Value value;
 	reader.parse(payload, value);
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	setRequestId(value["RequestId"].asString());
-	if(!value["CiphertextBlob"].isNull())
-		ciphertextBlob_ = value["CiphertextBlob"].asString();
-	if(!value["KeyId"].isNull())
-		keyId_ = value["KeyId"].asString();
 	if(!value["KeyVersionId"].isNull())
 	if(!value["KeyVersionId"].isNull())
 		keyVersionId_ = value["KeyVersionId"].asString();
 		keyVersionId_ = value["KeyVersionId"].asString();
+	if(!value["KeyId"].isNull())
+		keyId_ = value["KeyId"].asString();
+	if(!value["CiphertextBlob"].isNull())
+		ciphertextBlob_ = value["CiphertextBlob"].asString();
 
 
 }
 }
 
 

+ 36 - 46
kms/src/model/AsymmetricSignRequest.cc

@@ -1,73 +1,63 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#include <alibabacloud/kms/model/AsymmetricSignRequest.h>
-
-using AlibabaCloud::Kms::Model::AsymmetricSignRequest;
-
-AsymmetricSignRequest::AsymmetricSignRequest() :
-	RpcServiceRequest("kms", "2016-01-20", "AsymmetricSign")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-AsymmetricSignRequest::~AsymmetricSignRequest()
-{}
-
-std::string AsymmetricSignRequest::getKeyVersionId()const
-{
-	return keyVersionId_;
+ */
+
+#include <alibabacloud/kms/model/AsymmetricSignRequest.h>
+
+using AlibabaCloud::Kms::Model::AsymmetricSignRequest;
+
+AsymmetricSignRequest::AsymmetricSignRequest()
+    : RpcServiceRequest("kms", "2016-01-20", "AsymmetricSign") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+AsymmetricSignRequest::~AsymmetricSignRequest() {}
+
+std::string AsymmetricSignRequest::getKeyVersionId() const {
+  return keyVersionId_;
 }
 }
 
 
-void AsymmetricSignRequest::setKeyVersionId(const std::string& keyVersionId)
-{
-	keyVersionId_ = keyVersionId;
-	setParameter("KeyVersionId", keyVersionId);
+void AsymmetricSignRequest::setKeyVersionId(const std::string &keyVersionId) {
+  keyVersionId_ = keyVersionId;
+  setParameter(std::string("KeyVersionId"), keyVersionId);
 }
 }
 
 
-std::string AsymmetricSignRequest::getDigest()const
-{
-	return digest_;
+std::string AsymmetricSignRequest::getDigest() const {
+  return digest_;
 }
 }
 
 
-void AsymmetricSignRequest::setDigest(const std::string& digest)
-{
-	digest_ = digest;
-	setParameter("Digest", digest);
+void AsymmetricSignRequest::setDigest(const std::string &digest) {
+  digest_ = digest;
+  setParameter(std::string("Digest"), digest);
 }
 }
 
 
-std::string AsymmetricSignRequest::getKeyId()const
-{
-	return keyId_;
+std::string AsymmetricSignRequest::getKeyId() const {
+  return keyId_;
 }
 }
 
 
-void AsymmetricSignRequest::setKeyId(const std::string& keyId)
-{
-	keyId_ = keyId;
-	setParameter("KeyId", keyId);
+void AsymmetricSignRequest::setKeyId(const std::string &keyId) {
+  keyId_ = keyId;
+  setParameter(std::string("KeyId"), keyId);
 }
 }
 
 
-std::string AsymmetricSignRequest::getAlgorithm()const
-{
-	return algorithm_;
+std::string AsymmetricSignRequest::getAlgorithm() const {
+  return algorithm_;
 }
 }
 
 
-void AsymmetricSignRequest::setAlgorithm(const std::string& algorithm)
-{
-	algorithm_ = algorithm;
-	setParameter("Algorithm", algorithm);
+void AsymmetricSignRequest::setAlgorithm(const std::string &algorithm) {
+  algorithm_ = algorithm;
+  setParameter(std::string("Algorithm"), algorithm);
 }
 }
 
 

+ 4 - 4
kms/src/model/AsymmetricSignResult.cc

@@ -39,12 +39,12 @@ void AsymmetricSignResult::parse(const std::string &payload)
 	Json::Value value;
 	Json::Value value;
 	reader.parse(payload, value);
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	setRequestId(value["RequestId"].asString());
-	if(!value["Value"].isNull())
-		value_ = value["Value"].asString();
-	if(!value["KeyId"].isNull())
-		keyId_ = value["KeyId"].asString();
 	if(!value["KeyVersionId"].isNull())
 	if(!value["KeyVersionId"].isNull())
 		keyVersionId_ = value["KeyVersionId"].asString();
 		keyVersionId_ = value["KeyVersionId"].asString();
+	if(!value["KeyId"].isNull())
+		keyId_ = value["KeyId"].asString();
+	if(!value["Value"].isNull())
+		value_ = value["Value"].asString();
 
 
 }
 }
 
 

+ 41 - 53
kms/src/model/AsymmetricVerifyRequest.cc

@@ -1,84 +1,72 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#include <alibabacloud/kms/model/AsymmetricVerifyRequest.h>
-
-using AlibabaCloud::Kms::Model::AsymmetricVerifyRequest;
-
-AsymmetricVerifyRequest::AsymmetricVerifyRequest() :
-	RpcServiceRequest("kms", "2016-01-20", "AsymmetricVerify")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-AsymmetricVerifyRequest::~AsymmetricVerifyRequest()
-{}
-
-std::string AsymmetricVerifyRequest::getKeyVersionId()const
-{
-	return keyVersionId_;
+ */
+
+#include <alibabacloud/kms/model/AsymmetricVerifyRequest.h>
+
+using AlibabaCloud::Kms::Model::AsymmetricVerifyRequest;
+
+AsymmetricVerifyRequest::AsymmetricVerifyRequest()
+    : RpcServiceRequest("kms", "2016-01-20", "AsymmetricVerify") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+AsymmetricVerifyRequest::~AsymmetricVerifyRequest() {}
+
+std::string AsymmetricVerifyRequest::getKeyVersionId() const {
+  return keyVersionId_;
 }
 }
 
 
-void AsymmetricVerifyRequest::setKeyVersionId(const std::string& keyVersionId)
-{
-	keyVersionId_ = keyVersionId;
-	setParameter("KeyVersionId", keyVersionId);
+void AsymmetricVerifyRequest::setKeyVersionId(const std::string &keyVersionId) {
+  keyVersionId_ = keyVersionId;
+  setParameter(std::string("KeyVersionId"), keyVersionId);
 }
 }
 
 
-std::string AsymmetricVerifyRequest::getDigest()const
-{
-	return digest_;
+std::string AsymmetricVerifyRequest::getDigest() const {
+  return digest_;
 }
 }
 
 
-void AsymmetricVerifyRequest::setDigest(const std::string& digest)
-{
-	digest_ = digest;
-	setParameter("Digest", digest);
+void AsymmetricVerifyRequest::setDigest(const std::string &digest) {
+  digest_ = digest;
+  setParameter(std::string("Digest"), digest);
 }
 }
 
 
-std::string AsymmetricVerifyRequest::getKeyId()const
-{
-	return keyId_;
+std::string AsymmetricVerifyRequest::getKeyId() const {
+  return keyId_;
 }
 }
 
 
-void AsymmetricVerifyRequest::setKeyId(const std::string& keyId)
-{
-	keyId_ = keyId;
-	setParameter("KeyId", keyId);
+void AsymmetricVerifyRequest::setKeyId(const std::string &keyId) {
+  keyId_ = keyId;
+  setParameter(std::string("KeyId"), keyId);
 }
 }
 
 
-std::string AsymmetricVerifyRequest::getValue()const
-{
-	return value_;
+std::string AsymmetricVerifyRequest::getValue() const {
+  return value_;
 }
 }
 
 
-void AsymmetricVerifyRequest::setValue(const std::string& value)
-{
-	value_ = value;
-	setParameter("Value", value);
+void AsymmetricVerifyRequest::setValue(const std::string &value) {
+  value_ = value;
+  setParameter(std::string("Value"), value);
 }
 }
 
 
-std::string AsymmetricVerifyRequest::getAlgorithm()const
-{
-	return algorithm_;
+std::string AsymmetricVerifyRequest::getAlgorithm() const {
+  return algorithm_;
 }
 }
 
 
-void AsymmetricVerifyRequest::setAlgorithm(const std::string& algorithm)
-{
-	algorithm_ = algorithm;
-	setParameter("Algorithm", algorithm);
+void AsymmetricVerifyRequest::setAlgorithm(const std::string &algorithm) {
+  algorithm_ = algorithm;
+  setParameter(std::string("Algorithm"), algorithm);
 }
 }
 
 

+ 4 - 4
kms/src/model/AsymmetricVerifyResult.cc

@@ -39,12 +39,12 @@ void AsymmetricVerifyResult::parse(const std::string &payload)
 	Json::Value value;
 	Json::Value value;
 	reader.parse(payload, value);
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	setRequestId(value["RequestId"].asString());
-	if(!value["Value"].isNull())
-		value_ = value["Value"].asString() == "true";
-	if(!value["KeyId"].isNull())
-		keyId_ = value["KeyId"].asString();
 	if(!value["KeyVersionId"].isNull())
 	if(!value["KeyVersionId"].isNull())
 		keyVersionId_ = value["KeyVersionId"].asString();
 		keyVersionId_ = value["KeyVersionId"].asString();
+	if(!value["KeyId"].isNull())
+		keyId_ = value["KeyId"].asString();
+	if(!value["Value"].isNull())
+		value_ = value["Value"].asString() == "true";
 
 
 }
 }
 
 

+ 21 - 25
kms/src/model/CancelKeyDeletionRequest.cc

@@ -1,40 +1,36 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#include <alibabacloud/kms/model/CancelKeyDeletionRequest.h>
-
-using AlibabaCloud::Kms::Model::CancelKeyDeletionRequest;
-
-CancelKeyDeletionRequest::CancelKeyDeletionRequest() :
-	RpcServiceRequest("kms", "2016-01-20", "CancelKeyDeletion")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-CancelKeyDeletionRequest::~CancelKeyDeletionRequest()
-{}
-
-std::string CancelKeyDeletionRequest::getKeyId()const
-{
-	return keyId_;
+ */
+
+#include <alibabacloud/kms/model/CancelKeyDeletionRequest.h>
+
+using AlibabaCloud::Kms::Model::CancelKeyDeletionRequest;
+
+CancelKeyDeletionRequest::CancelKeyDeletionRequest()
+    : RpcServiceRequest("kms", "2016-01-20", "CancelKeyDeletion") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+CancelKeyDeletionRequest::~CancelKeyDeletionRequest() {}
+
+std::string CancelKeyDeletionRequest::getKeyId() const {
+  return keyId_;
 }
 }
 
 
-void CancelKeyDeletionRequest::setKeyId(const std::string& keyId)
-{
-	keyId_ = keyId;
-	setParameter("KeyId", keyId);
+void CancelKeyDeletionRequest::setKeyId(const std::string &keyId) {
+  keyId_ = keyId;
+  setParameter(std::string("KeyId"), keyId);
 }
 }
 
 

+ 31 - 39
kms/src/model/CertificatePrivateKeyDecryptRequest.cc

@@ -1,62 +1,54 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#include <alibabacloud/kms/model/CertificatePrivateKeyDecryptRequest.h>
-
-using AlibabaCloud::Kms::Model::CertificatePrivateKeyDecryptRequest;
-
-CertificatePrivateKeyDecryptRequest::CertificatePrivateKeyDecryptRequest() :
-	RpcServiceRequest("kms", "2016-01-20", "CertificatePrivateKeyDecrypt")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-CertificatePrivateKeyDecryptRequest::~CertificatePrivateKeyDecryptRequest()
-{}
-
-std::string CertificatePrivateKeyDecryptRequest::getCertificateId()const
-{
-	return certificateId_;
+ */
+
+#include <alibabacloud/kms/model/CertificatePrivateKeyDecryptRequest.h>
+
+using AlibabaCloud::Kms::Model::CertificatePrivateKeyDecryptRequest;
+
+CertificatePrivateKeyDecryptRequest::CertificatePrivateKeyDecryptRequest()
+    : RpcServiceRequest("kms", "2016-01-20", "CertificatePrivateKeyDecrypt") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+CertificatePrivateKeyDecryptRequest::~CertificatePrivateKeyDecryptRequest() {}
+
+std::string CertificatePrivateKeyDecryptRequest::getCertificateId() const {
+  return certificateId_;
 }
 }
 
 
-void CertificatePrivateKeyDecryptRequest::setCertificateId(const std::string& certificateId)
-{
-	certificateId_ = certificateId;
-	setParameter("CertificateId", certificateId);
+void CertificatePrivateKeyDecryptRequest::setCertificateId(const std::string &certificateId) {
+  certificateId_ = certificateId;
+  setParameter(std::string("CertificateId"), certificateId);
 }
 }
 
 
-std::string CertificatePrivateKeyDecryptRequest::getAlgorithm()const
-{
-	return algorithm_;
+std::string CertificatePrivateKeyDecryptRequest::getAlgorithm() const {
+  return algorithm_;
 }
 }
 
 
-void CertificatePrivateKeyDecryptRequest::setAlgorithm(const std::string& algorithm)
-{
-	algorithm_ = algorithm;
-	setParameter("Algorithm", algorithm);
+void CertificatePrivateKeyDecryptRequest::setAlgorithm(const std::string &algorithm) {
+  algorithm_ = algorithm;
+  setParameter(std::string("Algorithm"), algorithm);
 }
 }
 
 
-std::string CertificatePrivateKeyDecryptRequest::getCiphertextBlob()const
-{
-	return ciphertextBlob_;
+std::string CertificatePrivateKeyDecryptRequest::getCiphertextBlob() const {
+  return ciphertextBlob_;
 }
 }
 
 
-void CertificatePrivateKeyDecryptRequest::setCiphertextBlob(const std::string& ciphertextBlob)
-{
-	ciphertextBlob_ = ciphertextBlob;
-	setParameter("CiphertextBlob", ciphertextBlob);
+void CertificatePrivateKeyDecryptRequest::setCiphertextBlob(const std::string &ciphertextBlob) {
+  ciphertextBlob_ = ciphertextBlob;
+  setParameter(std::string("CiphertextBlob"), ciphertextBlob);
 }
 }
 
 

+ 36 - 46
kms/src/model/CertificatePrivateKeySignRequest.cc

@@ -1,73 +1,63 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#include <alibabacloud/kms/model/CertificatePrivateKeySignRequest.h>
-
-using AlibabaCloud::Kms::Model::CertificatePrivateKeySignRequest;
-
-CertificatePrivateKeySignRequest::CertificatePrivateKeySignRequest() :
-	RpcServiceRequest("kms", "2016-01-20", "CertificatePrivateKeySign")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-CertificatePrivateKeySignRequest::~CertificatePrivateKeySignRequest()
-{}
-
-std::string CertificatePrivateKeySignRequest::getMessageType()const
-{
-	return messageType_;
+ */
+
+#include <alibabacloud/kms/model/CertificatePrivateKeySignRequest.h>
+
+using AlibabaCloud::Kms::Model::CertificatePrivateKeySignRequest;
+
+CertificatePrivateKeySignRequest::CertificatePrivateKeySignRequest()
+    : RpcServiceRequest("kms", "2016-01-20", "CertificatePrivateKeySign") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+CertificatePrivateKeySignRequest::~CertificatePrivateKeySignRequest() {}
+
+std::string CertificatePrivateKeySignRequest::getMessageType() const {
+  return messageType_;
 }
 }
 
 
-void CertificatePrivateKeySignRequest::setMessageType(const std::string& messageType)
-{
-	messageType_ = messageType;
-	setParameter("MessageType", messageType);
+void CertificatePrivateKeySignRequest::setMessageType(const std::string &messageType) {
+  messageType_ = messageType;
+  setParameter(std::string("MessageType"), messageType);
 }
 }
 
 
-std::string CertificatePrivateKeySignRequest::getCertificateId()const
-{
-	return certificateId_;
+std::string CertificatePrivateKeySignRequest::getCertificateId() const {
+  return certificateId_;
 }
 }
 
 
-void CertificatePrivateKeySignRequest::setCertificateId(const std::string& certificateId)
-{
-	certificateId_ = certificateId;
-	setParameter("CertificateId", certificateId);
+void CertificatePrivateKeySignRequest::setCertificateId(const std::string &certificateId) {
+  certificateId_ = certificateId;
+  setParameter(std::string("CertificateId"), certificateId);
 }
 }
 
 
-std::string CertificatePrivateKeySignRequest::getMessage()const
-{
-	return message_;
+std::string CertificatePrivateKeySignRequest::getMessage() const {
+  return message_;
 }
 }
 
 
-void CertificatePrivateKeySignRequest::setMessage(const std::string& message)
-{
-	message_ = message;
-	setParameter("Message", message);
+void CertificatePrivateKeySignRequest::setMessage(const std::string &message) {
+  message_ = message;
+  setParameter(std::string("Message"), message);
 }
 }
 
 
-std::string CertificatePrivateKeySignRequest::getAlgorithm()const
-{
-	return algorithm_;
+std::string CertificatePrivateKeySignRequest::getAlgorithm() const {
+  return algorithm_;
 }
 }
 
 
-void CertificatePrivateKeySignRequest::setAlgorithm(const std::string& algorithm)
-{
-	algorithm_ = algorithm;
-	setParameter("Algorithm", algorithm);
+void CertificatePrivateKeySignRequest::setAlgorithm(const std::string &algorithm) {
+  algorithm_ = algorithm;
+  setParameter(std::string("Algorithm"), algorithm);
 }
 }
 
 

+ 2 - 2
kms/src/model/CertificatePrivateKeySignResult.cc

@@ -39,10 +39,10 @@ void CertificatePrivateKeySignResult::parse(const std::string &payload)
 	Json::Value value;
 	Json::Value value;
 	reader.parse(payload, value);
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	setRequestId(value["RequestId"].asString());
-	if(!value["CertificateId"].isNull())
-		certificateId_ = value["CertificateId"].asString();
 	if(!value["SignatureValue"].isNull())
 	if(!value["SignatureValue"].isNull())
 		signatureValue_ = value["SignatureValue"].asString();
 		signatureValue_ = value["SignatureValue"].asString();
+	if(!value["CertificateId"].isNull())
+		certificateId_ = value["CertificateId"].asString();
 
 
 }
 }
 
 

+ 31 - 39
kms/src/model/CertificatePublicKeyEncryptRequest.cc

@@ -1,62 +1,54 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#include <alibabacloud/kms/model/CertificatePublicKeyEncryptRequest.h>
-
-using AlibabaCloud::Kms::Model::CertificatePublicKeyEncryptRequest;
-
-CertificatePublicKeyEncryptRequest::CertificatePublicKeyEncryptRequest() :
-	RpcServiceRequest("kms", "2016-01-20", "CertificatePublicKeyEncrypt")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-CertificatePublicKeyEncryptRequest::~CertificatePublicKeyEncryptRequest()
-{}
-
-std::string CertificatePublicKeyEncryptRequest::getCertificateId()const
-{
-	return certificateId_;
+ */
+
+#include <alibabacloud/kms/model/CertificatePublicKeyEncryptRequest.h>
+
+using AlibabaCloud::Kms::Model::CertificatePublicKeyEncryptRequest;
+
+CertificatePublicKeyEncryptRequest::CertificatePublicKeyEncryptRequest()
+    : RpcServiceRequest("kms", "2016-01-20", "CertificatePublicKeyEncrypt") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+CertificatePublicKeyEncryptRequest::~CertificatePublicKeyEncryptRequest() {}
+
+std::string CertificatePublicKeyEncryptRequest::getCertificateId() const {
+  return certificateId_;
 }
 }
 
 
-void CertificatePublicKeyEncryptRequest::setCertificateId(const std::string& certificateId)
-{
-	certificateId_ = certificateId;
-	setParameter("CertificateId", certificateId);
+void CertificatePublicKeyEncryptRequest::setCertificateId(const std::string &certificateId) {
+  certificateId_ = certificateId;
+  setParameter(std::string("CertificateId"), certificateId);
 }
 }
 
 
-std::string CertificatePublicKeyEncryptRequest::getPlaintext()const
-{
-	return plaintext_;
+std::string CertificatePublicKeyEncryptRequest::getPlaintext() const {
+  return plaintext_;
 }
 }
 
 
-void CertificatePublicKeyEncryptRequest::setPlaintext(const std::string& plaintext)
-{
-	plaintext_ = plaintext;
-	setParameter("Plaintext", plaintext);
+void CertificatePublicKeyEncryptRequest::setPlaintext(const std::string &plaintext) {
+  plaintext_ = plaintext;
+  setParameter(std::string("Plaintext"), plaintext);
 }
 }
 
 
-std::string CertificatePublicKeyEncryptRequest::getAlgorithm()const
-{
-	return algorithm_;
+std::string CertificatePublicKeyEncryptRequest::getAlgorithm() const {
+  return algorithm_;
 }
 }
 
 
-void CertificatePublicKeyEncryptRequest::setAlgorithm(const std::string& algorithm)
-{
-	algorithm_ = algorithm;
-	setParameter("Algorithm", algorithm);
+void CertificatePublicKeyEncryptRequest::setAlgorithm(const std::string &algorithm) {
+  algorithm_ = algorithm;
+  setParameter(std::string("Algorithm"), algorithm);
 }
 }
 
 

+ 6 - 6
kms/src/model/CertificatePublicKeyEncryptResult.cc

@@ -39,20 +39,20 @@ void CertificatePublicKeyEncryptResult::parse(const std::string &payload)
 	Json::Value value;
 	Json::Value value;
 	reader.parse(payload, value);
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	setRequestId(value["RequestId"].asString());
-	if(!value["CertificateId"].isNull())
-		certificateId_ = value["CertificateId"].asString();
 	if(!value["CiphertextBlob"].isNull())
 	if(!value["CiphertextBlob"].isNull())
 		ciphertextBlob_ = value["CiphertextBlob"].asString();
 		ciphertextBlob_ = value["CiphertextBlob"].asString();
+	if(!value["CertificateId"].isNull())
+		certificateId_ = value["CertificateId"].asString();
 
 
 }
 }
 
 
-std::string CertificatePublicKeyEncryptResult::getCertificateId()const
+std::string CertificatePublicKeyEncryptResult::getCiphertextBlob()const
 {
 {
-	return certificateId_;
+	return ciphertextBlob_;
 }
 }
 
 
-std::string CertificatePublicKeyEncryptResult::getCiphertextBlob()const
+std::string CertificatePublicKeyEncryptResult::getCertificateId()const
 {
 {
-	return ciphertextBlob_;
+	return certificateId_;
 }
 }
 
 

+ 41 - 53
kms/src/model/CertificatePublicKeyVerifyRequest.cc

@@ -1,84 +1,72 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#include <alibabacloud/kms/model/CertificatePublicKeyVerifyRequest.h>
-
-using AlibabaCloud::Kms::Model::CertificatePublicKeyVerifyRequest;
-
-CertificatePublicKeyVerifyRequest::CertificatePublicKeyVerifyRequest() :
-	RpcServiceRequest("kms", "2016-01-20", "CertificatePublicKeyVerify")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-CertificatePublicKeyVerifyRequest::~CertificatePublicKeyVerifyRequest()
-{}
-
-std::string CertificatePublicKeyVerifyRequest::getSignatureValue()const
-{
-	return signatureValue_;
+ */
+
+#include <alibabacloud/kms/model/CertificatePublicKeyVerifyRequest.h>
+
+using AlibabaCloud::Kms::Model::CertificatePublicKeyVerifyRequest;
+
+CertificatePublicKeyVerifyRequest::CertificatePublicKeyVerifyRequest()
+    : RpcServiceRequest("kms", "2016-01-20", "CertificatePublicKeyVerify") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+CertificatePublicKeyVerifyRequest::~CertificatePublicKeyVerifyRequest() {}
+
+std::string CertificatePublicKeyVerifyRequest::getSignatureValue() const {
+  return signatureValue_;
 }
 }
 
 
-void CertificatePublicKeyVerifyRequest::setSignatureValue(const std::string& signatureValue)
-{
-	signatureValue_ = signatureValue;
-	setParameter("SignatureValue", signatureValue);
+void CertificatePublicKeyVerifyRequest::setSignatureValue(const std::string &signatureValue) {
+  signatureValue_ = signatureValue;
+  setParameter(std::string("SignatureValue"), signatureValue);
 }
 }
 
 
-std::string CertificatePublicKeyVerifyRequest::getMessageType()const
-{
-	return messageType_;
+std::string CertificatePublicKeyVerifyRequest::getMessageType() const {
+  return messageType_;
 }
 }
 
 
-void CertificatePublicKeyVerifyRequest::setMessageType(const std::string& messageType)
-{
-	messageType_ = messageType;
-	setParameter("MessageType", messageType);
+void CertificatePublicKeyVerifyRequest::setMessageType(const std::string &messageType) {
+  messageType_ = messageType;
+  setParameter(std::string("MessageType"), messageType);
 }
 }
 
 
-std::string CertificatePublicKeyVerifyRequest::getCertificateId()const
-{
-	return certificateId_;
+std::string CertificatePublicKeyVerifyRequest::getCertificateId() const {
+  return certificateId_;
 }
 }
 
 
-void CertificatePublicKeyVerifyRequest::setCertificateId(const std::string& certificateId)
-{
-	certificateId_ = certificateId;
-	setParameter("CertificateId", certificateId);
+void CertificatePublicKeyVerifyRequest::setCertificateId(const std::string &certificateId) {
+  certificateId_ = certificateId;
+  setParameter(std::string("CertificateId"), certificateId);
 }
 }
 
 
-std::string CertificatePublicKeyVerifyRequest::getMessage()const
-{
-	return message_;
+std::string CertificatePublicKeyVerifyRequest::getMessage() const {
+  return message_;
 }
 }
 
 
-void CertificatePublicKeyVerifyRequest::setMessage(const std::string& message)
-{
-	message_ = message;
-	setParameter("Message", message);
+void CertificatePublicKeyVerifyRequest::setMessage(const std::string &message) {
+  message_ = message;
+  setParameter(std::string("Message"), message);
 }
 }
 
 
-std::string CertificatePublicKeyVerifyRequest::getAlgorithm()const
-{
-	return algorithm_;
+std::string CertificatePublicKeyVerifyRequest::getAlgorithm() const {
+  return algorithm_;
 }
 }
 
 
-void CertificatePublicKeyVerifyRequest::setAlgorithm(const std::string& algorithm)
-{
-	algorithm_ = algorithm;
-	setParameter("Algorithm", algorithm);
+void CertificatePublicKeyVerifyRequest::setAlgorithm(const std::string &algorithm) {
+  algorithm_ = algorithm;
+  setParameter(std::string("Algorithm"), algorithm);
 }
 }
 
 

+ 26 - 32
kms/src/model/CreateAliasRequest.cc

@@ -1,51 +1,45 @@
 /*
 /*
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
  * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
- */
-
-#include <alibabacloud/kms/model/CreateAliasRequest.h>
-
-using AlibabaCloud::Kms::Model::CreateAliasRequest;
-
-CreateAliasRequest::CreateAliasRequest() :
-	RpcServiceRequest("kms", "2016-01-20", "CreateAlias")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-CreateAliasRequest::~CreateAliasRequest()
-{}
-
-std::string CreateAliasRequest::getAliasName()const
-{
-	return aliasName_;
+ */
+
+#include <alibabacloud/kms/model/CreateAliasRequest.h>
+
+using AlibabaCloud::Kms::Model::CreateAliasRequest;
+
+CreateAliasRequest::CreateAliasRequest()
+    : RpcServiceRequest("kms", "2016-01-20", "CreateAlias") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+CreateAliasRequest::~CreateAliasRequest() {}
+
+std::string CreateAliasRequest::getAliasName() const {
+  return aliasName_;
 }
 }
 
 
-void CreateAliasRequest::setAliasName(const std::string& aliasName)
-{
-	aliasName_ = aliasName;
-	setParameter("AliasName", aliasName);
+void CreateAliasRequest::setAliasName(const std::string &aliasName) {
+  aliasName_ = aliasName;
+  setParameter(std::string("AliasName"), aliasName);
 }
 }
 
 
-std::string CreateAliasRequest::getKeyId()const
-{
-	return keyId_;
+std::string CreateAliasRequest::getKeyId() const {
+  return keyId_;
 }
 }
 
 
-void CreateAliasRequest::setKeyId(const std::string& keyId)
-{
-	keyId_ = keyId;
-	setParameter("KeyId", keyId);
+void CreateAliasRequest::setKeyId(const std::string &keyId) {
+  keyId_ = keyId;
+  setParameter(std::string("KeyId"), keyId);
 }
 }
 
 

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików