From 4aa00d49d1f21ffcbfe0f5a47ae3da2399995a95 Mon Sep 17 00:00:00 2001 From: sdk-team Date: Thu, 23 Apr 2020 17:51:52 +0800 Subject: [PATCH] Fixed bugs for MassPush API. --- CHANGELOG | 3 + VERSION | 2 +- push/CMakeLists.txt | 8 -- push/include/alibabacloud/push/PushClient.h | 16 --- .../push/model/ListPushRecordsRequest.h | 66 ----------- .../push/model/ListPushRecordsResult.h | 68 ------------ .../push/model/QueryPushListRequest.h | 66 ----------- .../push/model/QueryPushListResult.h | 68 ------------ push/src/PushClient.cc | 78 +------------ push/src/model/ListPushRecordsRequest.cc | 104 ------------------ push/src/model/ListPushRecordsResult.cc | 92 ---------------- push/src/model/QueryPushListRequest.cc | 104 ------------------ push/src/model/QueryPushListResult.cc | 92 ---------------- 13 files changed, 7 insertions(+), 760 deletions(-) delete mode 100644 push/include/alibabacloud/push/model/ListPushRecordsRequest.h delete mode 100644 push/include/alibabacloud/push/model/ListPushRecordsResult.h delete mode 100644 push/include/alibabacloud/push/model/QueryPushListRequest.h delete mode 100644 push/include/alibabacloud/push/model/QueryPushListResult.h delete mode 100644 push/src/model/ListPushRecordsRequest.cc delete mode 100644 push/src/model/ListPushRecordsResult.cc delete mode 100644 push/src/model/QueryPushListRequest.cc delete mode 100644 push/src/model/QueryPushListResult.cc diff --git a/CHANGELOG b/CHANGELOG index ef14cfd7f..5227af6f2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-04-23 Version: 1.36.374 +- Fixed bugs for MassPush API. + 2020-04-23 Version: 1.36.373 - Add location info. diff --git a/VERSION b/VERSION index 9a11f5d46..5d5545222 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.373 \ No newline at end of file +1.36.374 \ No newline at end of file diff --git a/push/CMakeLists.txt b/push/CMakeLists.txt index 6244c6804..41f7fb34e 100644 --- a/push/CMakeLists.txt +++ b/push/CMakeLists.txt @@ -37,8 +37,6 @@ set(push_public_header_model include/alibabacloud/push/model/CompleteContinuouslyPushResult.h include/alibabacloud/push/model/ContinuouslyPushRequest.h include/alibabacloud/push/model/ContinuouslyPushResult.h - include/alibabacloud/push/model/ListPushRecordsRequest.h - include/alibabacloud/push/model/ListPushRecordsResult.h include/alibabacloud/push/model/ListSummaryAppsRequest.h include/alibabacloud/push/model/ListSummaryAppsResult.h include/alibabacloud/push/model/ListTagsRequest.h @@ -65,8 +63,6 @@ set(push_public_header_model include/alibabacloud/push/model/QueryDevicesByAccountResult.h include/alibabacloud/push/model/QueryDevicesByAliasRequest.h include/alibabacloud/push/model/QueryDevicesByAliasResult.h - include/alibabacloud/push/model/QueryPushListRequest.h - include/alibabacloud/push/model/QueryPushListResult.h include/alibabacloud/push/model/QueryPushRecordsRequest.h include/alibabacloud/push/model/QueryPushRecordsResult.h include/alibabacloud/push/model/QueryPushStatByAppRequest.h @@ -104,8 +100,6 @@ set(push_src src/model/CompleteContinuouslyPushResult.cc src/model/ContinuouslyPushRequest.cc src/model/ContinuouslyPushResult.cc - src/model/ListPushRecordsRequest.cc - src/model/ListPushRecordsResult.cc src/model/ListSummaryAppsRequest.cc src/model/ListSummaryAppsResult.cc src/model/ListTagsRequest.cc @@ -132,8 +126,6 @@ set(push_src src/model/QueryDevicesByAccountResult.cc src/model/QueryDevicesByAliasRequest.cc src/model/QueryDevicesByAliasResult.cc - src/model/QueryPushListRequest.cc - src/model/QueryPushListResult.cc src/model/QueryPushRecordsRequest.cc src/model/QueryPushRecordsResult.cc src/model/QueryPushStatByAppRequest.cc diff --git a/push/include/alibabacloud/push/PushClient.h b/push/include/alibabacloud/push/PushClient.h index 2d8aec071..081f7e373 100644 --- a/push/include/alibabacloud/push/PushClient.h +++ b/push/include/alibabacloud/push/PushClient.h @@ -38,8 +38,6 @@ #include "model/CompleteContinuouslyPushResult.h" #include "model/ContinuouslyPushRequest.h" #include "model/ContinuouslyPushResult.h" -#include "model/ListPushRecordsRequest.h" -#include "model/ListPushRecordsResult.h" #include "model/ListSummaryAppsRequest.h" #include "model/ListSummaryAppsResult.h" #include "model/ListTagsRequest.h" @@ -66,8 +64,6 @@ #include "model/QueryDevicesByAccountResult.h" #include "model/QueryDevicesByAliasRequest.h" #include "model/QueryDevicesByAliasResult.h" -#include "model/QueryPushListRequest.h" -#include "model/QueryPushListResult.h" #include "model/QueryPushRecordsRequest.h" #include "model/QueryPushRecordsResult.h" #include "model/QueryPushStatByAppRequest.h" @@ -119,9 +115,6 @@ namespace AlibabaCloud typedef Outcome ContinuouslyPushOutcome; typedef std::future ContinuouslyPushOutcomeCallable; typedef std::function&)> ContinuouslyPushAsyncHandler; - typedef Outcome ListPushRecordsOutcome; - typedef std::future ListPushRecordsOutcomeCallable; - typedef std::function&)> ListPushRecordsAsyncHandler; typedef Outcome ListSummaryAppsOutcome; typedef std::future ListSummaryAppsOutcomeCallable; typedef std::function&)> ListSummaryAppsAsyncHandler; @@ -161,9 +154,6 @@ namespace AlibabaCloud typedef Outcome QueryDevicesByAliasOutcome; typedef std::future QueryDevicesByAliasOutcomeCallable; typedef std::function&)> QueryDevicesByAliasAsyncHandler; - typedef Outcome QueryPushListOutcome; - typedef std::future QueryPushListOutcomeCallable; - typedef std::function&)> QueryPushListAsyncHandler; typedef Outcome QueryPushRecordsOutcome; typedef std::future QueryPushRecordsOutcomeCallable; typedef std::function&)> QueryPushRecordsAsyncHandler; @@ -220,9 +210,6 @@ namespace AlibabaCloud ContinuouslyPushOutcome continuouslyPush(const Model::ContinuouslyPushRequest &request)const; void continuouslyPushAsync(const Model::ContinuouslyPushRequest& request, const ContinuouslyPushAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ContinuouslyPushOutcomeCallable continuouslyPushCallable(const Model::ContinuouslyPushRequest& request) const; - ListPushRecordsOutcome listPushRecords(const Model::ListPushRecordsRequest &request)const; - void listPushRecordsAsync(const Model::ListPushRecordsRequest& request, const ListPushRecordsAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; - ListPushRecordsOutcomeCallable listPushRecordsCallable(const Model::ListPushRecordsRequest& request) const; ListSummaryAppsOutcome listSummaryApps(const Model::ListSummaryAppsRequest &request)const; void listSummaryAppsAsync(const Model::ListSummaryAppsRequest& request, const ListSummaryAppsAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ListSummaryAppsOutcomeCallable listSummaryAppsCallable(const Model::ListSummaryAppsRequest& request) const; @@ -262,9 +249,6 @@ namespace AlibabaCloud QueryDevicesByAliasOutcome queryDevicesByAlias(const Model::QueryDevicesByAliasRequest &request)const; void queryDevicesByAliasAsync(const Model::QueryDevicesByAliasRequest& request, const QueryDevicesByAliasAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; QueryDevicesByAliasOutcomeCallable queryDevicesByAliasCallable(const Model::QueryDevicesByAliasRequest& request) const; - QueryPushListOutcome queryPushList(const Model::QueryPushListRequest &request)const; - void queryPushListAsync(const Model::QueryPushListRequest& request, const QueryPushListAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; - QueryPushListOutcomeCallable queryPushListCallable(const Model::QueryPushListRequest& request) const; QueryPushRecordsOutcome queryPushRecords(const Model::QueryPushRecordsRequest &request)const; void queryPushRecordsAsync(const Model::QueryPushRecordsRequest& request, const QueryPushRecordsAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; QueryPushRecordsOutcomeCallable queryPushRecordsCallable(const Model::QueryPushRecordsRequest& request) const; diff --git a/push/include/alibabacloud/push/model/ListPushRecordsRequest.h b/push/include/alibabacloud/push/model/ListPushRecordsRequest.h deleted file mode 100644 index ab8fd7a50..000000000 --- a/push/include/alibabacloud/push/model/ListPushRecordsRequest.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2009-2017 Alibaba Cloud All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ALIBABACLOUD_PUSH_MODEL_LISTPUSHRECORDSREQUEST_H_ -#define ALIBABACLOUD_PUSH_MODEL_LISTPUSHRECORDSREQUEST_H_ - -#include -#include -#include -#include - -namespace AlibabaCloud -{ - namespace Push - { - namespace Model - { - class ALIBABACLOUD_PUSH_EXPORT ListPushRecordsRequest : public RpcServiceRequest - { - - public: - ListPushRecordsRequest(); - ~ListPushRecordsRequest(); - - std::string getEndTime()const; - void setEndTime(const std::string& endTime); - std::string getStartTime()const; - void setStartTime(const std::string& startTime); - std::string getAccessKeyId()const; - void setAccessKeyId(const std::string& accessKeyId); - int getPageSize()const; - void setPageSize(int pageSize); - long getAppKey()const; - void setAppKey(long appKey); - int getPage()const; - void setPage(int page); - std::string getPushType()const; - void setPushType(const std::string& pushType); - - private: - std::string endTime_; - std::string startTime_; - std::string accessKeyId_; - int pageSize_; - long appKey_; - int page_; - std::string pushType_; - - }; - } - } -} -#endif // !ALIBABACLOUD_PUSH_MODEL_LISTPUSHRECORDSREQUEST_H_ \ No newline at end of file diff --git a/push/include/alibabacloud/push/model/ListPushRecordsResult.h b/push/include/alibabacloud/push/model/ListPushRecordsResult.h deleted file mode 100644 index df16e2c11..000000000 --- a/push/include/alibabacloud/push/model/ListPushRecordsResult.h +++ /dev/null @@ -1,68 +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_PUSH_MODEL_LISTPUSHRECORDSRESULT_H_ -#define ALIBABACLOUD_PUSH_MODEL_LISTPUSHRECORDSRESULT_H_ - -#include -#include -#include -#include -#include - -namespace AlibabaCloud -{ - namespace Push - { - namespace Model - { - class ALIBABACLOUD_PUSH_EXPORT ListPushRecordsResult : public ServiceResult - { - public: - struct PushMessageInfo - { - std::string deviceType; - std::string type; - std::string pushTime; - long appKey; - std::string title; - std::string body; - std::string appName; - std::string messageId; - }; - - - ListPushRecordsResult(); - explicit ListPushRecordsResult(const std::string &payload); - ~ListPushRecordsResult(); - int getPageSize()const; - int getTotal()const; - int getPage()const; - std::vector getPushMessageInfos()const; - - protected: - void parse(const std::string &payload); - private: - int pageSize_; - int total_; - int page_; - std::vector pushMessageInfos_; - - }; - } - } -} -#endif // !ALIBABACLOUD_PUSH_MODEL_LISTPUSHRECORDSRESULT_H_ \ No newline at end of file diff --git a/push/include/alibabacloud/push/model/QueryPushListRequest.h b/push/include/alibabacloud/push/model/QueryPushListRequest.h deleted file mode 100644 index 78f623194..000000000 --- a/push/include/alibabacloud/push/model/QueryPushListRequest.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2009-2017 Alibaba Cloud All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ALIBABACLOUD_PUSH_MODEL_QUERYPUSHLISTREQUEST_H_ -#define ALIBABACLOUD_PUSH_MODEL_QUERYPUSHLISTREQUEST_H_ - -#include -#include -#include -#include - -namespace AlibabaCloud -{ - namespace Push - { - namespace Model - { - class ALIBABACLOUD_PUSH_EXPORT QueryPushListRequest : public RpcServiceRequest - { - - public: - QueryPushListRequest(); - ~QueryPushListRequest(); - - std::string getEndTime()const; - void setEndTime(const std::string& endTime); - std::string getStartTime()const; - void setStartTime(const std::string& startTime); - std::string getAccessKeyId()const; - void setAccessKeyId(const std::string& accessKeyId); - int getPageSize()const; - void setPageSize(int pageSize); - long getAppKey()const; - void setAppKey(long appKey); - int getPage()const; - void setPage(int page); - std::string getPushType()const; - void setPushType(const std::string& pushType); - - private: - std::string endTime_; - std::string startTime_; - std::string accessKeyId_; - int pageSize_; - long appKey_; - int page_; - std::string pushType_; - - }; - } - } -} -#endif // !ALIBABACLOUD_PUSH_MODEL_QUERYPUSHLISTREQUEST_H_ \ No newline at end of file diff --git a/push/include/alibabacloud/push/model/QueryPushListResult.h b/push/include/alibabacloud/push/model/QueryPushListResult.h deleted file mode 100644 index 3528bd065..000000000 --- a/push/include/alibabacloud/push/model/QueryPushListResult.h +++ /dev/null @@ -1,68 +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_PUSH_MODEL_QUERYPUSHLISTRESULT_H_ -#define ALIBABACLOUD_PUSH_MODEL_QUERYPUSHLISTRESULT_H_ - -#include -#include -#include -#include -#include - -namespace AlibabaCloud -{ - namespace Push - { - namespace Model - { - class ALIBABACLOUD_PUSH_EXPORT QueryPushListResult : public ServiceResult - { - public: - struct PushMessageInfo - { - std::string deviceType; - std::string type; - std::string pushTime; - long appKey; - std::string title; - std::string body; - std::string appName; - std::string messageId; - }; - - - QueryPushListResult(); - explicit QueryPushListResult(const std::string &payload); - ~QueryPushListResult(); - int getPageSize()const; - int getPage()const; - std::vector getPushMessageInfos()const; - bool getHasNext()const; - - protected: - void parse(const std::string &payload); - private: - int pageSize_; - int page_; - std::vector pushMessageInfos_; - bool hasNext_; - - }; - } - } -} -#endif // !ALIBABACLOUD_PUSH_MODEL_QUERYPUSHLISTRESULT_H_ \ No newline at end of file diff --git a/push/src/PushClient.cc b/push/src/PushClient.cc index 72e806dc7..c40a164c4 100644 --- a/push/src/PushClient.cc +++ b/push/src/PushClient.cc @@ -31,21 +31,21 @@ PushClient::PushClient(const Credentials &credentials, const ClientConfiguration RpcServiceClient(SERVICE_NAME, std::make_shared(credentials), configuration) { auto locationClient = std::make_shared(credentials, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "cps"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } PushClient::PushClient(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, "cps"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } PushClient::PushClient(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, "cps"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } PushClient::~PushClient() @@ -339,42 +339,6 @@ PushClient::ContinuouslyPushOutcomeCallable PushClient::continuouslyPushCallable return task->get_future(); } -PushClient::ListPushRecordsOutcome PushClient::listPushRecords(const ListPushRecordsRequest &request) const -{ - auto endpointOutcome = endpointProvider_->getEndpoint(); - if (!endpointOutcome.isSuccess()) - return ListPushRecordsOutcome(endpointOutcome.error()); - - auto outcome = makeRequest(endpointOutcome.result(), request); - - if (outcome.isSuccess()) - return ListPushRecordsOutcome(ListPushRecordsResult(outcome.result())); - else - return ListPushRecordsOutcome(outcome.error()); -} - -void PushClient::listPushRecordsAsync(const ListPushRecordsRequest& request, const ListPushRecordsAsyncHandler& handler, const std::shared_ptr& context) const -{ - auto fn = [this, request, handler, context]() - { - handler(this, request, listPushRecords(request), context); - }; - - asyncExecute(new Runnable(fn)); -} - -PushClient::ListPushRecordsOutcomeCallable PushClient::listPushRecordsCallable(const ListPushRecordsRequest &request) const -{ - auto task = std::make_shared>( - [this, request]() - { - return this->listPushRecords(request); - }); - - asyncExecute(new Runnable([task]() { (*task)(); })); - return task->get_future(); -} - PushClient::ListSummaryAppsOutcome PushClient::listSummaryApps(const ListSummaryAppsRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); @@ -843,42 +807,6 @@ PushClient::QueryDevicesByAliasOutcomeCallable PushClient::queryDevicesByAliasCa return task->get_future(); } -PushClient::QueryPushListOutcome PushClient::queryPushList(const QueryPushListRequest &request) const -{ - auto endpointOutcome = endpointProvider_->getEndpoint(); - if (!endpointOutcome.isSuccess()) - return QueryPushListOutcome(endpointOutcome.error()); - - auto outcome = makeRequest(endpointOutcome.result(), request); - - if (outcome.isSuccess()) - return QueryPushListOutcome(QueryPushListResult(outcome.result())); - else - return QueryPushListOutcome(outcome.error()); -} - -void PushClient::queryPushListAsync(const QueryPushListRequest& request, const QueryPushListAsyncHandler& handler, const std::shared_ptr& context) const -{ - auto fn = [this, request, handler, context]() - { - handler(this, request, queryPushList(request), context); - }; - - asyncExecute(new Runnable(fn)); -} - -PushClient::QueryPushListOutcomeCallable PushClient::queryPushListCallable(const QueryPushListRequest &request) const -{ - auto task = std::make_shared>( - [this, request]() - { - return this->queryPushList(request); - }); - - asyncExecute(new Runnable([task]() { (*task)(); })); - return task->get_future(); -} - PushClient::QueryPushRecordsOutcome PushClient::queryPushRecords(const QueryPushRecordsRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/push/src/model/ListPushRecordsRequest.cc b/push/src/model/ListPushRecordsRequest.cc deleted file mode 100644 index 914173905..000000000 --- a/push/src/model/ListPushRecordsRequest.cc +++ /dev/null @@ -1,104 +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 - -using AlibabaCloud::Push::Model::ListPushRecordsRequest; - -ListPushRecordsRequest::ListPushRecordsRequest() : - RpcServiceRequest("push", "2016-08-01", "ListPushRecords") -{} - -ListPushRecordsRequest::~ListPushRecordsRequest() -{} - -std::string ListPushRecordsRequest::getEndTime()const -{ - return endTime_; -} - -void ListPushRecordsRequest::setEndTime(const std::string& endTime) -{ - endTime_ = endTime; - setCoreParameter("EndTime", endTime); -} - -std::string ListPushRecordsRequest::getStartTime()const -{ - return startTime_; -} - -void ListPushRecordsRequest::setStartTime(const std::string& startTime) -{ - startTime_ = startTime; - setCoreParameter("StartTime", startTime); -} - -std::string ListPushRecordsRequest::getAccessKeyId()const -{ - return accessKeyId_; -} - -void ListPushRecordsRequest::setAccessKeyId(const std::string& accessKeyId) -{ - accessKeyId_ = accessKeyId; - setCoreParameter("AccessKeyId", accessKeyId); -} - -int ListPushRecordsRequest::getPageSize()const -{ - return pageSize_; -} - -void ListPushRecordsRequest::setPageSize(int pageSize) -{ - pageSize_ = pageSize; - setCoreParameter("PageSize", std::to_string(pageSize)); -} - -long ListPushRecordsRequest::getAppKey()const -{ - return appKey_; -} - -void ListPushRecordsRequest::setAppKey(long appKey) -{ - appKey_ = appKey; - setCoreParameter("AppKey", std::to_string(appKey)); -} - -int ListPushRecordsRequest::getPage()const -{ - return page_; -} - -void ListPushRecordsRequest::setPage(int page) -{ - page_ = page; - setCoreParameter("Page", std::to_string(page)); -} - -std::string ListPushRecordsRequest::getPushType()const -{ - return pushType_; -} - -void ListPushRecordsRequest::setPushType(const std::string& pushType) -{ - pushType_ = pushType; - setCoreParameter("PushType", pushType); -} - diff --git a/push/src/model/ListPushRecordsResult.cc b/push/src/model/ListPushRecordsResult.cc deleted file mode 100644 index 85a025c07..000000000 --- a/push/src/model/ListPushRecordsResult.cc +++ /dev/null @@ -1,92 +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 -#include - -using namespace AlibabaCloud::Push; -using namespace AlibabaCloud::Push::Model; - -ListPushRecordsResult::ListPushRecordsResult() : - ServiceResult() -{} - -ListPushRecordsResult::ListPushRecordsResult(const std::string &payload) : - ServiceResult() -{ - parse(payload); -} - -ListPushRecordsResult::~ListPushRecordsResult() -{} - -void ListPushRecordsResult::parse(const std::string &payload) -{ - Json::Reader reader; - Json::Value value; - reader.parse(payload, value); - setRequestId(value["RequestId"].asString()); - auto allPushMessageInfosNode = value["PushMessageInfos"]["PushMessageInfo"]; - for (auto valuePushMessageInfosPushMessageInfo : allPushMessageInfosNode) - { - PushMessageInfo pushMessageInfosObject; - if(!valuePushMessageInfosPushMessageInfo["AppKey"].isNull()) - pushMessageInfosObject.appKey = std::stol(valuePushMessageInfosPushMessageInfo["AppKey"].asString()); - if(!valuePushMessageInfosPushMessageInfo["AppName"].isNull()) - pushMessageInfosObject.appName = valuePushMessageInfosPushMessageInfo["AppName"].asString(); - if(!valuePushMessageInfosPushMessageInfo["MessageId"].isNull()) - pushMessageInfosObject.messageId = valuePushMessageInfosPushMessageInfo["MessageId"].asString(); - if(!valuePushMessageInfosPushMessageInfo["Type"].isNull()) - pushMessageInfosObject.type = valuePushMessageInfosPushMessageInfo["Type"].asString(); - if(!valuePushMessageInfosPushMessageInfo["DeviceType"].isNull()) - pushMessageInfosObject.deviceType = valuePushMessageInfosPushMessageInfo["DeviceType"].asString(); - if(!valuePushMessageInfosPushMessageInfo["PushTime"].isNull()) - pushMessageInfosObject.pushTime = valuePushMessageInfosPushMessageInfo["PushTime"].asString(); - if(!valuePushMessageInfosPushMessageInfo["Title"].isNull()) - pushMessageInfosObject.title = valuePushMessageInfosPushMessageInfo["Title"].asString(); - if(!valuePushMessageInfosPushMessageInfo["Body"].isNull()) - pushMessageInfosObject.body = valuePushMessageInfosPushMessageInfo["Body"].asString(); - pushMessageInfos_.push_back(pushMessageInfosObject); - } - if(!value["Total"].isNull()) - total_ = std::stoi(value["Total"].asString()); - if(!value["Page"].isNull()) - page_ = std::stoi(value["Page"].asString()); - if(!value["PageSize"].isNull()) - pageSize_ = std::stoi(value["PageSize"].asString()); - -} - -int ListPushRecordsResult::getPageSize()const -{ - return pageSize_; -} - -int ListPushRecordsResult::getTotal()const -{ - return total_; -} - -int ListPushRecordsResult::getPage()const -{ - return page_; -} - -std::vector ListPushRecordsResult::getPushMessageInfos()const -{ - return pushMessageInfos_; -} - diff --git a/push/src/model/QueryPushListRequest.cc b/push/src/model/QueryPushListRequest.cc deleted file mode 100644 index 2661b5c53..000000000 --- a/push/src/model/QueryPushListRequest.cc +++ /dev/null @@ -1,104 +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 - -using AlibabaCloud::Push::Model::QueryPushListRequest; - -QueryPushListRequest::QueryPushListRequest() : - RpcServiceRequest("push", "2016-08-01", "QueryPushList") -{} - -QueryPushListRequest::~QueryPushListRequest() -{} - -std::string QueryPushListRequest::getEndTime()const -{ - return endTime_; -} - -void QueryPushListRequest::setEndTime(const std::string& endTime) -{ - endTime_ = endTime; - setCoreParameter("EndTime", endTime); -} - -std::string QueryPushListRequest::getStartTime()const -{ - return startTime_; -} - -void QueryPushListRequest::setStartTime(const std::string& startTime) -{ - startTime_ = startTime; - setCoreParameter("StartTime", startTime); -} - -std::string QueryPushListRequest::getAccessKeyId()const -{ - return accessKeyId_; -} - -void QueryPushListRequest::setAccessKeyId(const std::string& accessKeyId) -{ - accessKeyId_ = accessKeyId; - setCoreParameter("AccessKeyId", accessKeyId); -} - -int QueryPushListRequest::getPageSize()const -{ - return pageSize_; -} - -void QueryPushListRequest::setPageSize(int pageSize) -{ - pageSize_ = pageSize; - setCoreParameter("PageSize", std::to_string(pageSize)); -} - -long QueryPushListRequest::getAppKey()const -{ - return appKey_; -} - -void QueryPushListRequest::setAppKey(long appKey) -{ - appKey_ = appKey; - setCoreParameter("AppKey", std::to_string(appKey)); -} - -int QueryPushListRequest::getPage()const -{ - return page_; -} - -void QueryPushListRequest::setPage(int page) -{ - page_ = page; - setCoreParameter("Page", std::to_string(page)); -} - -std::string QueryPushListRequest::getPushType()const -{ - return pushType_; -} - -void QueryPushListRequest::setPushType(const std::string& pushType) -{ - pushType_ = pushType; - setCoreParameter("PushType", pushType); -} - diff --git a/push/src/model/QueryPushListResult.cc b/push/src/model/QueryPushListResult.cc deleted file mode 100644 index 07a7fc964..000000000 --- a/push/src/model/QueryPushListResult.cc +++ /dev/null @@ -1,92 +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 -#include - -using namespace AlibabaCloud::Push; -using namespace AlibabaCloud::Push::Model; - -QueryPushListResult::QueryPushListResult() : - ServiceResult() -{} - -QueryPushListResult::QueryPushListResult(const std::string &payload) : - ServiceResult() -{ - parse(payload); -} - -QueryPushListResult::~QueryPushListResult() -{} - -void QueryPushListResult::parse(const std::string &payload) -{ - Json::Reader reader; - Json::Value value; - reader.parse(payload, value); - setRequestId(value["RequestId"].asString()); - auto allPushMessageInfosNode = value["PushMessageInfos"]["PushMessageInfo"]; - for (auto valuePushMessageInfosPushMessageInfo : allPushMessageInfosNode) - { - PushMessageInfo pushMessageInfosObject; - if(!valuePushMessageInfosPushMessageInfo["AppKey"].isNull()) - pushMessageInfosObject.appKey = std::stol(valuePushMessageInfosPushMessageInfo["AppKey"].asString()); - if(!valuePushMessageInfosPushMessageInfo["AppName"].isNull()) - pushMessageInfosObject.appName = valuePushMessageInfosPushMessageInfo["AppName"].asString(); - if(!valuePushMessageInfosPushMessageInfo["MessageId"].isNull()) - pushMessageInfosObject.messageId = valuePushMessageInfosPushMessageInfo["MessageId"].asString(); - if(!valuePushMessageInfosPushMessageInfo["Type"].isNull()) - pushMessageInfosObject.type = valuePushMessageInfosPushMessageInfo["Type"].asString(); - if(!valuePushMessageInfosPushMessageInfo["DeviceType"].isNull()) - pushMessageInfosObject.deviceType = valuePushMessageInfosPushMessageInfo["DeviceType"].asString(); - if(!valuePushMessageInfosPushMessageInfo["PushTime"].isNull()) - pushMessageInfosObject.pushTime = valuePushMessageInfosPushMessageInfo["PushTime"].asString(); - if(!valuePushMessageInfosPushMessageInfo["Title"].isNull()) - pushMessageInfosObject.title = valuePushMessageInfosPushMessageInfo["Title"].asString(); - if(!valuePushMessageInfosPushMessageInfo["Body"].isNull()) - pushMessageInfosObject.body = valuePushMessageInfosPushMessageInfo["Body"].asString(); - pushMessageInfos_.push_back(pushMessageInfosObject); - } - if(!value["HasNext"].isNull()) - hasNext_ = value["HasNext"].asString() == "true"; - if(!value["Page"].isNull()) - page_ = std::stoi(value["Page"].asString()); - if(!value["PageSize"].isNull()) - pageSize_ = std::stoi(value["PageSize"].asString()); - -} - -int QueryPushListResult::getPageSize()const -{ - return pageSize_; -} - -int QueryPushListResult::getPage()const -{ - return page_; -} - -std::vector QueryPushListResult::getPushMessageInfos()const -{ - return pushMessageInfos_; -} - -bool QueryPushListResult::getHasNext()const -{ - return hasNext_; -} -