From b4c6fc0aebd42d52dad5eb053b19876b848a61e9 Mon Sep 17 00:00:00 2001 From: "haowei.yao" Date: Mon, 25 Mar 2019 15:18:21 +0800 Subject: [PATCH] =?UTF-8?q?JARVIS-PUBLIC=20SDK=20Auto=20Released=20By=20zh?= =?UTF-8?q?angzifa,Version=EF=BC=9A1.34.59?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: haowei.yao --- CHANGELOG | 3 ++ CMakeLists.txt | 3 +- VERSION | 2 +- jarvis-public/CMakeLists.txt | 6 +-- ...s-publicClient.h => Jarvis_publicClient.h} | 28 ++++++------ ...s-publicExport.h => Jarvis_publicExport.h} | 14 +++--- .../model/DescribeAttackEventRequest.h | 12 ++--- .../model/DescribeAttackEventResult.h | 12 ++--- .../model/DescribeAttackedIpRequest.h | 12 ++--- .../model/DescribeAttackedIpResult.h | 12 ++--- .../model/DescribeCountAttackEventRequest.h | 12 ++--- .../model/DescribeCountAttackEventResult.h | 12 ++--- .../model/DescribePhoneInfoRequest.h | 12 ++--- .../model/DescribePhoneInfoResult.h | 12 ++--- jarvis-public/src/Jarvis-publicClient.cc | 44 +++++++++---------- .../src/model/DescribeAttackEventRequest.cc | 2 +- .../src/model/DescribeAttackEventResult.cc | 4 +- .../src/model/DescribeAttackedIpRequest.cc | 2 +- .../src/model/DescribeAttackedIpResult.cc | 4 +- .../model/DescribeCountAttackEventRequest.cc | 2 +- .../model/DescribeCountAttackEventResult.cc | 4 +- .../src/model/DescribePhoneInfoRequest.cc | 2 +- .../src/model/DescribePhoneInfoResult.cc | 4 +- 23 files changed, 112 insertions(+), 108 deletions(-) rename jarvis-public/include/alibabacloud/jarvis-public/{Jarvis-publicClient.h => Jarvis_publicClient.h} (85%) rename jarvis-public/include/alibabacloud/jarvis-public/{Jarvis-publicExport.h => Jarvis_publicExport.h} (65%) diff --git a/CHANGELOG b/CHANGELOG index 32504c7fc..7f37a21ba 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2019-03-25 Version: 1.34.59 +1, jarvis-pulic fix product code with dash + 2019-03-25 Version: 1.34.58 1, sas-api, fix product code with dash diff --git a/CMakeLists.txt b/CMakeLists.txt index 002812120..fa0fc79e9 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,4 +110,5 @@ add_subdirectory(httpdns) add_subdirectory(crm) add_subdirectory(kms) -add_subdirectory(sas-api) \ No newline at end of file +add_subdirectory(sas-api) +add_subdirectory(jarvis-public) \ No newline at end of file diff --git a/VERSION b/VERSION index 000b4d21f..0882ea7dc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.34.58 \ No newline at end of file +1.34.59 \ No newline at end of file diff --git a/jarvis-public/CMakeLists.txt b/jarvis-public/CMakeLists.txt index 0cbd2a42f..d3da8569a 100644 --- a/jarvis-public/CMakeLists.txt +++ b/jarvis-public/CMakeLists.txt @@ -17,8 +17,8 @@ set(public_header_dir ${CMAKE_CURRENT_SOURCE_DIR}/../include) set(jarvis-public_public_header - include/alibabacloud/jarvis-public/Jarvis-publicClient.h - include/alibabacloud/jarvis-public/Jarvis-publicExport.h ) + include/alibabacloud/jarvis-public/Jarvis_publicClient.h + include/alibabacloud/jarvis-public/Jarvis_publicExport.h ) set(jarvis-public_public_header_model include/alibabacloud/jarvis-public/model/DescribeCountAttackEventRequest.h @@ -58,7 +58,7 @@ set_target_properties(jarvis-public if(${LIB_TYPE} STREQUAL "SHARED") set_target_properties(jarvis-public PROPERTIES - DEFINE_SYMBOL ALIBABACLOUD_JARVIS-PUBLIC_LIBRARY) + DEFINE_SYMBOL ALIBABACLOUD_JARVIS_PUBLIC_LIBRARY) endif() target_include_directories(jarvis-public diff --git a/jarvis-public/include/alibabacloud/jarvis-public/Jarvis-publicClient.h b/jarvis-public/include/alibabacloud/jarvis-public/Jarvis_publicClient.h similarity index 85% rename from jarvis-public/include/alibabacloud/jarvis-public/Jarvis-publicClient.h rename to jarvis-public/include/alibabacloud/jarvis-public/Jarvis_publicClient.h index 78ef35f78..23a17d12a 100644 --- a/jarvis-public/include/alibabacloud/jarvis-public/Jarvis-publicClient.h +++ b/jarvis-public/include/alibabacloud/jarvis-public/Jarvis_publicClient.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef ALIBABACLOUD_JARVIS-PUBLIC_JARVIS-PUBLICCLIENT_H_ -#define ALIBABACLOUD_JARVIS-PUBLIC_JARVIS-PUBLICCLIENT_H_ +#ifndef ALIBABACLOUD_JARVIS_PUBLIC_JARVIS_PUBLICCLIENT_H_ +#define ALIBABACLOUD_JARVIS_PUBLIC_JARVIS_PUBLICCLIENT_H_ #include #include #include #include -#include "Jarvis-publicExport.h" +#include "Jarvis_publicExport.h" #include "model/DescribeCountAttackEventRequest.h" #include "model/DescribeCountAttackEventResult.h" #include "model/DescribeAttackEventRequest.h" @@ -34,28 +34,28 @@ namespace AlibabaCloud { - namespace Jarvis-public + namespace Jarvis_public { - class ALIBABACLOUD_JARVIS-PUBLIC_EXPORT Jarvis-publicClient : public RpcServiceClient + class ALIBABACLOUD_JARVIS_PUBLIC_EXPORT Jarvis_publicClient : public RpcServiceClient { public: typedef Outcome DescribeCountAttackEventOutcome; typedef std::future DescribeCountAttackEventOutcomeCallable; - typedef std::function&)> DescribeCountAttackEventAsyncHandler; + typedef std::function&)> DescribeCountAttackEventAsyncHandler; typedef Outcome DescribeAttackEventOutcome; typedef std::future DescribeAttackEventOutcomeCallable; - typedef std::function&)> DescribeAttackEventAsyncHandler; + typedef std::function&)> DescribeAttackEventAsyncHandler; typedef Outcome DescribePhoneInfoOutcome; typedef std::future DescribePhoneInfoOutcomeCallable; - typedef std::function&)> DescribePhoneInfoAsyncHandler; + typedef std::function&)> DescribePhoneInfoAsyncHandler; typedef Outcome DescribeAttackedIpOutcome; typedef std::future DescribeAttackedIpOutcomeCallable; - typedef std::function&)> DescribeAttackedIpAsyncHandler; + typedef std::function&)> DescribeAttackedIpAsyncHandler; - Jarvis-publicClient(const Credentials &credentials, const ClientConfiguration &configuration); - Jarvis-publicClient(const std::shared_ptr &credentialsProvider, const ClientConfiguration &configuration); - Jarvis-publicClient(const std::string &accessKeyId, const std::string &accessKeySecret, const ClientConfiguration &configuration); - ~Jarvis-publicClient(); + Jarvis_publicClient(const Credentials &credentials, const ClientConfiguration &configuration); + Jarvis_publicClient(const std::shared_ptr &credentialsProvider, const ClientConfiguration &configuration); + Jarvis_publicClient(const std::string &accessKeyId, const std::string &accessKeySecret, const ClientConfiguration &configuration); + ~Jarvis_publicClient(); DescribeCountAttackEventOutcome describeCountAttackEvent(const Model::DescribeCountAttackEventRequest &request)const; void describeCountAttackEventAsync(const Model::DescribeCountAttackEventRequest& request, const DescribeCountAttackEventAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DescribeCountAttackEventOutcomeCallable describeCountAttackEventCallable(const Model::DescribeCountAttackEventRequest& request) const; @@ -75,4 +75,4 @@ namespace AlibabaCloud } } -#endif // !ALIBABACLOUD_JARVIS-PUBLIC_JARVIS-PUBLICCLIENT_H_ +#endif // !ALIBABACLOUD_JARVIS_PUBLIC_JARVIS_PUBLICCLIENT_H_ diff --git a/jarvis-public/include/alibabacloud/jarvis-public/Jarvis-publicExport.h b/jarvis-public/include/alibabacloud/jarvis-public/Jarvis_publicExport.h similarity index 65% rename from jarvis-public/include/alibabacloud/jarvis-public/Jarvis-publicExport.h rename to jarvis-public/include/alibabacloud/jarvis-public/Jarvis_publicExport.h index f263f3b51..bca81531d 100644 --- a/jarvis-public/include/alibabacloud/jarvis-public/Jarvis-publicExport.h +++ b/jarvis-public/include/alibabacloud/jarvis-public/Jarvis_publicExport.h @@ -14,19 +14,19 @@ * limitations under the License. */ -#ifndef ALIBABACLOUD_JARVIS-PUBLIC_JARVIS-PUBLICEXPORT_H_ -#define ALIBABACLOUD_JARVIS-PUBLIC_JARVIS-PUBLICEXPORT_H_ +#ifndef ALIBABACLOUD_JARVIS_PUBLIC_JARVIS_PUBLICEXPORT_H_ +#define ALIBABACLOUD_JARVIS_PUBLIC_JARVIS_PUBLICEXPORT_H_ #include #if defined(ALIBABACLOUD_SHARED) -# if defined(ALIBABACLOUD_JARVIS-PUBLIC_LIBRARY) -# define ALIBABACLOUD_JARVIS-PUBLIC_EXPORT ALIBABACLOUD_DECL_EXPORT +# if defined(ALIBABACLOUD_JARVIS_PUBLIC_LIBRARY) +# define ALIBABACLOUD_JARVIS_PUBLIC_EXPORT ALIBABACLOUD_DECL_EXPORT # else -# define ALIBABACLOUD_JARVIS-PUBLIC_EXPORT ALIBABACLOUD_DECL_IMPORT +# define ALIBABACLOUD_JARVIS_PUBLIC_EXPORT ALIBABACLOUD_DECL_IMPORT # endif #else -# define ALIBABACLOUD_JARVIS-PUBLIC_EXPORT +# define ALIBABACLOUD_JARVIS_PUBLIC_EXPORT #endif -#endif // !ALIBABACLOUD_JARVIS-PUBLIC_JARVIS-PUBLICEXPORT_H_ \ No newline at end of file +#endif // !ALIBABACLOUD_JARVIS_PUBLIC_JARVIS_PUBLICEXPORT_H_ \ No newline at end of file diff --git a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackEventRequest.h b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackEventRequest.h index ab523932f..8aad45434 100644 --- a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackEventRequest.h +++ b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackEventRequest.h @@ -14,21 +14,21 @@ * limitations under the License. */ -#ifndef ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEATTACKEVENTREQUEST_H_ -#define ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEATTACKEVENTREQUEST_H_ +#ifndef ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEATTACKEVENTREQUEST_H_ +#define ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEATTACKEVENTREQUEST_H_ #include #include #include -#include +#include namespace AlibabaCloud { - namespace Jarvis-public + namespace Jarvis_public { namespace Model { - class ALIBABACLOUD_JARVIS-PUBLIC_EXPORT DescribeAttackEventRequest : public RpcServiceRequest + class ALIBABACLOUD_JARVIS_PUBLIC_EXPORT DescribeAttackEventRequest : public RpcServiceRequest { public: @@ -69,4 +69,4 @@ namespace AlibabaCloud } } } -#endif // !ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEATTACKEVENTREQUEST_H_ \ No newline at end of file +#endif // !ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEATTACKEVENTREQUEST_H_ \ No newline at end of file diff --git a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackEventResult.h b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackEventResult.h index 6622d0ce8..22bba01e8 100644 --- a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackEventResult.h +++ b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackEventResult.h @@ -14,22 +14,22 @@ * limitations under the License. */ -#ifndef ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEATTACKEVENTRESULT_H_ -#define ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEATTACKEVENTRESULT_H_ +#ifndef ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEATTACKEVENTRESULT_H_ +#define ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEATTACKEVENTRESULT_H_ #include #include #include #include -#include +#include namespace AlibabaCloud { - namespace Jarvis-public + namespace Jarvis_public { namespace Model { - class ALIBABACLOUD_JARVIS-PUBLIC_EXPORT DescribeAttackEventResult : public ServiceResult + class ALIBABACLOUD_JARVIS_PUBLIC_EXPORT DescribeAttackEventResult : public ServiceResult { public: struct Event @@ -60,4 +60,4 @@ namespace AlibabaCloud } } } -#endif // !ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEATTACKEVENTRESULT_H_ \ No newline at end of file +#endif // !ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEATTACKEVENTRESULT_H_ \ No newline at end of file diff --git a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackedIpRequest.h b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackedIpRequest.h index 60e08b808..a16a3ebc5 100644 --- a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackedIpRequest.h +++ b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackedIpRequest.h @@ -14,21 +14,21 @@ * limitations under the License. */ -#ifndef ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEATTACKEDIPREQUEST_H_ -#define ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEATTACKEDIPREQUEST_H_ +#ifndef ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEATTACKEDIPREQUEST_H_ +#define ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEATTACKEDIPREQUEST_H_ #include #include #include -#include +#include namespace AlibabaCloud { - namespace Jarvis-public + namespace Jarvis_public { namespace Model { - class ALIBABACLOUD_JARVIS-PUBLIC_EXPORT DescribeAttackedIpRequest : public RpcServiceRequest + class ALIBABACLOUD_JARVIS_PUBLIC_EXPORT DescribeAttackedIpRequest : public RpcServiceRequest { public: @@ -69,4 +69,4 @@ namespace AlibabaCloud } } } -#endif // !ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEATTACKEDIPREQUEST_H_ \ No newline at end of file +#endif // !ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEATTACKEDIPREQUEST_H_ \ No newline at end of file diff --git a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackedIpResult.h b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackedIpResult.h index d2a8c9df1..0a706323c 100644 --- a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackedIpResult.h +++ b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeAttackedIpResult.h @@ -14,22 +14,22 @@ * limitations under the License. */ -#ifndef ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEATTACKEDIPRESULT_H_ -#define ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEATTACKEDIPRESULT_H_ +#ifndef ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEATTACKEDIPRESULT_H_ +#define ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEATTACKEDIPRESULT_H_ #include #include #include #include -#include +#include namespace AlibabaCloud { - namespace Jarvis-public + namespace Jarvis_public { namespace Model { - class ALIBABACLOUD_JARVIS-PUBLIC_EXPORT DescribeAttackedIpResult : public ServiceResult + class ALIBABACLOUD_JARVIS_PUBLIC_EXPORT DescribeAttackedIpResult : public ServiceResult { public: @@ -50,4 +50,4 @@ namespace AlibabaCloud } } } -#endif // !ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEATTACKEDIPRESULT_H_ \ No newline at end of file +#endif // !ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEATTACKEDIPRESULT_H_ \ No newline at end of file diff --git a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeCountAttackEventRequest.h b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeCountAttackEventRequest.h index 1ed9d3711..239d47c45 100644 --- a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeCountAttackEventRequest.h +++ b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeCountAttackEventRequest.h @@ -14,21 +14,21 @@ * limitations under the License. */ -#ifndef ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBECOUNTATTACKEVENTREQUEST_H_ -#define ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBECOUNTATTACKEVENTREQUEST_H_ +#ifndef ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBECOUNTATTACKEVENTREQUEST_H_ +#define ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBECOUNTATTACKEVENTREQUEST_H_ #include #include #include -#include +#include namespace AlibabaCloud { - namespace Jarvis-public + namespace Jarvis_public { namespace Model { - class ALIBABACLOUD_JARVIS-PUBLIC_EXPORT DescribeCountAttackEventRequest : public RpcServiceRequest + class ALIBABACLOUD_JARVIS_PUBLIC_EXPORT DescribeCountAttackEventRequest : public RpcServiceRequest { public: @@ -69,4 +69,4 @@ namespace AlibabaCloud } } } -#endif // !ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBECOUNTATTACKEVENTREQUEST_H_ \ No newline at end of file +#endif // !ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBECOUNTATTACKEVENTREQUEST_H_ \ No newline at end of file diff --git a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeCountAttackEventResult.h b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeCountAttackEventResult.h index fbc2ecbdd..4ae908a0b 100644 --- a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeCountAttackEventResult.h +++ b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribeCountAttackEventResult.h @@ -14,22 +14,22 @@ * limitations under the License. */ -#ifndef ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBECOUNTATTACKEVENTRESULT_H_ -#define ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBECOUNTATTACKEVENTRESULT_H_ +#ifndef ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBECOUNTATTACKEVENTRESULT_H_ +#define ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBECOUNTATTACKEVENTRESULT_H_ #include #include #include #include -#include +#include namespace AlibabaCloud { - namespace Jarvis-public + namespace Jarvis_public { namespace Model { - class ALIBABACLOUD_JARVIS-PUBLIC_EXPORT DescribeCountAttackEventResult : public ServiceResult + class ALIBABACLOUD_JARVIS_PUBLIC_EXPORT DescribeCountAttackEventResult : public ServiceResult { public: @@ -50,4 +50,4 @@ namespace AlibabaCloud } } } -#endif // !ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBECOUNTATTACKEVENTRESULT_H_ \ No newline at end of file +#endif // !ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBECOUNTATTACKEVENTRESULT_H_ \ No newline at end of file diff --git a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribePhoneInfoRequest.h b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribePhoneInfoRequest.h index 82c65d408..b4dd8128e 100644 --- a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribePhoneInfoRequest.h +++ b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribePhoneInfoRequest.h @@ -14,21 +14,21 @@ * limitations under the License. */ -#ifndef ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEPHONEINFOREQUEST_H_ -#define ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEPHONEINFOREQUEST_H_ +#ifndef ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEPHONEINFOREQUEST_H_ +#define ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEPHONEINFOREQUEST_H_ #include #include #include -#include +#include namespace AlibabaCloud { - namespace Jarvis-public + namespace Jarvis_public { namespace Model { - class ALIBABACLOUD_JARVIS-PUBLIC_EXPORT DescribePhoneInfoRequest : public RpcServiceRequest + class ALIBABACLOUD_JARVIS_PUBLIC_EXPORT DescribePhoneInfoRequest : public RpcServiceRequest { public: @@ -54,4 +54,4 @@ namespace AlibabaCloud } } } -#endif // !ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEPHONEINFOREQUEST_H_ \ No newline at end of file +#endif // !ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEPHONEINFOREQUEST_H_ \ No newline at end of file diff --git a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribePhoneInfoResult.h b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribePhoneInfoResult.h index 0f88e7e32..926b523c0 100644 --- a/jarvis-public/include/alibabacloud/jarvis-public/model/DescribePhoneInfoResult.h +++ b/jarvis-public/include/alibabacloud/jarvis-public/model/DescribePhoneInfoResult.h @@ -14,22 +14,22 @@ * limitations under the License. */ -#ifndef ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEPHONEINFORESULT_H_ -#define ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEPHONEINFORESULT_H_ +#ifndef ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEPHONEINFORESULT_H_ +#define ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEPHONEINFORESULT_H_ #include #include #include #include -#include +#include namespace AlibabaCloud { - namespace Jarvis-public + namespace Jarvis_public { namespace Model { - class ALIBABACLOUD_JARVIS-PUBLIC_EXPORT DescribePhoneInfoResult : public ServiceResult + class ALIBABACLOUD_JARVIS_PUBLIC_EXPORT DescribePhoneInfoResult : public ServiceResult { public: @@ -54,4 +54,4 @@ namespace AlibabaCloud } } } -#endif // !ALIBABACLOUD_JARVIS-PUBLIC_MODEL_DESCRIBEPHONEINFORESULT_H_ \ No newline at end of file +#endif // !ALIBABACLOUD_JARVIS_PUBLIC_MODEL_DESCRIBEPHONEINFORESULT_H_ \ No newline at end of file diff --git a/jarvis-public/src/Jarvis-publicClient.cc b/jarvis-public/src/Jarvis-publicClient.cc index 2349661ef..b72a6e101 100644 --- a/jarvis-public/src/Jarvis-publicClient.cc +++ b/jarvis-public/src/Jarvis-publicClient.cc @@ -14,44 +14,44 @@ * limitations under the License. */ -#include +#include #include using namespace AlibabaCloud; using namespace AlibabaCloud::Location; -using namespace AlibabaCloud::Jarvis-public; -using namespace AlibabaCloud::Jarvis-public::Model; +using namespace AlibabaCloud::Jarvis_public; +using namespace AlibabaCloud::Jarvis_public::Model; namespace { const std::string SERVICE_NAME = "jarvis-public"; } -Jarvis-publicClient::Jarvis-publicClient(const Credentials &credentials, const ClientConfiguration &configuration) : +Jarvis_publicClient::Jarvis_publicClient(const Credentials &credentials, const ClientConfiguration &configuration) : RpcServiceClient(SERVICE_NAME, std::make_shared(credentials), configuration) { auto locationClient = std::make_shared(credentials, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "jarvis-public"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } -Jarvis-publicClient::Jarvis-publicClient(const std::shared_ptr& credentialsProvider, const ClientConfiguration & configuration) : +Jarvis_publicClient::Jarvis_publicClient(const std::shared_ptr& credentialsProvider, const ClientConfiguration & configuration) : RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration) { auto locationClient = std::make_shared(credentialsProvider, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "jarvis-public"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } -Jarvis-publicClient::Jarvis-publicClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) : +Jarvis_publicClient::Jarvis_publicClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) : RpcServiceClient(SERVICE_NAME, std::make_shared(accessKeyId, accessKeySecret), configuration) { auto locationClient = std::make_shared(accessKeyId, accessKeySecret, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "jarvis-public"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } -Jarvis-publicClient::~Jarvis-publicClient() +Jarvis_publicClient::~Jarvis_publicClient() {} -Jarvis-publicClient::DescribeCountAttackEventOutcome Jarvis-publicClient::describeCountAttackEvent(const DescribeCountAttackEventRequest &request) const +Jarvis_publicClient::DescribeCountAttackEventOutcome Jarvis_publicClient::describeCountAttackEvent(const DescribeCountAttackEventRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); if (!endpointOutcome.isSuccess()) @@ -65,7 +65,7 @@ Jarvis-publicClient::DescribeCountAttackEventOutcome Jarvis-publicClient::descri return DescribeCountAttackEventOutcome(outcome.error()); } -void Jarvis-publicClient::describeCountAttackEventAsync(const DescribeCountAttackEventRequest& request, const DescribeCountAttackEventAsyncHandler& handler, const std::shared_ptr& context) const +void Jarvis_publicClient::describeCountAttackEventAsync(const DescribeCountAttackEventRequest& request, const DescribeCountAttackEventAsyncHandler& handler, const std::shared_ptr& context) const { auto fn = [this, request, handler, context]() { @@ -75,7 +75,7 @@ void Jarvis-publicClient::describeCountAttackEventAsync(const DescribeCountAttac asyncExecute(new Runnable(fn)); } -Jarvis-publicClient::DescribeCountAttackEventOutcomeCallable Jarvis-publicClient::describeCountAttackEventCallable(const DescribeCountAttackEventRequest &request) const +Jarvis_publicClient::DescribeCountAttackEventOutcomeCallable Jarvis_publicClient::describeCountAttackEventCallable(const DescribeCountAttackEventRequest &request) const { auto task = std::make_shared>( [this, request]() @@ -87,7 +87,7 @@ Jarvis-publicClient::DescribeCountAttackEventOutcomeCallable Jarvis-publicClient return task->get_future(); } -Jarvis-publicClient::DescribeAttackEventOutcome Jarvis-publicClient::describeAttackEvent(const DescribeAttackEventRequest &request) const +Jarvis_publicClient::DescribeAttackEventOutcome Jarvis_publicClient::describeAttackEvent(const DescribeAttackEventRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); if (!endpointOutcome.isSuccess()) @@ -101,7 +101,7 @@ Jarvis-publicClient::DescribeAttackEventOutcome Jarvis-publicClient::describeAtt return DescribeAttackEventOutcome(outcome.error()); } -void Jarvis-publicClient::describeAttackEventAsync(const DescribeAttackEventRequest& request, const DescribeAttackEventAsyncHandler& handler, const std::shared_ptr& context) const +void Jarvis_publicClient::describeAttackEventAsync(const DescribeAttackEventRequest& request, const DescribeAttackEventAsyncHandler& handler, const std::shared_ptr& context) const { auto fn = [this, request, handler, context]() { @@ -111,7 +111,7 @@ void Jarvis-publicClient::describeAttackEventAsync(const DescribeAttackEventRequ asyncExecute(new Runnable(fn)); } -Jarvis-publicClient::DescribeAttackEventOutcomeCallable Jarvis-publicClient::describeAttackEventCallable(const DescribeAttackEventRequest &request) const +Jarvis_publicClient::DescribeAttackEventOutcomeCallable Jarvis_publicClient::describeAttackEventCallable(const DescribeAttackEventRequest &request) const { auto task = std::make_shared>( [this, request]() @@ -123,7 +123,7 @@ Jarvis-publicClient::DescribeAttackEventOutcomeCallable Jarvis-publicClient::des return task->get_future(); } -Jarvis-publicClient::DescribePhoneInfoOutcome Jarvis-publicClient::describePhoneInfo(const DescribePhoneInfoRequest &request) const +Jarvis_publicClient::DescribePhoneInfoOutcome Jarvis_publicClient::describePhoneInfo(const DescribePhoneInfoRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); if (!endpointOutcome.isSuccess()) @@ -137,7 +137,7 @@ Jarvis-publicClient::DescribePhoneInfoOutcome Jarvis-publicClient::describePhone return DescribePhoneInfoOutcome(outcome.error()); } -void Jarvis-publicClient::describePhoneInfoAsync(const DescribePhoneInfoRequest& request, const DescribePhoneInfoAsyncHandler& handler, const std::shared_ptr& context) const +void Jarvis_publicClient::describePhoneInfoAsync(const DescribePhoneInfoRequest& request, const DescribePhoneInfoAsyncHandler& handler, const std::shared_ptr& context) const { auto fn = [this, request, handler, context]() { @@ -147,7 +147,7 @@ void Jarvis-publicClient::describePhoneInfoAsync(const DescribePhoneInfoRequest& asyncExecute(new Runnable(fn)); } -Jarvis-publicClient::DescribePhoneInfoOutcomeCallable Jarvis-publicClient::describePhoneInfoCallable(const DescribePhoneInfoRequest &request) const +Jarvis_publicClient::DescribePhoneInfoOutcomeCallable Jarvis_publicClient::describePhoneInfoCallable(const DescribePhoneInfoRequest &request) const { auto task = std::make_shared>( [this, request]() @@ -159,7 +159,7 @@ Jarvis-publicClient::DescribePhoneInfoOutcomeCallable Jarvis-publicClient::descr return task->get_future(); } -Jarvis-publicClient::DescribeAttackedIpOutcome Jarvis-publicClient::describeAttackedIp(const DescribeAttackedIpRequest &request) const +Jarvis_publicClient::DescribeAttackedIpOutcome Jarvis_publicClient::describeAttackedIp(const DescribeAttackedIpRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); if (!endpointOutcome.isSuccess()) @@ -173,7 +173,7 @@ Jarvis-publicClient::DescribeAttackedIpOutcome Jarvis-publicClient::describeAtta return DescribeAttackedIpOutcome(outcome.error()); } -void Jarvis-publicClient::describeAttackedIpAsync(const DescribeAttackedIpRequest& request, const DescribeAttackedIpAsyncHandler& handler, const std::shared_ptr& context) const +void Jarvis_publicClient::describeAttackedIpAsync(const DescribeAttackedIpRequest& request, const DescribeAttackedIpAsyncHandler& handler, const std::shared_ptr& context) const { auto fn = [this, request, handler, context]() { @@ -183,7 +183,7 @@ void Jarvis-publicClient::describeAttackedIpAsync(const DescribeAttackedIpReques asyncExecute(new Runnable(fn)); } -Jarvis-publicClient::DescribeAttackedIpOutcomeCallable Jarvis-publicClient::describeAttackedIpCallable(const DescribeAttackedIpRequest &request) const +Jarvis_publicClient::DescribeAttackedIpOutcomeCallable Jarvis_publicClient::describeAttackedIpCallable(const DescribeAttackedIpRequest &request) const { auto task = std::make_shared>( [this, request]() diff --git a/jarvis-public/src/model/DescribeAttackEventRequest.cc b/jarvis-public/src/model/DescribeAttackEventRequest.cc index 581e38214..8157b39c6 100644 --- a/jarvis-public/src/model/DescribeAttackEventRequest.cc +++ b/jarvis-public/src/model/DescribeAttackEventRequest.cc @@ -16,7 +16,7 @@ #include -using AlibabaCloud::Jarvis-public::Model::DescribeAttackEventRequest; +using AlibabaCloud::Jarvis_public::Model::DescribeAttackEventRequest; DescribeAttackEventRequest::DescribeAttackEventRequest() : RpcServiceRequest("jarvis-public", "2018-06-21", "DescribeAttackEvent") diff --git a/jarvis-public/src/model/DescribeAttackEventResult.cc b/jarvis-public/src/model/DescribeAttackEventResult.cc index a0849eb3f..628afe272 100644 --- a/jarvis-public/src/model/DescribeAttackEventResult.cc +++ b/jarvis-public/src/model/DescribeAttackEventResult.cc @@ -17,8 +17,8 @@ #include #include -using namespace AlibabaCloud::Jarvis-public; -using namespace AlibabaCloud::Jarvis-public::Model; +using namespace AlibabaCloud::Jarvis_public; +using namespace AlibabaCloud::Jarvis_public::Model; DescribeAttackEventResult::DescribeAttackEventResult() : ServiceResult() diff --git a/jarvis-public/src/model/DescribeAttackedIpRequest.cc b/jarvis-public/src/model/DescribeAttackedIpRequest.cc index 54cee402f..ccd758985 100644 --- a/jarvis-public/src/model/DescribeAttackedIpRequest.cc +++ b/jarvis-public/src/model/DescribeAttackedIpRequest.cc @@ -16,7 +16,7 @@ #include -using AlibabaCloud::Jarvis-public::Model::DescribeAttackedIpRequest; +using AlibabaCloud::Jarvis_public::Model::DescribeAttackedIpRequest; DescribeAttackedIpRequest::DescribeAttackedIpRequest() : RpcServiceRequest("jarvis-public", "2018-06-21", "DescribeAttackedIp") diff --git a/jarvis-public/src/model/DescribeAttackedIpResult.cc b/jarvis-public/src/model/DescribeAttackedIpResult.cc index 020eb3b06..3c6de94d1 100644 --- a/jarvis-public/src/model/DescribeAttackedIpResult.cc +++ b/jarvis-public/src/model/DescribeAttackedIpResult.cc @@ -17,8 +17,8 @@ #include #include -using namespace AlibabaCloud::Jarvis-public; -using namespace AlibabaCloud::Jarvis-public::Model; +using namespace AlibabaCloud::Jarvis_public; +using namespace AlibabaCloud::Jarvis_public::Model; DescribeAttackedIpResult::DescribeAttackedIpResult() : ServiceResult() diff --git a/jarvis-public/src/model/DescribeCountAttackEventRequest.cc b/jarvis-public/src/model/DescribeCountAttackEventRequest.cc index df365e2df..996a13884 100644 --- a/jarvis-public/src/model/DescribeCountAttackEventRequest.cc +++ b/jarvis-public/src/model/DescribeCountAttackEventRequest.cc @@ -16,7 +16,7 @@ #include -using AlibabaCloud::Jarvis-public::Model::DescribeCountAttackEventRequest; +using AlibabaCloud::Jarvis_public::Model::DescribeCountAttackEventRequest; DescribeCountAttackEventRequest::DescribeCountAttackEventRequest() : RpcServiceRequest("jarvis-public", "2018-06-21", "DescribeCountAttackEvent") diff --git a/jarvis-public/src/model/DescribeCountAttackEventResult.cc b/jarvis-public/src/model/DescribeCountAttackEventResult.cc index d81fc3c1b..dcff5ab65 100644 --- a/jarvis-public/src/model/DescribeCountAttackEventResult.cc +++ b/jarvis-public/src/model/DescribeCountAttackEventResult.cc @@ -17,8 +17,8 @@ #include #include -using namespace AlibabaCloud::Jarvis-public; -using namespace AlibabaCloud::Jarvis-public::Model; +using namespace AlibabaCloud::Jarvis_public; +using namespace AlibabaCloud::Jarvis_public::Model; DescribeCountAttackEventResult::DescribeCountAttackEventResult() : ServiceResult() diff --git a/jarvis-public/src/model/DescribePhoneInfoRequest.cc b/jarvis-public/src/model/DescribePhoneInfoRequest.cc index 5a289c6dc..875b5c30b 100644 --- a/jarvis-public/src/model/DescribePhoneInfoRequest.cc +++ b/jarvis-public/src/model/DescribePhoneInfoRequest.cc @@ -16,7 +16,7 @@ #include -using AlibabaCloud::Jarvis-public::Model::DescribePhoneInfoRequest; +using AlibabaCloud::Jarvis_public::Model::DescribePhoneInfoRequest; DescribePhoneInfoRequest::DescribePhoneInfoRequest() : RpcServiceRequest("jarvis-public", "2018-06-21", "DescribePhoneInfo") diff --git a/jarvis-public/src/model/DescribePhoneInfoResult.cc b/jarvis-public/src/model/DescribePhoneInfoResult.cc index 90f726dc9..fbc0395e6 100644 --- a/jarvis-public/src/model/DescribePhoneInfoResult.cc +++ b/jarvis-public/src/model/DescribePhoneInfoResult.cc @@ -17,8 +17,8 @@ #include #include -using namespace AlibabaCloud::Jarvis-public; -using namespace AlibabaCloud::Jarvis-public::Model; +using namespace AlibabaCloud::Jarvis_public; +using namespace AlibabaCloud::Jarvis_public::Model; DescribePhoneInfoResult::DescribePhoneInfoResult() : ServiceResult()