Supported AAA for BBB.

CHANGELOG

@@ -1,3 +1,28 @@
+2020-07-23 Version: 1.36.533
+- Supported AAA for BBB.
+- Fixed bugs for CCC.
+
+2020-07-23 Version: 1.36.532
+- Add AddSecretBlacklist and DeleteSecretBlacklist.
+- Suppoort ASR.
+
+2020-07-23 Version: 1.36.531
+- Add GenerateAndExportDataKey, ExportDataKey, ReEncrypt api.
+
+2020-07-23 Version: 1.36.530
+- Add GenerateAndExportDataKey, ExportDataKey, ReEncrypt api.
+
+2020-07-22 Version: 1.36.529
+- Generated 2015-01-01 for `R-kvstore`.
+- Add SyncDtsStatus API.
+
+2020-07-22 Version: 1.36.528
+- Add snapshot settings.
+- Add ElasticTask.
+
+2020-07-22 Version: 1.36.527
+- Add SourceId for SearchFace.
+
 2020-07-22 Version: 1.36.526
 - Add source id for file uploader.
 

VERSION

@@ -1 +1 @@
-1.36.526
+1.36.533

dyplsapi/CMakeLists.txt

@@ -23,6 +23,8 @@ set(dyplsapi_public_header
 set(dyplsapi_public_header_model 
 	include/alibabacloud/dyplsapi/model/AddAxnTrackNoRequest.h
 	include/alibabacloud/dyplsapi/model/AddAxnTrackNoResult.h
+	include/alibabacloud/dyplsapi/model/AddSecretBlacklistRequest.h
+	include/alibabacloud/dyplsapi/model/AddSecretBlacklistResult.h
 	include/alibabacloud/dyplsapi/model/BindAxbRequest.h
 	include/alibabacloud/dyplsapi/model/BindAxbResult.h
 	include/alibabacloud/dyplsapi/model/BindAxgRequest.h
@@ -35,6 +37,12 @@ set(dyplsapi_public_header_model
 	include/alibabacloud/dyplsapi/model/BuySecretNoResult.h
 	include/alibabacloud/dyplsapi/model/CreateAxgGroupRequest.h
 	include/alibabacloud/dyplsapi/model/CreateAxgGroupResult.h
+	include/alibabacloud/dyplsapi/model/DeleteSecretBlacklistRequest.h
+	include/alibabacloud/dyplsapi/model/DeleteSecretBlacklistResult.h
+	include/alibabacloud/dyplsapi/model/GetSecretAsrDetailRequest.h
+	include/alibabacloud/dyplsapi/model/GetSecretAsrDetailResult.h
+	include/alibabacloud/dyplsapi/model/LockSecretNoRequest.h
+	include/alibabacloud/dyplsapi/model/LockSecretNoResult.h
 	include/alibabacloud/dyplsapi/model/OperateAxgGroupRequest.h
 	include/alibabacloud/dyplsapi/model/OperateAxgGroupResult.h
 	include/alibabacloud/dyplsapi/model/OperateBlackNoRequest.h
@@ -55,6 +63,8 @@ set(dyplsapi_public_header_model
 	include/alibabacloud/dyplsapi/model/ReleaseSecretNoResult.h
 	include/alibabacloud/dyplsapi/model/UnbindSubscriptionRequest.h
 	include/alibabacloud/dyplsapi/model/UnbindSubscriptionResult.h
+	include/alibabacloud/dyplsapi/model/UnlockSecretNoRequest.h
+	include/alibabacloud/dyplsapi/model/UnlockSecretNoResult.h
 	include/alibabacloud/dyplsapi/model/UpdateSubscriptionRequest.h
 	include/alibabacloud/dyplsapi/model/UpdateSubscriptionResult.h )
 
@@ -62,6 +72,8 @@ set(dyplsapi_src
 	src/DyplsapiClient.cc
 	src/model/AddAxnTrackNoRequest.cc
 	src/model/AddAxnTrackNoResult.cc
+	src/model/AddSecretBlacklistRequest.cc
+	src/model/AddSecretBlacklistResult.cc
 	src/model/BindAxbRequest.cc
 	src/model/BindAxbResult.cc
 	src/model/BindAxgRequest.cc
@@ -74,6 +86,12 @@ set(dyplsapi_src
 	src/model/BuySecretNoResult.cc
 	src/model/CreateAxgGroupRequest.cc
 	src/model/CreateAxgGroupResult.cc
+	src/model/DeleteSecretBlacklistRequest.cc
+	src/model/DeleteSecretBlacklistResult.cc
+	src/model/GetSecretAsrDetailRequest.cc
+	src/model/GetSecretAsrDetailResult.cc
+	src/model/LockSecretNoRequest.cc
+	src/model/LockSecretNoResult.cc
 	src/model/OperateAxgGroupRequest.cc
 	src/model/OperateAxgGroupResult.cc
 	src/model/OperateBlackNoRequest.cc
@@ -94,6 +112,8 @@ set(dyplsapi_src
 	src/model/ReleaseSecretNoResult.cc
 	src/model/UnbindSubscriptionRequest.cc
 	src/model/UnbindSubscriptionResult.cc
+	src/model/UnlockSecretNoRequest.cc
+	src/model/UnlockSecretNoResult.cc
 	src/model/UpdateSubscriptionRequest.cc
 	src/model/UpdateSubscriptionResult.cc )
 

dyplsapi/include/alibabacloud/dyplsapi/DyplsapiClient.h

@@ -24,6 +24,8 @@
 #include "DyplsapiExport.h"
 #include "model/AddAxnTrackNoRequest.h"
 #include "model/AddAxnTrackNoResult.h"
+#include "model/AddSecretBlacklistRequest.h"
+#include "model/AddSecretBlacklistResult.h"
 #include "model/BindAxbRequest.h"
 #include "model/BindAxbResult.h"
 #include "model/BindAxgRequest.h"
@@ -36,6 +38,12 @@
 #include "model/BuySecretNoResult.h"
 #include "model/CreateAxgGroupRequest.h"
 #include "model/CreateAxgGroupResult.h"
+#include "model/DeleteSecretBlacklistRequest.h"
+#include "model/DeleteSecretBlacklistResult.h"
+#include "model/GetSecretAsrDetailRequest.h"
+#include "model/GetSecretAsrDetailResult.h"
+#include "model/LockSecretNoRequest.h"
+#include "model/LockSecretNoResult.h"
 #include "model/OperateAxgGroupRequest.h"
 #include "model/OperateAxgGroupResult.h"
 #include "model/OperateBlackNoRequest.h"
@@ -56,6 +64,8 @@
 #include "model/ReleaseSecretNoResult.h"
 #include "model/UnbindSubscriptionRequest.h"
 #include "model/UnbindSubscriptionResult.h"
+#include "model/UnlockSecretNoRequest.h"
+#include "model/UnlockSecretNoResult.h"
 #include "model/UpdateSubscriptionRequest.h"
 #include "model/UpdateSubscriptionResult.h"
 
@@ -70,6 +80,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::AddAxnTrackNoResult> AddAxnTrackNoOutcome;
 			typedef std::future<AddAxnTrackNoOutcome> AddAxnTrackNoOutcomeCallable;
 			typedef std::function<void(const DyplsapiClient*, const Model::AddAxnTrackNoRequest&, const AddAxnTrackNoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> AddAxnTrackNoAsyncHandler;
+			typedef Outcome<Error, Model::AddSecretBlacklistResult> AddSecretBlacklistOutcome;
+			typedef std::future<AddSecretBlacklistOutcome> AddSecretBlacklistOutcomeCallable;
+			typedef std::function<void(const DyplsapiClient*, const Model::AddSecretBlacklistRequest&, const AddSecretBlacklistOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> AddSecretBlacklistAsyncHandler;
 			typedef Outcome<Error, Model::BindAxbResult> BindAxbOutcome;
 			typedef std::future<BindAxbOutcome> BindAxbOutcomeCallable;
 			typedef std::function<void(const DyplsapiClient*, const Model::BindAxbRequest&, const BindAxbOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> BindAxbAsyncHandler;
@@ -88,6 +101,15 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreateAxgGroupResult> CreateAxgGroupOutcome;
 			typedef std::future<CreateAxgGroupOutcome> CreateAxgGroupOutcomeCallable;
 			typedef std::function<void(const DyplsapiClient*, const Model::CreateAxgGroupRequest&, const CreateAxgGroupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateAxgGroupAsyncHandler;
+			typedef Outcome<Error, Model::DeleteSecretBlacklistResult> DeleteSecretBlacklistOutcome;
+			typedef std::future<DeleteSecretBlacklistOutcome> DeleteSecretBlacklistOutcomeCallable;
+			typedef std::function<void(const DyplsapiClient*, const Model::DeleteSecretBlacklistRequest&, const DeleteSecretBlacklistOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteSecretBlacklistAsyncHandler;
+			typedef Outcome<Error, Model::GetSecretAsrDetailResult> GetSecretAsrDetailOutcome;
+			typedef std::future<GetSecretAsrDetailOutcome> GetSecretAsrDetailOutcomeCallable;
+			typedef std::function<void(const DyplsapiClient*, const Model::GetSecretAsrDetailRequest&, const GetSecretAsrDetailOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetSecretAsrDetailAsyncHandler;
+			typedef Outcome<Error, Model::LockSecretNoResult> LockSecretNoOutcome;
+			typedef std::future<LockSecretNoOutcome> LockSecretNoOutcomeCallable;
+			typedef std::function<void(const DyplsapiClient*, const Model::LockSecretNoRequest&, const LockSecretNoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> LockSecretNoAsyncHandler;
 			typedef Outcome<Error, Model::OperateAxgGroupResult> OperateAxgGroupOutcome;
 			typedef std::future<OperateAxgGroupOutcome> OperateAxgGroupOutcomeCallable;
 			typedef std::function<void(const DyplsapiClient*, const Model::OperateAxgGroupRequest&, const OperateAxgGroupOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> OperateAxgGroupAsyncHandler;
@@ -118,6 +140,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::UnbindSubscriptionResult> UnbindSubscriptionOutcome;
 			typedef std::future<UnbindSubscriptionOutcome> UnbindSubscriptionOutcomeCallable;
 			typedef std::function<void(const DyplsapiClient*, const Model::UnbindSubscriptionRequest&, const UnbindSubscriptionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UnbindSubscriptionAsyncHandler;
+			typedef Outcome<Error, Model::UnlockSecretNoResult> UnlockSecretNoOutcome;
+			typedef std::future<UnlockSecretNoOutcome> UnlockSecretNoOutcomeCallable;
+			typedef std::function<void(const DyplsapiClient*, const Model::UnlockSecretNoRequest&, const UnlockSecretNoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UnlockSecretNoAsyncHandler;
 			typedef Outcome<Error, Model::UpdateSubscriptionResult> UpdateSubscriptionOutcome;
 			typedef std::future<UpdateSubscriptionOutcome> UpdateSubscriptionOutcomeCallable;
 			typedef std::function<void(const DyplsapiClient*, const Model::UpdateSubscriptionRequest&, const UpdateSubscriptionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> UpdateSubscriptionAsyncHandler;
@@ -129,6 +154,9 @@ namespace AlibabaCloud
 			AddAxnTrackNoOutcome addAxnTrackNo(const Model::AddAxnTrackNoRequest &request)const;
 			void addAxnTrackNoAsync(const Model::AddAxnTrackNoRequest& request, const AddAxnTrackNoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			AddAxnTrackNoOutcomeCallable addAxnTrackNoCallable(const Model::AddAxnTrackNoRequest& request) const;
+			AddSecretBlacklistOutcome addSecretBlacklist(const Model::AddSecretBlacklistRequest &request)const;
+			void addSecretBlacklistAsync(const Model::AddSecretBlacklistRequest& request, const AddSecretBlacklistAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			AddSecretBlacklistOutcomeCallable addSecretBlacklistCallable(const Model::AddSecretBlacklistRequest& request) const;
 			BindAxbOutcome bindAxb(const Model::BindAxbRequest &request)const;
 			void bindAxbAsync(const Model::BindAxbRequest& request, const BindAxbAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			BindAxbOutcomeCallable bindAxbCallable(const Model::BindAxbRequest& request) const;
@@ -147,6 +175,15 @@ namespace AlibabaCloud
 			CreateAxgGroupOutcome createAxgGroup(const Model::CreateAxgGroupRequest &request)const;
 			void createAxgGroupAsync(const Model::CreateAxgGroupRequest& request, const CreateAxgGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateAxgGroupOutcomeCallable createAxgGroupCallable(const Model::CreateAxgGroupRequest& request) const;
+			DeleteSecretBlacklistOutcome deleteSecretBlacklist(const Model::DeleteSecretBlacklistRequest &request)const;
+			void deleteSecretBlacklistAsync(const Model::DeleteSecretBlacklistRequest& request, const DeleteSecretBlacklistAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DeleteSecretBlacklistOutcomeCallable deleteSecretBlacklistCallable(const Model::DeleteSecretBlacklistRequest& request) const;
+			GetSecretAsrDetailOutcome getSecretAsrDetail(const Model::GetSecretAsrDetailRequest &request)const;
+			void getSecretAsrDetailAsync(const Model::GetSecretAsrDetailRequest& request, const GetSecretAsrDetailAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			GetSecretAsrDetailOutcomeCallable getSecretAsrDetailCallable(const Model::GetSecretAsrDetailRequest& request) const;
+			LockSecretNoOutcome lockSecretNo(const Model::LockSecretNoRequest &request)const;
+			void lockSecretNoAsync(const Model::LockSecretNoRequest& request, const LockSecretNoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			LockSecretNoOutcomeCallable lockSecretNoCallable(const Model::LockSecretNoRequest& request) const;
 			OperateAxgGroupOutcome operateAxgGroup(const Model::OperateAxgGroupRequest &request)const;
 			void operateAxgGroupAsync(const Model::OperateAxgGroupRequest& request, const OperateAxgGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			OperateAxgGroupOutcomeCallable operateAxgGroupCallable(const Model::OperateAxgGroupRequest& request) const;
@@ -177,6 +214,9 @@ namespace AlibabaCloud
 			UnbindSubscriptionOutcome unbindSubscription(const Model::UnbindSubscriptionRequest &request)const;
 			void unbindSubscriptionAsync(const Model::UnbindSubscriptionRequest& request, const UnbindSubscriptionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			UnbindSubscriptionOutcomeCallable unbindSubscriptionCallable(const Model::UnbindSubscriptionRequest& request) const;
+			UnlockSecretNoOutcome unlockSecretNo(const Model::UnlockSecretNoRequest &request)const;
+			void unlockSecretNoAsync(const Model::UnlockSecretNoRequest& request, const UnlockSecretNoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			UnlockSecretNoOutcomeCallable unlockSecretNoCallable(const Model::UnlockSecretNoRequest& request) const;
 			UpdateSubscriptionOutcome updateSubscription(const Model::UpdateSubscriptionRequest &request)const;
 			void updateSubscriptionAsync(const Model::UpdateSubscriptionRequest& request, const UpdateSubscriptionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			UpdateSubscriptionOutcomeCallable updateSubscriptionCallable(const Model::UpdateSubscriptionRequest& request) const;

dyplsapi/include/alibabacloud/dyplsapi/model/AddSecretBlacklistRequest.h

@@ -0,0 +1,69 @@
+/*
+ * 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_DYPLSAPI_MODEL_ADDSECRETBLACKLISTREQUEST_H_
+#define ALIBABACLOUD_DYPLSAPI_MODEL_ADDSECRETBLACKLISTREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/dyplsapi/DyplsapiExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dyplsapi
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DYPLSAPI_EXPORT AddSecretBlacklistRequest : public RpcServiceRequest
+			{
+
+			public:
+				AddSecretBlacklistRequest();
+				~AddSecretBlacklistRequest();
+
+				std::string getBlackType()const;
+				void setBlackType(const std::string& blackType);
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getRemark()const;
+				void setRemark(const std::string& remark);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getPoolKey()const;
+				void setPoolKey(const std::string& poolKey);
+				std::string getBlackNo()const;
+				void setBlackNo(const std::string& blackNo);
+
+            private:
+				std::string blackType_;
+				long resourceOwnerId_;
+				std::string remark_;
+				std::string accessKeyId_;
+				std::string resourceOwnerAccount_;
+				long ownerId_;
+				std::string poolKey_;
+				std::string blackNo_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DYPLSAPI_MODEL_ADDSECRETBLACKLISTREQUEST_H_

dyplsapi/include/alibabacloud/dyplsapi/model/AddSecretBlacklistResult.h

@@ -0,0 +1,53 @@
+/*
+ * 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_DYPLSAPI_MODEL_ADDSECRETBLACKLISTRESULT_H_
+#define ALIBABACLOUD_DYPLSAPI_MODEL_ADDSECRETBLACKLISTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/dyplsapi/DyplsapiExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dyplsapi
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DYPLSAPI_EXPORT AddSecretBlacklistResult : public ServiceResult
+			{
+			public:
+
+
+				AddSecretBlacklistResult();
+				explicit AddSecretBlacklistResult(const std::string &payload);
+				~AddSecretBlacklistResult();
+				std::string getMessage()const;
+				std::string getCode()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::string code_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DYPLSAPI_MODEL_ADDSECRETBLACKLISTRESULT_H_

dyplsapi/include/alibabacloud/dyplsapi/model/BindAxbRequest.h

@@ -45,6 +45,8 @@ namespace AlibabaCloud
 				void setPhoneNoX(const std::string& phoneNoX);
 				std::string getRingConfig()const;
 				void setRingConfig(const std::string& ringConfig);
+				bool getASRStatus()const;
+				void setASRStatus(bool aSRStatus);
 				std::string getPhoneNoB()const;
 				void setPhoneNoB(const std::string& phoneNoB);
 				std::string getPhoneNoA()const;
@@ -65,6 +67,8 @@ namespace AlibabaCloud
 				void setIsRecordingEnabled(bool isRecordingEnabled);
 				std::string getOutId()const;
 				void setOutId(const std::string& outId);
+				std::string getASRModelId()const;
+				void setASRModelId(const std::string& aSRModelId);
 				std::string getCallRestrict()const;
 				void setCallRestrict(const std::string& callRestrict);
 
@@ -74,6 +78,7 @@ namespace AlibabaCloud
 				std::string accessKeyId_;
 				std::string phoneNoX_;
 				std::string ringConfig_;
+				bool aSRStatus_;
 				std::string phoneNoB_;
 				std::string phoneNoA_;
 				std::string expectCity_;
@@ -84,6 +89,7 @@ namespace AlibabaCloud
 				std::string expiration_;
 				bool isRecordingEnabled_;
 				std::string outId_;
+				std::string aSRModelId_;
 				std::string callRestrict_;
 
 			};

dyplsapi/include/alibabacloud/dyplsapi/model/BindAxgRequest.h

@@ -45,6 +45,8 @@ namespace AlibabaCloud
 				void setPhoneNoX(const std::string& phoneNoX);
 				std::string getRingConfig()const;
 				void setRingConfig(const std::string& ringConfig);
+				bool getASRStatus()const;
+				void setASRStatus(bool aSRStatus);
 				std::string getPhoneNoB()const;
 				void setPhoneNoB(const std::string& phoneNoB);
 				std::string getPhoneNoA()const;
@@ -67,6 +69,8 @@ namespace AlibabaCloud
 				void setIsRecordingEnabled(bool isRecordingEnabled);
 				std::string getOutId()const;
 				void setOutId(const std::string& outId);
+				std::string getASRModelId()const;
+				void setASRModelId(const std::string& aSRModelId);
 
             private:
 				long resourceOwnerId_;
@@ -74,6 +78,7 @@ namespace AlibabaCloud
 				std::string accessKeyId_;
 				std::string phoneNoX_;
 				std::string ringConfig_;
+				bool aSRStatus_;
 				std::string phoneNoB_;
 				std::string phoneNoA_;
 				std::string expectCity_;
@@ -85,6 +90,7 @@ namespace AlibabaCloud
 				std::string expiration_;
 				bool isRecordingEnabled_;
 				std::string outId_;
+				std::string aSRModelId_;
 
 			};
 		}

dyplsapi/include/alibabacloud/dyplsapi/model/BindAxnExtensionRequest.h

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				void setPhoneNoX(const std::string& phoneNoX);
 				std::string getRingConfig()const;
 				void setRingConfig(const std::string& ringConfig);
+				bool getASRStatus()const;
+				void setASRStatus(bool aSRStatus);
 				std::string getPhoneNoB()const;
 				void setPhoneNoB(const std::string& phoneNoB);
 				std::string getPhoneNoA()const;
@@ -67,6 +69,8 @@ namespace AlibabaCloud
 				void setIsRecordingEnabled(bool isRecordingEnabled);
 				std::string getOutId()const;
 				void setOutId(const std::string& outId);
+				std::string getASRModelId()const;
+				void setASRModelId(const std::string& aSRModelId);
 
             private:
 				long resourceOwnerId_;
@@ -75,6 +79,7 @@ namespace AlibabaCloud
 				std::string accessKeyId_;
 				std::string phoneNoX_;
 				std::string ringConfig_;
+				bool aSRStatus_;
 				std::string phoneNoB_;
 				std::string phoneNoA_;
 				std::string expectCity_;
@@ -85,6 +90,7 @@ namespace AlibabaCloud
 				std::string expiration_;
 				bool isRecordingEnabled_;
 				std::string outId_;
+				std::string aSRModelId_;
 
 			};
 		}

dyplsapi/include/alibabacloud/dyplsapi/model/BindAxnRequest.h

@@ -45,6 +45,8 @@ namespace AlibabaCloud
 				void setPhoneNoX(const std::string& phoneNoX);
 				std::string getRingConfig()const;
 				void setRingConfig(const std::string& ringConfig);
+				bool getASRStatus()const;
+				void setASRStatus(bool aSRStatus);
 				std::string getPhoneNoB()const;
 				void setPhoneNoB(const std::string& phoneNoB);
 				std::string getPhoneNoA()const;
@@ -67,6 +69,8 @@ namespace AlibabaCloud
 				void setOutId(const std::string& outId);
 				std::string getNoType()const;
 				void setNoType(const std::string& noType);
+				std::string getASRModelId()const;
+				void setASRModelId(const std::string& aSRModelId);
 
             private:
 				long resourceOwnerId_;
@@ -74,6 +78,7 @@ namespace AlibabaCloud
 				std::string accessKeyId_;
 				std::string phoneNoX_;
 				std::string ringConfig_;
+				bool aSRStatus_;
 				std::string phoneNoB_;
 				std::string phoneNoA_;
 				std::string expectCity_;
@@ -85,6 +90,7 @@ namespace AlibabaCloud
 				bool isRecordingEnabled_;
 				std::string outId_;
 				std::string noType_;
+				std::string aSRModelId_;
 
 			};
 		}

dyplsapi/include/alibabacloud/dyplsapi/model/DeleteSecretBlacklistRequest.h

@@ -0,0 +1,69 @@
+/*
+ * 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_DYPLSAPI_MODEL_DELETESECRETBLACKLISTREQUEST_H_
+#define ALIBABACLOUD_DYPLSAPI_MODEL_DELETESECRETBLACKLISTREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/dyplsapi/DyplsapiExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dyplsapi
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DYPLSAPI_EXPORT DeleteSecretBlacklistRequest : public RpcServiceRequest
+			{
+
+			public:
+				DeleteSecretBlacklistRequest();
+				~DeleteSecretBlacklistRequest();
+
+				std::string getBlackType()const;
+				void setBlackType(const std::string& blackType);
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getRemark()const;
+				void setRemark(const std::string& remark);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getPoolKey()const;
+				void setPoolKey(const std::string& poolKey);
+				std::string getBlackNo()const;
+				void setBlackNo(const std::string& blackNo);
+
+            private:
+				std::string blackType_;
+				long resourceOwnerId_;
+				std::string remark_;
+				std::string accessKeyId_;
+				std::string resourceOwnerAccount_;
+				long ownerId_;
+				std::string poolKey_;
+				std::string blackNo_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DYPLSAPI_MODEL_DELETESECRETBLACKLISTREQUEST_H_

dyplsapi/include/alibabacloud/dyplsapi/model/DeleteSecretBlacklistResult.h

@@ -0,0 +1,53 @@
+/*
+ * 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_DYPLSAPI_MODEL_DELETESECRETBLACKLISTRESULT_H_
+#define ALIBABACLOUD_DYPLSAPI_MODEL_DELETESECRETBLACKLISTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/dyplsapi/DyplsapiExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dyplsapi
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DYPLSAPI_EXPORT DeleteSecretBlacklistResult : public ServiceResult
+			{
+			public:
+
+
+				DeleteSecretBlacklistResult();
+				explicit DeleteSecretBlacklistResult(const std::string &payload);
+				~DeleteSecretBlacklistResult();
+				std::string getMessage()const;
+				std::string getCode()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::string code_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DYPLSAPI_MODEL_DELETESECRETBLACKLISTRESULT_H_

dyplsapi/include/alibabacloud/dyplsapi/model/GetSecretAsrDetailRequest.h

@@ -0,0 +1,66 @@
+/*
+ * 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_DYPLSAPI_MODEL_GETSECRETASRDETAILREQUEST_H_
+#define ALIBABACLOUD_DYPLSAPI_MODEL_GETSECRETASRDETAILREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/dyplsapi/DyplsapiExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dyplsapi
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DYPLSAPI_EXPORT GetSecretAsrDetailRequest : public RpcServiceRequest
+			{
+
+			public:
+				GetSecretAsrDetailRequest();
+				~GetSecretAsrDetailRequest();
+
+				std::string getCallId()const;
+				void setCallId(const std::string& callId);
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getCallTime()const;
+				void setCallTime(const std::string& callTime);
+				std::string getPoolKey()const;
+				void setPoolKey(const std::string& poolKey);
+
+            private:
+				std::string callId_;
+				long resourceOwnerId_;
+				std::string accessKeyId_;
+				std::string resourceOwnerAccount_;
+				long ownerId_;
+				std::string callTime_;
+				std::string poolKey_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DYPLSAPI_MODEL_GETSECRETASRDETAILREQUEST_H_

dyplsapi/include/alibabacloud/dyplsapi/model/GetSecretAsrDetailResult.h

@@ -0,0 +1,55 @@
+/*
+ * 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_DYPLSAPI_MODEL_GETSECRETASRDETAILRESULT_H_
+#define ALIBABACLOUD_DYPLSAPI_MODEL_GETSECRETASRDETAILRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/dyplsapi/DyplsapiExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dyplsapi
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DYPLSAPI_EXPORT GetSecretAsrDetailResult : public ServiceResult
+			{
+			public:
+
+
+				GetSecretAsrDetailResult();
+				explicit GetSecretAsrDetailResult(const std::string &payload);
+				~GetSecretAsrDetailResult();
+				std::string getMessage()const;
+				std::string getData()const;
+				std::string getCode()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::string data_;
+				std::string code_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DYPLSAPI_MODEL_GETSECRETASRDETAILRESULT_H_

dyplsapi/include/alibabacloud/dyplsapi/model/LockSecretNoRequest.h

@@ -0,0 +1,63 @@
+/*
+ * 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_DYPLSAPI_MODEL_LOCKSECRETNOREQUEST_H_
+#define ALIBABACLOUD_DYPLSAPI_MODEL_LOCKSECRETNOREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/dyplsapi/DyplsapiExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dyplsapi
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DYPLSAPI_EXPORT LockSecretNoRequest : public RpcServiceRequest
+			{
+
+			public:
+				LockSecretNoRequest();
+				~LockSecretNoRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getPoolKey()const;
+				void setPoolKey(const std::string& poolKey);
+				std::string getSecretNo()const;
+				void setSecretNo(const std::string& secretNo);
+
+            private:
+				long resourceOwnerId_;
+				std::string resourceOwnerAccount_;
+				long ownerId_;
+				std::string accessKeyId_;
+				std::string poolKey_;
+				std::string secretNo_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DYPLSAPI_MODEL_LOCKSECRETNOREQUEST_H_

dyplsapi/include/alibabacloud/dyplsapi/model/LockSecretNoResult.h

@@ -0,0 +1,53 @@
+/*
+ * 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_DYPLSAPI_MODEL_LOCKSECRETNORESULT_H_
+#define ALIBABACLOUD_DYPLSAPI_MODEL_LOCKSECRETNORESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/dyplsapi/DyplsapiExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dyplsapi
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DYPLSAPI_EXPORT LockSecretNoResult : public ServiceResult
+			{
+			public:
+
+
+				LockSecretNoResult();
+				explicit LockSecretNoResult(const std::string &payload);
+				~LockSecretNoResult();
+				std::string getMessage()const;
+				std::string getCode()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::string code_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DYPLSAPI_MODEL_LOCKSECRETNORESULT_H_

dyplsapi/include/alibabacloud/dyplsapi/model/QuerySubscriptionDetailResult.h

@@ -34,17 +34,19 @@ namespace AlibabaCloud
 			public:
 				struct SecretBindDetailDTO
 				{
-					std::string extension;
 					long status;
-					std::string callRestrict;
-					std::string gmtCreate;
+					bool aSRStatus;
 					std::string phoneNoX;
 					std::string expireDate;
+					std::string subsId;
+					long groupId;
+					std::string extension;
+					std::string callRestrict;
+					std::string gmtCreate;
+					std::string aSRModelId;
 					bool needRecord;
 					std::string phoneNoB;
-					std::string subsId;
 					std::string phoneNoA;
-					long groupId;
 				};
 
 

dyplsapi/include/alibabacloud/dyplsapi/model/UnlockSecretNoRequest.h

@@ -0,0 +1,63 @@
+/*
+ * 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_DYPLSAPI_MODEL_UNLOCKSECRETNOREQUEST_H_
+#define ALIBABACLOUD_DYPLSAPI_MODEL_UNLOCKSECRETNOREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/dyplsapi/DyplsapiExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dyplsapi
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DYPLSAPI_EXPORT UnlockSecretNoRequest : public RpcServiceRequest
+			{
+
+			public:
+				UnlockSecretNoRequest();
+				~UnlockSecretNoRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getPoolKey()const;
+				void setPoolKey(const std::string& poolKey);
+				std::string getSecretNo()const;
+				void setSecretNo(const std::string& secretNo);
+
+            private:
+				long resourceOwnerId_;
+				std::string resourceOwnerAccount_;
+				long ownerId_;
+				std::string accessKeyId_;
+				std::string poolKey_;
+				std::string secretNo_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DYPLSAPI_MODEL_UNLOCKSECRETNOREQUEST_H_

dyplsapi/include/alibabacloud/dyplsapi/model/UnlockSecretNoResult.h

@@ -0,0 +1,53 @@
+/*
+ * 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_DYPLSAPI_MODEL_UNLOCKSECRETNORESULT_H_
+#define ALIBABACLOUD_DYPLSAPI_MODEL_UNLOCKSECRETNORESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/dyplsapi/DyplsapiExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Dyplsapi
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_DYPLSAPI_EXPORT UnlockSecretNoResult : public ServiceResult
+			{
+			public:
+
+
+				UnlockSecretNoResult();
+				explicit UnlockSecretNoResult(const std::string &payload);
+				~UnlockSecretNoResult();
+				std::string getMessage()const;
+				std::string getCode()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::string code_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_DYPLSAPI_MODEL_UNLOCKSECRETNORESULT_H_

dyplsapi/include/alibabacloud/dyplsapi/model/UpdateSubscriptionRequest.h

@@ -49,6 +49,8 @@ namespace AlibabaCloud
 				void setPhoneNoX(const std::string& phoneNoX);
 				std::string getRingConfig()const;
 				void setRingConfig(const std::string& ringConfig);
+				bool getASRStatus()const;
+				void setASRStatus(bool aSRStatus);
 				std::string getPhoneNoB()const;
 				void setPhoneNoB(const std::string& phoneNoB);
 				std::string getPhoneNoA()const;
@@ -69,6 +71,8 @@ namespace AlibabaCloud
 				void setIsRecordingEnabled(bool isRecordingEnabled);
 				std::string getOperateType()const;
 				void setOperateType(const std::string& operateType);
+				std::string getASRModelId()const;
+				void setASRModelId(const std::string& aSRModelId);
 				std::string getCallRestrict()const;
 				void setCallRestrict(const std::string& callRestrict);
 
@@ -80,6 +84,7 @@ namespace AlibabaCloud
 				std::string subsId_;
 				std::string phoneNoX_;
 				std::string ringConfig_;
+				bool aSRStatus_;
 				std::string phoneNoB_;
 				std::string phoneNoA_;
 				std::string resourceOwnerAccount_;
@@ -90,6 +95,7 @@ namespace AlibabaCloud
 				std::string outId_;
 				bool isRecordingEnabled_;
 				std::string operateType_;
+				std::string aSRModelId_;
 				std::string callRestrict_;
 
 			};

dyplsapi/src/DyplsapiClient.cc

@@ -87,6 +87,42 @@ DyplsapiClient::AddAxnTrackNoOutcomeCallable DyplsapiClient::addAxnTrackNoCallab
 	return task->get_future();
 }
 
+DyplsapiClient::AddSecretBlacklistOutcome DyplsapiClient::addSecretBlacklist(const AddSecretBlacklistRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return AddSecretBlacklistOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return AddSecretBlacklistOutcome(AddSecretBlacklistResult(outcome.result()));
+	else
+		return AddSecretBlacklistOutcome(outcome.error());
+}
+
+void DyplsapiClient::addSecretBlacklistAsync(const AddSecretBlacklistRequest& request, const AddSecretBlacklistAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, addSecretBlacklist(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DyplsapiClient::AddSecretBlacklistOutcomeCallable DyplsapiClient::addSecretBlacklistCallable(const AddSecretBlacklistRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<AddSecretBlacklistOutcome()>>(
+			[this, request]()
+			{
+			return this->addSecretBlacklist(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 DyplsapiClient::BindAxbOutcome DyplsapiClient::bindAxb(const BindAxbRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -303,6 +339,114 @@ DyplsapiClient::CreateAxgGroupOutcomeCallable DyplsapiClient::createAxgGroupCall
 	return task->get_future();
 }
 
+DyplsapiClient::DeleteSecretBlacklistOutcome DyplsapiClient::deleteSecretBlacklist(const DeleteSecretBlacklistRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DeleteSecretBlacklistOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DeleteSecretBlacklistOutcome(DeleteSecretBlacklistResult(outcome.result()));
+	else
+		return DeleteSecretBlacklistOutcome(outcome.error());
+}
+
+void DyplsapiClient::deleteSecretBlacklistAsync(const DeleteSecretBlacklistRequest& request, const DeleteSecretBlacklistAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, deleteSecretBlacklist(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DyplsapiClient::DeleteSecretBlacklistOutcomeCallable DyplsapiClient::deleteSecretBlacklistCallable(const DeleteSecretBlacklistRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DeleteSecretBlacklistOutcome()>>(
+			[this, request]()
+			{
+			return this->deleteSecretBlacklist(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+DyplsapiClient::GetSecretAsrDetailOutcome DyplsapiClient::getSecretAsrDetail(const GetSecretAsrDetailRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return GetSecretAsrDetailOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return GetSecretAsrDetailOutcome(GetSecretAsrDetailResult(outcome.result()));
+	else
+		return GetSecretAsrDetailOutcome(outcome.error());
+}
+
+void DyplsapiClient::getSecretAsrDetailAsync(const GetSecretAsrDetailRequest& request, const GetSecretAsrDetailAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, getSecretAsrDetail(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DyplsapiClient::GetSecretAsrDetailOutcomeCallable DyplsapiClient::getSecretAsrDetailCallable(const GetSecretAsrDetailRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<GetSecretAsrDetailOutcome()>>(
+			[this, request]()
+			{
+			return this->getSecretAsrDetail(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+DyplsapiClient::LockSecretNoOutcome DyplsapiClient::lockSecretNo(const LockSecretNoRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return LockSecretNoOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return LockSecretNoOutcome(LockSecretNoResult(outcome.result()));
+	else
+		return LockSecretNoOutcome(outcome.error());
+}
+
+void DyplsapiClient::lockSecretNoAsync(const LockSecretNoRequest& request, const LockSecretNoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, lockSecretNo(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DyplsapiClient::LockSecretNoOutcomeCallable DyplsapiClient::lockSecretNoCallable(const LockSecretNoRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<LockSecretNoOutcome()>>(
+			[this, request]()
+			{
+			return this->lockSecretNo(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 DyplsapiClient::OperateAxgGroupOutcome DyplsapiClient::operateAxgGroup(const OperateAxgGroupRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -663,6 +807,42 @@ DyplsapiClient::UnbindSubscriptionOutcomeCallable DyplsapiClient::unbindSubscrip
 	return task->get_future();
 }
 
+DyplsapiClient::UnlockSecretNoOutcome DyplsapiClient::unlockSecretNo(const UnlockSecretNoRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return UnlockSecretNoOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return UnlockSecretNoOutcome(UnlockSecretNoResult(outcome.result()));
+	else
+		return UnlockSecretNoOutcome(outcome.error());
+}
+
+void DyplsapiClient::unlockSecretNoAsync(const UnlockSecretNoRequest& request, const UnlockSecretNoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, unlockSecretNo(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+DyplsapiClient::UnlockSecretNoOutcomeCallable DyplsapiClient::unlockSecretNoCallable(const UnlockSecretNoRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<UnlockSecretNoOutcome()>>(
+			[this, request]()
+			{
+			return this->unlockSecretNo(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 DyplsapiClient::UpdateSubscriptionOutcome DyplsapiClient::updateSubscription(const UpdateSubscriptionRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

dyplsapi/src/model/AddSecretBlacklistRequest.cc

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/dyplsapi/model/AddSecretBlacklistRequest.h>
+
+using AlibabaCloud::Dyplsapi::Model::AddSecretBlacklistRequest;
+
+AddSecretBlacklistRequest::AddSecretBlacklistRequest() :
+	RpcServiceRequest("dyplsapi", "2017-05-25", "AddSecretBlacklist")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+AddSecretBlacklistRequest::~AddSecretBlacklistRequest()
+{}
+
+std::string AddSecretBlacklistRequest::getBlackType()const
+{
+	return blackType_;
+}
+
+void AddSecretBlacklistRequest::setBlackType(const std::string& blackType)
+{
+	blackType_ = blackType;
+	setParameter("BlackType", blackType);
+}
+
+long AddSecretBlacklistRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void AddSecretBlacklistRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string AddSecretBlacklistRequest::getRemark()const
+{
+	return remark_;
+}
+
+void AddSecretBlacklistRequest::setRemark(const std::string& remark)
+{
+	remark_ = remark;
+	setParameter("Remark", remark);
+}
+
+std::string AddSecretBlacklistRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void AddSecretBlacklistRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string AddSecretBlacklistRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void AddSecretBlacklistRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+long AddSecretBlacklistRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void AddSecretBlacklistRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string AddSecretBlacklistRequest::getPoolKey()const
+{
+	return poolKey_;
+}
+
+void AddSecretBlacklistRequest::setPoolKey(const std::string& poolKey)
+{
+	poolKey_ = poolKey;
+	setParameter("PoolKey", poolKey);
+}
+
+std::string AddSecretBlacklistRequest::getBlackNo()const
+{
+	return blackNo_;
+}
+
+void AddSecretBlacklistRequest::setBlackNo(const std::string& blackNo)
+{
+	blackNo_ = blackNo;
+	setParameter("BlackNo", blackNo);
+}
+

dyplsapi/src/model/AddSecretBlacklistResult.cc

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/dyplsapi/model/AddSecretBlacklistResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Dyplsapi;
+using namespace AlibabaCloud::Dyplsapi::Model;
+
+AddSecretBlacklistResult::AddSecretBlacklistResult() :
+	ServiceResult()
+{}
+
+AddSecretBlacklistResult::AddSecretBlacklistResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+AddSecretBlacklistResult::~AddSecretBlacklistResult()
+{}
+
+void AddSecretBlacklistResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+
+}
+
+std::string AddSecretBlacklistResult::getMessage()const
+{
+	return message_;
+}
+
+std::string AddSecretBlacklistResult::getCode()const
+{
+	return code_;
+}
+

dyplsapi/src/model/BindAxbRequest.cc

@@ -82,6 +82,17 @@ void BindAxbRequest::setRingConfig(const std::string& ringConfig)
 	setParameter("RingConfig", ringConfig);
 }
 
+bool BindAxbRequest::getASRStatus()const
+{
+	return aSRStatus_;
+}
+
+void BindAxbRequest::setASRStatus(bool aSRStatus)
+{
+	aSRStatus_ = aSRStatus;
+	setParameter("ASRStatus", aSRStatus ? "true" : "false");
+}
+
 std::string BindAxbRequest::getPhoneNoB()const
 {
 	return phoneNoB_;
@@ -192,6 +203,17 @@ void BindAxbRequest::setOutId(const std::string& outId)
 	setParameter("OutId", outId);
 }
 
+std::string BindAxbRequest::getASRModelId()const
+{
+	return aSRModelId_;
+}
+
+void BindAxbRequest::setASRModelId(const std::string& aSRModelId)
+{
+	aSRModelId_ = aSRModelId;
+	setParameter("ASRModelId", aSRModelId);
+}
+
 std::string BindAxbRequest::getCallRestrict()const
 {
 	return callRestrict_;

dyplsapi/src/model/BindAxgRequest.cc

@@ -82,6 +82,17 @@ void BindAxgRequest::setRingConfig(const std::string& ringConfig)
 	setParameter("RingConfig", ringConfig);
 }
 
+bool BindAxgRequest::getASRStatus()const
+{
+	return aSRStatus_;
+}
+
+void BindAxgRequest::setASRStatus(bool aSRStatus)
+{
+	aSRStatus_ = aSRStatus;
+	setParameter("ASRStatus", aSRStatus ? "true" : "false");
+}
+
 std::string BindAxgRequest::getPhoneNoB()const
 {
 	return phoneNoB_;
@@ -203,3 +214,14 @@ void BindAxgRequest::setOutId(const std::string& outId)
 	setParameter("OutId", outId);
 }
 
+std::string BindAxgRequest::getASRModelId()const
+{
+	return aSRModelId_;
+}
+
+void BindAxgRequest::setASRModelId(const std::string& aSRModelId)
+{
+	aSRModelId_ = aSRModelId;
+	setParameter("ASRModelId", aSRModelId);
+}
+

dyplsapi/src/model/BindAxnExtensionRequest.cc

@@ -93,6 +93,17 @@ void BindAxnExtensionRequest::setRingConfig(const std::string& ringConfig)
 	setParameter("RingConfig", ringConfig);
 }
 
+bool BindAxnExtensionRequest::getASRStatus()const
+{
+	return aSRStatus_;
+}
+
+void BindAxnExtensionRequest::setASRStatus(bool aSRStatus)
+{
+	aSRStatus_ = aSRStatus;
+	setParameter("ASRStatus", aSRStatus ? "true" : "false");
+}
+
 std::string BindAxnExtensionRequest::getPhoneNoB()const
 {
 	return phoneNoB_;
@@ -203,3 +214,14 @@ void BindAxnExtensionRequest::setOutId(const std::string& outId)
 	setParameter("OutId", outId);
 }
 
+std::string BindAxnExtensionRequest::getASRModelId()const
+{
+	return aSRModelId_;
+}
+
+void BindAxnExtensionRequest::setASRModelId(const std::string& aSRModelId)
+{
+	aSRModelId_ = aSRModelId;
+	setParameter("ASRModelId", aSRModelId);
+}
+

dyplsapi/src/model/BindAxnRequest.cc

@@ -82,6 +82,17 @@ void BindAxnRequest::setRingConfig(const std::string& ringConfig)
 	setParameter("RingConfig", ringConfig);
 }
 
+bool BindAxnRequest::getASRStatus()const
+{
+	return aSRStatus_;
+}
+
+void BindAxnRequest::setASRStatus(bool aSRStatus)
+{
+	aSRStatus_ = aSRStatus;
+	setParameter("ASRStatus", aSRStatus ? "true" : "false");
+}
+
 std::string BindAxnRequest::getPhoneNoB()const
 {
 	return phoneNoB_;
@@ -203,3 +214,14 @@ void BindAxnRequest::setNoType(const std::string& noType)
 	setParameter("NoType", noType);
 }
 
+std::string BindAxnRequest::getASRModelId()const
+{
+	return aSRModelId_;
+}
+
+void BindAxnRequest::setASRModelId(const std::string& aSRModelId)
+{
+	aSRModelId_ = aSRModelId;
+	setParameter("ASRModelId", aSRModelId);
+}
+

dyplsapi/src/model/DeleteSecretBlacklistRequest.cc

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/dyplsapi/model/DeleteSecretBlacklistRequest.h>
+
+using AlibabaCloud::Dyplsapi::Model::DeleteSecretBlacklistRequest;
+
+DeleteSecretBlacklistRequest::DeleteSecretBlacklistRequest() :
+	RpcServiceRequest("dyplsapi", "2017-05-25", "DeleteSecretBlacklist")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DeleteSecretBlacklistRequest::~DeleteSecretBlacklistRequest()
+{}
+
+std::string DeleteSecretBlacklistRequest::getBlackType()const
+{
+	return blackType_;
+}
+
+void DeleteSecretBlacklistRequest::setBlackType(const std::string& blackType)
+{
+	blackType_ = blackType;
+	setParameter("BlackType", blackType);
+}
+
+long DeleteSecretBlacklistRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void DeleteSecretBlacklistRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string DeleteSecretBlacklistRequest::getRemark()const
+{
+	return remark_;
+}
+
+void DeleteSecretBlacklistRequest::setRemark(const std::string& remark)
+{
+	remark_ = remark;
+	setParameter("Remark", remark);
+}
+
+std::string DeleteSecretBlacklistRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void DeleteSecretBlacklistRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string DeleteSecretBlacklistRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void DeleteSecretBlacklistRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+long DeleteSecretBlacklistRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DeleteSecretBlacklistRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string DeleteSecretBlacklistRequest::getPoolKey()const
+{
+	return poolKey_;
+}
+
+void DeleteSecretBlacklistRequest::setPoolKey(const std::string& poolKey)
+{
+	poolKey_ = poolKey;
+	setParameter("PoolKey", poolKey);
+}
+
+std::string DeleteSecretBlacklistRequest::getBlackNo()const
+{
+	return blackNo_;
+}
+
+void DeleteSecretBlacklistRequest::setBlackNo(const std::string& blackNo)
+{
+	blackNo_ = blackNo;
+	setParameter("BlackNo", blackNo);
+}
+

dyplsapi/src/model/DeleteSecretBlacklistResult.cc

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/dyplsapi/model/DeleteSecretBlacklistResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Dyplsapi;
+using namespace AlibabaCloud::Dyplsapi::Model;
+
+DeleteSecretBlacklistResult::DeleteSecretBlacklistResult() :
+	ServiceResult()
+{}
+
+DeleteSecretBlacklistResult::DeleteSecretBlacklistResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DeleteSecretBlacklistResult::~DeleteSecretBlacklistResult()
+{}
+
+void DeleteSecretBlacklistResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+
+}
+
+std::string DeleteSecretBlacklistResult::getMessage()const
+{
+	return message_;
+}
+
+std::string DeleteSecretBlacklistResult::getCode()const
+{
+	return code_;
+}
+

dyplsapi/src/model/GetSecretAsrDetailRequest.cc

@@ -0,0 +1,106 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/dyplsapi/model/GetSecretAsrDetailRequest.h>
+
+using AlibabaCloud::Dyplsapi::Model::GetSecretAsrDetailRequest;
+
+GetSecretAsrDetailRequest::GetSecretAsrDetailRequest() :
+	RpcServiceRequest("dyplsapi", "2017-05-25", "GetSecretAsrDetail")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+GetSecretAsrDetailRequest::~GetSecretAsrDetailRequest()
+{}
+
+std::string GetSecretAsrDetailRequest::getCallId()const
+{
+	return callId_;
+}
+
+void GetSecretAsrDetailRequest::setCallId(const std::string& callId)
+{
+	callId_ = callId;
+	setParameter("CallId", callId);
+}
+
+long GetSecretAsrDetailRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void GetSecretAsrDetailRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string GetSecretAsrDetailRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void GetSecretAsrDetailRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string GetSecretAsrDetailRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void GetSecretAsrDetailRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+long GetSecretAsrDetailRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void GetSecretAsrDetailRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string GetSecretAsrDetailRequest::getCallTime()const
+{
+	return callTime_;
+}
+
+void GetSecretAsrDetailRequest::setCallTime(const std::string& callTime)
+{
+	callTime_ = callTime;
+	setParameter("CallTime", callTime);
+}
+
+std::string GetSecretAsrDetailRequest::getPoolKey()const
+{
+	return poolKey_;
+}
+
+void GetSecretAsrDetailRequest::setPoolKey(const std::string& poolKey)
+{
+	poolKey_ = poolKey;
+	setParameter("PoolKey", poolKey);
+}
+

dyplsapi/src/model/GetSecretAsrDetailResult.cc

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/dyplsapi/model/GetSecretAsrDetailResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Dyplsapi;
+using namespace AlibabaCloud::Dyplsapi::Model;
+
+GetSecretAsrDetailResult::GetSecretAsrDetailResult() :
+	ServiceResult()
+{}
+
+GetSecretAsrDetailResult::GetSecretAsrDetailResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+GetSecretAsrDetailResult::~GetSecretAsrDetailResult()
+{}
+
+void GetSecretAsrDetailResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["Data"].isNull())
+		data_ = value["Data"].asString();
+
+}
+
+std::string GetSecretAsrDetailResult::getMessage()const
+{
+	return message_;
+}
+
+std::string GetSecretAsrDetailResult::getData()const
+{
+	return data_;
+}
+
+std::string GetSecretAsrDetailResult::getCode()const
+{
+	return code_;
+}
+

dyplsapi/src/model/LockSecretNoRequest.cc

@@ -0,0 +1,95 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/dyplsapi/model/LockSecretNoRequest.h>
+
+using AlibabaCloud::Dyplsapi::Model::LockSecretNoRequest;
+
+LockSecretNoRequest::LockSecretNoRequest() :
+	RpcServiceRequest("dyplsapi", "2017-05-25", "LockSecretNo")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+LockSecretNoRequest::~LockSecretNoRequest()
+{}
+
+long LockSecretNoRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void LockSecretNoRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string LockSecretNoRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void LockSecretNoRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+long LockSecretNoRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void LockSecretNoRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string LockSecretNoRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void LockSecretNoRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string LockSecretNoRequest::getPoolKey()const
+{
+	return poolKey_;
+}
+
+void LockSecretNoRequest::setPoolKey(const std::string& poolKey)
+{
+	poolKey_ = poolKey;
+	setParameter("PoolKey", poolKey);
+}
+
+std::string LockSecretNoRequest::getSecretNo()const
+{
+	return secretNo_;
+}
+
+void LockSecretNoRequest::setSecretNo(const std::string& secretNo)
+{
+	secretNo_ = secretNo;
+	setParameter("SecretNo", secretNo);
+}
+

dyplsapi/src/model/LockSecretNoResult.cc

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/dyplsapi/model/LockSecretNoResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Dyplsapi;
+using namespace AlibabaCloud::Dyplsapi::Model;
+
+LockSecretNoResult::LockSecretNoResult() :
+	ServiceResult()
+{}
+
+LockSecretNoResult::LockSecretNoResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+LockSecretNoResult::~LockSecretNoResult()
+{}
+
+void LockSecretNoResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+
+}
+
+std::string LockSecretNoResult::getMessage()const
+{
+	return message_;
+}
+
+std::string LockSecretNoResult::getCode()const
+{
+	return code_;
+}
+

dyplsapi/src/model/QuerySubscriptionDetailResult.cc

@@ -62,6 +62,10 @@ void QuerySubscriptionDetailResult::parse(const std::string &payload)
 		secretBindDetailDTO_.callRestrict = secretBindDetailDTONode["CallRestrict"].asString();
 	if(!secretBindDetailDTONode["Status"].isNull())
 		secretBindDetailDTO_.status = std::stol(secretBindDetailDTONode["Status"].asString());
+	if(!secretBindDetailDTONode["ASRStatus"].isNull())
+		secretBindDetailDTO_.aSRStatus = secretBindDetailDTONode["ASRStatus"].asString() == "true";
+	if(!secretBindDetailDTONode["ASRModelId"].isNull())
+		secretBindDetailDTO_.aSRModelId = secretBindDetailDTONode["ASRModelId"].asString();
 	if(!value["Code"].isNull())
 		code_ = value["Code"].asString();
 	if(!value["Message"].isNull())

dyplsapi/src/model/UnlockSecretNoRequest.cc

@@ -0,0 +1,95 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/dyplsapi/model/UnlockSecretNoRequest.h>
+
+using AlibabaCloud::Dyplsapi::Model::UnlockSecretNoRequest;
+
+UnlockSecretNoRequest::UnlockSecretNoRequest() :
+	RpcServiceRequest("dyplsapi", "2017-05-25", "UnlockSecretNo")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+UnlockSecretNoRequest::~UnlockSecretNoRequest()
+{}
+
+long UnlockSecretNoRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void UnlockSecretNoRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string UnlockSecretNoRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void UnlockSecretNoRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+long UnlockSecretNoRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void UnlockSecretNoRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string UnlockSecretNoRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void UnlockSecretNoRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string UnlockSecretNoRequest::getPoolKey()const
+{
+	return poolKey_;
+}
+
+void UnlockSecretNoRequest::setPoolKey(const std::string& poolKey)
+{
+	poolKey_ = poolKey;
+	setParameter("PoolKey", poolKey);
+}
+
+std::string UnlockSecretNoRequest::getSecretNo()const
+{
+	return secretNo_;
+}
+
+void UnlockSecretNoRequest::setSecretNo(const std::string& secretNo)
+{
+	secretNo_ = secretNo;
+	setParameter("SecretNo", secretNo);
+}
+

dyplsapi/src/model/UnlockSecretNoResult.cc

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/dyplsapi/model/UnlockSecretNoResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Dyplsapi;
+using namespace AlibabaCloud::Dyplsapi::Model;
+
+UnlockSecretNoResult::UnlockSecretNoResult() :
+	ServiceResult()
+{}
+
+UnlockSecretNoResult::UnlockSecretNoResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+UnlockSecretNoResult::~UnlockSecretNoResult()
+{}
+
+void UnlockSecretNoResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+
+}
+
+std::string UnlockSecretNoResult::getMessage()const
+{
+	return message_;
+}
+
+std::string UnlockSecretNoResult::getCode()const
+{
+	return code_;
+}
+

dyplsapi/src/model/UpdateSubscriptionRequest.cc

@@ -104,6 +104,17 @@ void UpdateSubscriptionRequest::setRingConfig(const std::string& ringConfig)
 	setParameter("RingConfig", ringConfig);
 }
 
+bool UpdateSubscriptionRequest::getASRStatus()const
+{
+	return aSRStatus_;
+}
+
+void UpdateSubscriptionRequest::setASRStatus(bool aSRStatus)
+{
+	aSRStatus_ = aSRStatus;
+	setParameter("ASRStatus", aSRStatus ? "true" : "false");
+}
+
 std::string UpdateSubscriptionRequest::getPhoneNoB()const
 {
 	return phoneNoB_;
@@ -214,6 +225,17 @@ void UpdateSubscriptionRequest::setOperateType(const std::string& operateType)
 	setParameter("OperateType", operateType);
 }
 
+std::string UpdateSubscriptionRequest::getASRModelId()const
+{
+	return aSRModelId_;
+}
+
+void UpdateSubscriptionRequest::setASRModelId(const std::string& aSRModelId)
+{
+	aSRModelId_ = aSRModelId;
+	setParameter("ASRModelId", aSRModelId);
+}
+
 std::string UpdateSubscriptionRequest::getCallRestrict()const
 {
 	return callRestrict_;

elasticsearch/CMakeLists.txt

@@ -63,6 +63,10 @@ set(elasticsearch_public_header_model
 	include/alibabacloud/elasticsearch/model/DescribePipelineManagementConfigResult.h
 	include/alibabacloud/elasticsearch/model/DescribeRegionsRequest.h
 	include/alibabacloud/elasticsearch/model/DescribeRegionsResult.h
+	include/alibabacloud/elasticsearch/model/DescribeSnapshotSettingRequest.h
+	include/alibabacloud/elasticsearch/model/DescribeSnapshotSettingResult.h
+	include/alibabacloud/elasticsearch/model/GetElastictaskRequest.h
+	include/alibabacloud/elasticsearch/model/GetElastictaskResult.h
 	include/alibabacloud/elasticsearch/model/GetRegionConfigurationRequest.h
 	include/alibabacloud/elasticsearch/model/GetRegionConfigurationResult.h
 	include/alibabacloud/elasticsearch/model/GetSuggestShrinkableNodesRequest.h
@@ -105,6 +109,8 @@ set(elasticsearch_public_header_model
 	include/alibabacloud/elasticsearch/model/ListSnapshotReposByInstanceIdResult.h
 	include/alibabacloud/elasticsearch/model/ListTagResourcesRequest.h
 	include/alibabacloud/elasticsearch/model/ListTagResourcesResult.h
+	include/alibabacloud/elasticsearch/model/ModifyElastictaskRequest.h
+	include/alibabacloud/elasticsearch/model/ModifyElastictaskResult.h
 	include/alibabacloud/elasticsearch/model/ModifyWhiteIpsRequest.h
 	include/alibabacloud/elasticsearch/model/ModifyWhiteIpsResult.h
 	include/alibabacloud/elasticsearch/model/MoveResourceGroupRequest.h
@@ -240,6 +246,10 @@ set(elasticsearch_src
 	src/model/DescribePipelineManagementConfigResult.cc
 	src/model/DescribeRegionsRequest.cc
 	src/model/DescribeRegionsResult.cc
+	src/model/DescribeSnapshotSettingRequest.cc
+	src/model/DescribeSnapshotSettingResult.cc
+	src/model/GetElastictaskRequest.cc
+	src/model/GetElastictaskResult.cc
 	src/model/GetRegionConfigurationRequest.cc
 	src/model/GetRegionConfigurationResult.cc
 	src/model/GetSuggestShrinkableNodesRequest.cc
@@ -282,6 +292,8 @@ set(elasticsearch_src
 	src/model/ListSnapshotReposByInstanceIdResult.cc
 	src/model/ListTagResourcesRequest.cc
 	src/model/ListTagResourcesResult.cc
+	src/model/ModifyElastictaskRequest.cc
+	src/model/ModifyElastictaskResult.cc
 	src/model/ModifyWhiteIpsRequest.cc
 	src/model/ModifyWhiteIpsResult.cc
 	src/model/MoveResourceGroupRequest.cc

elasticsearch/include/alibabacloud/elasticsearch/ElasticsearchClient.h

@@ -64,6 +64,10 @@
 #include "model/DescribePipelineManagementConfigResult.h"
 #include "model/DescribeRegionsRequest.h"
 #include "model/DescribeRegionsResult.h"
+#include "model/DescribeSnapshotSettingRequest.h"
+#include "model/DescribeSnapshotSettingResult.h"
+#include "model/GetElastictaskRequest.h"
+#include "model/GetElastictaskResult.h"
 #include "model/GetRegionConfigurationRequest.h"
 #include "model/GetRegionConfigurationResult.h"
 #include "model/GetSuggestShrinkableNodesRequest.h"
@@ -106,6 +110,8 @@
 #include "model/ListSnapshotReposByInstanceIdResult.h"
 #include "model/ListTagResourcesRequest.h"
 #include "model/ListTagResourcesResult.h"
+#include "model/ModifyElastictaskRequest.h"
+#include "model/ModifyElastictaskResult.h"
 #include "model/ModifyWhiteIpsRequest.h"
 #include "model/ModifyWhiteIpsResult.h"
 #include "model/MoveResourceGroupRequest.h"
@@ -268,6 +274,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeRegionsResult> DescribeRegionsOutcome;
 			typedef std::future<DescribeRegionsOutcome> DescribeRegionsOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::DescribeRegionsRequest&, const DescribeRegionsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeRegionsAsyncHandler;
+			typedef Outcome<Error, Model::DescribeSnapshotSettingResult> DescribeSnapshotSettingOutcome;
+			typedef std::future<DescribeSnapshotSettingOutcome> DescribeSnapshotSettingOutcomeCallable;
+			typedef std::function<void(const ElasticsearchClient*, const Model::DescribeSnapshotSettingRequest&, const DescribeSnapshotSettingOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeSnapshotSettingAsyncHandler;
+			typedef Outcome<Error, Model::GetElastictaskResult> GetElastictaskOutcome;
+			typedef std::future<GetElastictaskOutcome> GetElastictaskOutcomeCallable;
+			typedef std::function<void(const ElasticsearchClient*, const Model::GetElastictaskRequest&, const GetElastictaskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetElastictaskAsyncHandler;
 			typedef Outcome<Error, Model::GetRegionConfigurationResult> GetRegionConfigurationOutcome;
 			typedef std::future<GetRegionConfigurationOutcome> GetRegionConfigurationOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::GetRegionConfigurationRequest&, const GetRegionConfigurationOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GetRegionConfigurationAsyncHandler;
@@ -331,6 +343,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ListTagResourcesResult> ListTagResourcesOutcome;
 			typedef std::future<ListTagResourcesOutcome> ListTagResourcesOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::ListTagResourcesRequest&, const ListTagResourcesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ListTagResourcesAsyncHandler;
+			typedef Outcome<Error, Model::ModifyElastictaskResult> ModifyElastictaskOutcome;
+			typedef std::future<ModifyElastictaskOutcome> ModifyElastictaskOutcomeCallable;
+			typedef std::function<void(const ElasticsearchClient*, const Model::ModifyElastictaskRequest&, const ModifyElastictaskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyElastictaskAsyncHandler;
 			typedef Outcome<Error, Model::ModifyWhiteIpsResult> ModifyWhiteIpsOutcome;
 			typedef std::future<ModifyWhiteIpsOutcome> ModifyWhiteIpsOutcomeCallable;
 			typedef std::function<void(const ElasticsearchClient*, const Model::ModifyWhiteIpsRequest&, const ModifyWhiteIpsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyWhiteIpsAsyncHandler;
@@ -534,6 +549,12 @@ namespace AlibabaCloud
 			DescribeRegionsOutcome describeRegions(const Model::DescribeRegionsRequest &request)const;
 			void describeRegionsAsync(const Model::DescribeRegionsRequest& request, const DescribeRegionsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeRegionsOutcomeCallable describeRegionsCallable(const Model::DescribeRegionsRequest& request) const;
+			DescribeSnapshotSettingOutcome describeSnapshotSetting(const Model::DescribeSnapshotSettingRequest &request)const;
+			void describeSnapshotSettingAsync(const Model::DescribeSnapshotSettingRequest& request, const DescribeSnapshotSettingAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeSnapshotSettingOutcomeCallable describeSnapshotSettingCallable(const Model::DescribeSnapshotSettingRequest& request) const;
+			GetElastictaskOutcome getElastictask(const Model::GetElastictaskRequest &request)const;
+			void getElastictaskAsync(const Model::GetElastictaskRequest& request, const GetElastictaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			GetElastictaskOutcomeCallable getElastictaskCallable(const Model::GetElastictaskRequest& request) const;
 			GetRegionConfigurationOutcome getRegionConfiguration(const Model::GetRegionConfigurationRequest &request)const;
 			void getRegionConfigurationAsync(const Model::GetRegionConfigurationRequest& request, const GetRegionConfigurationAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			GetRegionConfigurationOutcomeCallable getRegionConfigurationCallable(const Model::GetRegionConfigurationRequest& request) const;
@@ -597,6 +618,9 @@ namespace AlibabaCloud
 			ListTagResourcesOutcome listTagResources(const Model::ListTagResourcesRequest &request)const;
 			void listTagResourcesAsync(const Model::ListTagResourcesRequest& request, const ListTagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ListTagResourcesOutcomeCallable listTagResourcesCallable(const Model::ListTagResourcesRequest& request) const;
+			ModifyElastictaskOutcome modifyElastictask(const Model::ModifyElastictaskRequest &request)const;
+			void modifyElastictaskAsync(const Model::ModifyElastictaskRequest& request, const ModifyElastictaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ModifyElastictaskOutcomeCallable modifyElastictaskCallable(const Model::ModifyElastictaskRequest& request) const;
 			ModifyWhiteIpsOutcome modifyWhiteIps(const Model::ModifyWhiteIpsRequest &request)const;
 			void modifyWhiteIpsAsync(const Model::ModifyWhiteIpsRequest& request, const ModifyWhiteIpsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyWhiteIpsOutcomeCallable modifyWhiteIpsCallable(const Model::ModifyWhiteIpsRequest& request) const;

elasticsearch/include/alibabacloud/elasticsearch/model/DeleteSnapshotRepoRequest.h

@@ -37,11 +37,14 @@ namespace AlibabaCloud
 
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
+				std::string getClientToken()const;
+				void setClientToken(const std::string& clientToken);
 				std::string getRepoPath()const;
 				void setRepoPath(const std::string& repoPath);
 
             private:
 				std::string instanceId_;
+				std::string clientToken_;
 				std::string repoPath_;
 
 			};

elasticsearch/include/alibabacloud/elasticsearch/model/DescribeInstanceResult.h

@@ -79,6 +79,14 @@ namespace AlibabaCloud
 					{
 						std::string gcName;
 					};
+					struct ElasticDataNodeConfiguration
+					{
+						std::string diskType;
+						bool diskEncryption;
+						int amount;
+						std::string spec;
+						int disk;
+					};
 					struct DictListItem
 					{
 						std::string type;
@@ -113,6 +121,7 @@ namespace AlibabaCloud
 					MasterConfiguration masterConfiguration;
 					std::string description;
 					std::string resourceGroupId;
+					ElasticDataNodeConfiguration elasticDataNodeConfiguration;
 					bool dedicateMaster;
 					std::vector<std::string> esIPBlacklist;
 					std::vector<ZoneInfo> zoneInfos;

elasticsearch/include/alibabacloud/elasticsearch/model/DescribeSnapshotSettingRequest.h

@@ -0,0 +1,48 @@
+/*
+ * 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_ELASTICSEARCH_MODEL_DESCRIBESNAPSHOTSETTINGREQUEST_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_DESCRIBESNAPSHOTSETTINGREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RoaServiceRequest.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Elasticsearch
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT DescribeSnapshotSettingRequest : public RoaServiceRequest
+			{
+
+			public:
+				DescribeSnapshotSettingRequest();
+				~DescribeSnapshotSettingRequest();
+
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
+
+            private:
+				std::string instanceId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_DESCRIBESNAPSHOTSETTINGREQUEST_H_

elasticsearch/include/alibabacloud/elasticsearch/model/DescribeSnapshotSettingResult.h

@@ -0,0 +1,56 @@
+/*
+ * 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_ELASTICSEARCH_MODEL_DESCRIBESNAPSHOTSETTINGRESULT_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_DESCRIBESNAPSHOTSETTINGRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Elasticsearch
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT DescribeSnapshotSettingResult : public ServiceResult
+			{
+			public:
+				struct Result
+				{
+					bool enable;
+					std::string quartzRegex;
+				};
+
+
+				DescribeSnapshotSettingResult();
+				explicit DescribeSnapshotSettingResult(const std::string &payload);
+				~DescribeSnapshotSettingResult();
+				Result getResult()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				Result result_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_DESCRIBESNAPSHOTSETTINGRESULT_H_

elasticsearch/include/alibabacloud/elasticsearch/model/GetElastictaskRequest.h

@@ -0,0 +1,48 @@
+/*
+ * 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_ELASTICSEARCH_MODEL_GETELASTICTASKREQUEST_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_GETELASTICTASKREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RoaServiceRequest.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Elasticsearch
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT GetElastictaskRequest : public RoaServiceRequest
+			{
+
+			public:
+				GetElastictaskRequest();
+				~GetElastictaskRequest();
+
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
+
+            private:
+				std::string instanceId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_GETELASTICTASKREQUEST_H_

elasticsearch/include/alibabacloud/elasticsearch/model/GetElastictaskResult.h

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_GETELASTICTASKRESULT_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_GETELASTICTASKRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Elasticsearch
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT GetElastictaskResult : public ServiceResult
+			{
+			public:
+				struct Result
+				{
+					struct ElasticExpansionTask
+					{
+						std::string triggerType;
+						int replicaCount;
+						std::string cronExpression;
+						int elasticNodeCount;
+						std::vector<std::string> targetIndices;
+					};
+					struct ElasticShrinkTask
+					{
+						std::string triggerType;
+						int replicaCount;
+						std::string cronExpression;
+						int elasticNodeCount;
+						std::vector<std::string> targetIndices1;
+					};
+					ElasticShrinkTask elasticShrinkTask;
+					ElasticExpansionTask elasticExpansionTask;
+				};
+
+
+				GetElastictaskResult();
+				explicit GetElastictaskResult(const std::string &payload);
+				~GetElastictaskResult();
+				Result getResult()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				Result result_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_GETELASTICTASKRESULT_H_

elasticsearch/include/alibabacloud/elasticsearch/model/GetRegionConfigurationResult.h

@@ -62,6 +62,7 @@ namespace AlibabaCloud
 							std::string diskType;
 							int minSize;
 							int scaleLimit;
+							bool diskEncryption;
 							std::vector<std::string> valueLimitSet2;
 							int maxSize;
 						};
@@ -79,6 +80,26 @@ namespace AlibabaCloud
 						AmountRange4 amountRange4;
 						std::vector<std::string> spec3;
 					};
+					struct ElasticNodeProperties
+					{
+						struct AmountRange6
+						{
+							int minAmount;
+							int maxAmount;
+						};
+						struct Disk8
+						{
+							std::string diskType;
+							int minSize;
+							int scaleLimit;
+							std::vector<std::string> valueLimitSet9;
+							bool diskEncryption;
+							int maxSize;
+						};
+						AmountRange6 amountRange6;
+						std::vector<Disk8> diskList7;
+						std::vector<std::string> spec5;
+					};
 					struct DataDiskListItem
 					{
 						std::string diskType;
@@ -127,6 +148,7 @@ namespace AlibabaCloud
 					std::vector<CategoryEntity> supportVersions;
 					WarmNodeProperties warmNodeProperties;
 					std::vector<Disk> clientNodeDiskList;
+					ElasticNodeProperties elasticNodeProperties;
 					std::vector<EsVersionsLatestListItem> esVersionsLatestList;
 					std::string env;
 					std::vector<std::string> clientNodeSpec;
@@ -137,6 +159,7 @@ namespace AlibabaCloud
 					std::string regionId;
 					std::vector<std::string> esVersions;
 					std::vector<std::string> masterSpec;
+					std::vector<std::string> instanceSupportNodes;
 				};
 
 

elasticsearch/include/alibabacloud/elasticsearch/model/GetSuggestShrinkableNodesRequest.h

@@ -35,6 +35,8 @@ namespace AlibabaCloud
 				GetSuggestShrinkableNodesRequest();
 				~GetSuggestShrinkableNodesRequest();
 
+				bool getIgnoreStatus()const;
+				void setIgnoreStatus(bool ignoreStatus);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
 				std::string getNodeType()const;
@@ -43,6 +45,7 @@ namespace AlibabaCloud
 				void setCount(int count);
 
             private:
+				bool ignoreStatus_;
 				std::string instanceId_;
 				std::string nodeType_;
 				int count_;

elasticsearch/include/alibabacloud/elasticsearch/model/ListInstanceResult.h

@@ -65,6 +65,21 @@ namespace AlibabaCloud
 						std::string spec;
 						int disk;
 					};
+					struct ElasticDataNodeConfiguration
+					{
+						std::string diskType;
+						bool diskEncryption;
+						int amount;
+						std::string spec;
+						int disk;
+					};
+					struct ClientNodeConfiguration
+					{
+						std::string diskType;
+						int amount;
+						std::string spec;
+						int disk;
+					};
 					struct Tag
 					{
 						std::string tagKey;
@@ -74,6 +89,7 @@ namespace AlibabaCloud
 					std::string status;
 					std::string description;
 					std::string resourceGroupId;
+					ElasticDataNodeConfiguration elasticDataNodeConfiguration;
 					std::string instanceId;
 					bool dedicateMaster;
 					std::string createdAt;
@@ -86,6 +102,7 @@ namespace AlibabaCloud
 					bool advancedDedicateMaster;
 					NodeSpec nodeSpec;
 					std::string paymentType;
+					ClientNodeConfiguration clientNodeConfiguration;
 				};
 
 

elasticsearch/include/alibabacloud/elasticsearch/model/ModifyElastictaskRequest.h

@@ -0,0 +1,48 @@
+/*
+ * 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_ELASTICSEARCH_MODEL_MODIFYELASTICTASKREQUEST_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_MODIFYELASTICTASKREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RoaServiceRequest.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Elasticsearch
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT ModifyElastictaskRequest : public RoaServiceRequest
+			{
+
+			public:
+				ModifyElastictaskRequest();
+				~ModifyElastictaskRequest();
+
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
+
+            private:
+				std::string instanceId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_MODIFYELASTICTASKREQUEST_H_

elasticsearch/include/alibabacloud/elasticsearch/model/ModifyElastictaskResult.h

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_ELASTICSEARCH_MODEL_MODIFYELASTICTASKRESULT_H_
+#define ALIBABACLOUD_ELASTICSEARCH_MODEL_MODIFYELASTICTASKRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/elasticsearch/ElasticsearchExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Elasticsearch
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_ELASTICSEARCH_EXPORT ModifyElastictaskResult : public ServiceResult
+			{
+			public:
+				struct Result
+				{
+					struct ElasticExpansionTask
+					{
+						std::string triggerType;
+						int replicaCount;
+						std::string cronExpression;
+						int elasticNodeCount;
+						std::vector<std::string> targetIndices;
+					};
+					struct ElasticShrinkTask
+					{
+						std::string triggerType;
+						int replicaCount;
+						std::string cronExpression;
+						int elasticNodeCount;
+						std::vector<std::string> targetIndices1;
+					};
+					ElasticShrinkTask elasticShrinkTask;
+					ElasticExpansionTask elasticExpansionTask;
+				};
+
+
+				ModifyElastictaskResult();
+				explicit ModifyElastictaskResult(const std::string &payload);
+				~ModifyElastictaskResult();
+				Result getResult()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				Result result_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_ELASTICSEARCH_MODEL_MODIFYELASTICTASKRESULT_H_

elasticsearch/include/alibabacloud/elasticsearch/model/ShrinkNodeRequest.h

@@ -35,6 +35,8 @@ namespace AlibabaCloud
 				ShrinkNodeRequest();
 				~ShrinkNodeRequest();
 
+				bool getIgnoreStatus()const;
+				void setIgnoreStatus(bool ignoreStatus);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
 				std::string getNodeType()const;
@@ -43,6 +45,7 @@ namespace AlibabaCloud
 				void setClientToken(const std::string& clientToken);
 
             private:
+				bool ignoreStatus_;
 				std::string instanceId_;
 				std::string nodeType_;
 				std::string clientToken_;

elasticsearch/include/alibabacloud/elasticsearch/model/UpdateInstanceRequest.h

@@ -35,12 +35,15 @@ namespace AlibabaCloud
 				UpdateInstanceRequest();
 				~UpdateInstanceRequest();
 
+				bool getIgnoreStatus()const;
+				void setIgnoreStatus(bool ignoreStatus);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
 				std::string getClientToken()const;
 				void setClientToken(const std::string& clientToken);
 
             private:
+				bool ignoreStatus_;
 				std::string instanceId_;
 				std::string clientToken_;
 

elasticsearch/include/alibabacloud/elasticsearch/model/ValidateShrinkNodesRequest.h

@@ -35,12 +35,15 @@ namespace AlibabaCloud
 				ValidateShrinkNodesRequest();
 				~ValidateShrinkNodesRequest();
 
+				bool getIgnoreStatus()const;
+				void setIgnoreStatus(bool ignoreStatus);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
 				std::string getNodeType()const;
 				void setNodeType(const std::string& nodeType);
 
             private:
+				bool ignoreStatus_;
 				std::string instanceId_;
 				std::string nodeType_;
 

elasticsearch/src/ElasticsearchClient.cc

@@ -807,6 +807,78 @@ ElasticsearchClient::DescribeRegionsOutcomeCallable ElasticsearchClient::describ
 	return task->get_future();
 }
 
+ElasticsearchClient::DescribeSnapshotSettingOutcome ElasticsearchClient::describeSnapshotSetting(const DescribeSnapshotSettingRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeSnapshotSettingOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeSnapshotSettingOutcome(DescribeSnapshotSettingResult(outcome.result()));
+	else
+		return DescribeSnapshotSettingOutcome(outcome.error());
+}
+
+void ElasticsearchClient::describeSnapshotSettingAsync(const DescribeSnapshotSettingRequest& request, const DescribeSnapshotSettingAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeSnapshotSetting(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ElasticsearchClient::DescribeSnapshotSettingOutcomeCallable ElasticsearchClient::describeSnapshotSettingCallable(const DescribeSnapshotSettingRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeSnapshotSettingOutcome()>>(
+			[this, request]()
+			{
+			return this->describeSnapshotSetting(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+ElasticsearchClient::GetElastictaskOutcome ElasticsearchClient::getElastictask(const GetElastictaskRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return GetElastictaskOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return GetElastictaskOutcome(GetElastictaskResult(outcome.result()));
+	else
+		return GetElastictaskOutcome(outcome.error());
+}
+
+void ElasticsearchClient::getElastictaskAsync(const GetElastictaskRequest& request, const GetElastictaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, getElastictask(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ElasticsearchClient::GetElastictaskOutcomeCallable ElasticsearchClient::getElastictaskCallable(const GetElastictaskRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<GetElastictaskOutcome()>>(
+			[this, request]()
+			{
+			return this->getElastictask(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ElasticsearchClient::GetRegionConfigurationOutcome ElasticsearchClient::getRegionConfiguration(const GetRegionConfigurationRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1563,6 +1635,42 @@ ElasticsearchClient::ListTagResourcesOutcomeCallable ElasticsearchClient::listTa
 	return task->get_future();
 }
 
+ElasticsearchClient::ModifyElastictaskOutcome ElasticsearchClient::modifyElastictask(const ModifyElastictaskRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ModifyElastictaskOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ModifyElastictaskOutcome(ModifyElastictaskResult(outcome.result()));
+	else
+		return ModifyElastictaskOutcome(outcome.error());
+}
+
+void ElasticsearchClient::modifyElastictaskAsync(const ModifyElastictaskRequest& request, const ModifyElastictaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, modifyElastictask(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+ElasticsearchClient::ModifyElastictaskOutcomeCallable ElasticsearchClient::modifyElastictaskCallable(const ModifyElastictaskRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ModifyElastictaskOutcome()>>(
+			[this, request]()
+			{
+			return this->modifyElastictask(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 ElasticsearchClient::ModifyWhiteIpsOutcome ElasticsearchClient::modifyWhiteIps(const ModifyWhiteIpsRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

elasticsearch/src/model/DeleteSnapshotRepoRequest.cc

@@ -39,6 +39,17 @@ void DeleteSnapshotRepoRequest::setInstanceId(const std::string& instanceId)
 	setParameter("InstanceId", instanceId);
 }
 
+std::string DeleteSnapshotRepoRequest::getClientToken()const
+{
+	return clientToken_;
+}
+
+void DeleteSnapshotRepoRequest::setClientToken(const std::string& clientToken)
+{
+	clientToken_ = clientToken;
+	setParameter("ClientToken", clientToken);
+}
+
 std::string DeleteSnapshotRepoRequest::getRepoPath()const
 {
 	return repoPath_;

elasticsearch/src/model/DescribeInstanceResult.cc

@@ -211,6 +211,17 @@ void DescribeInstanceResult::parse(const std::string &payload)
 	auto advancedSettingNode = resultNode["advancedSetting"];
 	if(!advancedSettingNode["gcName"].isNull())
 		result_.advancedSetting.gcName = advancedSettingNode["gcName"].asString();
+	auto elasticDataNodeConfigurationNode = resultNode["elasticDataNodeConfiguration"];
+	if(!elasticDataNodeConfigurationNode["spec"].isNull())
+		result_.elasticDataNodeConfiguration.spec = elasticDataNodeConfigurationNode["spec"].asString();
+	if(!elasticDataNodeConfigurationNode["amount"].isNull())
+		result_.elasticDataNodeConfiguration.amount = std::stoi(elasticDataNodeConfigurationNode["amount"].asString());
+	if(!elasticDataNodeConfigurationNode["diskType"].isNull())
+		result_.elasticDataNodeConfiguration.diskType = elasticDataNodeConfigurationNode["diskType"].asString();
+	if(!elasticDataNodeConfigurationNode["disk"].isNull())
+		result_.elasticDataNodeConfiguration.disk = std::stoi(elasticDataNodeConfigurationNode["disk"].asString());
+	if(!elasticDataNodeConfigurationNode["diskEncryption"].isNull())
+		result_.elasticDataNodeConfiguration.diskEncryption = elasticDataNodeConfigurationNode["diskEncryption"].asString() == "true";
 		auto allEsIPWhitelist = resultNode["esIPWhitelist"]["EsIPWhitelist"];
 		for (auto value : allEsIPWhitelist)
 			result_.esIPWhitelist.push_back(value.asString());

elasticsearch/src/model/DescribeSnapshotSettingRequest.cc

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/elasticsearch/model/DescribeSnapshotSettingRequest.h>
+
+using AlibabaCloud::Elasticsearch::Model::DescribeSnapshotSettingRequest;
+
+DescribeSnapshotSettingRequest::DescribeSnapshotSettingRequest() :
+	RoaServiceRequest("elasticsearch", "2017-06-13")
+{
+	setResourcePath("/openapi/instances/[InstanceId]/snapshot-setting");
+	setMethod(HttpRequest::Method::Get);
+}
+
+DescribeSnapshotSettingRequest::~DescribeSnapshotSettingRequest()
+{}
+
+std::string DescribeSnapshotSettingRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void DescribeSnapshotSettingRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setParameter("InstanceId", instanceId);
+}
+

elasticsearch/src/model/DescribeSnapshotSettingResult.cc

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/elasticsearch/model/DescribeSnapshotSettingResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Elasticsearch;
+using namespace AlibabaCloud::Elasticsearch::Model;
+
+DescribeSnapshotSettingResult::DescribeSnapshotSettingResult() :
+	ServiceResult()
+{}
+
+DescribeSnapshotSettingResult::DescribeSnapshotSettingResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeSnapshotSettingResult::~DescribeSnapshotSettingResult()
+{}
+
+void DescribeSnapshotSettingResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto resultNode = value["Result"];
+	if(!resultNode["QuartzRegex"].isNull())
+		result_.quartzRegex = resultNode["QuartzRegex"].asString();
+	if(!resultNode["Enable"].isNull())
+		result_.enable = resultNode["Enable"].asString() == "true";
+
+}
+
+DescribeSnapshotSettingResult::Result DescribeSnapshotSettingResult::getResult()const
+{
+	return result_;
+}
+

elasticsearch/src/model/GetElastictaskRequest.cc

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/elasticsearch/model/GetElastictaskRequest.h>
+
+using AlibabaCloud::Elasticsearch::Model::GetElastictaskRequest;
+
+GetElastictaskRequest::GetElastictaskRequest() :
+	RoaServiceRequest("elasticsearch", "2017-06-13")
+{
+	setResourcePath("/openapi/instances/[InstanceId]/elastic-task");
+	setMethod(HttpRequest::Method::Get);
+}
+
+GetElastictaskRequest::~GetElastictaskRequest()
+{}
+
+std::string GetElastictaskRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void GetElastictaskRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setParameter("InstanceId", instanceId);
+}
+

elasticsearch/src/model/GetElastictaskResult.cc

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/elasticsearch/model/GetElastictaskResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Elasticsearch;
+using namespace AlibabaCloud::Elasticsearch::Model;
+
+GetElastictaskResult::GetElastictaskResult() :
+	ServiceResult()
+{}
+
+GetElastictaskResult::GetElastictaskResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+GetElastictaskResult::~GetElastictaskResult()
+{}
+
+void GetElastictaskResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto resultNode = value["Result"];
+	auto elasticExpansionTaskNode = resultNode["ElasticExpansionTask"];
+	if(!elasticExpansionTaskNode["TriggerType"].isNull())
+		result_.elasticExpansionTask.triggerType = elasticExpansionTaskNode["TriggerType"].asString();
+	if(!elasticExpansionTaskNode["CronExpression"].isNull())
+		result_.elasticExpansionTask.cronExpression = elasticExpansionTaskNode["CronExpression"].asString();
+	if(!elasticExpansionTaskNode["ElasticNodeCount"].isNull())
+		result_.elasticExpansionTask.elasticNodeCount = std::stoi(elasticExpansionTaskNode["ElasticNodeCount"].asString());
+	if(!elasticExpansionTaskNode["ReplicaCount"].isNull())
+		result_.elasticExpansionTask.replicaCount = std::stoi(elasticExpansionTaskNode["ReplicaCount"].asString());
+		auto allTargetIndices = elasticExpansionTaskNode["TargetIndices"]["TargetIndices"];
+		for (auto value : allTargetIndices)
+			result_.elasticExpansionTask.targetIndices.push_back(value.asString());
+	auto elasticShrinkTaskNode = resultNode["ElasticShrinkTask"];
+	if(!elasticShrinkTaskNode["TriggerType"].isNull())
+		result_.elasticShrinkTask.triggerType = elasticShrinkTaskNode["TriggerType"].asString();
+	if(!elasticShrinkTaskNode["CronExpression"].isNull())
+		result_.elasticShrinkTask.cronExpression = elasticShrinkTaskNode["CronExpression"].asString();
+	if(!elasticShrinkTaskNode["ElasticNodeCount"].isNull())
+		result_.elasticShrinkTask.elasticNodeCount = std::stoi(elasticShrinkTaskNode["ElasticNodeCount"].asString());
+	if(!elasticShrinkTaskNode["ReplicaCount"].isNull())
+		result_.elasticShrinkTask.replicaCount = std::stoi(elasticShrinkTaskNode["ReplicaCount"].asString());
+		auto allTargetIndices1 = elasticShrinkTaskNode["TargetIndices"]["TargetIndices"];
+		for (auto value : allTargetIndices1)
+			result_.elasticShrinkTask.targetIndices1.push_back(value.asString());
+
+}
+
+GetElastictaskResult::Result GetElastictaskResult::getResult()const
+{
+	return result_;
+}
+

elasticsearch/src/model/GetRegionConfigurationResult.cc

@@ -165,34 +165,64 @@ void GetRegionConfigurationResult::parse(const std::string &payload)
 		Result::WarmNodeProperties::Disk1 disk1Object;
 		if(!warmNodePropertiesNodediskListdisk["diskType"].isNull())
 			disk1Object.diskType = warmNodePropertiesNodediskListdisk["diskType"].asString();
-		if(!warmNodePropertiesNodediskListdisk["minSize"].isNull())
-			disk1Object.minSize = std::stoi(warmNodePropertiesNodediskListdisk["minSize"].asString());
 		if(!warmNodePropertiesNodediskListdisk["maxSize"].isNull())
 			disk1Object.maxSize = std::stoi(warmNodePropertiesNodediskListdisk["maxSize"].asString());
+		if(!warmNodePropertiesNodediskListdisk["minSize"].isNull())
+			disk1Object.minSize = std::stoi(warmNodePropertiesNodediskListdisk["minSize"].asString());
 		if(!warmNodePropertiesNodediskListdisk["scaleLimit"].isNull())
 			disk1Object.scaleLimit = std::stoi(warmNodePropertiesNodediskListdisk["scaleLimit"].asString());
+		if(!warmNodePropertiesNodediskListdisk["diskEncryption"].isNull())
+			disk1Object.diskEncryption = warmNodePropertiesNodediskListdisk["diskEncryption"].asString() == "true";
 		auto allValueLimitSet2 = value["valueLimitSet"]["valueLimitSet"];
 		for (auto value : allValueLimitSet2)
 			disk1Object.valueLimitSet2.push_back(value.asString());
 		result_.warmNodeProperties.diskList.push_back(disk1Object);
 	}
 	auto amountRangeNode = warmNodePropertiesNode["amountRange"];
-	if(!amountRangeNode["minAmount"].isNull())
-		result_.warmNodeProperties.amountRange.minAmount = std::stoi(amountRangeNode["minAmount"].asString());
 	if(!amountRangeNode["maxAmount"].isNull())
 		result_.warmNodeProperties.amountRange.maxAmount = std::stoi(amountRangeNode["maxAmount"].asString());
+	if(!amountRangeNode["minAmount"].isNull())
+		result_.warmNodeProperties.amountRange.minAmount = std::stoi(amountRangeNode["minAmount"].asString());
 		auto allSpec = warmNodePropertiesNode["spec"]["spec"];
 		for (auto value : allSpec)
 			result_.warmNodeProperties.spec.push_back(value.asString());
 	auto kibanaNodePropertiesNode = resultNode["kibanaNodeProperties"];
 	auto amountRange4Node = kibanaNodePropertiesNode["amountRange"];
-	if(!amountRange4Node["minAmount"].isNull())
-		result_.kibanaNodeProperties.amountRange4.minAmount = std::stoi(amountRange4Node["minAmount"].asString());
 	if(!amountRange4Node["maxAmount"].isNull())
 		result_.kibanaNodeProperties.amountRange4.maxAmount = std::stoi(amountRange4Node["maxAmount"].asString());
+	if(!amountRange4Node["minAmount"].isNull())
+		result_.kibanaNodeProperties.amountRange4.minAmount = std::stoi(amountRange4Node["minAmount"].asString());
 		auto allSpec3 = kibanaNodePropertiesNode["spec"]["spec"];
 		for (auto value : allSpec3)
 			result_.kibanaNodeProperties.spec3.push_back(value.asString());
+	auto elasticNodePropertiesNode = resultNode["elasticNodeProperties"];
+	auto alldiskList7Node = elasticNodePropertiesNode["diskList"]["disk"];
+	for (auto elasticNodePropertiesNodediskListdisk : alldiskList7Node)
+	{
+		Result::ElasticNodeProperties::Disk8 disk8Object;
+		if(!elasticNodePropertiesNodediskListdisk["diskType"].isNull())
+			disk8Object.diskType = elasticNodePropertiesNodediskListdisk["diskType"].asString();
+		if(!elasticNodePropertiesNodediskListdisk["maxSize"].isNull())
+			disk8Object.maxSize = std::stoi(elasticNodePropertiesNodediskListdisk["maxSize"].asString());
+		if(!elasticNodePropertiesNodediskListdisk["minSize"].isNull())
+			disk8Object.minSize = std::stoi(elasticNodePropertiesNodediskListdisk["minSize"].asString());
+		if(!elasticNodePropertiesNodediskListdisk["scaleLimit"].isNull())
+			disk8Object.scaleLimit = std::stoi(elasticNodePropertiesNodediskListdisk["scaleLimit"].asString());
+		if(!elasticNodePropertiesNodediskListdisk["diskEncryption"].isNull())
+			disk8Object.diskEncryption = elasticNodePropertiesNodediskListdisk["diskEncryption"].asString() == "true";
+		auto allValueLimitSet9 = value["valueLimitSet"]["valueLimitSet"];
+		for (auto value : allValueLimitSet9)
+			disk8Object.valueLimitSet9.push_back(value.asString());
+		result_.elasticNodeProperties.diskList7.push_back(disk8Object);
+	}
+	auto amountRange6Node = elasticNodePropertiesNode["amountRange"];
+	if(!amountRange6Node["maxAmount"].isNull())
+		result_.elasticNodeProperties.amountRange6.maxAmount = std::stoi(amountRange6Node["maxAmount"].asString());
+	if(!amountRange6Node["minAmount"].isNull())
+		result_.elasticNodeProperties.amountRange6.minAmount = std::stoi(amountRange6Node["minAmount"].asString());
+		auto allSpec5 = elasticNodePropertiesNode["spec"]["spec"];
+		for (auto value : allSpec5)
+			result_.elasticNodeProperties.spec5.push_back(value.asString());
 		auto allZones = resultNode["zones"]["zones"];
 		for (auto value : allZones)
 			result_.zones.push_back(value.asString());
@@ -205,6 +235,9 @@ void GetRegionConfigurationResult::parse(const std::string &payload)
 		auto allClientNodeSpec = resultNode["clientNodeSpec"]["spec"];
 		for (auto value : allClientNodeSpec)
 			result_.clientNodeSpec.push_back(value.asString());
+		auto allInstanceSupportNodes = resultNode["instanceSupportNodes"]["instanceSupportNodes"];
+		for (auto value : allInstanceSupportNodes)
+			result_.instanceSupportNodes.push_back(value.asString());
 
 }
 

elasticsearch/src/model/GetSuggestShrinkableNodesRequest.cc

@@ -28,6 +28,17 @@ GetSuggestShrinkableNodesRequest::GetSuggestShrinkableNodesRequest() :
 GetSuggestShrinkableNodesRequest::~GetSuggestShrinkableNodesRequest()
 {}
 
+bool GetSuggestShrinkableNodesRequest::getIgnoreStatus()const
+{
+	return ignoreStatus_;
+}
+
+void GetSuggestShrinkableNodesRequest::setIgnoreStatus(bool ignoreStatus)
+{
+	ignoreStatus_ = ignoreStatus;
+	setParameter("IgnoreStatus", ignoreStatus ? "true" : "false");
+}
+
 std::string GetSuggestShrinkableNodesRequest::getInstanceId()const
 {
 	return instanceId_;

elasticsearch/src/model/ListInstanceResult.cc

@@ -109,6 +109,26 @@ void ListInstanceResult::parse(const std::string &payload)
 			resultObject.kibanaConfiguration.amount = std::stoi(kibanaConfigurationNode["amount"].asString());
 		if(!kibanaConfigurationNode["diskType"].isNull())
 			resultObject.kibanaConfiguration.diskType = kibanaConfigurationNode["diskType"].asString();
+		auto elasticDataNodeConfigurationNode = value["elasticDataNodeConfiguration"];
+		if(!elasticDataNodeConfigurationNode["spec"].isNull())
+			resultObject.elasticDataNodeConfiguration.spec = elasticDataNodeConfigurationNode["spec"].asString();
+		if(!elasticDataNodeConfigurationNode["amount"].isNull())
+			resultObject.elasticDataNodeConfiguration.amount = std::stoi(elasticDataNodeConfigurationNode["amount"].asString());
+		if(!elasticDataNodeConfigurationNode["diskType"].isNull())
+			resultObject.elasticDataNodeConfiguration.diskType = elasticDataNodeConfigurationNode["diskType"].asString();
+		if(!elasticDataNodeConfigurationNode["disk"].isNull())
+			resultObject.elasticDataNodeConfiguration.disk = std::stoi(elasticDataNodeConfigurationNode["disk"].asString());
+		if(!elasticDataNodeConfigurationNode["diskEncryption"].isNull())
+			resultObject.elasticDataNodeConfiguration.diskEncryption = elasticDataNodeConfigurationNode["diskEncryption"].asString() == "true";
+		auto clientNodeConfigurationNode = value["clientNodeConfiguration"];
+		if(!clientNodeConfigurationNode["spec"].isNull())
+			resultObject.clientNodeConfiguration.spec = clientNodeConfigurationNode["spec"].asString();
+		if(!clientNodeConfigurationNode["amount"].isNull())
+			resultObject.clientNodeConfiguration.amount = std::stoi(clientNodeConfigurationNode["amount"].asString());
+		if(!clientNodeConfigurationNode["diskType"].isNull())
+			resultObject.clientNodeConfiguration.diskType = clientNodeConfigurationNode["diskType"].asString();
+		if(!clientNodeConfigurationNode["disk"].isNull())
+			resultObject.clientNodeConfiguration.disk = std::stoi(clientNodeConfigurationNode["disk"].asString());
 		result_.push_back(resultObject);
 	}
 	auto headersNode = value["Headers"];

elasticsearch/src/model/ModifyElastictaskRequest.cc

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/elasticsearch/model/ModifyElastictaskRequest.h>
+
+using AlibabaCloud::Elasticsearch::Model::ModifyElastictaskRequest;
+
+ModifyElastictaskRequest::ModifyElastictaskRequest() :
+	RoaServiceRequest("elasticsearch", "2017-06-13")
+{
+	setResourcePath("/openapi/instances/[InstanceId]/elastic-task");
+	setMethod(HttpRequest::Method::Post);
+}
+
+ModifyElastictaskRequest::~ModifyElastictaskRequest()
+{}
+
+std::string ModifyElastictaskRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void ModifyElastictaskRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setParameter("InstanceId", instanceId);
+}
+

elasticsearch/src/model/ModifyElastictaskResult.cc

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/elasticsearch/model/ModifyElastictaskResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Elasticsearch;
+using namespace AlibabaCloud::Elasticsearch::Model;
+
+ModifyElastictaskResult::ModifyElastictaskResult() :
+	ServiceResult()
+{}
+
+ModifyElastictaskResult::ModifyElastictaskResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+ModifyElastictaskResult::~ModifyElastictaskResult()
+{}
+
+void ModifyElastictaskResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto resultNode = value["Result"];
+	auto elasticExpansionTaskNode = resultNode["ElasticExpansionTask"];
+	if(!elasticExpansionTaskNode["TriggerType"].isNull())
+		result_.elasticExpansionTask.triggerType = elasticExpansionTaskNode["TriggerType"].asString();
+	if(!elasticExpansionTaskNode["CronExpression"].isNull())
+		result_.elasticExpansionTask.cronExpression = elasticExpansionTaskNode["CronExpression"].asString();
+	if(!elasticExpansionTaskNode["ElasticNodeCount"].isNull())
+		result_.elasticExpansionTask.elasticNodeCount = std::stoi(elasticExpansionTaskNode["ElasticNodeCount"].asString());
+	if(!elasticExpansionTaskNode["ReplicaCount"].isNull())
+		result_.elasticExpansionTask.replicaCount = std::stoi(elasticExpansionTaskNode["ReplicaCount"].asString());
+		auto allTargetIndices = elasticExpansionTaskNode["TargetIndices"]["TargetIndices"];
+		for (auto value : allTargetIndices)
+			result_.elasticExpansionTask.targetIndices.push_back(value.asString());
+	auto elasticShrinkTaskNode = resultNode["ElasticShrinkTask"];
+	if(!elasticShrinkTaskNode["TriggerType"].isNull())
+		result_.elasticShrinkTask.triggerType = elasticShrinkTaskNode["TriggerType"].asString();
+	if(!elasticShrinkTaskNode["CronExpression"].isNull())
+		result_.elasticShrinkTask.cronExpression = elasticShrinkTaskNode["CronExpression"].asString();
+	if(!elasticShrinkTaskNode["ElasticNodeCount"].isNull())
+		result_.elasticShrinkTask.elasticNodeCount = std::stoi(elasticShrinkTaskNode["ElasticNodeCount"].asString());
+	if(!elasticShrinkTaskNode["ReplicaCount"].isNull())
+		result_.elasticShrinkTask.replicaCount = std::stoi(elasticShrinkTaskNode["ReplicaCount"].asString());
+		auto allTargetIndices1 = elasticShrinkTaskNode["TargetIndices"]["TargetIndices"];
+		for (auto value : allTargetIndices1)
+			result_.elasticShrinkTask.targetIndices1.push_back(value.asString());
+
+}
+
+ModifyElastictaskResult::Result ModifyElastictaskResult::getResult()const
+{
+	return result_;
+}
+

elasticsearch/src/model/ShrinkNodeRequest.cc

@@ -28,6 +28,17 @@ ShrinkNodeRequest::ShrinkNodeRequest() :
 ShrinkNodeRequest::~ShrinkNodeRequest()
 {}
 
+bool ShrinkNodeRequest::getIgnoreStatus()const
+{
+	return ignoreStatus_;
+}
+
+void ShrinkNodeRequest::setIgnoreStatus(bool ignoreStatus)
+{
+	ignoreStatus_ = ignoreStatus;
+	setParameter("IgnoreStatus", ignoreStatus ? "true" : "false");
+}
+
 std::string ShrinkNodeRequest::getInstanceId()const
 {
 	return instanceId_;

elasticsearch/src/model/UpdateInstanceRequest.cc

@@ -28,6 +28,17 @@ UpdateInstanceRequest::UpdateInstanceRequest() :
 UpdateInstanceRequest::~UpdateInstanceRequest()
 {}
 
+bool UpdateInstanceRequest::getIgnoreStatus()const
+{
+	return ignoreStatus_;
+}
+
+void UpdateInstanceRequest::setIgnoreStatus(bool ignoreStatus)
+{
+	ignoreStatus_ = ignoreStatus;
+	setParameter("IgnoreStatus", ignoreStatus ? "true" : "false");
+}
+
 std::string UpdateInstanceRequest::getInstanceId()const
 {
 	return instanceId_;

elasticsearch/src/model/UpdateLogstashRequest.cc

@@ -22,7 +22,7 @@ UpdateLogstashRequest::UpdateLogstashRequest() :
 	RoaServiceRequest("elasticsearch", "2017-06-13")
 {
 	setResourcePath("/openapi/logstashes/[InstanceId]");
-	setMethod(HttpRequest::Method::Get);
+	setMethod(HttpRequest::Method::Put);
 }
 
 UpdateLogstashRequest::~UpdateLogstashRequest()

elasticsearch/src/model/ValidateShrinkNodesRequest.cc

@@ -28,6 +28,17 @@ ValidateShrinkNodesRequest::ValidateShrinkNodesRequest() :
 ValidateShrinkNodesRequest::~ValidateShrinkNodesRequest()
 {}
 
+bool ValidateShrinkNodesRequest::getIgnoreStatus()const
+{
+	return ignoreStatus_;
+}
+
+void ValidateShrinkNodesRequest::setIgnoreStatus(bool ignoreStatus)
+{
+	ignoreStatus_ = ignoreStatus;
+	setParameter("IgnoreStatus", ignoreStatus ? "true" : "false");
+}
+
 std::string ValidateShrinkNodesRequest::getInstanceId()const
 {
 	return instanceId_;

kms/CMakeLists.txt

@@ -63,6 +63,10 @@ set(kms_public_header_model
 	include/alibabacloud/kms/model/EnableKeyResult.h
 	include/alibabacloud/kms/model/EncryptRequest.h
 	include/alibabacloud/kms/model/EncryptResult.h
+	include/alibabacloud/kms/model/ExportDataKeyRequest.h
+	include/alibabacloud/kms/model/ExportDataKeyResult.h
+	include/alibabacloud/kms/model/GenerateAndExportDataKeyRequest.h
+	include/alibabacloud/kms/model/GenerateAndExportDataKeyResult.h
 	include/alibabacloud/kms/model/GenerateDataKeyRequest.h
 	include/alibabacloud/kms/model/GenerateDataKeyResult.h
 	include/alibabacloud/kms/model/GenerateDataKeyWithoutPlaintextRequest.h
@@ -93,6 +97,8 @@ set(kms_public_header_model
 	include/alibabacloud/kms/model/ListSecretsResult.h
 	include/alibabacloud/kms/model/PutSecretValueRequest.h
 	include/alibabacloud/kms/model/PutSecretValueResult.h
+	include/alibabacloud/kms/model/ReEncryptRequest.h
+	include/alibabacloud/kms/model/ReEncryptResult.h
 	include/alibabacloud/kms/model/RestoreSecretRequest.h
 	include/alibabacloud/kms/model/RestoreSecretResult.h
 	include/alibabacloud/kms/model/ScheduleKeyDeletionRequest.h
@@ -156,6 +162,10 @@ set(kms_src
 	src/model/EnableKeyResult.cc
 	src/model/EncryptRequest.cc
 	src/model/EncryptResult.cc
+	src/model/ExportDataKeyRequest.cc
+	src/model/ExportDataKeyResult.cc
+	src/model/GenerateAndExportDataKeyRequest.cc
+	src/model/GenerateAndExportDataKeyResult.cc
 	src/model/GenerateDataKeyRequest.cc
 	src/model/GenerateDataKeyResult.cc
 	src/model/GenerateDataKeyWithoutPlaintextRequest.cc
@@ -186,6 +196,8 @@ set(kms_src
 	src/model/ListSecretsResult.cc
 	src/model/PutSecretValueRequest.cc
 	src/model/PutSecretValueResult.cc
+	src/model/ReEncryptRequest.cc
+	src/model/ReEncryptResult.cc
 	src/model/RestoreSecretRequest.cc
 	src/model/RestoreSecretResult.cc
 	src/model/ScheduleKeyDeletionRequest.cc

kms/include/alibabacloud/kms/KmsClient.h

@@ -64,6 +64,10 @@
 #include "model/EnableKeyResult.h"
 #include "model/EncryptRequest.h"
 #include "model/EncryptResult.h"
+#include "model/ExportDataKeyRequest.h"
+#include "model/ExportDataKeyResult.h"
+#include "model/GenerateAndExportDataKeyRequest.h"
+#include "model/GenerateAndExportDataKeyResult.h"
 #include "model/GenerateDataKeyRequest.h"
 #include "model/GenerateDataKeyResult.h"
 #include "model/GenerateDataKeyWithoutPlaintextRequest.h"
@@ -94,6 +98,8 @@
 #include "model/ListSecretsResult.h"
 #include "model/PutSecretValueRequest.h"
 #include "model/PutSecretValueResult.h"
+#include "model/ReEncryptRequest.h"
+#include "model/ReEncryptResult.h"
 #include "model/RestoreSecretRequest.h"
 #include "model/RestoreSecretResult.h"
 #include "model/ScheduleKeyDeletionRequest.h"
@@ -184,6 +190,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::EncryptResult> EncryptOutcome;
 			typedef std::future<EncryptOutcome> EncryptOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::EncryptRequest&, const EncryptOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> EncryptAsyncHandler;
+			typedef Outcome<Error, Model::ExportDataKeyResult> ExportDataKeyOutcome;
+			typedef std::future<ExportDataKeyOutcome> ExportDataKeyOutcomeCallable;
+			typedef std::function<void(const KmsClient*, const Model::ExportDataKeyRequest&, const ExportDataKeyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ExportDataKeyAsyncHandler;
+			typedef Outcome<Error, Model::GenerateAndExportDataKeyResult> GenerateAndExportDataKeyOutcome;
+			typedef std::future<GenerateAndExportDataKeyOutcome> GenerateAndExportDataKeyOutcomeCallable;
+			typedef std::function<void(const KmsClient*, const Model::GenerateAndExportDataKeyRequest&, const GenerateAndExportDataKeyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GenerateAndExportDataKeyAsyncHandler;
 			typedef Outcome<Error, Model::GenerateDataKeyResult> GenerateDataKeyOutcome;
 			typedef std::future<GenerateDataKeyOutcome> GenerateDataKeyOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::GenerateDataKeyRequest&, const GenerateDataKeyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> GenerateDataKeyAsyncHandler;
@@ -229,6 +241,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::PutSecretValueResult> PutSecretValueOutcome;
 			typedef std::future<PutSecretValueOutcome> PutSecretValueOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::PutSecretValueRequest&, const PutSecretValueOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> PutSecretValueAsyncHandler;
+			typedef Outcome<Error, Model::ReEncryptResult> ReEncryptOutcome;
+			typedef std::future<ReEncryptOutcome> ReEncryptOutcomeCallable;
+			typedef std::function<void(const KmsClient*, const Model::ReEncryptRequest&, const ReEncryptOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ReEncryptAsyncHandler;
 			typedef Outcome<Error, Model::RestoreSecretResult> RestoreSecretOutcome;
 			typedef std::future<RestoreSecretOutcome> RestoreSecretOutcomeCallable;
 			typedef std::function<void(const KmsClient*, const Model::RestoreSecretRequest&, const RestoreSecretOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> RestoreSecretAsyncHandler;
@@ -324,6 +339,12 @@ namespace AlibabaCloud
 			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;
 			EncryptOutcomeCallable encryptCallable(const Model::EncryptRequest& 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;
+			ExportDataKeyOutcomeCallable exportDataKeyCallable(const Model::ExportDataKeyRequest& request) const;
+			GenerateAndExportDataKeyOutcome generateAndExportDataKey(const Model::GenerateAndExportDataKeyRequest &request)const;
+			void generateAndExportDataKeyAsync(const Model::GenerateAndExportDataKeyRequest& request, const GenerateAndExportDataKeyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			GenerateAndExportDataKeyOutcomeCallable generateAndExportDataKeyCallable(const Model::GenerateAndExportDataKeyRequest& request) const;
 			GenerateDataKeyOutcome generateDataKey(const Model::GenerateDataKeyRequest &request)const;
 			void generateDataKeyAsync(const Model::GenerateDataKeyRequest& request, const GenerateDataKeyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			GenerateDataKeyOutcomeCallable generateDataKeyCallable(const Model::GenerateDataKeyRequest& request) const;
@@ -369,6 +390,9 @@ namespace AlibabaCloud
 			PutSecretValueOutcome putSecretValue(const Model::PutSecretValueRequest &request)const;
 			void putSecretValueAsync(const Model::PutSecretValueRequest& request, const PutSecretValueAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			PutSecretValueOutcomeCallable putSecretValueCallable(const Model::PutSecretValueRequest& request) const;
+			ReEncryptOutcome reEncrypt(const Model::ReEncryptRequest &request)const;
+			void reEncryptAsync(const Model::ReEncryptRequest& request, const ReEncryptAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ReEncryptOutcomeCallable reEncryptCallable(const Model::ReEncryptRequest& request) const;
 			RestoreSecretOutcome restoreSecret(const Model::RestoreSecretRequest &request)const;
 			void restoreSecretAsync(const Model::RestoreSecretRequest& request, const RestoreSecretAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			RestoreSecretOutcomeCallable restoreSecretCallable(const Model::RestoreSecretRequest& request) const;

kms/include/alibabacloud/kms/model/ExportDataKeyRequest.h

@@ -0,0 +1,60 @@
+/*
+ * 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_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_

kms/include/alibabacloud/kms/model/ExportDataKeyResult.h

@@ -0,0 +1,55 @@
+/*
+ * 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_EXPORTDATAKEYRESULT_H_
+#define ALIBABACLOUD_KMS_MODEL_EXPORTDATAKEYRESULT_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 ExportDataKeyResult : public ServiceResult
+			{
+			public:
+
+
+				ExportDataKeyResult();
+				explicit ExportDataKeyResult(const std::string &payload);
+				~ExportDataKeyResult();
+				std::string getExportedDataKey()const;
+				std::string getKeyId()const;
+				std::string getKeyVersionId()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string exportedDataKey_;
+				std::string keyId_;
+				std::string keyVersionId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_KMS_MODEL_EXPORTDATAKEYRESULT_H_

kms/include/alibabacloud/kms/model/GenerateAndExportDataKeyRequest.h

@@ -0,0 +1,66 @@
+/*
+ * 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_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_

kms/include/alibabacloud/kms/model/GenerateAndExportDataKeyResult.h

@@ -0,0 +1,57 @@
+/*
+ * 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_GENERATEANDEXPORTDATAKEYRESULT_H_
+#define ALIBABACLOUD_KMS_MODEL_GENERATEANDEXPORTDATAKEYRESULT_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 GenerateAndExportDataKeyResult : public ServiceResult
+			{
+			public:
+
+
+				GenerateAndExportDataKeyResult();
+				explicit GenerateAndExportDataKeyResult(const std::string &payload);
+				~GenerateAndExportDataKeyResult();
+				std::string getCiphertextBlob()const;
+				std::string getExportedDataKey()const;
+				std::string getKeyId()const;
+				std::string getKeyVersionId()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string ciphertextBlob_;
+				std::string exportedDataKey_;
+				std::string keyId_;
+				std::string keyVersionId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_KMS_MODEL_GENERATEANDEXPORTDATAKEYRESULT_H_

kms/include/alibabacloud/kms/model/ReEncryptRequest.h

@@ -0,0 +1,66 @@
+/*
+ * 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_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_

kms/include/alibabacloud/kms/model/ReEncryptResult.h

@@ -0,0 +1,55 @@
+/*
+ * 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_REENCRYPTRESULT_H_
+#define ALIBABACLOUD_KMS_MODEL_REENCRYPTRESULT_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 ReEncryptResult : public ServiceResult
+			{
+			public:
+
+
+				ReEncryptResult();
+				explicit ReEncryptResult(const std::string &payload);
+				~ReEncryptResult();
+				std::string getCiphertextBlob()const;
+				std::string getKeyId()const;
+				std::string getKeyVersionId()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string ciphertextBlob_;
+				std::string keyId_;
+				std::string keyVersionId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_KMS_MODEL_REENCRYPTRESULT_H_

kms/src/KmsClient.cc

@@ -31,21 +31,21 @@ KmsClient::KmsClient(const Credentials &credentials, const ClientConfiguration &
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "kms");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "kms-service");
 }
 
 KmsClient::KmsClient(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "kms");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "kms-service");
 }
 
 KmsClient::KmsClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "kms");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "kms-service");
 }
 
 KmsClient::~KmsClient()
@@ -807,6 +807,78 @@ KmsClient::EncryptOutcomeCallable KmsClient::encryptCallable(const EncryptReques
 	return task->get_future();
 }
 
+KmsClient::ExportDataKeyOutcome KmsClient::exportDataKey(const ExportDataKeyRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ExportDataKeyOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ExportDataKeyOutcome(ExportDataKeyResult(outcome.result()));
+	else
+		return ExportDataKeyOutcome(outcome.error());
+}
+
+void KmsClient::exportDataKeyAsync(const ExportDataKeyRequest& request, const ExportDataKeyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, exportDataKey(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+KmsClient::ExportDataKeyOutcomeCallable KmsClient::exportDataKeyCallable(const ExportDataKeyRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ExportDataKeyOutcome()>>(
+			[this, request]()
+			{
+			return this->exportDataKey(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+KmsClient::GenerateAndExportDataKeyOutcome KmsClient::generateAndExportDataKey(const GenerateAndExportDataKeyRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return GenerateAndExportDataKeyOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return GenerateAndExportDataKeyOutcome(GenerateAndExportDataKeyResult(outcome.result()));
+	else
+		return GenerateAndExportDataKeyOutcome(outcome.error());
+}
+
+void KmsClient::generateAndExportDataKeyAsync(const GenerateAndExportDataKeyRequest& request, const GenerateAndExportDataKeyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, generateAndExportDataKey(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+KmsClient::GenerateAndExportDataKeyOutcomeCallable KmsClient::generateAndExportDataKeyCallable(const GenerateAndExportDataKeyRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<GenerateAndExportDataKeyOutcome()>>(
+			[this, request]()
+			{
+			return this->generateAndExportDataKey(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 KmsClient::GenerateDataKeyOutcome KmsClient::generateDataKey(const GenerateDataKeyRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1347,6 +1419,42 @@ KmsClient::PutSecretValueOutcomeCallable KmsClient::putSecretValueCallable(const
 	return task->get_future();
 }
 
+KmsClient::ReEncryptOutcome KmsClient::reEncrypt(const ReEncryptRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ReEncryptOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ReEncryptOutcome(ReEncryptResult(outcome.result()));
+	else
+		return ReEncryptOutcome(outcome.error());
+}
+
+void KmsClient::reEncryptAsync(const ReEncryptRequest& request, const ReEncryptAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, reEncrypt(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+KmsClient::ReEncryptOutcomeCallable KmsClient::reEncryptCallable(const ReEncryptRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ReEncryptOutcome()>>(
+			[this, request]()
+			{
+			return this->reEncrypt(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 KmsClient::RestoreSecretOutcome KmsClient::restoreSecret(const RestoreSecretRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

kms/src/model/ExportDataKeyRequest.cc

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/kms/model/ExportDataKeyRequest.h>
+
+using AlibabaCloud::Kms::Model::ExportDataKeyRequest;
+
+ExportDataKeyRequest::ExportDataKeyRequest() :
+	RpcServiceRequest("kms", "2016-01-20", "ExportDataKey")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+ExportDataKeyRequest::~ExportDataKeyRequest()
+{}
+
+std::string ExportDataKeyRequest::getEncryptionContext()const
+{
+	return encryptionContext_;
+}
+
+void ExportDataKeyRequest::setEncryptionContext(const std::string& encryptionContext)
+{
+	encryptionContext_ = encryptionContext;
+	setParameter("EncryptionContext", encryptionContext);
+}
+
+std::string ExportDataKeyRequest::getWrappingAlgorithm()const
+{
+	return wrappingAlgorithm_;
+}
+
+void ExportDataKeyRequest::setWrappingAlgorithm(const std::string& wrappingAlgorithm)
+{
+	wrappingAlgorithm_ = wrappingAlgorithm;
+	setParameter("WrappingAlgorithm", wrappingAlgorithm);
+}
+
+std::string ExportDataKeyRequest::getCiphertextBlob()const
+{
+	return ciphertextBlob_;
+}
+
+void ExportDataKeyRequest::setCiphertextBlob(const std::string& ciphertextBlob)
+{
+	ciphertextBlob_ = ciphertextBlob;
+	setParameter("CiphertextBlob", ciphertextBlob);
+}
+
+std::string ExportDataKeyRequest::getPublicKeyBlob()const
+{
+	return publicKeyBlob_;
+}
+
+void ExportDataKeyRequest::setPublicKeyBlob(const std::string& publicKeyBlob)
+{
+	publicKeyBlob_ = publicKeyBlob;
+	setParameter("PublicKeyBlob", publicKeyBlob);
+}
+
+std::string ExportDataKeyRequest::getWrappingKeySpec()const
+{
+	return wrappingKeySpec_;
+}
+
+void ExportDataKeyRequest::setWrappingKeySpec(const std::string& wrappingKeySpec)
+{
+	wrappingKeySpec_ = wrappingKeySpec;
+	setParameter("WrappingKeySpec", wrappingKeySpec);
+}
+

kms/src/model/ExportDataKeyResult.cc

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/kms/model/ExportDataKeyResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Kms;
+using namespace AlibabaCloud::Kms::Model;
+
+ExportDataKeyResult::ExportDataKeyResult() :
+	ServiceResult()
+{}
+
+ExportDataKeyResult::ExportDataKeyResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+ExportDataKeyResult::~ExportDataKeyResult()
+{}
+
+void ExportDataKeyResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["ExportedDataKey"].isNull())
+		exportedDataKey_ = value["ExportedDataKey"].asString();
+	if(!value["KeyId"].isNull())
+		keyId_ = value["KeyId"].asString();
+	if(!value["KeyVersionId"].isNull())
+		keyVersionId_ = value["KeyVersionId"].asString();
+
+}
+
+std::string ExportDataKeyResult::getExportedDataKey()const
+{
+	return exportedDataKey_;
+}
+
+std::string ExportDataKeyResult::getKeyId()const
+{
+	return keyId_;
+}
+
+std::string ExportDataKeyResult::getKeyVersionId()const
+{
+	return keyVersionId_;
+}
+

kms/src/model/GenerateAndExportDataKeyRequest.cc

@@ -0,0 +1,106 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/kms/model/GenerateAndExportDataKeyRequest.h>
+
+using AlibabaCloud::Kms::Model::GenerateAndExportDataKeyRequest;
+
+GenerateAndExportDataKeyRequest::GenerateAndExportDataKeyRequest() :
+	RpcServiceRequest("kms", "2016-01-20", "GenerateAndExportDataKey")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+GenerateAndExportDataKeyRequest::~GenerateAndExportDataKeyRequest()
+{}
+
+std::string GenerateAndExportDataKeyRequest::getEncryptionContext()const
+{
+	return encryptionContext_;
+}
+
+void GenerateAndExportDataKeyRequest::setEncryptionContext(const std::string& encryptionContext)
+{
+	encryptionContext_ = encryptionContext;
+	setParameter("EncryptionContext", encryptionContext);
+}
+
+std::string GenerateAndExportDataKeyRequest::getKeyId()const
+{
+	return keyId_;
+}
+
+void GenerateAndExportDataKeyRequest::setKeyId(const std::string& keyId)
+{
+	keyId_ = keyId;
+	setParameter("KeyId", keyId);
+}
+
+std::string GenerateAndExportDataKeyRequest::getKeySpec()const
+{
+	return keySpec_;
+}
+
+void GenerateAndExportDataKeyRequest::setKeySpec(const std::string& keySpec)
+{
+	keySpec_ = keySpec;
+	setParameter("KeySpec", keySpec);
+}
+
+int GenerateAndExportDataKeyRequest::getNumberOfBytes()const
+{
+	return numberOfBytes_;
+}
+
+void GenerateAndExportDataKeyRequest::setNumberOfBytes(int numberOfBytes)
+{
+	numberOfBytes_ = numberOfBytes;
+	setParameter("NumberOfBytes", std::to_string(numberOfBytes));
+}
+
+std::string GenerateAndExportDataKeyRequest::getWrappingAlgorithm()const
+{
+	return wrappingAlgorithm_;
+}
+
+void GenerateAndExportDataKeyRequest::setWrappingAlgorithm(const std::string& wrappingAlgorithm)
+{
+	wrappingAlgorithm_ = wrappingAlgorithm;
+	setParameter("WrappingAlgorithm", wrappingAlgorithm);
+}
+
+std::string GenerateAndExportDataKeyRequest::getPublicKeyBlob()const
+{
+	return publicKeyBlob_;
+}
+
+void GenerateAndExportDataKeyRequest::setPublicKeyBlob(const std::string& publicKeyBlob)
+{
+	publicKeyBlob_ = publicKeyBlob;
+	setParameter("PublicKeyBlob", publicKeyBlob);
+}
+
+std::string GenerateAndExportDataKeyRequest::getWrappingKeySpec()const
+{
+	return wrappingKeySpec_;
+}
+
+void GenerateAndExportDataKeyRequest::setWrappingKeySpec(const std::string& wrappingKeySpec)
+{
+	wrappingKeySpec_ = wrappingKeySpec;
+	setParameter("WrappingKeySpec", wrappingKeySpec);
+}
+

kms/src/model/GenerateAndExportDataKeyResult.cc

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/kms/model/GenerateAndExportDataKeyResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Kms;
+using namespace AlibabaCloud::Kms::Model;
+
+GenerateAndExportDataKeyResult::GenerateAndExportDataKeyResult() :
+	ServiceResult()
+{}
+
+GenerateAndExportDataKeyResult::GenerateAndExportDataKeyResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+GenerateAndExportDataKeyResult::~GenerateAndExportDataKeyResult()
+{}
+
+void GenerateAndExportDataKeyResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["CiphertextBlob"].isNull())
+		ciphertextBlob_ = value["CiphertextBlob"].asString();
+	if(!value["KeyId"].isNull())
+		keyId_ = value["KeyId"].asString();
+	if(!value["ExportedDataKey"].isNull())
+		exportedDataKey_ = value["ExportedDataKey"].asString();
+	if(!value["KeyVersionId"].isNull())
+		keyVersionId_ = value["KeyVersionId"].asString();
+
+}
+
+std::string GenerateAndExportDataKeyResult::getCiphertextBlob()const
+{
+	return ciphertextBlob_;
+}
+
+std::string GenerateAndExportDataKeyResult::getExportedDataKey()const
+{
+	return exportedDataKey_;
+}
+
+std::string GenerateAndExportDataKeyResult::getKeyId()const
+{
+	return keyId_;
+}
+
+std::string GenerateAndExportDataKeyResult::getKeyVersionId()const
+{
+	return keyVersionId_;
+}
+

kms/src/model/ReEncryptRequest.cc

@@ -0,0 +1,106 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/kms/model/ReEncryptRequest.h>
+
+using AlibabaCloud::Kms::Model::ReEncryptRequest;
+
+ReEncryptRequest::ReEncryptRequest() :
+	RpcServiceRequest("kms", "2016-01-20", "ReEncrypt")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+ReEncryptRequest::~ReEncryptRequest()
+{}
+
+std::string ReEncryptRequest::getDestinationEncryptionContext()const
+{
+	return destinationEncryptionContext_;
+}
+
+void ReEncryptRequest::setDestinationEncryptionContext(const std::string& destinationEncryptionContext)
+{
+	destinationEncryptionContext_ = destinationEncryptionContext;
+	setParameter("DestinationEncryptionContext", destinationEncryptionContext);
+}
+
+std::string ReEncryptRequest::getSourceEncryptionAlgorithm()const
+{
+	return sourceEncryptionAlgorithm_;
+}
+
+void ReEncryptRequest::setSourceEncryptionAlgorithm(const std::string& sourceEncryptionAlgorithm)
+{
+	sourceEncryptionAlgorithm_ = sourceEncryptionAlgorithm;
+	setParameter("SourceEncryptionAlgorithm", sourceEncryptionAlgorithm);
+}
+
+std::string ReEncryptRequest::getSourceKeyVersionId()const
+{
+	return sourceKeyVersionId_;
+}
+
+void ReEncryptRequest::setSourceKeyVersionId(const std::string& sourceKeyVersionId)
+{
+	sourceKeyVersionId_ = sourceKeyVersionId;
+	setParameter("SourceKeyVersionId", sourceKeyVersionId);
+}
+
+std::string ReEncryptRequest::getDestinationKeyId()const
+{
+	return destinationKeyId_;
+}
+
+void ReEncryptRequest::setDestinationKeyId(const std::string& destinationKeyId)
+{
+	destinationKeyId_ = destinationKeyId;
+	setParameter("DestinationKeyId", destinationKeyId);
+}
+
+std::string ReEncryptRequest::getSourceKeyId()const
+{
+	return sourceKeyId_;
+}
+
+void ReEncryptRequest::setSourceKeyId(const std::string& sourceKeyId)
+{
+	sourceKeyId_ = sourceKeyId;
+	setParameter("SourceKeyId", sourceKeyId);
+}
+
+std::string ReEncryptRequest::getSourceEncryptionContext()const
+{
+	return sourceEncryptionContext_;
+}
+
+void ReEncryptRequest::setSourceEncryptionContext(const std::string& sourceEncryptionContext)
+{
+	sourceEncryptionContext_ = sourceEncryptionContext;
+	setParameter("SourceEncryptionContext", sourceEncryptionContext);
+}
+
+std::string ReEncryptRequest::getCiphertextBlob()const
+{
+	return ciphertextBlob_;
+}
+
+void ReEncryptRequest::setCiphertextBlob(const std::string& ciphertextBlob)
+{
+	ciphertextBlob_ = ciphertextBlob;
+	setParameter("CiphertextBlob", ciphertextBlob);
+}
+

kms/src/model/ReEncryptResult.cc

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/kms/model/ReEncryptResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Kms;
+using namespace AlibabaCloud::Kms::Model;
+
+ReEncryptResult::ReEncryptResult() :
+	ServiceResult()
+{}
+
+ReEncryptResult::ReEncryptResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+ReEncryptResult::~ReEncryptResult()
+{}
+
+void ReEncryptResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["KeyId"].isNull())
+		keyId_ = value["KeyId"].asString();
+	if(!value["KeyVersionId"].isNull())
+		keyVersionId_ = value["KeyVersionId"].asString();
+	if(!value["CiphertextBlob"].isNull())
+		ciphertextBlob_ = value["CiphertextBlob"].asString();
+
+}
+
+std::string ReEncryptResult::getCiphertextBlob()const
+{
+	return ciphertextBlob_;
+}
+
+std::string ReEncryptResult::getKeyId()const
+{
+	return keyId_;
+}
+
+std::string ReEncryptResult::getKeyVersionId()const
+{
+	return keyVersionId_;
+}
+

r-kvstore/CMakeLists.txt

@@ -63,6 +63,8 @@ set(r-kvstore_public_header_model
 	include/alibabacloud/r-kvstore/model/DescribeCacheAnalysisReportListResult.h
 	include/alibabacloud/r-kvstore/model/DescribeDBInstanceNetInfoRequest.h
 	include/alibabacloud/r-kvstore/model/DescribeDBInstanceNetInfoResult.h
+	include/alibabacloud/r-kvstore/model/DescribeDedicatedClusterInstanceListRequest.h
+	include/alibabacloud/r-kvstore/model/DescribeDedicatedClusterInstanceListResult.h
 	include/alibabacloud/r-kvstore/model/DescribeDedicatedUserClusterRequest.h
 	include/alibabacloud/r-kvstore/model/DescribeDedicatedUserClusterResult.h
 	include/alibabacloud/r-kvstore/model/DescribeHistoryMonitorValuesRequest.h
@@ -113,8 +115,8 @@ set(r-kvstore_public_header_model
 	include/alibabacloud/r-kvstore/model/MigrateToOtherZoneResult.h
 	include/alibabacloud/r-kvstore/model/ModifyAccountDescriptionRequest.h
 	include/alibabacloud/r-kvstore/model/ModifyAccountDescriptionResult.h
-	include/alibabacloud/r-kvstore/model/ModifyAuditLogConfigRequest.h
-	include/alibabacloud/r-kvstore/model/ModifyAuditLogConfigResult.h
+	include/alibabacloud/r-kvstore/model/ModifyAccountPasswordRequest.h
+	include/alibabacloud/r-kvstore/model/ModifyAccountPasswordResult.h
 	include/alibabacloud/r-kvstore/model/ModifyBackupPolicyRequest.h
 	include/alibabacloud/r-kvstore/model/ModifyBackupPolicyResult.h
 	include/alibabacloud/r-kvstore/model/ModifyDBInstanceConnectionStringRequest.h
@@ -167,6 +169,8 @@ set(r-kvstore_public_header_model
 	include/alibabacloud/r-kvstore/model/RestoreInstanceResult.h
 	include/alibabacloud/r-kvstore/model/SwitchNetworkRequest.h
 	include/alibabacloud/r-kvstore/model/SwitchNetworkResult.h
+	include/alibabacloud/r-kvstore/model/SyncDtsStatusRequest.h
+	include/alibabacloud/r-kvstore/model/SyncDtsStatusResult.h
 	include/alibabacloud/r-kvstore/model/TagResourcesRequest.h
 	include/alibabacloud/r-kvstore/model/TagResourcesResult.h
 	include/alibabacloud/r-kvstore/model/TransformToPrePaidRequest.h
@@ -218,6 +222,8 @@ set(r-kvstore_src
 	src/model/DescribeCacheAnalysisReportListResult.cc
 	src/model/DescribeDBInstanceNetInfoRequest.cc
 	src/model/DescribeDBInstanceNetInfoResult.cc
+	src/model/DescribeDedicatedClusterInstanceListRequest.cc
+	src/model/DescribeDedicatedClusterInstanceListResult.cc
 	src/model/DescribeDedicatedUserClusterRequest.cc
 	src/model/DescribeDedicatedUserClusterResult.cc
 	src/model/DescribeHistoryMonitorValuesRequest.cc
@@ -268,8 +274,8 @@ set(r-kvstore_src
 	src/model/MigrateToOtherZoneResult.cc
 	src/model/ModifyAccountDescriptionRequest.cc
 	src/model/ModifyAccountDescriptionResult.cc
-	src/model/ModifyAuditLogConfigRequest.cc
-	src/model/ModifyAuditLogConfigResult.cc
+	src/model/ModifyAccountPasswordRequest.cc
+	src/model/ModifyAccountPasswordResult.cc
 	src/model/ModifyBackupPolicyRequest.cc
 	src/model/ModifyBackupPolicyResult.cc
 	src/model/ModifyDBInstanceConnectionStringRequest.cc
@@ -322,6 +328,8 @@ set(r-kvstore_src
 	src/model/RestoreInstanceResult.cc
 	src/model/SwitchNetworkRequest.cc
 	src/model/SwitchNetworkResult.cc
+	src/model/SyncDtsStatusRequest.cc
+	src/model/SyncDtsStatusResult.cc
 	src/model/TagResourcesRequest.cc
 	src/model/TagResourcesResult.cc
 	src/model/TransformToPrePaidRequest.cc

r-kvstore/include/alibabacloud/r-kvstore/R_kvstoreClient.h

@@ -64,6 +64,8 @@
 #include "model/DescribeCacheAnalysisReportListResult.h"
 #include "model/DescribeDBInstanceNetInfoRequest.h"
 #include "model/DescribeDBInstanceNetInfoResult.h"
+#include "model/DescribeDedicatedClusterInstanceListRequest.h"
+#include "model/DescribeDedicatedClusterInstanceListResult.h"
 #include "model/DescribeDedicatedUserClusterRequest.h"
 #include "model/DescribeDedicatedUserClusterResult.h"
 #include "model/DescribeHistoryMonitorValuesRequest.h"
@@ -114,8 +116,8 @@
 #include "model/MigrateToOtherZoneResult.h"
 #include "model/ModifyAccountDescriptionRequest.h"
 #include "model/ModifyAccountDescriptionResult.h"
-#include "model/ModifyAuditLogConfigRequest.h"
-#include "model/ModifyAuditLogConfigResult.h"
+#include "model/ModifyAccountPasswordRequest.h"
+#include "model/ModifyAccountPasswordResult.h"
 #include "model/ModifyBackupPolicyRequest.h"
 #include "model/ModifyBackupPolicyResult.h"
 #include "model/ModifyDBInstanceConnectionStringRequest.h"
@@ -168,6 +170,8 @@
 #include "model/RestoreInstanceResult.h"
 #include "model/SwitchNetworkRequest.h"
 #include "model/SwitchNetworkResult.h"
+#include "model/SyncDtsStatusRequest.h"
+#include "model/SyncDtsStatusResult.h"
 #include "model/TagResourcesRequest.h"
 #include "model/TagResourcesResult.h"
 #include "model/TransformToPrePaidRequest.h"
@@ -246,6 +250,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeDBInstanceNetInfoResult> DescribeDBInstanceNetInfoOutcome;
 			typedef std::future<DescribeDBInstanceNetInfoOutcome> DescribeDBInstanceNetInfoOutcomeCallable;
 			typedef std::function<void(const R_kvstoreClient*, const Model::DescribeDBInstanceNetInfoRequest&, const DescribeDBInstanceNetInfoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDBInstanceNetInfoAsyncHandler;
+			typedef Outcome<Error, Model::DescribeDedicatedClusterInstanceListResult> DescribeDedicatedClusterInstanceListOutcome;
+			typedef std::future<DescribeDedicatedClusterInstanceListOutcome> DescribeDedicatedClusterInstanceListOutcomeCallable;
+			typedef std::function<void(const R_kvstoreClient*, const Model::DescribeDedicatedClusterInstanceListRequest&, const DescribeDedicatedClusterInstanceListOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDedicatedClusterInstanceListAsyncHandler;
 			typedef Outcome<Error, Model::DescribeDedicatedUserClusterResult> DescribeDedicatedUserClusterOutcome;
 			typedef std::future<DescribeDedicatedUserClusterOutcome> DescribeDedicatedUserClusterOutcomeCallable;
 			typedef std::function<void(const R_kvstoreClient*, const Model::DescribeDedicatedUserClusterRequest&, const DescribeDedicatedUserClusterOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeDedicatedUserClusterAsyncHandler;
@@ -321,9 +328,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ModifyAccountDescriptionResult> ModifyAccountDescriptionOutcome;
 			typedef std::future<ModifyAccountDescriptionOutcome> ModifyAccountDescriptionOutcomeCallable;
 			typedef std::function<void(const R_kvstoreClient*, const Model::ModifyAccountDescriptionRequest&, const ModifyAccountDescriptionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyAccountDescriptionAsyncHandler;
-			typedef Outcome<Error, Model::ModifyAuditLogConfigResult> ModifyAuditLogConfigOutcome;
-			typedef std::future<ModifyAuditLogConfigOutcome> ModifyAuditLogConfigOutcomeCallable;
-			typedef std::function<void(const R_kvstoreClient*, const Model::ModifyAuditLogConfigRequest&, const ModifyAuditLogConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyAuditLogConfigAsyncHandler;
+			typedef Outcome<Error, Model::ModifyAccountPasswordResult> ModifyAccountPasswordOutcome;
+			typedef std::future<ModifyAccountPasswordOutcome> ModifyAccountPasswordOutcomeCallable;
+			typedef std::function<void(const R_kvstoreClient*, const Model::ModifyAccountPasswordRequest&, const ModifyAccountPasswordOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyAccountPasswordAsyncHandler;
 			typedef Outcome<Error, Model::ModifyBackupPolicyResult> ModifyBackupPolicyOutcome;
 			typedef std::future<ModifyBackupPolicyOutcome> ModifyBackupPolicyOutcomeCallable;
 			typedef std::function<void(const R_kvstoreClient*, const Model::ModifyBackupPolicyRequest&, const ModifyBackupPolicyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyBackupPolicyAsyncHandler;
@@ -402,6 +409,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::SwitchNetworkResult> SwitchNetworkOutcome;
 			typedef std::future<SwitchNetworkOutcome> SwitchNetworkOutcomeCallable;
 			typedef std::function<void(const R_kvstoreClient*, const Model::SwitchNetworkRequest&, const SwitchNetworkOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SwitchNetworkAsyncHandler;
+			typedef Outcome<Error, Model::SyncDtsStatusResult> SyncDtsStatusOutcome;
+			typedef std::future<SyncDtsStatusOutcome> SyncDtsStatusOutcomeCallable;
+			typedef std::function<void(const R_kvstoreClient*, const Model::SyncDtsStatusRequest&, const SyncDtsStatusOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SyncDtsStatusAsyncHandler;
 			typedef Outcome<Error, Model::TagResourcesResult> TagResourcesOutcome;
 			typedef std::future<TagResourcesOutcome> TagResourcesOutcomeCallable;
 			typedef std::function<void(const R_kvstoreClient*, const Model::TagResourcesRequest&, const TagResourcesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> TagResourcesAsyncHandler;
@@ -479,6 +489,9 @@ namespace AlibabaCloud
 			DescribeDBInstanceNetInfoOutcome describeDBInstanceNetInfo(const Model::DescribeDBInstanceNetInfoRequest &request)const;
 			void describeDBInstanceNetInfoAsync(const Model::DescribeDBInstanceNetInfoRequest& request, const DescribeDBInstanceNetInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDBInstanceNetInfoOutcomeCallable describeDBInstanceNetInfoCallable(const Model::DescribeDBInstanceNetInfoRequest& request) const;
+			DescribeDedicatedClusterInstanceListOutcome describeDedicatedClusterInstanceList(const Model::DescribeDedicatedClusterInstanceListRequest &request)const;
+			void describeDedicatedClusterInstanceListAsync(const Model::DescribeDedicatedClusterInstanceListRequest& request, const DescribeDedicatedClusterInstanceListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeDedicatedClusterInstanceListOutcomeCallable describeDedicatedClusterInstanceListCallable(const Model::DescribeDedicatedClusterInstanceListRequest& request) const;
 			DescribeDedicatedUserClusterOutcome describeDedicatedUserCluster(const Model::DescribeDedicatedUserClusterRequest &request)const;
 			void describeDedicatedUserClusterAsync(const Model::DescribeDedicatedUserClusterRequest& request, const DescribeDedicatedUserClusterAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeDedicatedUserClusterOutcomeCallable describeDedicatedUserClusterCallable(const Model::DescribeDedicatedUserClusterRequest& request) const;
@@ -554,9 +567,9 @@ namespace AlibabaCloud
 			ModifyAccountDescriptionOutcome modifyAccountDescription(const Model::ModifyAccountDescriptionRequest &request)const;
 			void modifyAccountDescriptionAsync(const Model::ModifyAccountDescriptionRequest& request, const ModifyAccountDescriptionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyAccountDescriptionOutcomeCallable modifyAccountDescriptionCallable(const Model::ModifyAccountDescriptionRequest& request) const;
-			ModifyAuditLogConfigOutcome modifyAuditLogConfig(const Model::ModifyAuditLogConfigRequest &request)const;
-			void modifyAuditLogConfigAsync(const Model::ModifyAuditLogConfigRequest& request, const ModifyAuditLogConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			ModifyAuditLogConfigOutcomeCallable modifyAuditLogConfigCallable(const Model::ModifyAuditLogConfigRequest& request) const;
+			ModifyAccountPasswordOutcome modifyAccountPassword(const Model::ModifyAccountPasswordRequest &request)const;
+			void modifyAccountPasswordAsync(const Model::ModifyAccountPasswordRequest& request, const ModifyAccountPasswordAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ModifyAccountPasswordOutcomeCallable modifyAccountPasswordCallable(const Model::ModifyAccountPasswordRequest& request) const;
 			ModifyBackupPolicyOutcome modifyBackupPolicy(const Model::ModifyBackupPolicyRequest &request)const;
 			void modifyBackupPolicyAsync(const Model::ModifyBackupPolicyRequest& request, const ModifyBackupPolicyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyBackupPolicyOutcomeCallable modifyBackupPolicyCallable(const Model::ModifyBackupPolicyRequest& request) const;
@@ -635,6 +648,9 @@ namespace AlibabaCloud
 			SwitchNetworkOutcome switchNetwork(const Model::SwitchNetworkRequest &request)const;
 			void switchNetworkAsync(const Model::SwitchNetworkRequest& request, const SwitchNetworkAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			SwitchNetworkOutcomeCallable switchNetworkCallable(const Model::SwitchNetworkRequest& request) const;
+			SyncDtsStatusOutcome syncDtsStatus(const Model::SyncDtsStatusRequest &request)const;
+			void syncDtsStatusAsync(const Model::SyncDtsStatusRequest& request, const SyncDtsStatusAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			SyncDtsStatusOutcomeCallable syncDtsStatusCallable(const Model::SyncDtsStatusRequest& request) const;
 			TagResourcesOutcome tagResources(const Model::TagResourcesRequest &request)const;
 			void tagResourcesAsync(const Model::TagResourcesRequest& request, const TagResourcesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			TagResourcesOutcomeCallable tagResourcesCallable(const Model::TagResourcesRequest& request) const;

r-kvstore/include/alibabacloud/r-kvstore/model/CreateInstanceRequest.h

@@ -81,6 +81,8 @@ namespace AlibabaCloud
 				void setCapacity(long capacity);
 				std::string getInstanceType()const;
 				void setInstanceType(const std::string& instanceType);
+				std::string getDedicatedHostGroupId()const;
+				void setDedicatedHostGroupId(const std::string& dedicatedHostGroupId);
 				std::string getRestoreTime()const;
 				void setRestoreTime(const std::string& restoreTime);
 				std::string getResourceOwnerAccount()const;
@@ -122,6 +124,7 @@ namespace AlibabaCloud
 				std::string accessKeyId_;
 				long capacity_;
 				std::string instanceType_;
+				std::string dedicatedHostGroupId_;
 				std::string restoreTime_;
 				std::string resourceOwnerAccount_;
 				std::string srcDBInstanceId_;

r-kvstore/include/alibabacloud/r-kvstore/model/DescribeDedicatedClusterInstanceListRequest.h

@@ -0,0 +1,93 @@
+/*
+ * 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_R_KVSTORE_MODEL_DESCRIBEDEDICATEDCLUSTERINSTANCELISTREQUEST_H_
+#define ALIBABACLOUD_R_KVSTORE_MODEL_DESCRIBEDEDICATEDCLUSTERINSTANCELISTREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/r-kvstore/R_kvstoreExport.h>
+
+namespace AlibabaCloud
+{
+	namespace R_kvstore
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_R_KVSTORE_EXPORT DescribeDedicatedClusterInstanceListRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeDedicatedClusterInstanceListRequest();
+				~DescribeDedicatedClusterInstanceListRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getEngineVersion()const;
+				void setEngineVersion(const std::string& engineVersion);
+				int getPageNumber()const;
+				void setPageNumber(int pageNumber);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getEngine()const;
+				void setEngine(const std::string& engine);
+				int getPageSize()const;
+				void setPageSize(int pageSize);
+				int getInstanceStatus()const;
+				void setInstanceStatus(int instanceStatus);
+				std::string getDedicatedHostName()const;
+				void setDedicatedHostName(const std::string& dedicatedHostName);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getInstanceNetType()const;
+				void setInstanceNetType(const std::string& instanceNetType);
+				std::string getClusterId()const;
+				void setClusterId(const std::string& clusterId);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
+
+            private:
+				long resourceOwnerId_;
+				std::string engineVersion_;
+				int pageNumber_;
+				std::string accessKeyId_;
+				std::string securityToken_;
+				std::string regionId_;
+				std::string engine_;
+				int pageSize_;
+				int instanceStatus_;
+				std::string dedicatedHostName_;
+				std::string resourceOwnerAccount_;
+				std::string ownerAccount_;
+				std::string instanceNetType_;
+				std::string clusterId_;
+				long ownerId_;
+				std::string instanceId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_R_KVSTORE_MODEL_DESCRIBEDEDICATEDCLUSTERINSTANCELISTREQUEST_H_

r-kvstore/include/alibabacloud/r-kvstore/model/DescribeDedicatedClusterInstanceListResult.h

@@ -0,0 +1,91 @@
+/*
+ * 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_R_KVSTORE_MODEL_DESCRIBEDEDICATEDCLUSTERINSTANCELISTRESULT_H_
+#define ALIBABACLOUD_R_KVSTORE_MODEL_DESCRIBEDEDICATEDCLUSTERINSTANCELISTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/r-kvstore/R_kvstoreExport.h>
+
+namespace AlibabaCloud
+{
+	namespace R_kvstore
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_R_KVSTORE_EXPORT DescribeDedicatedClusterInstanceListResult : public ServiceResult
+			{
+			public:
+				struct InstancesItem
+				{
+					struct InstanceNodes
+					{
+						std::string role;
+						std::string zoneId;
+						std::string instanceId;
+						std::string dedicatedHostName;
+						std::string nodeType;
+						int port;
+						int nodeId;
+						std::string nodeIp;
+					};
+					std::string engineVersion;
+					std::string storageType;
+					std::string zoneId;
+					std::string clusterId;
+					std::string instanceId;
+					std::string createTime;
+					std::string instanceClass;
+					int characterType;
+					std::string vswitchId;
+					std::string instanceName;
+					std::string connectionDomain;
+					std::string maintainEndTime;
+					std::string vpcId;
+					std::string instanceStatus;
+					std::vector<InstancesItem::InstanceNodes> instanceNodeList;
+					std::string customId;
+					std::string clusterName;
+					std::string regionId;
+					std::string maintainStartTime;
+					std::string engine;
+				};
+
+
+				DescribeDedicatedClusterInstanceListResult();
+				explicit DescribeDedicatedClusterInstanceListResult(const std::string &payload);
+				~DescribeDedicatedClusterInstanceListResult();
+				std::vector<InstancesItem> getInstances()const;
+				int getTotalCount()const;
+				int getPageSize()const;
+				int getPageNumber()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<InstancesItem> instances_;
+				int totalCount_;
+				int pageSize_;
+				int pageNumber_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_R_KVSTORE_MODEL_DESCRIBEDEDICATEDCLUSTERINSTANCELISTRESULT_H_

r-kvstore/include/alibabacloud/r-kvstore/model/DescribeInstancesResult.h

@@ -41,6 +41,7 @@ namespace AlibabaCloud
 					};
 					long connections;
 					std::string endTime;
+					std::string resourceGroupId;
 					std::string config;
 					long port;
 					std::string destroyTime;

r-kvstore/include/alibabacloud/r-kvstore/model/DescribeRunningLogRecordsRequest.h

@@ -59,6 +59,8 @@ namespace AlibabaCloud
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getQueryKeyword()const;
+				void setQueryKeyword(const std::string& queryKeyword);
 				std::string getEndTime()const;
 				void setEndTime(const std::string& endTime);
 				long getOwnerId()const;
@@ -67,6 +69,10 @@ namespace AlibabaCloud
 				void setInstanceId(const std::string& instanceId);
 				std::string getDBName()const;
 				void setDBName(const std::string& dBName);
+				std::string getCharacterType()const;
+				void setCharacterType(const std::string& characterType);
+				std::string getOrderType()const;
+				void setOrderType(const std::string& orderType);
 
             private:
 				long resourceOwnerId_;
@@ -81,10 +87,13 @@ namespace AlibabaCloud
 				long sQLId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
+				std::string queryKeyword_;
 				std::string endTime_;
 				long ownerId_;
 				std::string instanceId_;
 				std::string dBName_;
+				std::string characterType_;
+				std::string orderType_;
 
 			};
 		}

r-kvstore/include/alibabacloud/r-kvstore/model/DescribeRunningLogRecordsResult.h

@@ -36,6 +36,7 @@ namespace AlibabaCloud
 				{
 					std::string connInfo;
 					std::string category;
+					std::string instanceId;
 					std::string content;
 					std::string createTime;
 					std::string level;

r-kvstore/include/alibabacloud/r-kvstore/model/ModifyAccountPasswordRequest.h

@@ -0,0 +1,75 @@
+/*
+ * 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_R_KVSTORE_MODEL_MODIFYACCOUNTPASSWORDREQUEST_H_
+#define ALIBABACLOUD_R_KVSTORE_MODEL_MODIFYACCOUNTPASSWORDREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/r-kvstore/R_kvstoreExport.h>
+
+namespace AlibabaCloud
+{
+	namespace R_kvstore
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_R_KVSTORE_EXPORT ModifyAccountPasswordRequest : public RpcServiceRequest
+			{
+
+			public:
+				ModifyAccountPasswordRequest();
+				~ModifyAccountPasswordRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getAccountName()const;
+				void setAccountName(const std::string& accountName);
+				std::string getNewAccountPassword()const;
+				void setNewAccountPassword(const std::string& newAccountPassword);
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
+				std::string getOldAccountPassword()const;
+				void setOldAccountPassword(const std::string& oldAccountPassword);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
+
+            private:
+				long resourceOwnerId_;
+				std::string accessKeyId_;
+				std::string accountName_;
+				std::string newAccountPassword_;
+				std::string securityToken_;
+				std::string oldAccountPassword_;
+				std::string resourceOwnerAccount_;
+				std::string ownerAccount_;
+				long ownerId_;
+				std::string instanceId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_R_KVSTORE_MODEL_MODIFYACCOUNTPASSWORDREQUEST_H_

r-kvstore/include/alibabacloud/r-kvstore/model/ModifyAccountPasswordResult.h

@@ -0,0 +1,49 @@
+/*
+ * 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_R_KVSTORE_MODEL_MODIFYACCOUNTPASSWORDRESULT_H_
+#define ALIBABACLOUD_R_KVSTORE_MODEL_MODIFYACCOUNTPASSWORDRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/r-kvstore/R_kvstoreExport.h>
+
+namespace AlibabaCloud
+{
+	namespace R_kvstore
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_R_KVSTORE_EXPORT ModifyAccountPasswordResult : public ServiceResult
+			{
+			public:
+
+
+				ModifyAccountPasswordResult();
+				explicit ModifyAccountPasswordResult(const std::string &payload);
+				~ModifyAccountPasswordResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_R_KVSTORE_MODEL_MODIFYACCOUNTPASSWORDRESULT_H_

r-kvstore/include/alibabacloud/r-kvstore/model/SyncDtsStatusRequest.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_R_KVSTORE_MODEL_MODIFYAUDITLOGCONFIGREQUEST_H_
-#define ALIBABACLOUD_R_KVSTORE_MODEL_MODIFYAUDITLOGCONFIGREQUEST_H_
+#ifndef ALIBABACLOUD_R_KVSTORE_MODEL_SYNCDTSSTATUSREQUEST_H_
+#define ALIBABACLOUD_R_KVSTORE_MODEL_SYNCDTSSTATUSREQUEST_H_
 
 #include <string>
 #include <vector>
@@ -28,12 +28,12 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_R_KVSTORE_EXPORT ModifyAuditLogConfigRequest : public RpcServiceRequest
+			class ALIBABACLOUD_R_KVSTORE_EXPORT SyncDtsStatusRequest : public RpcServiceRequest
 			{
 
 			public:
-				ModifyAuditLogConfigRequest();
-				~ModifyAuditLogConfigRequest();
+				SyncDtsStatusRequest();
+				~SyncDtsStatusRequest();
 
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
@@ -41,10 +41,8 @@ namespace AlibabaCloud
 				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
-				std::string getAuditCommand()const;
-				void setAuditCommand(const std::string& auditCommand);
-				std::string getRetention()const;
-				void setRetention(const std::string& retention);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
@@ -53,20 +51,22 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
+				std::string getStatus()const;
+				void setStatus(const std::string& status);
 
             private:
 				long resourceOwnerId_;
 				std::string accessKeyId_;
 				std::string securityToken_;
-				std::string auditCommand_;
-				std::string retention_;
+				std::string regionId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				long ownerId_;
 				std::string instanceId_;
+				std::string status_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_R_KVSTORE_MODEL_MODIFYAUDITLOGCONFIGREQUEST_H_
+#endif // !ALIBABACLOUD_R_KVSTORE_MODEL_SYNCDTSSTATUSREQUEST_H_

r-kvstore/include/alibabacloud/r-kvstore/model/SyncDtsStatusResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_R_KVSTORE_MODEL_MODIFYAUDITLOGCONFIGRESULT_H_
-#define ALIBABACLOUD_R_KVSTORE_MODEL_MODIFYAUDITLOGCONFIGRESULT_H_
+#ifndef ALIBABACLOUD_R_KVSTORE_MODEL_SYNCDTSSTATUSRESULT_H_
+#define ALIBABACLOUD_R_KVSTORE_MODEL_SYNCDTSSTATUSRESULT_H_
 
 #include <string>
 #include <vector>
@@ -29,14 +29,14 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_R_KVSTORE_EXPORT ModifyAuditLogConfigResult : public ServiceResult
+			class ALIBABACLOUD_R_KVSTORE_EXPORT SyncDtsStatusResult : public ServiceResult
 			{
 			public:
 
 
-				ModifyAuditLogConfigResult();
-				explicit ModifyAuditLogConfigResult(const std::string &payload);
-				~ModifyAuditLogConfigResult();
+				SyncDtsStatusResult();
+				explicit SyncDtsStatusResult(const std::string &payload);
+				~SyncDtsStatusResult();
 
 			protected:
 				void parse(const std::string &payload);
@@ -46,4 +46,4 @@ namespace AlibabaCloud
 		}
 	}
 }
-#endif // !ALIBABACLOUD_R_KVSTORE_MODEL_MODIFYAUDITLOGCONFIGRESULT_H_
+#endif // !ALIBABACLOUD_R_KVSTORE_MODEL_SYNCDTSSTATUSRESULT_H_

r-kvstore/src/R-kvstoreClient.cc

@@ -807,6 +807,42 @@ R_kvstoreClient::DescribeDBInstanceNetInfoOutcomeCallable R_kvstoreClient::descr
 	return task->get_future();
 }
 
+R_kvstoreClient::DescribeDedicatedClusterInstanceListOutcome R_kvstoreClient::describeDedicatedClusterInstanceList(const DescribeDedicatedClusterInstanceListRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeDedicatedClusterInstanceListOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeDedicatedClusterInstanceListOutcome(DescribeDedicatedClusterInstanceListResult(outcome.result()));
+	else
+		return DescribeDedicatedClusterInstanceListOutcome(outcome.error());
+}
+
+void R_kvstoreClient::describeDedicatedClusterInstanceListAsync(const DescribeDedicatedClusterInstanceListRequest& request, const DescribeDedicatedClusterInstanceListAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeDedicatedClusterInstanceList(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+R_kvstoreClient::DescribeDedicatedClusterInstanceListOutcomeCallable R_kvstoreClient::describeDedicatedClusterInstanceListCallable(const DescribeDedicatedClusterInstanceListRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeDedicatedClusterInstanceListOutcome()>>(
+			[this, request]()
+			{
+			return this->describeDedicatedClusterInstanceList(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 R_kvstoreClient::DescribeDedicatedUserClusterOutcome R_kvstoreClient::describeDedicatedUserCluster(const DescribeDedicatedUserClusterRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1707,36 +1743,36 @@ R_kvstoreClient::ModifyAccountDescriptionOutcomeCallable R_kvstoreClient::modify
 	return task->get_future();
 }
 
-R_kvstoreClient::ModifyAuditLogConfigOutcome R_kvstoreClient::modifyAuditLogConfig(const ModifyAuditLogConfigRequest &request) const
+R_kvstoreClient::ModifyAccountPasswordOutcome R_kvstoreClient::modifyAccountPassword(const ModifyAccountPasswordRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
 	if (!endpointOutcome.isSuccess())
-		return ModifyAuditLogConfigOutcome(endpointOutcome.error());
+		return ModifyAccountPasswordOutcome(endpointOutcome.error());
 
 	auto outcome = makeRequest(endpointOutcome.result(), request);
 
 	if (outcome.isSuccess())
-		return ModifyAuditLogConfigOutcome(ModifyAuditLogConfigResult(outcome.result()));
+		return ModifyAccountPasswordOutcome(ModifyAccountPasswordResult(outcome.result()));
 	else
-		return ModifyAuditLogConfigOutcome(outcome.error());
+		return ModifyAccountPasswordOutcome(outcome.error());
 }
 
-void R_kvstoreClient::modifyAuditLogConfigAsync(const ModifyAuditLogConfigRequest& request, const ModifyAuditLogConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+void R_kvstoreClient::modifyAccountPasswordAsync(const ModifyAccountPasswordRequest& request, const ModifyAccountPasswordAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
 {
 	auto fn = [this, request, handler, context]()
 	{
-		handler(this, request, modifyAuditLogConfig(request), context);
+		handler(this, request, modifyAccountPassword(request), context);
 	};
 
 	asyncExecute(new Runnable(fn));
 }
 
-R_kvstoreClient::ModifyAuditLogConfigOutcomeCallable R_kvstoreClient::modifyAuditLogConfigCallable(const ModifyAuditLogConfigRequest &request) const
+R_kvstoreClient::ModifyAccountPasswordOutcomeCallable R_kvstoreClient::modifyAccountPasswordCallable(const ModifyAccountPasswordRequest &request) const
 {
-	auto task = std::make_shared<std::packaged_task<ModifyAuditLogConfigOutcome()>>(
+	auto task = std::make_shared<std::packaged_task<ModifyAccountPasswordOutcome()>>(
 			[this, request]()
 			{
-			return this->modifyAuditLogConfig(request);
+			return this->modifyAccountPassword(request);
 			});
 
 	asyncExecute(new Runnable([task]() { (*task)(); }));
@@ -2679,6 +2715,42 @@ R_kvstoreClient::SwitchNetworkOutcomeCallable R_kvstoreClient::switchNetworkCall
 	return task->get_future();
 }
 
+R_kvstoreClient::SyncDtsStatusOutcome R_kvstoreClient::syncDtsStatus(const SyncDtsStatusRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return SyncDtsStatusOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return SyncDtsStatusOutcome(SyncDtsStatusResult(outcome.result()));
+	else
+		return SyncDtsStatusOutcome(outcome.error());
+}
+
+void R_kvstoreClient::syncDtsStatusAsync(const SyncDtsStatusRequest& request, const SyncDtsStatusAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, syncDtsStatus(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+R_kvstoreClient::SyncDtsStatusOutcomeCallable R_kvstoreClient::syncDtsStatusCallable(const SyncDtsStatusRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<SyncDtsStatusOutcome()>>(
+			[this, request]()
+			{
+			return this->syncDtsStatus(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 R_kvstoreClient::TagResourcesOutcome R_kvstoreClient::tagResources(const TagResourcesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

r-kvstore/src/model/CreateInstanceRequest.cc

@@ -280,6 +280,17 @@ void CreateInstanceRequest::setInstanceType(const std::string& instanceType)
 	setParameter("InstanceType", instanceType);
 }
 
+std::string CreateInstanceRequest::getDedicatedHostGroupId()const
+{
+	return dedicatedHostGroupId_;
+}
+
+void CreateInstanceRequest::setDedicatedHostGroupId(const std::string& dedicatedHostGroupId)
+{
+	dedicatedHostGroupId_ = dedicatedHostGroupId;
+	setParameter("DedicatedHostGroupId", dedicatedHostGroupId);
+}
+
 std::string CreateInstanceRequest::getRestoreTime()const
 {
 	return restoreTime_;

r-kvstore/src/model/DescribeDedicatedClusterInstanceListRequest.cc

@@ -0,0 +1,205 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/r-kvstore/model/DescribeDedicatedClusterInstanceListRequest.h>
+
+using AlibabaCloud::R_kvstore::Model::DescribeDedicatedClusterInstanceListRequest;
+
+DescribeDedicatedClusterInstanceListRequest::DescribeDedicatedClusterInstanceListRequest() :
+	RpcServiceRequest("r-kvstore", "2015-01-01", "DescribeDedicatedClusterInstanceList")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeDedicatedClusterInstanceListRequest::~DescribeDedicatedClusterInstanceListRequest()
+{}
+
+long DescribeDedicatedClusterInstanceListRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string DescribeDedicatedClusterInstanceListRequest::getEngineVersion()const
+{
+	return engineVersion_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setEngineVersion(const std::string& engineVersion)
+{
+	engineVersion_ = engineVersion;
+	setParameter("EngineVersion", engineVersion);
+}
+
+int DescribeDedicatedClusterInstanceListRequest::getPageNumber()const
+{
+	return pageNumber_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setPageNumber(int pageNumber)
+{
+	pageNumber_ = pageNumber;
+	setParameter("PageNumber", std::to_string(pageNumber));
+}
+
+std::string DescribeDedicatedClusterInstanceListRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string DescribeDedicatedClusterInstanceListRequest::getSecurityToken()const
+{
+	return securityToken_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setSecurityToken(const std::string& securityToken)
+{
+	securityToken_ = securityToken;
+	setParameter("SecurityToken", securityToken);
+}
+
+std::string DescribeDedicatedClusterInstanceListRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string DescribeDedicatedClusterInstanceListRequest::getEngine()const
+{
+	return engine_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setEngine(const std::string& engine)
+{
+	engine_ = engine;
+	setParameter("Engine", engine);
+}
+
+int DescribeDedicatedClusterInstanceListRequest::getPageSize()const
+{
+	return pageSize_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setPageSize(int pageSize)
+{
+	pageSize_ = pageSize;
+	setParameter("PageSize", std::to_string(pageSize));
+}
+
+int DescribeDedicatedClusterInstanceListRequest::getInstanceStatus()const
+{
+	return instanceStatus_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setInstanceStatus(int instanceStatus)
+{
+	instanceStatus_ = instanceStatus;
+	setParameter("InstanceStatus", std::to_string(instanceStatus));
+}
+
+std::string DescribeDedicatedClusterInstanceListRequest::getDedicatedHostName()const
+{
+	return dedicatedHostName_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setDedicatedHostName(const std::string& dedicatedHostName)
+{
+	dedicatedHostName_ = dedicatedHostName;
+	setParameter("DedicatedHostName", dedicatedHostName);
+}
+
+std::string DescribeDedicatedClusterInstanceListRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string DescribeDedicatedClusterInstanceListRequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setParameter("OwnerAccount", ownerAccount);
+}
+
+std::string DescribeDedicatedClusterInstanceListRequest::getInstanceNetType()const
+{
+	return instanceNetType_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setInstanceNetType(const std::string& instanceNetType)
+{
+	instanceNetType_ = instanceNetType;
+	setParameter("InstanceNetType", instanceNetType);
+}
+
+std::string DescribeDedicatedClusterInstanceListRequest::getClusterId()const
+{
+	return clusterId_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setClusterId(const std::string& clusterId)
+{
+	clusterId_ = clusterId;
+	setParameter("ClusterId", clusterId);
+}
+
+long DescribeDedicatedClusterInstanceListRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string DescribeDedicatedClusterInstanceListRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setParameter("InstanceId", instanceId);
+}
+

r-kvstore/src/model/DescribeDedicatedClusterInstanceListResult.cc

@@ -0,0 +1,136 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/r-kvstore/model/DescribeDedicatedClusterInstanceListResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::R_kvstore;
+using namespace AlibabaCloud::R_kvstore::Model;
+
+DescribeDedicatedClusterInstanceListResult::DescribeDedicatedClusterInstanceListResult() :
+	ServiceResult()
+{}
+
+DescribeDedicatedClusterInstanceListResult::DescribeDedicatedClusterInstanceListResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeDedicatedClusterInstanceListResult::~DescribeDedicatedClusterInstanceListResult()
+{}
+
+void DescribeDedicatedClusterInstanceListResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allInstancesNode = value["Instances"]["InstancesItem"];
+	for (auto valueInstancesInstancesItem : allInstancesNode)
+	{
+		InstancesItem instancesObject;
+		if(!valueInstancesInstancesItem["CharacterType"].isNull())
+			instancesObject.characterType = std::stoi(valueInstancesInstancesItem["CharacterType"].asString());
+		if(!valueInstancesInstancesItem["ClusterId"].isNull())
+			instancesObject.clusterId = valueInstancesInstancesItem["ClusterId"].asString();
+		if(!valueInstancesInstancesItem["ClusterName"].isNull())
+			instancesObject.clusterName = valueInstancesInstancesItem["ClusterName"].asString();
+		if(!valueInstancesInstancesItem["EngineVersion"].isNull())
+			instancesObject.engineVersion = valueInstancesInstancesItem["EngineVersion"].asString();
+		if(!valueInstancesInstancesItem["InstanceId"].isNull())
+			instancesObject.instanceId = valueInstancesInstancesItem["InstanceId"].asString();
+		if(!valueInstancesInstancesItem["InstanceStatus"].isNull())
+			instancesObject.instanceStatus = valueInstancesInstancesItem["InstanceStatus"].asString();
+		if(!valueInstancesInstancesItem["MaintainEndTime"].isNull())
+			instancesObject.maintainEndTime = valueInstancesInstancesItem["MaintainEndTime"].asString();
+		if(!valueInstancesInstancesItem["MaintainStartTime"].isNull())
+			instancesObject.maintainStartTime = valueInstancesInstancesItem["MaintainStartTime"].asString();
+		if(!valueInstancesInstancesItem["RegionId"].isNull())
+			instancesObject.regionId = valueInstancesInstancesItem["RegionId"].asString();
+		if(!valueInstancesInstancesItem["VpcId"].isNull())
+			instancesObject.vpcId = valueInstancesInstancesItem["VpcId"].asString();
+		if(!valueInstancesInstancesItem["VswitchId"].isNull())
+			instancesObject.vswitchId = valueInstancesInstancesItem["VswitchId"].asString();
+		if(!valueInstancesInstancesItem["ZoneId"].isNull())
+			instancesObject.zoneId = valueInstancesInstancesItem["ZoneId"].asString();
+		if(!valueInstancesInstancesItem["InstanceName"].isNull())
+			instancesObject.instanceName = valueInstancesInstancesItem["InstanceName"].asString();
+		if(!valueInstancesInstancesItem["CustomId"].isNull())
+			instancesObject.customId = valueInstancesInstancesItem["CustomId"].asString();
+		if(!valueInstancesInstancesItem["InstanceClass"].isNull())
+			instancesObject.instanceClass = valueInstancesInstancesItem["InstanceClass"].asString();
+		if(!valueInstancesInstancesItem["Engine"].isNull())
+			instancesObject.engine = valueInstancesInstancesItem["Engine"].asString();
+		if(!valueInstancesInstancesItem["StorageType"].isNull())
+			instancesObject.storageType = valueInstancesInstancesItem["StorageType"].asString();
+		if(!valueInstancesInstancesItem["ConnectionDomain"].isNull())
+			instancesObject.connectionDomain = valueInstancesInstancesItem["ConnectionDomain"].asString();
+		if(!valueInstancesInstancesItem["CreateTime"].isNull())
+			instancesObject.createTime = valueInstancesInstancesItem["CreateTime"].asString();
+		auto allInstanceNodeListNode = allInstancesNode["InstanceNodeList"]["InstanceNodes"];
+		for (auto allInstancesNodeInstanceNodeListInstanceNodes : allInstanceNodeListNode)
+		{
+			InstancesItem::InstanceNodes instanceNodeListObject;
+			if(!allInstancesNodeInstanceNodeListInstanceNodes["NodeId"].isNull())
+				instanceNodeListObject.nodeId = std::stoi(allInstancesNodeInstanceNodeListInstanceNodes["NodeId"].asString());
+			if(!allInstancesNodeInstanceNodeListInstanceNodes["NodeIp"].isNull())
+				instanceNodeListObject.nodeIp = allInstancesNodeInstanceNodeListInstanceNodes["NodeIp"].asString();
+			if(!allInstancesNodeInstanceNodeListInstanceNodes["NodeType"].isNull())
+				instanceNodeListObject.nodeType = allInstancesNodeInstanceNodeListInstanceNodes["NodeType"].asString();
+			if(!allInstancesNodeInstanceNodeListInstanceNodes["Port"].isNull())
+				instanceNodeListObject.port = std::stoi(allInstancesNodeInstanceNodeListInstanceNodes["Port"].asString());
+			if(!allInstancesNodeInstanceNodeListInstanceNodes["Role"].isNull())
+				instanceNodeListObject.role = allInstancesNodeInstanceNodeListInstanceNodes["Role"].asString();
+			if(!allInstancesNodeInstanceNodeListInstanceNodes["ZoneId"].isNull())
+				instanceNodeListObject.zoneId = allInstancesNodeInstanceNodeListInstanceNodes["ZoneId"].asString();
+			if(!allInstancesNodeInstanceNodeListInstanceNodes["InstanceId"].isNull())
+				instanceNodeListObject.instanceId = allInstancesNodeInstanceNodeListInstanceNodes["InstanceId"].asString();
+			if(!allInstancesNodeInstanceNodeListInstanceNodes["DedicatedHostName"].isNull())
+				instanceNodeListObject.dedicatedHostName = allInstancesNodeInstanceNodeListInstanceNodes["DedicatedHostName"].asString();
+			instancesObject.instanceNodeList.push_back(instanceNodeListObject);
+		}
+		instances_.push_back(instancesObject);
+	}
+	if(!value["PageNumber"].isNull())
+		pageNumber_ = std::stoi(value["PageNumber"].asString());
+	if(!value["PageSize"].isNull())
+		pageSize_ = std::stoi(value["PageSize"].asString());
+	if(!value["TotalCount"].isNull())
+		totalCount_ = std::stoi(value["TotalCount"].asString());
+
+}
+
+std::vector<DescribeDedicatedClusterInstanceListResult::InstancesItem> DescribeDedicatedClusterInstanceListResult::getInstances()const
+{
+	return instances_;
+}
+
+int DescribeDedicatedClusterInstanceListResult::getTotalCount()const
+{
+	return totalCount_;
+}
+
+int DescribeDedicatedClusterInstanceListResult::getPageSize()const
+{
+	return pageSize_;
+}
+
+int DescribeDedicatedClusterInstanceListResult::getPageNumber()const
+{
+	return pageNumber_;
+}
+