From f9cb2e216765547f60521ad624a0ef6f77438656 Mon Sep 17 00:00:00 2001 From: sdk-team Date: Mon, 18 Jul 2022 03:05:36 +0000 Subject: [PATCH] Test. --- CHANGELOG | 3 ++ VERSION | 2 +- btripopen/CMakeLists.txt | 8 ++-- .../alibabacloud/btripopen/BtripOpenClient.h | 16 ++++---- ...essTokenRequest.h => AccessTokenRequest.h} | 12 +++--- ...ccessTokenResult.h => AccessTokenResult.h} | 20 +++++----- btripopen/src/BtripOpenClient.cc | 18 ++++----- ...sTokenRequest.cc => AccessTokenRequest.cc} | 20 +++++----- ...essTokenResult.cc => AccessTokenResult.cc} | 40 +++++++++---------- 9 files changed, 71 insertions(+), 68 deletions(-) rename btripopen/include/alibabacloud/btripopen/model/{TakeAccessTokenRequest.h => AccessTokenRequest.h} (75%) rename btripopen/include/alibabacloud/btripopen/model/{TakeAccessTokenResult.h => AccessTokenResult.h} (71%) rename btripopen/src/model/{TakeAccessTokenRequest.cc => AccessTokenRequest.cc} (58%) rename btripopen/src/model/{TakeAccessTokenResult.cc => AccessTokenResult.cc} (64%) diff --git a/CHANGELOG b/CHANGELOG index d02df36bb..92a1e4968 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2022-07-18 Version: 1.36.1182 +- Test. + 2022-07-15 Version: 1.36.1181 - Add cspm ListCheckResult api. diff --git a/VERSION b/VERSION index 148bd50be..7f53125f7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1181 \ No newline at end of file +1.36.1182 \ No newline at end of file diff --git a/btripopen/CMakeLists.txt b/btripopen/CMakeLists.txt index 90568d630..51a19fd5f 100644 --- a/btripopen/CMakeLists.txt +++ b/btripopen/CMakeLists.txt @@ -21,13 +21,13 @@ set(btripopen_public_header include/alibabacloud/btripopen/BtripOpenExport.h ) set(btripopen_public_header_model - include/alibabacloud/btripopen/model/TakeAccessTokenRequest.h - include/alibabacloud/btripopen/model/TakeAccessTokenResult.h ) + include/alibabacloud/btripopen/model/AccessTokenRequest.h + include/alibabacloud/btripopen/model/AccessTokenResult.h ) set(btripopen_src src/BtripOpenClient.cc - src/model/TakeAccessTokenRequest.cc - src/model/TakeAccessTokenResult.cc ) + src/model/AccessTokenRequest.cc + src/model/AccessTokenResult.cc ) add_library(btripopen ${LIB_TYPE} ${btripopen_public_header} diff --git a/btripopen/include/alibabacloud/btripopen/BtripOpenClient.h b/btripopen/include/alibabacloud/btripopen/BtripOpenClient.h index df012903a..df9b9be04 100644 --- a/btripopen/include/alibabacloud/btripopen/BtripOpenClient.h +++ b/btripopen/include/alibabacloud/btripopen/BtripOpenClient.h @@ -22,8 +22,8 @@ #include #include #include "BtripOpenExport.h" -#include "model/TakeAccessTokenRequest.h" -#include "model/TakeAccessTokenResult.h" +#include "model/AccessTokenRequest.h" +#include "model/AccessTokenResult.h" namespace AlibabaCloud @@ -33,17 +33,17 @@ namespace AlibabaCloud class ALIBABACLOUD_BTRIPOPEN_EXPORT BtripOpenClient : public RoaServiceClient { public: - typedef Outcome TakeAccessTokenOutcome; - typedef std::future TakeAccessTokenOutcomeCallable; - typedef std::function&)> TakeAccessTokenAsyncHandler; + typedef Outcome AccessTokenOutcome; + typedef std::future AccessTokenOutcomeCallable; + typedef std::function&)> AccessTokenAsyncHandler; BtripOpenClient(const Credentials &credentials, const ClientConfiguration &configuration); BtripOpenClient(const std::shared_ptr &credentialsProvider, const ClientConfiguration &configuration); BtripOpenClient(const std::string &accessKeyId, const std::string &accessKeySecret, const ClientConfiguration &configuration); ~BtripOpenClient(); - TakeAccessTokenOutcome takeAccessToken(const Model::TakeAccessTokenRequest &request)const; - void takeAccessTokenAsync(const Model::TakeAccessTokenRequest& request, const TakeAccessTokenAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; - TakeAccessTokenOutcomeCallable takeAccessTokenCallable(const Model::TakeAccessTokenRequest& request) const; + AccessTokenOutcome accessToken(const Model::AccessTokenRequest &request)const; + void accessTokenAsync(const Model::AccessTokenRequest& request, const AccessTokenAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + AccessTokenOutcomeCallable accessTokenCallable(const Model::AccessTokenRequest& request) const; private: std::shared_ptr endpointProvider_; diff --git a/btripopen/include/alibabacloud/btripopen/model/TakeAccessTokenRequest.h b/btripopen/include/alibabacloud/btripopen/model/AccessTokenRequest.h similarity index 75% rename from btripopen/include/alibabacloud/btripopen/model/TakeAccessTokenRequest.h rename to btripopen/include/alibabacloud/btripopen/model/AccessTokenRequest.h index 103a1d82c..3f7a02276 100644 --- a/btripopen/include/alibabacloud/btripopen/model/TakeAccessTokenRequest.h +++ b/btripopen/include/alibabacloud/btripopen/model/AccessTokenRequest.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ALIBABACLOUD_BTRIPOPEN_MODEL_TAKEACCESSTOKENREQUEST_H_ -#define ALIBABACLOUD_BTRIPOPEN_MODEL_TAKEACCESSTOKENREQUEST_H_ +#ifndef ALIBABACLOUD_BTRIPOPEN_MODEL_ACCESSTOKENREQUEST_H_ +#define ALIBABACLOUD_BTRIPOPEN_MODEL_ACCESSTOKENREQUEST_H_ #include #include @@ -26,10 +26,10 @@ namespace AlibabaCloud { namespace BtripOpen { namespace Model { -class ALIBABACLOUD_BTRIPOPEN_EXPORT TakeAccessTokenRequest : public RoaServiceRequest { +class ALIBABACLOUD_BTRIPOPEN_EXPORT AccessTokenRequest : public RoaServiceRequest { public: - TakeAccessTokenRequest(); - ~TakeAccessTokenRequest(); + AccessTokenRequest(); + ~AccessTokenRequest(); std::string getApp_key() const; void setApp_key(const std::string &app_key); std::string getApp_secret() const; @@ -42,4 +42,4 @@ private: } // namespace Model } // namespace BtripOpen } // namespace AlibabaCloud -#endif // !ALIBABACLOUD_BTRIPOPEN_MODEL_TAKEACCESSTOKENREQUEST_H_ +#endif // !ALIBABACLOUD_BTRIPOPEN_MODEL_ACCESSTOKENREQUEST_H_ diff --git a/btripopen/include/alibabacloud/btripopen/model/TakeAccessTokenResult.h b/btripopen/include/alibabacloud/btripopen/model/AccessTokenResult.h similarity index 71% rename from btripopen/include/alibabacloud/btripopen/model/TakeAccessTokenResult.h rename to btripopen/include/alibabacloud/btripopen/model/AccessTokenResult.h index 15c73dcaf..e8db9c371 100644 --- a/btripopen/include/alibabacloud/btripopen/model/TakeAccessTokenResult.h +++ b/btripopen/include/alibabacloud/btripopen/model/AccessTokenResult.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ALIBABACLOUD_BTRIPOPEN_MODEL_TAKEACCESSTOKENRESULT_H_ -#define ALIBABACLOUD_BTRIPOPEN_MODEL_TAKEACCESSTOKENRESULT_H_ +#ifndef ALIBABACLOUD_BTRIPOPEN_MODEL_ACCESSTOKENRESULT_H_ +#define ALIBABACLOUD_BTRIPOPEN_MODEL_ACCESSTOKENRESULT_H_ #include #include @@ -29,36 +29,36 @@ namespace AlibabaCloud { namespace Model { - class ALIBABACLOUD_BTRIPOPEN_EXPORT TakeAccessTokenResult : public ServiceResult + class ALIBABACLOUD_BTRIPOPEN_EXPORT AccessTokenResult : public ServiceResult { public: struct Data { long expire; - std::string access_token; + std::string token; }; - TakeAccessTokenResult(); - explicit TakeAccessTokenResult(const std::string &payload); - ~TakeAccessTokenResult(); + AccessTokenResult(); + explicit AccessTokenResult(const std::string &payload); + ~AccessTokenResult(); std::string getRequestId()const; std::string getMessage()const; + std::string getTraceId()const; Data getData()const; std::string getCode()const; - std::string getSuccess()const; protected: void parse(const std::string &payload); private: std::string requestId_; std::string message_; + std::string traceId_; Data data_; std::string code_; - std::string success_; }; } } } -#endif // !ALIBABACLOUD_BTRIPOPEN_MODEL_TAKEACCESSTOKENRESULT_H_ \ No newline at end of file +#endif // !ALIBABACLOUD_BTRIPOPEN_MODEL_ACCESSTOKENRESULT_H_ \ No newline at end of file diff --git a/btripopen/src/BtripOpenClient.cc b/btripopen/src/BtripOpenClient.cc index 4ef0cca92..faf0b66a1 100644 --- a/btripopen/src/BtripOpenClient.cc +++ b/btripopen/src/BtripOpenClient.cc @@ -51,36 +51,36 @@ BtripOpenClient::BtripOpenClient(const std::string & accessKeyId, const std::str BtripOpenClient::~BtripOpenClient() {} -BtripOpenClient::TakeAccessTokenOutcome BtripOpenClient::takeAccessToken(const TakeAccessTokenRequest &request) const +BtripOpenClient::AccessTokenOutcome BtripOpenClient::accessToken(const AccessTokenRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); if (!endpointOutcome.isSuccess()) - return TakeAccessTokenOutcome(endpointOutcome.error()); + return AccessTokenOutcome(endpointOutcome.error()); auto outcome = makeRequest(endpointOutcome.result(), request); if (outcome.isSuccess()) - return TakeAccessTokenOutcome(TakeAccessTokenResult(outcome.result())); + return AccessTokenOutcome(AccessTokenResult(outcome.result())); else - return TakeAccessTokenOutcome(outcome.error()); + return AccessTokenOutcome(outcome.error()); } -void BtripOpenClient::takeAccessTokenAsync(const TakeAccessTokenRequest& request, const TakeAccessTokenAsyncHandler& handler, const std::shared_ptr& context) const +void BtripOpenClient::accessTokenAsync(const AccessTokenRequest& request, const AccessTokenAsyncHandler& handler, const std::shared_ptr& context) const { auto fn = [this, request, handler, context]() { - handler(this, request, takeAccessToken(request), context); + handler(this, request, accessToken(request), context); }; asyncExecute(new Runnable(fn)); } -BtripOpenClient::TakeAccessTokenOutcomeCallable BtripOpenClient::takeAccessTokenCallable(const TakeAccessTokenRequest &request) const +BtripOpenClient::AccessTokenOutcomeCallable BtripOpenClient::accessTokenCallable(const AccessTokenRequest &request) const { - auto task = std::make_shared>( + auto task = std::make_shared>( [this, request]() { - return this->takeAccessToken(request); + return this->accessToken(request); }); asyncExecute(new Runnable([task]() { (*task)(); })); diff --git a/btripopen/src/model/TakeAccessTokenRequest.cc b/btripopen/src/model/AccessTokenRequest.cc similarity index 58% rename from btripopen/src/model/TakeAccessTokenRequest.cc rename to btripopen/src/model/AccessTokenRequest.cc index 8f40dad96..84f700918 100644 --- a/btripopen/src/model/TakeAccessTokenRequest.cc +++ b/btripopen/src/model/AccessTokenRequest.cc @@ -14,32 +14,32 @@ * limitations under the License. */ -#include +#include -using AlibabaCloud::BtripOpen::Model::TakeAccessTokenRequest; +using AlibabaCloud::BtripOpen::Model::AccessTokenRequest; -TakeAccessTokenRequest::TakeAccessTokenRequest() - : RoaServiceRequest("btripopen", "2022-05-17") { - setResourcePath("/btrip/open/access-token/take"}; +AccessTokenRequest::AccessTokenRequest() + : RoaServiceRequest("btripopen", "2022-05-20") { + setResourcePath("/btrip-open-auth/v1/access-token/action/take"}; setMethod(HttpRequest::Method::Get); } -TakeAccessTokenRequest::~TakeAccessTokenRequest() {} +AccessTokenRequest::~AccessTokenRequest() {} -std::string TakeAccessTokenRequest::getApp_key() const { +std::string AccessTokenRequest::getApp_key() const { return app_key_; } -void TakeAccessTokenRequest::setApp_key(const std::string &app_key) { +void AccessTokenRequest::setApp_key(const std::string &app_key) { app_key_ = app_key; setParameter(std::string("app_key"), app_key); } -std::string TakeAccessTokenRequest::getApp_secret() const { +std::string AccessTokenRequest::getApp_secret() const { return app_secret_; } -void TakeAccessTokenRequest::setApp_secret(const std::string &app_secret) { +void AccessTokenRequest::setApp_secret(const std::string &app_secret) { app_secret_ = app_secret; setParameter(std::string("app_secret"), app_secret); } diff --git a/btripopen/src/model/TakeAccessTokenResult.cc b/btripopen/src/model/AccessTokenResult.cc similarity index 64% rename from btripopen/src/model/TakeAccessTokenResult.cc rename to btripopen/src/model/AccessTokenResult.cc index 78881187c..270be8027 100644 --- a/btripopen/src/model/TakeAccessTokenResult.cc +++ b/btripopen/src/model/AccessTokenResult.cc @@ -14,69 +14,69 @@ * limitations under the License. */ -#include +#include #include using namespace AlibabaCloud::BtripOpen; using namespace AlibabaCloud::BtripOpen::Model; -TakeAccessTokenResult::TakeAccessTokenResult() : +AccessTokenResult::AccessTokenResult() : ServiceResult() {} -TakeAccessTokenResult::TakeAccessTokenResult(const std::string &payload) : +AccessTokenResult::AccessTokenResult(const std::string &payload) : ServiceResult() { parse(payload); } -TakeAccessTokenResult::~TakeAccessTokenResult() +AccessTokenResult::~AccessTokenResult() {} -void TakeAccessTokenResult::parse(const std::string &payload) +void AccessTokenResult::parse(const std::string &payload) { Json::Reader reader; Json::Value value; reader.parse(payload, value); setRequestId(value["RequestId"].asString()); auto dataNode = value["data"]; - if(!dataNode["access_token"].isNull()) - data_.access_token = dataNode["access_token"].asString(); + if(!dataNode["token"].isNull()) + data_.token = dataNode["token"].asString(); if(!dataNode["expire"].isNull()) data_.expire = std::stol(dataNode["expire"].asString()); if(!value["requestId"].isNull()) requestId_ = value["requestId"].asString(); - if(!value["code"].isNull()) - code_ = value["code"].asString(); + if(!value["traceId"].isNull()) + traceId_ = value["traceId"].asString(); if(!value["message"].isNull()) message_ = value["message"].asString(); - if(!value["success"].isNull()) - success_ = value["success"].asString(); + if(!value["code"].isNull()) + code_ = value["code"].asString(); } -std::string TakeAccessTokenResult::getRequestId()const +std::string AccessTokenResult::getRequestId()const { return requestId_; } -std::string TakeAccessTokenResult::getMessage()const +std::string AccessTokenResult::getMessage()const { return message_; } -TakeAccessTokenResult::Data TakeAccessTokenResult::getData()const +std::string AccessTokenResult::getTraceId()const +{ + return traceId_; +} + +AccessTokenResult::Data AccessTokenResult::getData()const { return data_; } -std::string TakeAccessTokenResult::getCode()const +std::string AccessTokenResult::getCode()const { return code_; } -std::string TakeAccessTokenResult::getSuccess()const -{ - return success_; -} -