patch

1. fixed code about delete char*
2. free curl_slist
3. added lock for EndpointProvider::LoadLocalEndpoints()

CHANGELOG

@@ -1,3 +1,21 @@
+2020-04-28 Version: 1.36.385
+- Generated 2019-03-15 for `fnf`.
+
+2020-04-28 Version: 1.36.384
+- Add CompareFaceVerify API.
+
+2020-04-27 Version: 1.36.383
+- Support watermark.
+
+2020-04-27 Version: 1.36.382
+- Describe describeAvailableResource.
+
+2020-04-27 Version: 1.36.381
+- ContrastFaceVerify Return SubCode.
+
+2020-04-27 Version: 1.36.380
+- Generated 2019-01-01 for `Cassandra`.
+
 2020-04-26 Version: 1.36.379
 - New api publish.
 

VERSION

@@ -1 +1 @@
-1.36.379
+1.36.385

cloudauth/CMakeLists.txt

@@ -21,6 +21,8 @@ set(cloudauth_public_header
 	include/alibabacloud/cloudauth/CloudauthExport.h )
 
 set(cloudauth_public_header_model 
+	include/alibabacloud/cloudauth/model/CompareFaceVerifyRequest.h
+	include/alibabacloud/cloudauth/model/CompareFaceVerifyResult.h
 	include/alibabacloud/cloudauth/model/CompareFacesRequest.h
 	include/alibabacloud/cloudauth/model/CompareFacesResult.h
 	include/alibabacloud/cloudauth/model/ContrastFaceVerifyRequest.h
@@ -84,6 +86,8 @@ set(cloudauth_public_header_model
 
 set(cloudauth_src 
 	src/CloudauthClient.cc
+	src/model/CompareFaceVerifyRequest.cc
+	src/model/CompareFaceVerifyResult.cc
 	src/model/CompareFacesRequest.cc
 	src/model/CompareFacesResult.cc
 	src/model/ContrastFaceVerifyRequest.cc

cloudauth/include/alibabacloud/cloudauth/CloudauthClient.h

@@ -22,6 +22,8 @@
 #include <alibabacloud/core/EndpointProvider.h>
 #include <alibabacloud/core/RpcServiceClient.h>
 #include "CloudauthExport.h"
+#include "model/CompareFaceVerifyRequest.h"
+#include "model/CompareFaceVerifyResult.h"
 #include "model/CompareFacesRequest.h"
 #include "model/CompareFacesResult.h"
 #include "model/ContrastFaceVerifyRequest.h"
@@ -91,6 +93,9 @@ namespace AlibabaCloud
 		class ALIBABACLOUD_CLOUDAUTH_EXPORT CloudauthClient : public RpcServiceClient
 		{
 		public:
+			typedef Outcome<Error, Model::CompareFaceVerifyResult> CompareFaceVerifyOutcome;
+			typedef std::future<CompareFaceVerifyOutcome> CompareFaceVerifyOutcomeCallable;
+			typedef std::function<void(const CloudauthClient*, const Model::CompareFaceVerifyRequest&, const CompareFaceVerifyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CompareFaceVerifyAsyncHandler;
 			typedef Outcome<Error, Model::CompareFacesResult> CompareFacesOutcome;
 			typedef std::future<CompareFacesOutcome> CompareFacesOutcomeCallable;
 			typedef std::function<void(const CloudauthClient*, const Model::CompareFacesRequest&, const CompareFacesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CompareFacesAsyncHandler;
@@ -186,6 +191,9 @@ namespace AlibabaCloud
 			CloudauthClient(const std::shared_ptr<CredentialsProvider> &credentialsProvider, const ClientConfiguration &configuration);
 			CloudauthClient(const std::string &accessKeyId, const std::string &accessKeySecret, const ClientConfiguration &configuration);
 			~CloudauthClient();
+			CompareFaceVerifyOutcome compareFaceVerify(const Model::CompareFaceVerifyRequest &request)const;
+			void compareFaceVerifyAsync(const Model::CompareFaceVerifyRequest& request, const CompareFaceVerifyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			CompareFaceVerifyOutcomeCallable compareFaceVerifyCallable(const Model::CompareFaceVerifyRequest& request) const;
 			CompareFacesOutcome compareFaces(const Model::CompareFacesRequest &request)const;
 			void compareFacesAsync(const Model::CompareFacesRequest& request, const CompareFacesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CompareFacesOutcomeCallable compareFacesCallable(const Model::CompareFacesRequest& request) const;

cloudauth/include/alibabacloud/cloudauth/model/CompareFaceVerifyRequest.h

@@ -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.
+ */
+
+#ifndef ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYREQUEST_H_
+#define ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/cloudauth/CloudauthExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Cloudauth
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CLOUDAUTH_EXPORT CompareFaceVerifyRequest : public RpcServiceRequest
+			{
+
+			public:
+				CompareFaceVerifyRequest();
+				~CompareFaceVerifyRequest();
+
+				std::string getTargetFaceContrastPictureUrl()const;
+				void setTargetFaceContrastPictureUrl(const std::string& targetFaceContrastPictureUrl);
+				std::string getProductCode()const;
+				void setProductCode(const std::string& productCode);
+				std::string getTargetCertifyId()const;
+				void setTargetCertifyId(const std::string& targetCertifyId);
+				std::string getSourceOssObjectName()const;
+				void setSourceOssObjectName(const std::string& sourceOssObjectName);
+				std::string getTargetFaceContrastPicture()const;
+				void setTargetFaceContrastPicture(const std::string& targetFaceContrastPicture);
+				std::string getTargetOssBucketName()const;
+				void setTargetOssBucketName(const std::string& targetOssBucketName);
+				std::string getSourceOssBucketName()const;
+				void setSourceOssBucketName(const std::string& sourceOssBucketName);
+				std::string getOuterOrderNo()const;
+				void setOuterOrderNo(const std::string& outerOrderNo);
+				std::string getTargetOssObjectName()const;
+				void setTargetOssObjectName(const std::string& targetOssObjectName);
+				std::string getSourceFaceContrastPicture()const;
+				void setSourceFaceContrastPicture(const std::string& sourceFaceContrastPicture);
+				long getSceneId()const;
+				void setSceneId(long sceneId);
+				std::string getSourceFaceContrastPictureUrl()const;
+				void setSourceFaceContrastPictureUrl(const std::string& sourceFaceContrastPictureUrl);
+				std::string getSourceCertifyId()const;
+				void setSourceCertifyId(const std::string& sourceCertifyId);
+
+            private:
+				std::string targetFaceContrastPictureUrl_;
+				std::string productCode_;
+				std::string targetCertifyId_;
+				std::string sourceOssObjectName_;
+				std::string targetFaceContrastPicture_;
+				std::string targetOssBucketName_;
+				std::string sourceOssBucketName_;
+				std::string outerOrderNo_;
+				std::string targetOssObjectName_;
+				std::string sourceFaceContrastPicture_;
+				long sceneId_;
+				std::string sourceFaceContrastPictureUrl_;
+				std::string sourceCertifyId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYREQUEST_H_

cloudauth/include/alibabacloud/cloudauth/model/CompareFaceVerifyResult.h

@@ -14,40 +14,47 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCERESULT_H_
-#define ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCERESULT_H_
+#ifndef ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYRESULT_H_
+#define ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYRESULT_H_
 
 #include <string>
 #include <vector>
 #include <utility>
 #include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/hbase/HBaseExport.h>
+#include <alibabacloud/cloudauth/CloudauthExport.h>
 
 namespace AlibabaCloud
 {
-	namespace HBase
+	namespace Cloudauth
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_HBASE_EXPORT CreateInstanceResult : public ServiceResult
+			class ALIBABACLOUD_CLOUDAUTH_EXPORT CompareFaceVerifyResult : public ServiceResult
 			{
 			public:
+				struct ResultObject
+				{
+					std::string passed;
+					float verifyScore;
+				};
 
 
-				CreateInstanceResult();
-				explicit CreateInstanceResult(const std::string &payload);
-				~CreateInstanceResult();
-				std::string getClusterId()const;
-				std::string getOrderId()const;
+				CompareFaceVerifyResult();
+				explicit CompareFaceVerifyResult(const std::string &payload);
+				~CompareFaceVerifyResult();
+				ResultObject getResultObject()const;
+				std::string getMessage()const;
+				std::string getCode()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				std::string clusterId_;
-				std::string orderId_;
+				ResultObject resultObject_;
+				std::string message_;
+				std::string code_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCERESULT_H_
+#endif // !ALIBABACLOUD_CLOUDAUTH_MODEL_COMPAREFACEVERIFYRESULT_H_

cloudauth/include/alibabacloud/cloudauth/model/ContrastFaceVerifyResult.h

@@ -37,6 +37,7 @@ namespace AlibabaCloud
 					std::string passed;
 					std::string identityInfo;
 					std::string materialInfo;
+					std::string subCode;
 				};
 
 

cloudauth/include/alibabacloud/cloudauth/model/VerifyDeviceRequest.h

@@ -35,6 +35,8 @@ namespace AlibabaCloud
 				VerifyDeviceRequest();
 				~VerifyDeviceRequest();
 
+				std::string getExtInfo()const;
+				void setExtInfo(const std::string& extInfo);
 				std::string getCertifyData()const;
 				void setCertifyData(const std::string& certifyData);
 				std::string getAppVersion()const;
@@ -43,6 +45,7 @@ namespace AlibabaCloud
 				void setCertifyId(const std::string& certifyId);
 
             private:
+				std::string extInfo_;
 				std::string certifyData_;
 				std::string appVersion_;
 				std::string certifyId_;

cloudauth/src/CloudauthClient.cc

@@ -51,6 +51,42 @@ CloudauthClient::CloudauthClient(const std::string & accessKeyId, const std::str
 CloudauthClient::~CloudauthClient()
 {}
 
+CloudauthClient::CompareFaceVerifyOutcome CloudauthClient::compareFaceVerify(const CompareFaceVerifyRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return CompareFaceVerifyOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return CompareFaceVerifyOutcome(CompareFaceVerifyResult(outcome.result()));
+	else
+		return CompareFaceVerifyOutcome(outcome.error());
+}
+
+void CloudauthClient::compareFaceVerifyAsync(const CompareFaceVerifyRequest& request, const CompareFaceVerifyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, compareFaceVerify(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+CloudauthClient::CompareFaceVerifyOutcomeCallable CloudauthClient::compareFaceVerifyCallable(const CompareFaceVerifyRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<CompareFaceVerifyOutcome()>>(
+			[this, request]()
+			{
+			return this->compareFaceVerify(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 CloudauthClient::CompareFacesOutcome CloudauthClient::compareFaces(const CompareFacesRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

cloudauth/src/model/CompareFaceVerifyRequest.cc

@@ -0,0 +1,172 @@
+/*
+ * 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/cloudauth/model/CompareFaceVerifyRequest.h>
+
+using AlibabaCloud::Cloudauth::Model::CompareFaceVerifyRequest;
+
+CompareFaceVerifyRequest::CompareFaceVerifyRequest() :
+	RpcServiceRequest("cloudauth", "2019-03-07", "CompareFaceVerify")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+CompareFaceVerifyRequest::~CompareFaceVerifyRequest()
+{}
+
+std::string CompareFaceVerifyRequest::getTargetFaceContrastPictureUrl()const
+{
+	return targetFaceContrastPictureUrl_;
+}
+
+void CompareFaceVerifyRequest::setTargetFaceContrastPictureUrl(const std::string& targetFaceContrastPictureUrl)
+{
+	targetFaceContrastPictureUrl_ = targetFaceContrastPictureUrl;
+	setBodyParameter("TargetFaceContrastPictureUrl", targetFaceContrastPictureUrl);
+}
+
+std::string CompareFaceVerifyRequest::getProductCode()const
+{
+	return productCode_;
+}
+
+void CompareFaceVerifyRequest::setProductCode(const std::string& productCode)
+{
+	productCode_ = productCode;
+	setBodyParameter("ProductCode", productCode);
+}
+
+std::string CompareFaceVerifyRequest::getTargetCertifyId()const
+{
+	return targetCertifyId_;
+}
+
+void CompareFaceVerifyRequest::setTargetCertifyId(const std::string& targetCertifyId)
+{
+	targetCertifyId_ = targetCertifyId;
+	setBodyParameter("TargetCertifyId", targetCertifyId);
+}
+
+std::string CompareFaceVerifyRequest::getSourceOssObjectName()const
+{
+	return sourceOssObjectName_;
+}
+
+void CompareFaceVerifyRequest::setSourceOssObjectName(const std::string& sourceOssObjectName)
+{
+	sourceOssObjectName_ = sourceOssObjectName;
+	setBodyParameter("SourceOssObjectName", sourceOssObjectName);
+}
+
+std::string CompareFaceVerifyRequest::getTargetFaceContrastPicture()const
+{
+	return targetFaceContrastPicture_;
+}
+
+void CompareFaceVerifyRequest::setTargetFaceContrastPicture(const std::string& targetFaceContrastPicture)
+{
+	targetFaceContrastPicture_ = targetFaceContrastPicture;
+	setBodyParameter("TargetFaceContrastPicture", targetFaceContrastPicture);
+}
+
+std::string CompareFaceVerifyRequest::getTargetOssBucketName()const
+{
+	return targetOssBucketName_;
+}
+
+void CompareFaceVerifyRequest::setTargetOssBucketName(const std::string& targetOssBucketName)
+{
+	targetOssBucketName_ = targetOssBucketName;
+	setBodyParameter("TargetOssBucketName", targetOssBucketName);
+}
+
+std::string CompareFaceVerifyRequest::getSourceOssBucketName()const
+{
+	return sourceOssBucketName_;
+}
+
+void CompareFaceVerifyRequest::setSourceOssBucketName(const std::string& sourceOssBucketName)
+{
+	sourceOssBucketName_ = sourceOssBucketName;
+	setBodyParameter("SourceOssBucketName", sourceOssBucketName);
+}
+
+std::string CompareFaceVerifyRequest::getOuterOrderNo()const
+{
+	return outerOrderNo_;
+}
+
+void CompareFaceVerifyRequest::setOuterOrderNo(const std::string& outerOrderNo)
+{
+	outerOrderNo_ = outerOrderNo;
+	setBodyParameter("OuterOrderNo", outerOrderNo);
+}
+
+std::string CompareFaceVerifyRequest::getTargetOssObjectName()const
+{
+	return targetOssObjectName_;
+}
+
+void CompareFaceVerifyRequest::setTargetOssObjectName(const std::string& targetOssObjectName)
+{
+	targetOssObjectName_ = targetOssObjectName;
+	setBodyParameter("TargetOssObjectName", targetOssObjectName);
+}
+
+std::string CompareFaceVerifyRequest::getSourceFaceContrastPicture()const
+{
+	return sourceFaceContrastPicture_;
+}
+
+void CompareFaceVerifyRequest::setSourceFaceContrastPicture(const std::string& sourceFaceContrastPicture)
+{
+	sourceFaceContrastPicture_ = sourceFaceContrastPicture;
+	setBodyParameter("SourceFaceContrastPicture", sourceFaceContrastPicture);
+}
+
+long CompareFaceVerifyRequest::getSceneId()const
+{
+	return sceneId_;
+}
+
+void CompareFaceVerifyRequest::setSceneId(long sceneId)
+{
+	sceneId_ = sceneId;
+	setBodyParameter("SceneId", std::to_string(sceneId));
+}
+
+std::string CompareFaceVerifyRequest::getSourceFaceContrastPictureUrl()const
+{
+	return sourceFaceContrastPictureUrl_;
+}
+
+void CompareFaceVerifyRequest::setSourceFaceContrastPictureUrl(const std::string& sourceFaceContrastPictureUrl)
+{
+	sourceFaceContrastPictureUrl_ = sourceFaceContrastPictureUrl;
+	setBodyParameter("SourceFaceContrastPictureUrl", sourceFaceContrastPictureUrl);
+}
+
+std::string CompareFaceVerifyRequest::getSourceCertifyId()const
+{
+	return sourceCertifyId_;
+}
+
+void CompareFaceVerifyRequest::setSourceCertifyId(const std::string& sourceCertifyId)
+{
+	sourceCertifyId_ = sourceCertifyId;
+	setBodyParameter("SourceCertifyId", sourceCertifyId);
+}
+

cloudauth/src/model/CompareFaceVerifyResult.cc

@@ -0,0 +1,68 @@
+/*
+ * 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/cloudauth/model/CompareFaceVerifyResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Cloudauth;
+using namespace AlibabaCloud::Cloudauth::Model;
+
+CompareFaceVerifyResult::CompareFaceVerifyResult() :
+	ServiceResult()
+{}
+
+CompareFaceVerifyResult::CompareFaceVerifyResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+CompareFaceVerifyResult::~CompareFaceVerifyResult()
+{}
+
+void CompareFaceVerifyResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto resultObjectNode = value["ResultObject"];
+	if(!resultObjectNode["Passed"].isNull())
+		resultObject_.passed = resultObjectNode["Passed"].asString();
+	if(!resultObjectNode["VerifyScore"].isNull())
+		resultObject_.verifyScore = std::stof(resultObjectNode["VerifyScore"].asString());
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+
+}
+
+CompareFaceVerifyResult::ResultObject CompareFaceVerifyResult::getResultObject()const
+{
+	return resultObject_;
+}
+
+std::string CompareFaceVerifyResult::getMessage()const
+{
+	return message_;
+}
+
+std::string CompareFaceVerifyResult::getCode()const
+{
+	return code_;
+}
+

cloudauth/src/model/ContrastFaceVerifyResult.cc

@@ -46,6 +46,8 @@ void ContrastFaceVerifyResult::parse(const std::string &payload)
 		resultObject_.identityInfo = resultObjectNode["IdentityInfo"].asString();
 	if(!resultObjectNode["MaterialInfo"].isNull())
 		resultObject_.materialInfo = resultObjectNode["MaterialInfo"].asString();
+	if(!resultObjectNode["SubCode"].isNull())
+		resultObject_.subCode = resultObjectNode["SubCode"].asString();
 	if(!value["Message"].isNull())
 		message_ = value["Message"].asString();
 	if(!value["Code"].isNull())

cloudauth/src/model/VerifyDeviceRequest.cc

@@ -27,6 +27,17 @@ VerifyDeviceRequest::VerifyDeviceRequest() :
 VerifyDeviceRequest::~VerifyDeviceRequest()
 {}
 
+std::string VerifyDeviceRequest::getExtInfo()const
+{
+	return extInfo_;
+}
+
+void VerifyDeviceRequest::setExtInfo(const std::string& extInfo)
+{
+	extInfo_ = extInfo;
+	setBodyParameter("ExtInfo", extInfo);
+}
+
 std::string VerifyDeviceRequest::getCertifyData()const
 {
 	return certifyData_;

core/src/CurlHttpClient.cc

@@ -145,6 +145,7 @@ CurlHttpClient::makeRequest(const HttpRequest &request) {
       curl_easy_setopt(curlHandle_, CURLOPT_READFUNCTION, readCallback);
       curl_easy_setopt(curlHandle_, CURLOPT_UPLOAD, 1L);
       curl_easy_setopt(curlHandle_, CURLOPT_READDATA, ctx);
+      free(ctx);
     }
     break;
 
@@ -194,6 +195,7 @@ CurlHttpClient::makeRequest(const HttpRequest &request) {
   }
 
   CURLcode res = curl_easy_perform(curlHandle_);
+  curl_slist_free_all(list);
   switch (res) {
     case CURLE_OK: {
       long response_code;

core/src/EndpointProvider.cc

@@ -19,6 +19,9 @@
 #include <iomanip>
 #include <json/json.h>
 #include <sstream>
+#include <thread>
+#include <mutex>
+#include <condition_variable>
 
 #ifndef WIN32
 #include "LocalEndpoints.h"
@@ -39,7 +42,10 @@ namespace
 #include <strings.h>
 #endif
 
+std::mutex mutex;
+std::condition_variable cv;
 bool local_endpoints_loaded = false;
+bool local_endpoints_loading = false;
 typedef std::string productType;
 typedef std::string regionType;
 typedef std::string endpointType;
@@ -60,6 +66,8 @@ static void LoadLocalEndpoints()
 {
   Json::Reader reader;
   Json::Value value;
+  std::unique_lock<std::mutex> lock(mutex);
+
   if (local_endpoints_loaded)
   {
     return;
@@ -76,6 +84,10 @@ static void LoadLocalEndpoints()
     return;
   }
 
+  cv.wait(lock, [] { return !local_endpoints_loading; });// continue if loading completed
+
+  local_endpoints_loading = true;
+
   auto regions = value["regions"];
   for (const auto &region : regions)
   {
@@ -107,6 +119,10 @@ static void LoadLocalEndpoints()
     allLocalEndpoints[product] = p;
   }
   local_endpoints_loaded = true;
+  local_endpoints_loading = false;
+
+  lock.unlock();
+  cv.notify_one();
 }
 
 } // namespace

core/src/HttpMessage.cc

@@ -139,7 +139,7 @@ HttpMessage::HeaderValueType HttpMessage::header(KnownHeader header)const {
 
 void HttpMessage::setBody(const char *data, size_t size) {
   if (body_)
-    delete body_;
+    delete[] body_;
   body_ = nullptr;
   bodySize_ = 0;
   if (size) {

fnf/include/alibabacloud/fnf/model/CreateFlowRequest.h

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				void setName(const std::string& name);
 				std::string getDefinition()const;
 				void setDefinition(const std::string& definition);
+				std::string getExternalStorageLocation()const;
+				void setExternalStorageLocation(const std::string& externalStorageLocation);
 
             private:
 				std::string description_;
@@ -55,6 +57,7 @@ namespace AlibabaCloud
 				std::string roleArn_;
 				std::string name_;
 				std::string definition_;
+				std::string externalStorageLocation_;
 
 			};
 		}

fnf/include/alibabacloud/fnf/model/CreateFlowResult.h

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 				std::string getDefinition()const;
 				std::string getLastModifiedTime()const;
 				std::string getId()const;
+				std::string getExternalStorageLocation()const;
 				std::string getRoleArn()const;
 				std::string getName()const;
 
@@ -55,6 +56,7 @@ namespace AlibabaCloud
 				std::string definition_;
 				std::string lastModifiedTime_;
 				std::string id_;
+				std::string externalStorageLocation_;
 				std::string roleArn_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/DescribeExecutionResult.h

@@ -42,7 +42,9 @@ namespace AlibabaCloud
 				std::string getStoppedTime()const;
 				std::string getFlowName()const;
 				std::string getOutput()const;
+				std::string getExternalOutputUri()const;
 				std::string getStartedTime()const;
+				std::string getExternalInputUri()const;
 				std::string getFlowDefinition()const;
 				std::string getName()const;
 
@@ -54,7 +56,9 @@ namespace AlibabaCloud
 				std::string stoppedTime_;
 				std::string flowName_;
 				std::string output_;
+				std::string externalOutputUri_;
 				std::string startedTime_;
+				std::string externalInputUri_;
 				std::string flowDefinition_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/DescribeFlowResult.h

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 				std::string getDefinition()const;
 				std::string getLastModifiedTime()const;
 				std::string getId()const;
+				std::string getExternalStorageLocation()const;
 				std::string getRoleArn()const;
 				std::string getName()const;
 
@@ -55,6 +56,7 @@ namespace AlibabaCloud
 				std::string definition_;
 				std::string lastModifiedTime_;
 				std::string id_;
+				std::string externalStorageLocation_;
 				std::string roleArn_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/ListExecutionsResult.h

@@ -39,7 +39,9 @@ namespace AlibabaCloud
 					std::string stoppedTime;
 					std::string flowName;
 					std::string output;
+					std::string externalOutputUri;
 					std::string startedTime;
+					std::string externalInputUri;
 					std::string flowDefinition;
 					std::string name;
 				};

fnf/include/alibabacloud/fnf/model/ListFlowsResult.h

@@ -40,6 +40,7 @@ namespace AlibabaCloud
 					std::string definition;
 					std::string lastModifiedTime;
 					std::string id;
+					std::string externalStorageLocation;
 					std::string roleArn;
 					std::string name;
 				};

fnf/include/alibabacloud/fnf/model/StartExecutionResult.h

@@ -42,7 +42,9 @@ namespace AlibabaCloud
 				std::string getStoppedTime()const;
 				std::string getFlowName()const;
 				std::string getOutput()const;
+				std::string getExternalOutputUri()const;
 				std::string getStartedTime()const;
+				std::string getExternalInputUri()const;
 				std::string getFlowDefinition()const;
 				std::string getName()const;
 
@@ -54,7 +56,9 @@ namespace AlibabaCloud
 				std::string stoppedTime_;
 				std::string flowName_;
 				std::string output_;
+				std::string externalOutputUri_;
 				std::string startedTime_;
+				std::string externalInputUri_;
 				std::string flowDefinition_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/StopExecutionResult.h

@@ -42,7 +42,9 @@ namespace AlibabaCloud
 				std::string getStoppedTime()const;
 				std::string getFlowName()const;
 				std::string getOutput()const;
+				std::string getExternalOutputUri()const;
 				std::string getStartedTime()const;
+				std::string getExternalInputUri()const;
 				std::string getFlowDefinition()const;
 				std::string getName()const;
 
@@ -54,7 +56,9 @@ namespace AlibabaCloud
 				std::string stoppedTime_;
 				std::string flowName_;
 				std::string output_;
+				std::string externalOutputUri_;
 				std::string startedTime_;
+				std::string externalInputUri_;
 				std::string flowDefinition_;
 				std::string name_;
 

fnf/include/alibabacloud/fnf/model/UpdateFlowRequest.h

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				void setName(const std::string& name);
 				std::string getDefinition()const;
 				void setDefinition(const std::string& definition);
+				std::string getExternalStorageLocation()const;
+				void setExternalStorageLocation(const std::string& externalStorageLocation);
 
             private:
 				std::string description_;
@@ -55,6 +57,7 @@ namespace AlibabaCloud
 				std::string roleArn_;
 				std::string name_;
 				std::string definition_;
+				std::string externalStorageLocation_;
 
 			};
 		}

fnf/include/alibabacloud/fnf/model/UpdateFlowResult.h

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 				std::string getDefinition()const;
 				std::string getLastModifiedTime()const;
 				std::string getId()const;
+				std::string getExternalStorageLocation()const;
 				std::string getRoleArn()const;
 				std::string getName()const;
 
@@ -55,6 +56,7 @@ namespace AlibabaCloud
 				std::string definition_;
 				std::string lastModifiedTime_;
 				std::string id_;
+				std::string externalStorageLocation_;
 				std::string roleArn_;
 				std::string name_;
 

fnf/src/model/CreateFlowRequest.cc

@@ -93,3 +93,14 @@ void CreateFlowRequest::setDefinition(const std::string& definition)
 	setBodyParameter("Definition", definition);
 }
 
+std::string CreateFlowRequest::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
+void CreateFlowRequest::setExternalStorageLocation(const std::string& externalStorageLocation)
+{
+	externalStorageLocation_ = externalStorageLocation;
+	setBodyParameter("ExternalStorageLocation", externalStorageLocation);
+}
+

fnf/src/model/CreateFlowResult.cc

@@ -55,6 +55,8 @@ void CreateFlowResult::parse(const std::string &payload)
 		createdTime_ = value["CreatedTime"].asString();
 	if(!value["LastModifiedTime"].isNull())
 		lastModifiedTime_ = value["LastModifiedTime"].asString();
+	if(!value["ExternalStorageLocation"].isNull())
+		externalStorageLocation_ = value["ExternalStorageLocation"].asString();
 
 }
 
@@ -88,6 +90,11 @@ std::string CreateFlowResult::getId()const
 	return id_;
 }
 
+std::string CreateFlowResult::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
 std::string CreateFlowResult::getRoleArn()const
 {
 	return roleArn_;

fnf/src/model/DescribeExecutionResult.cc

@@ -55,6 +55,10 @@ void DescribeExecutionResult::parse(const std::string &payload)
 		startedTime_ = value["StartedTime"].asString();
 	if(!value["StoppedTime"].isNull())
 		stoppedTime_ = value["StoppedTime"].asString();
+	if(!value["ExternalInputUri"].isNull())
+		externalInputUri_ = value["ExternalInputUri"].asString();
+	if(!value["ExternalOutputUri"].isNull())
+		externalOutputUri_ = value["ExternalOutputUri"].asString();
 
 }
 
@@ -83,11 +87,21 @@ std::string DescribeExecutionResult::getOutput()const
 	return output_;
 }
 
+std::string DescribeExecutionResult::getExternalOutputUri()const
+{
+	return externalOutputUri_;
+}
+
 std::string DescribeExecutionResult::getStartedTime()const
 {
 	return startedTime_;
 }
 
+std::string DescribeExecutionResult::getExternalInputUri()const
+{
+	return externalInputUri_;
+}
+
 std::string DescribeExecutionResult::getFlowDefinition()const
 {
 	return flowDefinition_;

fnf/src/model/DescribeFlowResult.cc

@@ -55,6 +55,8 @@ void DescribeFlowResult::parse(const std::string &payload)
 		createdTime_ = value["CreatedTime"].asString();
 	if(!value["LastModifiedTime"].isNull())
 		lastModifiedTime_ = value["LastModifiedTime"].asString();
+	if(!value["ExternalStorageLocation"].isNull())
+		externalStorageLocation_ = value["ExternalStorageLocation"].asString();
 
 }
 
@@ -88,6 +90,11 @@ std::string DescribeFlowResult::getId()const
 	return id_;
 }
 
+std::string DescribeFlowResult::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
 std::string DescribeFlowResult::getRoleArn()const
 {
 	return roleArn_;

fnf/src/model/ListExecutionsResult.cc

@@ -59,6 +59,10 @@ void ListExecutionsResult::parse(const std::string &payload)
 			executionsObject.startedTime = valueExecutionsExecutionsItem["StartedTime"].asString();
 		if(!valueExecutionsExecutionsItem["StoppedTime"].isNull())
 			executionsObject.stoppedTime = valueExecutionsExecutionsItem["StoppedTime"].asString();
+		if(!valueExecutionsExecutionsItem["ExternalInputUri"].isNull())
+			executionsObject.externalInputUri = valueExecutionsExecutionsItem["ExternalInputUri"].asString();
+		if(!valueExecutionsExecutionsItem["ExternalOutputUri"].isNull())
+			executionsObject.externalOutputUri = valueExecutionsExecutionsItem["ExternalOutputUri"].asString();
 		executions_.push_back(executionsObject);
 	}
 	if(!value["NextToken"].isNull())

fnf/src/model/ListFlowsResult.cc

@@ -59,6 +59,8 @@ void ListFlowsResult::parse(const std::string &payload)
 			flowsObject.createdTime = valueFlowsFlowsItem["CreatedTime"].asString();
 		if(!valueFlowsFlowsItem["LastModifiedTime"].isNull())
 			flowsObject.lastModifiedTime = valueFlowsFlowsItem["LastModifiedTime"].asString();
+		if(!valueFlowsFlowsItem["ExternalStorageLocation"].isNull())
+			flowsObject.externalStorageLocation = valueFlowsFlowsItem["ExternalStorageLocation"].asString();
 		flows_.push_back(flowsObject);
 	}
 	if(!value["NextToken"].isNull())

fnf/src/model/StartExecutionResult.cc

@@ -55,6 +55,10 @@ void StartExecutionResult::parse(const std::string &payload)
 		startedTime_ = value["StartedTime"].asString();
 	if(!value["StoppedTime"].isNull())
 		stoppedTime_ = value["StoppedTime"].asString();
+	if(!value["ExternalInputUri"].isNull())
+		externalInputUri_ = value["ExternalInputUri"].asString();
+	if(!value["ExternalOutputUri"].isNull())
+		externalOutputUri_ = value["ExternalOutputUri"].asString();
 
 }
 
@@ -83,11 +87,21 @@ std::string StartExecutionResult::getOutput()const
 	return output_;
 }
 
+std::string StartExecutionResult::getExternalOutputUri()const
+{
+	return externalOutputUri_;
+}
+
 std::string StartExecutionResult::getStartedTime()const
 {
 	return startedTime_;
 }
 
+std::string StartExecutionResult::getExternalInputUri()const
+{
+	return externalInputUri_;
+}
+
 std::string StartExecutionResult::getFlowDefinition()const
 {
 	return flowDefinition_;

fnf/src/model/StopExecutionResult.cc

@@ -55,6 +55,10 @@ void StopExecutionResult::parse(const std::string &payload)
 		startedTime_ = value["StartedTime"].asString();
 	if(!value["StoppedTime"].isNull())
 		stoppedTime_ = value["StoppedTime"].asString();
+	if(!value["ExternalInputUri"].isNull())
+		externalInputUri_ = value["ExternalInputUri"].asString();
+	if(!value["ExternalOutputUri"].isNull())
+		externalOutputUri_ = value["ExternalOutputUri"].asString();
 
 }
 
@@ -83,11 +87,21 @@ std::string StopExecutionResult::getOutput()const
 	return output_;
 }
 
+std::string StopExecutionResult::getExternalOutputUri()const
+{
+	return externalOutputUri_;
+}
+
 std::string StopExecutionResult::getStartedTime()const
 {
 	return startedTime_;
 }
 
+std::string StopExecutionResult::getExternalInputUri()const
+{
+	return externalInputUri_;
+}
+
 std::string StopExecutionResult::getFlowDefinition()const
 {
 	return flowDefinition_;

fnf/src/model/UpdateFlowRequest.cc

@@ -93,3 +93,14 @@ void UpdateFlowRequest::setDefinition(const std::string& definition)
 	setBodyParameter("Definition", definition);
 }
 
+std::string UpdateFlowRequest::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
+void UpdateFlowRequest::setExternalStorageLocation(const std::string& externalStorageLocation)
+{
+	externalStorageLocation_ = externalStorageLocation;
+	setBodyParameter("ExternalStorageLocation", externalStorageLocation);
+}
+

fnf/src/model/UpdateFlowResult.cc

@@ -55,6 +55,8 @@ void UpdateFlowResult::parse(const std::string &payload)
 		createdTime_ = value["CreatedTime"].asString();
 	if(!value["LastModifiedTime"].isNull())
 		lastModifiedTime_ = value["LastModifiedTime"].asString();
+	if(!value["ExternalStorageLocation"].isNull())
+		externalStorageLocation_ = value["ExternalStorageLocation"].asString();
 
 }
 
@@ -88,6 +90,11 @@ std::string UpdateFlowResult::getId()const
 	return id_;
 }
 
+std::string UpdateFlowResult::getExternalStorageLocation()const
+{
+	return externalStorageLocation_;
+}
+
 std::string UpdateFlowResult::getRoleArn()const
 {
 	return roleArn_;

hbase/CMakeLists.txt

@@ -31,8 +31,6 @@ set(hbase_public_header_model
 	include/alibabacloud/hbase/model/CreateClusterResult.h
 	include/alibabacloud/hbase/model/CreateHbaseHaSlbRequest.h
 	include/alibabacloud/hbase/model/CreateHbaseHaSlbResult.h
-	include/alibabacloud/hbase/model/CreateInstanceRequest.h
-	include/alibabacloud/hbase/model/CreateInstanceResult.h
 	include/alibabacloud/hbase/model/CreateRestorePlanRequest.h
 	include/alibabacloud/hbase/model/CreateRestorePlanResult.h
 	include/alibabacloud/hbase/model/DeleteHbaseHaSlbRequest.h
@@ -41,6 +39,8 @@ set(hbase_public_header_model
 	include/alibabacloud/hbase/model/DeleteInstanceResult.h
 	include/alibabacloud/hbase/model/DeleteUserHdfsInfoRequest.h
 	include/alibabacloud/hbase/model/DeleteUserHdfsInfoResult.h
+	include/alibabacloud/hbase/model/DescribeAvailableResourceRequest.h
+	include/alibabacloud/hbase/model/DescribeAvailableResourceResult.h
 	include/alibabacloud/hbase/model/DescribeBackupPlanConfigRequest.h
 	include/alibabacloud/hbase/model/DescribeBackupPlanConfigResult.h
 	include/alibabacloud/hbase/model/DescribeBackupStatusRequest.h
@@ -124,8 +124,6 @@ set(hbase_src
 	src/model/CreateClusterResult.cc
 	src/model/CreateHbaseHaSlbRequest.cc
 	src/model/CreateHbaseHaSlbResult.cc
-	src/model/CreateInstanceRequest.cc
-	src/model/CreateInstanceResult.cc
 	src/model/CreateRestorePlanRequest.cc
 	src/model/CreateRestorePlanResult.cc
 	src/model/DeleteHbaseHaSlbRequest.cc
@@ -134,6 +132,8 @@ set(hbase_src
 	src/model/DeleteInstanceResult.cc
 	src/model/DeleteUserHdfsInfoRequest.cc
 	src/model/DeleteUserHdfsInfoResult.cc
+	src/model/DescribeAvailableResourceRequest.cc
+	src/model/DescribeAvailableResourceResult.cc
 	src/model/DescribeBackupPlanConfigRequest.cc
 	src/model/DescribeBackupPlanConfigResult.cc
 	src/model/DescribeBackupStatusRequest.cc

hbase/include/alibabacloud/hbase/HBaseClient.h

@@ -32,8 +32,6 @@
 #include "model/CreateClusterResult.h"
 #include "model/CreateHbaseHaSlbRequest.h"
 #include "model/CreateHbaseHaSlbResult.h"
-#include "model/CreateInstanceRequest.h"
-#include "model/CreateInstanceResult.h"
 #include "model/CreateRestorePlanRequest.h"
 #include "model/CreateRestorePlanResult.h"
 #include "model/DeleteHbaseHaSlbRequest.h"
@@ -42,6 +40,8 @@
 #include "model/DeleteInstanceResult.h"
 #include "model/DeleteUserHdfsInfoRequest.h"
 #include "model/DeleteUserHdfsInfoResult.h"
+#include "model/DescribeAvailableResourceRequest.h"
+#include "model/DescribeAvailableResourceResult.h"
 #include "model/DescribeBackupPlanConfigRequest.h"
 #include "model/DescribeBackupPlanConfigResult.h"
 #include "model/DescribeBackupStatusRequest.h"
@@ -136,9 +136,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::CreateHbaseHaSlbResult> CreateHbaseHaSlbOutcome;
 			typedef std::future<CreateHbaseHaSlbOutcome> CreateHbaseHaSlbOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::CreateHbaseHaSlbRequest&, const CreateHbaseHaSlbOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateHbaseHaSlbAsyncHandler;
-			typedef Outcome<Error, Model::CreateInstanceResult> CreateInstanceOutcome;
-			typedef std::future<CreateInstanceOutcome> CreateInstanceOutcomeCallable;
-			typedef std::function<void(const HBaseClient*, const Model::CreateInstanceRequest&, const CreateInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateInstanceAsyncHandler;
 			typedef Outcome<Error, Model::CreateRestorePlanResult> CreateRestorePlanOutcome;
 			typedef std::future<CreateRestorePlanOutcome> CreateRestorePlanOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::CreateRestorePlanRequest&, const CreateRestorePlanOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CreateRestorePlanAsyncHandler;
@@ -151,6 +148,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DeleteUserHdfsInfoResult> DeleteUserHdfsInfoOutcome;
 			typedef std::future<DeleteUserHdfsInfoOutcome> DeleteUserHdfsInfoOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::DeleteUserHdfsInfoRequest&, const DeleteUserHdfsInfoOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteUserHdfsInfoAsyncHandler;
+			typedef Outcome<Error, Model::DescribeAvailableResourceResult> DescribeAvailableResourceOutcome;
+			typedef std::future<DescribeAvailableResourceOutcome> DescribeAvailableResourceOutcomeCallable;
+			typedef std::function<void(const HBaseClient*, const Model::DescribeAvailableResourceRequest&, const DescribeAvailableResourceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAvailableResourceAsyncHandler;
 			typedef Outcome<Error, Model::DescribeBackupPlanConfigResult> DescribeBackupPlanConfigOutcome;
 			typedef std::future<DescribeBackupPlanConfigOutcome> DescribeBackupPlanConfigOutcomeCallable;
 			typedef std::function<void(const HBaseClient*, const Model::DescribeBackupPlanConfigRequest&, const DescribeBackupPlanConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeBackupPlanConfigAsyncHandler;
@@ -276,9 +276,6 @@ namespace AlibabaCloud
 			CreateHbaseHaSlbOutcome createHbaseHaSlb(const Model::CreateHbaseHaSlbRequest &request)const;
 			void createHbaseHaSlbAsync(const Model::CreateHbaseHaSlbRequest& request, const CreateHbaseHaSlbAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateHbaseHaSlbOutcomeCallable createHbaseHaSlbCallable(const Model::CreateHbaseHaSlbRequest& request) const;
-			CreateInstanceOutcome createInstance(const Model::CreateInstanceRequest &request)const;
-			void createInstanceAsync(const Model::CreateInstanceRequest& request, const CreateInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			CreateInstanceOutcomeCallable createInstanceCallable(const Model::CreateInstanceRequest& request) const;
 			CreateRestorePlanOutcome createRestorePlan(const Model::CreateRestorePlanRequest &request)const;
 			void createRestorePlanAsync(const Model::CreateRestorePlanRequest& request, const CreateRestorePlanAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CreateRestorePlanOutcomeCallable createRestorePlanCallable(const Model::CreateRestorePlanRequest& request) const;
@@ -291,6 +288,9 @@ namespace AlibabaCloud
 			DeleteUserHdfsInfoOutcome deleteUserHdfsInfo(const Model::DeleteUserHdfsInfoRequest &request)const;
 			void deleteUserHdfsInfoAsync(const Model::DeleteUserHdfsInfoRequest& request, const DeleteUserHdfsInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteUserHdfsInfoOutcomeCallable deleteUserHdfsInfoCallable(const Model::DeleteUserHdfsInfoRequest& request) const;
+			DescribeAvailableResourceOutcome describeAvailableResource(const Model::DescribeAvailableResourceRequest &request)const;
+			void describeAvailableResourceAsync(const Model::DescribeAvailableResourceRequest& request, const DescribeAvailableResourceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeAvailableResourceOutcomeCallable describeAvailableResourceCallable(const Model::DescribeAvailableResourceRequest& request) const;
 			DescribeBackupPlanConfigOutcome describeBackupPlanConfig(const Model::DescribeBackupPlanConfigRequest &request)const;
 			void describeBackupPlanConfigAsync(const Model::DescribeBackupPlanConfigRequest& request, const DescribeBackupPlanConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeBackupPlanConfigOutcomeCallable describeBackupPlanConfigCallable(const Model::DescribeBackupPlanConfigRequest& request) const;

hbase/include/alibabacloud/hbase/model/CreateInstanceRequest.h

@@ -1,129 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCEREQUEST_H_
-#define ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/hbase/HBaseExport.h>
-
-namespace AlibabaCloud
-{
-	namespace HBase
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_HBASE_EXPORT CreateInstanceRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateInstanceRequest();
-				~CreateInstanceRequest();
-
-				std::string getClusterName()const;
-				void setClusterName(const std::string& clusterName);
-				std::string getDbInstanceConnType()const;
-				void setDbInstanceConnType(const std::string& dbInstanceConnType);
-				std::string getEngineVersion()const;
-				void setEngineVersion(const std::string& engineVersion);
-				std::string getDepMode()const;
-				void setDepMode(const std::string& depMode);
-				std::string getBackupId()const;
-				void setBackupId(const std::string& backupId);
-				std::string getDbInstanceType()const;
-				void setDbInstanceType(const std::string& dbInstanceType);
-				std::string getVSwitchId()const;
-				void setVSwitchId(const std::string& vSwitchId);
-				std::string getSecurityIPList()const;
-				void setSecurityIPList(const std::string& securityIPList);
-				std::string getAutoRenew()const;
-				void setAutoRenew(const std::string& autoRenew);
-				std::string getNetType()const;
-				void setNetType(const std::string& netType);
-				std::string getZoneId()const;
-				void setZoneId(const std::string& zoneId);
-				std::string getCoreDiskType()const;
-				void setCoreDiskType(const std::string& coreDiskType);
-				std::string getPricingCycle()const;
-				void setPricingCycle(const std::string& pricingCycle);
-				std::string getCoreInstanceQuantity()const;
-				void setCoreInstanceQuantity(const std::string& coreInstanceQuantity);
-				std::string getDuration()const;
-				void setDuration(const std::string& duration);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getEngine()const;
-				void setEngine(const std::string& engine);
-				std::string getRestoreTime()const;
-				void setRestoreTime(const std::string& restoreTime);
-				std::string getSrcDBInstanceId()const;
-				void setSrcDBInstanceId(const std::string& srcDBInstanceId);
-				std::string getMasterInstanceType()const;
-				void setMasterInstanceType(const std::string& masterInstanceType);
-				std::string getColdStorageSize()const;
-				void setColdStorageSize(const std::string& coldStorageSize);
-				std::string getCoreDiskQuantity()const;
-				void setCoreDiskQuantity(const std::string& coreDiskQuantity);
-				std::string getIsColdStorage()const;
-				void setIsColdStorage(const std::string& isColdStorage);
-				std::string getCoreInstanceType()const;
-				void setCoreInstanceType(const std::string& coreInstanceType);
-				std::string getCoreDiskSize()const;
-				void setCoreDiskSize(const std::string& coreDiskSize);
-				std::string getVpcId()const;
-				void setVpcId(const std::string& vpcId);
-				std::string getDbType()const;
-				void setDbType(const std::string& dbType);
-				std::string getPayType()const;
-				void setPayType(const std::string& payType);
-
-            private:
-				std::string clusterName_;
-				std::string dbInstanceConnType_;
-				std::string engineVersion_;
-				std::string depMode_;
-				std::string backupId_;
-				std::string dbInstanceType_;
-				std::string vSwitchId_;
-				std::string securityIPList_;
-				std::string autoRenew_;
-				std::string netType_;
-				std::string zoneId_;
-				std::string coreDiskType_;
-				std::string pricingCycle_;
-				std::string coreInstanceQuantity_;
-				std::string duration_;
-				std::string regionId_;
-				std::string engine_;
-				std::string restoreTime_;
-				std::string srcDBInstanceId_;
-				std::string masterInstanceType_;
-				std::string coldStorageSize_;
-				std::string coreDiskQuantity_;
-				std::string isColdStorage_;
-				std::string coreInstanceType_;
-				std::string coreDiskSize_;
-				std::string vpcId_;
-				std::string dbType_;
-				std::string payType_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_HBASE_MODEL_CREATEINSTANCEREQUEST_H_

hbase/include/alibabacloud/hbase/model/DescribeAvailableResourceRequest.h

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_HBASE_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_
+#define ALIBABACLOUD_HBASE_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/hbase/HBaseExport.h>
+
+namespace AlibabaCloud
+{
+	namespace HBase
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_HBASE_EXPORT DescribeAvailableResourceRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeAvailableResourceRequest();
+				~DescribeAvailableResourceRequest();
+
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getZoneId()const;
+				void setZoneId(const std::string& zoneId);
+				std::string getChargeType()const;
+				void setChargeType(const std::string& chargeType);
+
+            private:
+				std::string regionId_;
+				std::string zoneId_;
+				std::string chargeType_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_HBASE_MODEL_DESCRIBEAVAILABLERESOURCEREQUEST_H_

hbase/include/alibabacloud/hbase/model/DescribeAvailableResourceResult.h

@@ -0,0 +1,105 @@
+/*
+ * 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_HBASE_MODEL_DESCRIBEAVAILABLERESOURCERESULT_H_
+#define ALIBABACLOUD_HBASE_MODEL_DESCRIBEAVAILABLERESOURCERESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/hbase/HBaseExport.h>
+
+namespace AlibabaCloud
+{
+	namespace HBase
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_HBASE_EXPORT DescribeAvailableResourceResult : public ServiceResult
+			{
+			public:
+				struct AvailableZone
+				{
+					struct SupportedEngine
+					{
+						struct SupportedEngineVersion
+						{
+							struct SupportedCategoriesItem
+							{
+								struct SupportedStorageType
+								{
+									struct CoreResource
+									{
+										struct DBInstanceStorageRange
+										{
+											int minSize;
+											int stepSize;
+											int maxSize;
+										};
+										struct InstanceTypeDetail
+										{
+											int mem;
+											int cpu;
+										};
+										InstanceTypeDetail instanceTypeDetail;
+										DBInstanceStorageRange dBInstanceStorageRange;
+										std::string instanceType;
+									};
+									std::string storageType;
+									std::vector<SupportedStorageType::CoreResource> coreResources;
+								};
+								std::string category;
+								std::vector<SupportedCategoriesItem::SupportedStorageType> supportedStorageTypes;
+							};
+							std::string version;
+							std::vector<SupportedEngineVersion::SupportedCategoriesItem> supportedCategories;
+						};
+						std::vector<SupportedEngine::SupportedEngineVersion> supportedEngineVersions;
+						std::string engine;
+					};
+					struct MasterResource
+					{
+						struct InstanceTypeDetail1
+						{
+							int mem;
+							int cpu;
+						};
+						InstanceTypeDetail1 instanceTypeDetail1;
+						std::string instanceType;
+					};
+					std::vector<AvailableZone::MasterResource> masterResources;
+					std::string zoneId;
+					std::vector<AvailableZone::SupportedEngine> supportedEngines;
+					std::string regionId;
+				};
+
+
+				DescribeAvailableResourceResult();
+				explicit DescribeAvailableResourceResult(const std::string &payload);
+				~DescribeAvailableResourceResult();
+				std::vector<AvailableZone> getAvailableZones()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<AvailableZone> availableZones_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_HBASE_MODEL_DESCRIBEAVAILABLERESOURCERESULT_H_

hbase/src/HBaseClient.cc

@@ -31,21 +31,21 @@ HBaseClient::HBaseClient(const Credentials &credentials, const ClientConfigurati
 	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, "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "hbase");
 }
 
 HBaseClient::HBaseClient(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, "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "hbase");
 }
 
 HBaseClient::HBaseClient(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, "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "hbase");
 }
 
 HBaseClient::~HBaseClient()
@@ -231,42 +231,6 @@ HBaseClient::CreateHbaseHaSlbOutcomeCallable HBaseClient::createHbaseHaSlbCallab
 	return task->get_future();
 }
 
-HBaseClient::CreateInstanceOutcome HBaseClient::createInstance(const CreateInstanceRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return CreateInstanceOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return CreateInstanceOutcome(CreateInstanceResult(outcome.result()));
-	else
-		return CreateInstanceOutcome(outcome.error());
-}
-
-void HBaseClient::createInstanceAsync(const CreateInstanceRequest& request, const CreateInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, createInstance(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-HBaseClient::CreateInstanceOutcomeCallable HBaseClient::createInstanceCallable(const CreateInstanceRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<CreateInstanceOutcome()>>(
-			[this, request]()
-			{
-			return this->createInstance(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 HBaseClient::CreateRestorePlanOutcome HBaseClient::createRestorePlan(const CreateRestorePlanRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -411,6 +375,42 @@ HBaseClient::DeleteUserHdfsInfoOutcomeCallable HBaseClient::deleteUserHdfsInfoCa
 	return task->get_future();
 }
 
+HBaseClient::DescribeAvailableResourceOutcome HBaseClient::describeAvailableResource(const DescribeAvailableResourceRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeAvailableResourceOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeAvailableResourceOutcome(DescribeAvailableResourceResult(outcome.result()));
+	else
+		return DescribeAvailableResourceOutcome(outcome.error());
+}
+
+void HBaseClient::describeAvailableResourceAsync(const DescribeAvailableResourceRequest& request, const DescribeAvailableResourceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeAvailableResource(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+HBaseClient::DescribeAvailableResourceOutcomeCallable HBaseClient::describeAvailableResourceCallable(const DescribeAvailableResourceRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeAvailableResourceOutcome()>>(
+			[this, request]()
+			{
+			return this->describeAvailableResource(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 HBaseClient::DescribeBackupPlanConfigOutcome HBaseClient::describeBackupPlanConfig(const DescribeBackupPlanConfigRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

hbase/src/model/CreateInstanceRequest.cc

@@ -1,337 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/hbase/model/CreateInstanceRequest.h>
-
-using AlibabaCloud::HBase::Model::CreateInstanceRequest;
-
-CreateInstanceRequest::CreateInstanceRequest() :
-	RpcServiceRequest("hbase", "2019-01-01", "CreateInstance")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-CreateInstanceRequest::~CreateInstanceRequest()
-{}
-
-std::string CreateInstanceRequest::getClusterName()const
-{
-	return clusterName_;
-}
-
-void CreateInstanceRequest::setClusterName(const std::string& clusterName)
-{
-	clusterName_ = clusterName;
-	setParameter("ClusterName", clusterName);
-}
-
-std::string CreateInstanceRequest::getDbInstanceConnType()const
-{
-	return dbInstanceConnType_;
-}
-
-void CreateInstanceRequest::setDbInstanceConnType(const std::string& dbInstanceConnType)
-{
-	dbInstanceConnType_ = dbInstanceConnType;
-	setParameter("DbInstanceConnType", dbInstanceConnType);
-}
-
-std::string CreateInstanceRequest::getEngineVersion()const
-{
-	return engineVersion_;
-}
-
-void CreateInstanceRequest::setEngineVersion(const std::string& engineVersion)
-{
-	engineVersion_ = engineVersion;
-	setParameter("EngineVersion", engineVersion);
-}
-
-std::string CreateInstanceRequest::getDepMode()const
-{
-	return depMode_;
-}
-
-void CreateInstanceRequest::setDepMode(const std::string& depMode)
-{
-	depMode_ = depMode;
-	setParameter("DepMode", depMode);
-}
-
-std::string CreateInstanceRequest::getBackupId()const
-{
-	return backupId_;
-}
-
-void CreateInstanceRequest::setBackupId(const std::string& backupId)
-{
-	backupId_ = backupId;
-	setParameter("BackupId", backupId);
-}
-
-std::string CreateInstanceRequest::getDbInstanceType()const
-{
-	return dbInstanceType_;
-}
-
-void CreateInstanceRequest::setDbInstanceType(const std::string& dbInstanceType)
-{
-	dbInstanceType_ = dbInstanceType;
-	setParameter("DbInstanceType", dbInstanceType);
-}
-
-std::string CreateInstanceRequest::getVSwitchId()const
-{
-	return vSwitchId_;
-}
-
-void CreateInstanceRequest::setVSwitchId(const std::string& vSwitchId)
-{
-	vSwitchId_ = vSwitchId;
-	setParameter("VSwitchId", vSwitchId);
-}
-
-std::string CreateInstanceRequest::getSecurityIPList()const
-{
-	return securityIPList_;
-}
-
-void CreateInstanceRequest::setSecurityIPList(const std::string& securityIPList)
-{
-	securityIPList_ = securityIPList;
-	setParameter("SecurityIPList", securityIPList);
-}
-
-std::string CreateInstanceRequest::getAutoRenew()const
-{
-	return autoRenew_;
-}
-
-void CreateInstanceRequest::setAutoRenew(const std::string& autoRenew)
-{
-	autoRenew_ = autoRenew;
-	setParameter("AutoRenew", autoRenew);
-}
-
-std::string CreateInstanceRequest::getNetType()const
-{
-	return netType_;
-}
-
-void CreateInstanceRequest::setNetType(const std::string& netType)
-{
-	netType_ = netType;
-	setParameter("NetType", netType);
-}
-
-std::string CreateInstanceRequest::getZoneId()const
-{
-	return zoneId_;
-}
-
-void CreateInstanceRequest::setZoneId(const std::string& zoneId)
-{
-	zoneId_ = zoneId;
-	setParameter("ZoneId", zoneId);
-}
-
-std::string CreateInstanceRequest::getCoreDiskType()const
-{
-	return coreDiskType_;
-}
-
-void CreateInstanceRequest::setCoreDiskType(const std::string& coreDiskType)
-{
-	coreDiskType_ = coreDiskType;
-	setParameter("CoreDiskType", coreDiskType);
-}
-
-std::string CreateInstanceRequest::getPricingCycle()const
-{
-	return pricingCycle_;
-}
-
-void CreateInstanceRequest::setPricingCycle(const std::string& pricingCycle)
-{
-	pricingCycle_ = pricingCycle;
-	setParameter("PricingCycle", pricingCycle);
-}
-
-std::string CreateInstanceRequest::getCoreInstanceQuantity()const
-{
-	return coreInstanceQuantity_;
-}
-
-void CreateInstanceRequest::setCoreInstanceQuantity(const std::string& coreInstanceQuantity)
-{
-	coreInstanceQuantity_ = coreInstanceQuantity;
-	setParameter("CoreInstanceQuantity", coreInstanceQuantity);
-}
-
-std::string CreateInstanceRequest::getDuration()const
-{
-	return duration_;
-}
-
-void CreateInstanceRequest::setDuration(const std::string& duration)
-{
-	duration_ = duration;
-	setParameter("Duration", duration);
-}
-
-std::string CreateInstanceRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void CreateInstanceRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setParameter("RegionId", regionId);
-}
-
-std::string CreateInstanceRequest::getEngine()const
-{
-	return engine_;
-}
-
-void CreateInstanceRequest::setEngine(const std::string& engine)
-{
-	engine_ = engine;
-	setParameter("Engine", engine);
-}
-
-std::string CreateInstanceRequest::getRestoreTime()const
-{
-	return restoreTime_;
-}
-
-void CreateInstanceRequest::setRestoreTime(const std::string& restoreTime)
-{
-	restoreTime_ = restoreTime;
-	setParameter("RestoreTime", restoreTime);
-}
-
-std::string CreateInstanceRequest::getSrcDBInstanceId()const
-{
-	return srcDBInstanceId_;
-}
-
-void CreateInstanceRequest::setSrcDBInstanceId(const std::string& srcDBInstanceId)
-{
-	srcDBInstanceId_ = srcDBInstanceId;
-	setParameter("SrcDBInstanceId", srcDBInstanceId);
-}
-
-std::string CreateInstanceRequest::getMasterInstanceType()const
-{
-	return masterInstanceType_;
-}
-
-void CreateInstanceRequest::setMasterInstanceType(const std::string& masterInstanceType)
-{
-	masterInstanceType_ = masterInstanceType;
-	setParameter("MasterInstanceType", masterInstanceType);
-}
-
-std::string CreateInstanceRequest::getColdStorageSize()const
-{
-	return coldStorageSize_;
-}
-
-void CreateInstanceRequest::setColdStorageSize(const std::string& coldStorageSize)
-{
-	coldStorageSize_ = coldStorageSize;
-	setParameter("ColdStorageSize", coldStorageSize);
-}
-
-std::string CreateInstanceRequest::getCoreDiskQuantity()const
-{
-	return coreDiskQuantity_;
-}
-
-void CreateInstanceRequest::setCoreDiskQuantity(const std::string& coreDiskQuantity)
-{
-	coreDiskQuantity_ = coreDiskQuantity;
-	setParameter("CoreDiskQuantity", coreDiskQuantity);
-}
-
-std::string CreateInstanceRequest::getIsColdStorage()const
-{
-	return isColdStorage_;
-}
-
-void CreateInstanceRequest::setIsColdStorage(const std::string& isColdStorage)
-{
-	isColdStorage_ = isColdStorage;
-	setParameter("IsColdStorage", isColdStorage);
-}
-
-std::string CreateInstanceRequest::getCoreInstanceType()const
-{
-	return coreInstanceType_;
-}
-
-void CreateInstanceRequest::setCoreInstanceType(const std::string& coreInstanceType)
-{
-	coreInstanceType_ = coreInstanceType;
-	setParameter("CoreInstanceType", coreInstanceType);
-}
-
-std::string CreateInstanceRequest::getCoreDiskSize()const
-{
-	return coreDiskSize_;
-}
-
-void CreateInstanceRequest::setCoreDiskSize(const std::string& coreDiskSize)
-{
-	coreDiskSize_ = coreDiskSize;
-	setParameter("CoreDiskSize", coreDiskSize);
-}
-
-std::string CreateInstanceRequest::getVpcId()const
-{
-	return vpcId_;
-}
-
-void CreateInstanceRequest::setVpcId(const std::string& vpcId)
-{
-	vpcId_ = vpcId;
-	setParameter("VpcId", vpcId);
-}
-
-std::string CreateInstanceRequest::getDbType()const
-{
-	return dbType_;
-}
-
-void CreateInstanceRequest::setDbType(const std::string& dbType)
-{
-	dbType_ = dbType;
-	setParameter("DbType", dbType);
-}
-
-std::string CreateInstanceRequest::getPayType()const
-{
-	return payType_;
-}
-
-void CreateInstanceRequest::setPayType(const std::string& payType)
-{
-	payType_ = payType;
-	setParameter("PayType", payType);
-}
-

hbase/src/model/CreateInstanceResult.cc

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

hbase/src/model/DescribeAvailableResourceRequest.cc

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/hbase/model/DescribeAvailableResourceRequest.h>
+
+using AlibabaCloud::HBase::Model::DescribeAvailableResourceRequest;
+
+DescribeAvailableResourceRequest::DescribeAvailableResourceRequest() :
+	RpcServiceRequest("hbase", "2019-01-01", "DescribeAvailableResource")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeAvailableResourceRequest::~DescribeAvailableResourceRequest()
+{}
+
+std::string DescribeAvailableResourceRequest::getRegionId()const
+{
+	return regionId_;
+}
+
+void DescribeAvailableResourceRequest::setRegionId(const std::string& regionId)
+{
+	regionId_ = regionId;
+	setParameter("RegionId", regionId);
+}
+
+std::string DescribeAvailableResourceRequest::getZoneId()const
+{
+	return zoneId_;
+}
+
+void DescribeAvailableResourceRequest::setZoneId(const std::string& zoneId)
+{
+	zoneId_ = zoneId;
+	setParameter("ZoneId", zoneId);
+}
+
+std::string DescribeAvailableResourceRequest::getChargeType()const
+{
+	return chargeType_;
+}
+
+void DescribeAvailableResourceRequest::setChargeType(const std::string& chargeType)
+{
+	chargeType_ = chargeType;
+	setParameter("ChargeType", chargeType);
+}
+

hbase/src/model/DescribeAvailableResourceResult.cc

@@ -0,0 +1,124 @@
+/*
+ * 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/hbase/model/DescribeAvailableResourceResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::HBase;
+using namespace AlibabaCloud::HBase::Model;
+
+DescribeAvailableResourceResult::DescribeAvailableResourceResult() :
+	ServiceResult()
+{}
+
+DescribeAvailableResourceResult::DescribeAvailableResourceResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeAvailableResourceResult::~DescribeAvailableResourceResult()
+{}
+
+void DescribeAvailableResourceResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allAvailableZonesNode = value["AvailableZones"]["AvailableZone"];
+	for (auto valueAvailableZonesAvailableZone : allAvailableZonesNode)
+	{
+		AvailableZone availableZonesObject;
+		if(!valueAvailableZonesAvailableZone["RegionId"].isNull())
+			availableZonesObject.regionId = valueAvailableZonesAvailableZone["RegionId"].asString();
+		if(!valueAvailableZonesAvailableZone["ZoneId"].isNull())
+			availableZonesObject.zoneId = valueAvailableZonesAvailableZone["ZoneId"].asString();
+		auto allSupportedEnginesNode = allAvailableZonesNode["SupportedEngines"]["SupportedEngine"];
+		for (auto allAvailableZonesNodeSupportedEnginesSupportedEngine : allSupportedEnginesNode)
+		{
+			AvailableZone::SupportedEngine supportedEnginesObject;
+			if(!allAvailableZonesNodeSupportedEnginesSupportedEngine["Engine"].isNull())
+				supportedEnginesObject.engine = allAvailableZonesNodeSupportedEnginesSupportedEngine["Engine"].asString();
+			auto allSupportedEngineVersionsNode = allSupportedEnginesNode["SupportedEngineVersions"]["SupportedEngineVersion"];
+			for (auto allSupportedEnginesNodeSupportedEngineVersionsSupportedEngineVersion : allSupportedEngineVersionsNode)
+			{
+				AvailableZone::SupportedEngine::SupportedEngineVersion supportedEngineVersionsObject;
+				if(!allSupportedEnginesNodeSupportedEngineVersionsSupportedEngineVersion["Version"].isNull())
+					supportedEngineVersionsObject.version = allSupportedEnginesNodeSupportedEngineVersionsSupportedEngineVersion["Version"].asString();
+				auto allSupportedCategoriesNode = allSupportedEngineVersionsNode["SupportedCategories"]["SupportedCategoriesItem"];
+				for (auto allSupportedEngineVersionsNodeSupportedCategoriesSupportedCategoriesItem : allSupportedCategoriesNode)
+				{
+					AvailableZone::SupportedEngine::SupportedEngineVersion::SupportedCategoriesItem supportedCategoriesObject;
+					if(!allSupportedEngineVersionsNodeSupportedCategoriesSupportedCategoriesItem["Category"].isNull())
+						supportedCategoriesObject.category = allSupportedEngineVersionsNodeSupportedCategoriesSupportedCategoriesItem["Category"].asString();
+					auto allSupportedStorageTypesNode = allSupportedCategoriesNode["SupportedStorageTypes"]["SupportedStorageType"];
+					for (auto allSupportedCategoriesNodeSupportedStorageTypesSupportedStorageType : allSupportedStorageTypesNode)
+					{
+						AvailableZone::SupportedEngine::SupportedEngineVersion::SupportedCategoriesItem::SupportedStorageType supportedStorageTypesObject;
+						if(!allSupportedCategoriesNodeSupportedStorageTypesSupportedStorageType["StorageType"].isNull())
+							supportedStorageTypesObject.storageType = allSupportedCategoriesNodeSupportedStorageTypesSupportedStorageType["StorageType"].asString();
+						auto allCoreResourcesNode = allSupportedStorageTypesNode["CoreResources"]["CoreResource"];
+						for (auto allSupportedStorageTypesNodeCoreResourcesCoreResource : allCoreResourcesNode)
+						{
+							AvailableZone::SupportedEngine::SupportedEngineVersion::SupportedCategoriesItem::SupportedStorageType::CoreResource coreResourcesObject;
+							if(!allSupportedStorageTypesNodeCoreResourcesCoreResource["InstanceType"].isNull())
+								coreResourcesObject.instanceType = allSupportedStorageTypesNodeCoreResourcesCoreResource["InstanceType"].asString();
+							auto dBInstanceStorageRangeNode = value["DBInstanceStorageRange"];
+							if(!dBInstanceStorageRangeNode["MaxSize"].isNull())
+								coreResourcesObject.dBInstanceStorageRange.maxSize = std::stoi(dBInstanceStorageRangeNode["MaxSize"].asString());
+							if(!dBInstanceStorageRangeNode["MinSize"].isNull())
+								coreResourcesObject.dBInstanceStorageRange.minSize = std::stoi(dBInstanceStorageRangeNode["MinSize"].asString());
+							if(!dBInstanceStorageRangeNode["StepSize"].isNull())
+								coreResourcesObject.dBInstanceStorageRange.stepSize = std::stoi(dBInstanceStorageRangeNode["StepSize"].asString());
+							auto instanceTypeDetailNode = value["InstanceTypeDetail"];
+							if(!instanceTypeDetailNode["Cpu"].isNull())
+								coreResourcesObject.instanceTypeDetail.cpu = std::stoi(instanceTypeDetailNode["Cpu"].asString());
+							if(!instanceTypeDetailNode["Mem"].isNull())
+								coreResourcesObject.instanceTypeDetail.mem = std::stoi(instanceTypeDetailNode["Mem"].asString());
+							supportedStorageTypesObject.coreResources.push_back(coreResourcesObject);
+						}
+						supportedCategoriesObject.supportedStorageTypes.push_back(supportedStorageTypesObject);
+					}
+					supportedEngineVersionsObject.supportedCategories.push_back(supportedCategoriesObject);
+				}
+				supportedEnginesObject.supportedEngineVersions.push_back(supportedEngineVersionsObject);
+			}
+			availableZonesObject.supportedEngines.push_back(supportedEnginesObject);
+		}
+		auto allMasterResourcesNode = allAvailableZonesNode["MasterResources"]["MasterResource"];
+		for (auto allAvailableZonesNodeMasterResourcesMasterResource : allMasterResourcesNode)
+		{
+			AvailableZone::MasterResource masterResourcesObject;
+			if(!allAvailableZonesNodeMasterResourcesMasterResource["InstanceType"].isNull())
+				masterResourcesObject.instanceType = allAvailableZonesNodeMasterResourcesMasterResource["InstanceType"].asString();
+			auto instanceTypeDetail1Node = value["InstanceTypeDetail"];
+			if(!instanceTypeDetail1Node["Cpu"].isNull())
+				masterResourcesObject.instanceTypeDetail1.cpu = std::stoi(instanceTypeDetail1Node["Cpu"].asString());
+			if(!instanceTypeDetail1Node["Mem"].isNull())
+				masterResourcesObject.instanceTypeDetail1.mem = std::stoi(instanceTypeDetail1Node["Mem"].asString());
+			availableZonesObject.masterResources.push_back(masterResourcesObject);
+		}
+		availableZones_.push_back(availableZonesObject);
+	}
+
+}
+
+std::vector<DescribeAvailableResourceResult::AvailableZone> DescribeAvailableResourceResult::getAvailableZones()const
+{
+	return availableZones_;
+}
+

imm/include/alibabacloud/imm/model/GetOfficePreviewURLRequest.h

@@ -39,19 +39,37 @@ namespace AlibabaCloud
 				void setSrcType(const std::string& srcType);
 				std::string getProject()const;
 				void setProject(const std::string& project);
+				int getWatermarkVertical()const;
+				void setWatermarkVertical(int watermarkVertical);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
-				bool getUseOldURL()const;
-				void setUseOldURL(bool useOldURL);
+				int getWatermarkType()const;
+				void setWatermarkType(int watermarkType);
+				float getWatermarkRotate()const;
+				void setWatermarkRotate(float watermarkRotate);
+				std::string getWatermarkValue()const;
+				void setWatermarkValue(const std::string& watermarkValue);
+				std::string getWatermarkFont()const;
+				void setWatermarkFont(const std::string& watermarkFont);
+				int getWatermarkHorizontal()const;
+				void setWatermarkHorizontal(int watermarkHorizontal);
 				std::string getSrcUri()const;
 				void setSrcUri(const std::string& srcUri);
+				std::string getWatermarkFillStyle()const;
+				void setWatermarkFillStyle(const std::string& watermarkFillStyle);
 
             private:
 				std::string srcType_;
 				std::string project_;
+				int watermarkVertical_;
 				std::string accessKeyId_;
-				bool useOldURL_;
+				int watermarkType_;
+				float watermarkRotate_;
+				std::string watermarkValue_;
+				std::string watermarkFont_;
+				int watermarkHorizontal_;
 				std::string srcUri_;
+				std::string watermarkFillStyle_;
 
 			};
 		}

imm/src/model/GetOfficePreviewURLRequest.cc

@@ -49,6 +49,17 @@ void GetOfficePreviewURLRequest::setProject(const std::string& project)
 	setParameter("Project", project);
 }
 
+int GetOfficePreviewURLRequest::getWatermarkVertical()const
+{
+	return watermarkVertical_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkVertical(int watermarkVertical)
+{
+	watermarkVertical_ = watermarkVertical;
+	setParameter("WatermarkVertical", std::to_string(watermarkVertical));
+}
+
 std::string GetOfficePreviewURLRequest::getAccessKeyId()const
 {
 	return accessKeyId_;
@@ -60,15 +71,59 @@ void GetOfficePreviewURLRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
-bool GetOfficePreviewURLRequest::getUseOldURL()const
+int GetOfficePreviewURLRequest::getWatermarkType()const
 {
-	return useOldURL_;
+	return watermarkType_;
 }
 
-void GetOfficePreviewURLRequest::setUseOldURL(bool useOldURL)
+void GetOfficePreviewURLRequest::setWatermarkType(int watermarkType)
 {
-	useOldURL_ = useOldURL;
-	setParameter("UseOldURL", useOldURL ? "true" : "false");
+	watermarkType_ = watermarkType;
+	setParameter("WatermarkType", std::to_string(watermarkType));
+}
+
+float GetOfficePreviewURLRequest::getWatermarkRotate()const
+{
+	return watermarkRotate_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkRotate(float watermarkRotate)
+{
+	watermarkRotate_ = watermarkRotate;
+	setParameter("WatermarkRotate", std::to_string(watermarkRotate));
+}
+
+std::string GetOfficePreviewURLRequest::getWatermarkValue()const
+{
+	return watermarkValue_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkValue(const std::string& watermarkValue)
+{
+	watermarkValue_ = watermarkValue;
+	setParameter("WatermarkValue", watermarkValue);
+}
+
+std::string GetOfficePreviewURLRequest::getWatermarkFont()const
+{
+	return watermarkFont_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkFont(const std::string& watermarkFont)
+{
+	watermarkFont_ = watermarkFont;
+	setParameter("WatermarkFont", watermarkFont);
+}
+
+int GetOfficePreviewURLRequest::getWatermarkHorizontal()const
+{
+	return watermarkHorizontal_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkHorizontal(int watermarkHorizontal)
+{
+	watermarkHorizontal_ = watermarkHorizontal;
+	setParameter("WatermarkHorizontal", std::to_string(watermarkHorizontal));
 }
 
 std::string GetOfficePreviewURLRequest::getSrcUri()const
@@ -82,3 +137,14 @@ void GetOfficePreviewURLRequest::setSrcUri(const std::string& srcUri)
 	setParameter("SrcUri", srcUri);
 }
 
+std::string GetOfficePreviewURLRequest::getWatermarkFillStyle()const
+{
+	return watermarkFillStyle_;
+}
+
+void GetOfficePreviewURLRequest::setWatermarkFillStyle(const std::string& watermarkFillStyle)
+{
+	watermarkFillStyle_ = watermarkFillStyle;
+	setParameter("WatermarkFillStyle", watermarkFillStyle);
+}
+