diff --git a/CHANGELOG b/CHANGELOG index 21c3476b1..e77ba9650 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +2018-10-30 Version: 1.29.2 +1, Add API DescribeLiveDomainBpsData,DescribeLiveDomainTrafficData. + + 2018-10-26 Version: 1.29.1 1, Return AuditConclusions in SubmitMaterials API. diff --git a/VERSION b/VERSION index eaeb2365b..3410b780c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.29.1 \ No newline at end of file +1.29.2 \ No newline at end of file diff --git a/live/CMakeLists.txt b/live/CMakeLists.txt index 7d2c921b6..44096745a 100644 --- a/live/CMakeLists.txt +++ b/live/CMakeLists.txt @@ -209,6 +209,8 @@ set(live_public_header_model include/alibabacloud/live/model/SetCasterChannelResult.h include/alibabacloud/live/model/DescribeLiveSnapshotConfigRequest.h include/alibabacloud/live/model/DescribeLiveSnapshotConfigResult.h + include/alibabacloud/live/model/DescribeLiveDomainTrafficDataRequest.h + include/alibabacloud/live/model/DescribeLiveDomainTrafficDataResult.h include/alibabacloud/live/model/DescribeCasterProgramRequest.h include/alibabacloud/live/model/DescribeCasterProgramResult.h include/alibabacloud/live/model/StopLiveDomainRequest.h @@ -303,6 +305,8 @@ set(live_public_header_model include/alibabacloud/live/model/DescribeDomainUsageDataResult.h include/alibabacloud/live/model/DeleteLiveAppRecordConfigRequest.h include/alibabacloud/live/model/DeleteLiveAppRecordConfigResult.h + include/alibabacloud/live/model/DescribeLiveDomainBpsDataRequest.h + include/alibabacloud/live/model/DescribeLiveDomainBpsDataResult.h include/alibabacloud/live/model/DeleteCasterRequest.h include/alibabacloud/live/model/DeleteCasterResult.h include/alibabacloud/live/model/DescribeLiveRecordVodConfigsRequest.h @@ -512,6 +516,8 @@ set(live_src src/model/SetCasterChannelResult.cc src/model/DescribeLiveSnapshotConfigRequest.cc src/model/DescribeLiveSnapshotConfigResult.cc + src/model/DescribeLiveDomainTrafficDataRequest.cc + src/model/DescribeLiveDomainTrafficDataResult.cc src/model/DescribeCasterProgramRequest.cc src/model/DescribeCasterProgramResult.cc src/model/StopLiveDomainRequest.cc @@ -606,6 +612,8 @@ set(live_src src/model/DescribeDomainUsageDataResult.cc src/model/DeleteLiveAppRecordConfigRequest.cc src/model/DeleteLiveAppRecordConfigResult.cc + src/model/DescribeLiveDomainBpsDataRequest.cc + src/model/DescribeLiveDomainBpsDataResult.cc src/model/DeleteCasterRequest.cc src/model/DeleteCasterResult.cc src/model/DescribeLiveRecordVodConfigsRequest.cc diff --git a/live/include/alibabacloud/live/LiveClient.h b/live/include/alibabacloud/live/LiveClient.h index ab5e3d037..5be2202cd 100644 --- a/live/include/alibabacloud/live/LiveClient.h +++ b/live/include/alibabacloud/live/LiveClient.h @@ -210,6 +210,8 @@ #include "model/SetCasterChannelResult.h" #include "model/DescribeLiveSnapshotConfigRequest.h" #include "model/DescribeLiveSnapshotConfigResult.h" +#include "model/DescribeLiveDomainTrafficDataRequest.h" +#include "model/DescribeLiveDomainTrafficDataResult.h" #include "model/DescribeCasterProgramRequest.h" #include "model/DescribeCasterProgramResult.h" #include "model/StopLiveDomainRequest.h" @@ -304,6 +306,8 @@ #include "model/DescribeDomainUsageDataResult.h" #include "model/DeleteLiveAppRecordConfigRequest.h" #include "model/DeleteLiveAppRecordConfigResult.h" +#include "model/DescribeLiveDomainBpsDataRequest.h" +#include "model/DescribeLiveDomainBpsDataResult.h" #include "model/DeleteCasterRequest.h" #include "model/DeleteCasterResult.h" #include "model/DescribeLiveRecordVodConfigsRequest.h" @@ -613,6 +617,9 @@ namespace AlibabaCloud typedef Outcome DescribeLiveSnapshotConfigOutcome; typedef std::future DescribeLiveSnapshotConfigOutcomeCallable; typedef std::function&)> DescribeLiveSnapshotConfigAsyncHandler; + typedef Outcome DescribeLiveDomainTrafficDataOutcome; + typedef std::future DescribeLiveDomainTrafficDataOutcomeCallable; + typedef std::function&)> DescribeLiveDomainTrafficDataAsyncHandler; typedef Outcome DescribeCasterProgramOutcome; typedef std::future DescribeCasterProgramOutcomeCallable; typedef std::function&)> DescribeCasterProgramAsyncHandler; @@ -754,6 +761,9 @@ namespace AlibabaCloud typedef Outcome DeleteLiveAppRecordConfigOutcome; typedef std::future DeleteLiveAppRecordConfigOutcomeCallable; typedef std::function&)> DeleteLiveAppRecordConfigAsyncHandler; + typedef Outcome DescribeLiveDomainBpsDataOutcome; + typedef std::future DescribeLiveDomainBpsDataOutcomeCallable; + typedef std::function&)> DescribeLiveDomainBpsDataAsyncHandler; typedef Outcome DeleteCasterOutcome; typedef std::future DeleteCasterOutcomeCallable; typedef std::function&)> DeleteCasterAsyncHandler; @@ -1068,6 +1078,9 @@ namespace AlibabaCloud DescribeLiveSnapshotConfigOutcome describeLiveSnapshotConfig(const Model::DescribeLiveSnapshotConfigRequest &request)const; void describeLiveSnapshotConfigAsync(const Model::DescribeLiveSnapshotConfigRequest& request, const DescribeLiveSnapshotConfigAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DescribeLiveSnapshotConfigOutcomeCallable describeLiveSnapshotConfigCallable(const Model::DescribeLiveSnapshotConfigRequest& request) const; + DescribeLiveDomainTrafficDataOutcome describeLiveDomainTrafficData(const Model::DescribeLiveDomainTrafficDataRequest &request)const; + void describeLiveDomainTrafficDataAsync(const Model::DescribeLiveDomainTrafficDataRequest& request, const DescribeLiveDomainTrafficDataAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + DescribeLiveDomainTrafficDataOutcomeCallable describeLiveDomainTrafficDataCallable(const Model::DescribeLiveDomainTrafficDataRequest& request) const; DescribeCasterProgramOutcome describeCasterProgram(const Model::DescribeCasterProgramRequest &request)const; void describeCasterProgramAsync(const Model::DescribeCasterProgramRequest& request, const DescribeCasterProgramAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DescribeCasterProgramOutcomeCallable describeCasterProgramCallable(const Model::DescribeCasterProgramRequest& request) const; @@ -1209,6 +1222,9 @@ namespace AlibabaCloud DeleteLiveAppRecordConfigOutcome deleteLiveAppRecordConfig(const Model::DeleteLiveAppRecordConfigRequest &request)const; void deleteLiveAppRecordConfigAsync(const Model::DeleteLiveAppRecordConfigRequest& request, const DeleteLiveAppRecordConfigAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DeleteLiveAppRecordConfigOutcomeCallable deleteLiveAppRecordConfigCallable(const Model::DeleteLiveAppRecordConfigRequest& request) const; + DescribeLiveDomainBpsDataOutcome describeLiveDomainBpsData(const Model::DescribeLiveDomainBpsDataRequest &request)const; + void describeLiveDomainBpsDataAsync(const Model::DescribeLiveDomainBpsDataRequest& request, const DescribeLiveDomainBpsDataAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + DescribeLiveDomainBpsDataOutcomeCallable describeLiveDomainBpsDataCallable(const Model::DescribeLiveDomainBpsDataRequest& request) const; DeleteCasterOutcome deleteCaster(const Model::DeleteCasterRequest &request)const; void deleteCasterAsync(const Model::DeleteCasterRequest& request, const DeleteCasterAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DeleteCasterOutcomeCallable deleteCasterCallable(const Model::DeleteCasterRequest& request) const; diff --git a/live/include/alibabacloud/live/model/DescribeDomainUsageDataRequest.h b/live/include/alibabacloud/live/model/DescribeDomainUsageDataRequest.h index 94b6e09e6..6642a64c1 100644 --- a/live/include/alibabacloud/live/model/DescribeDomainUsageDataRequest.h +++ b/live/include/alibabacloud/live/model/DescribeDomainUsageDataRequest.h @@ -91,6 +91,8 @@ namespace AlibabaCloud void setField(const std::string& field); std::string getRequestId()const; void setRequestId(const std::string& requestId); + std::string getInterval()const; + void setInterval(const std::string& interval); private: long callerParentId_; @@ -121,6 +123,7 @@ namespace AlibabaCloud bool security_transport_; std::string field_; std::string requestId_; + std::string interval_; }; } diff --git a/live/include/alibabacloud/live/model/DescribeLiveDomainBpsDataRequest.h b/live/include/alibabacloud/live/model/DescribeLiveDomainBpsDataRequest.h new file mode 100644 index 000000000..6a0dde680 --- /dev/null +++ b/live/include/alibabacloud/live/model/DescribeLiveDomainBpsDataRequest.h @@ -0,0 +1,69 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ALIBABACLOUD_LIVE_MODEL_DESCRIBELIVEDOMAINBPSDATAREQUEST_H_ +#define ALIBABACLOUD_LIVE_MODEL_DESCRIBELIVEDOMAINBPSDATAREQUEST_H_ + +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Live + { + namespace Model + { + class ALIBABACLOUD_LIVE_EXPORT DescribeLiveDomainBpsDataRequest : public RpcServiceRequest + { + + public: + DescribeLiveDomainBpsDataRequest(); + ~DescribeLiveDomainBpsDataRequest(); + + std::string getRegionId()const; + void setRegionId(const std::string& regionId); + std::string getDomainName()const; + void setDomainName(const std::string& domainName); + std::string getEndTime()const; + void setEndTime(const std::string& endTime); + std::string getInterval()const; + void setInterval(const std::string& interval); + std::string getLocationNameEn()const; + void setLocationNameEn(const std::string& locationNameEn); + std::string getStartTime()const; + void setStartTime(const std::string& startTime); + std::string getIspNameEn()const; + void setIspNameEn(const std::string& ispNameEn); + long getOwnerId()const; + void setOwnerId(long ownerId); + + private: + std::string regionId_; + std::string domainName_; + std::string endTime_; + std::string interval_; + std::string locationNameEn_; + std::string startTime_; + std::string ispNameEn_; + long ownerId_; + + }; + } + } +} +#endif // !ALIBABACLOUD_LIVE_MODEL_DESCRIBELIVEDOMAINBPSDATAREQUEST_H_ \ No newline at end of file diff --git a/live/include/alibabacloud/live/model/DescribeLiveDomainBpsDataResult.h b/live/include/alibabacloud/live/model/DescribeLiveDomainBpsDataResult.h new file mode 100644 index 000000000..834a6f3ba --- /dev/null +++ b/live/include/alibabacloud/live/model/DescribeLiveDomainBpsDataResult.h @@ -0,0 +1,66 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ALIBABACLOUD_LIVE_MODEL_DESCRIBELIVEDOMAINBPSDATARESULT_H_ +#define ALIBABACLOUD_LIVE_MODEL_DESCRIBELIVEDOMAINBPSDATARESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Live + { + namespace Model + { + class ALIBABACLOUD_LIVE_EXPORT DescribeLiveDomainBpsDataResult : public ServiceResult + { + public: + struct DataModule + { + std::string httpsBpsValue; + std::string bpsValue; + std::string httpBpsValue; + std::string timeStamp; + }; + + + DescribeLiveDomainBpsDataResult(); + explicit DescribeLiveDomainBpsDataResult(const std::string &payload); + ~DescribeLiveDomainBpsDataResult(); + std::string getEndTime()const; + std::string getDomainName()const; + std::string getStartTime()const; + std::string getDataInterval()const; + std::vector getBpsDataPerInterval()const; + + protected: + void parse(const std::string &payload); + private: + std::string endTime_; + std::string domainName_; + std::string startTime_; + std::string dataInterval_; + std::vector bpsDataPerInterval_; + + }; + } + } +} +#endif // !ALIBABACLOUD_LIVE_MODEL_DESCRIBELIVEDOMAINBPSDATARESULT_H_ \ No newline at end of file diff --git a/live/include/alibabacloud/live/model/DescribeLiveDomainTrafficDataRequest.h b/live/include/alibabacloud/live/model/DescribeLiveDomainTrafficDataRequest.h new file mode 100644 index 000000000..d63ec6dbf --- /dev/null +++ b/live/include/alibabacloud/live/model/DescribeLiveDomainTrafficDataRequest.h @@ -0,0 +1,69 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ALIBABACLOUD_LIVE_MODEL_DESCRIBELIVEDOMAINTRAFFICDATAREQUEST_H_ +#define ALIBABACLOUD_LIVE_MODEL_DESCRIBELIVEDOMAINTRAFFICDATAREQUEST_H_ + +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Live + { + namespace Model + { + class ALIBABACLOUD_LIVE_EXPORT DescribeLiveDomainTrafficDataRequest : public RpcServiceRequest + { + + public: + DescribeLiveDomainTrafficDataRequest(); + ~DescribeLiveDomainTrafficDataRequest(); + + std::string getRegionId()const; + void setRegionId(const std::string& regionId); + std::string getDomainName()const; + void setDomainName(const std::string& domainName); + std::string getEndTime()const; + void setEndTime(const std::string& endTime); + std::string getInterval()const; + void setInterval(const std::string& interval); + std::string getLocationNameEn()const; + void setLocationNameEn(const std::string& locationNameEn); + std::string getStartTime()const; + void setStartTime(const std::string& startTime); + std::string getIspNameEn()const; + void setIspNameEn(const std::string& ispNameEn); + long getOwnerId()const; + void setOwnerId(long ownerId); + + private: + std::string regionId_; + std::string domainName_; + std::string endTime_; + std::string interval_; + std::string locationNameEn_; + std::string startTime_; + std::string ispNameEn_; + long ownerId_; + + }; + } + } +} +#endif // !ALIBABACLOUD_LIVE_MODEL_DESCRIBELIVEDOMAINTRAFFICDATAREQUEST_H_ \ No newline at end of file diff --git a/live/include/alibabacloud/live/model/DescribeLiveDomainTrafficDataResult.h b/live/include/alibabacloud/live/model/DescribeLiveDomainTrafficDataResult.h new file mode 100644 index 000000000..9e5556c2e --- /dev/null +++ b/live/include/alibabacloud/live/model/DescribeLiveDomainTrafficDataResult.h @@ -0,0 +1,66 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ALIBABACLOUD_LIVE_MODEL_DESCRIBELIVEDOMAINTRAFFICDATARESULT_H_ +#define ALIBABACLOUD_LIVE_MODEL_DESCRIBELIVEDOMAINTRAFFICDATARESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Live + { + namespace Model + { + class ALIBABACLOUD_LIVE_EXPORT DescribeLiveDomainTrafficDataResult : public ServiceResult + { + public: + struct DataModule + { + std::string httpTrafficValue; + std::string httpsTrafficValue; + std::string trafficValue; + std::string timeStamp; + }; + + + DescribeLiveDomainTrafficDataResult(); + explicit DescribeLiveDomainTrafficDataResult(const std::string &payload); + ~DescribeLiveDomainTrafficDataResult(); + std::string getEndTime()const; + std::vector getTrafficDataPerInterval()const; + std::string getDomainName()const; + std::string getStartTime()const; + std::string getDataInterval()const; + + protected: + void parse(const std::string &payload); + private: + std::string endTime_; + std::vector trafficDataPerInterval_; + std::string domainName_; + std::string startTime_; + std::string dataInterval_; + + }; + } + } +} +#endif // !ALIBABACLOUD_LIVE_MODEL_DESCRIBELIVEDOMAINTRAFFICDATARESULT_H_ \ No newline at end of file diff --git a/live/include/alibabacloud/live/model/DescribeRoomListRequest.h b/live/include/alibabacloud/live/model/DescribeRoomListRequest.h index 4a33b0518..dcd632dc4 100644 --- a/live/include/alibabacloud/live/model/DescribeRoomListRequest.h +++ b/live/include/alibabacloud/live/model/DescribeRoomListRequest.h @@ -39,8 +39,12 @@ namespace AlibabaCloud void setCallerParentId(long callerParentId); bool getProxy_original_security_transport()const; void setProxy_original_security_transport(bool proxy_original_security_transport); + std::string getStartTime()const; + void setStartTime(const std::string& startTime); std::string getProxy_original_source_ip()const; void setProxy_original_source_ip(const std::string& proxy_original_source_ip); + std::string getAnchorId()const; + void setAnchorId(const std::string& anchorId); int getPageNum()const; void setPageNum(int pageNum); std::string getOwnerIdLoginEmail()const; @@ -71,8 +75,8 @@ namespace AlibabaCloud void setApp_ip(const std::string& app_ip); std::string getPopProduct()const; void setPopProduct(const std::string& popProduct); - std::string getProduct()const; - void setProduct(const std::string& product); + std::string getEndTime()const; + void setEndTime(const std::string& endTime); std::string getCallerBid()const; void setCallerBid(const std::string& callerBid); long getOwnerId()const; @@ -83,6 +87,8 @@ namespace AlibabaCloud void setProxy_trust_transport_info(bool proxy_trust_transport_info); bool getAk_mfa_present()const; void setAk_mfa_present(bool ak_mfa_present); + std::string getRoomId()const; + void setRoomId(const std::string& roomId); bool getSecurity_transport()const; void setSecurity_transport(bool security_transport); std::string getRequestId()const; @@ -93,7 +99,9 @@ namespace AlibabaCloud private: long callerParentId_; bool proxy_original_security_transport_; + std::string startTime_; std::string proxy_original_source_ip_; + std::string anchorId_; int pageNum_; std::string ownerIdLoginEmail_; std::string callerType_; @@ -109,12 +117,13 @@ namespace AlibabaCloud std::string order_; std::string app_ip_; std::string popProduct_; - std::string product_; + std::string endTime_; std::string callerBid_; long ownerId_; std::string version_; bool proxy_trust_transport_info_; bool ak_mfa_present_; + std::string roomId_; bool security_transport_; std::string requestId_; std::string appId_; diff --git a/live/include/alibabacloud/live/model/DescribeRoomListResult.h b/live/include/alibabacloud/live/model/DescribeRoomListResult.h index 83294448a..c2cf16381 100644 --- a/live/include/alibabacloud/live/model/DescribeRoomListResult.h +++ b/live/include/alibabacloud/live/model/DescribeRoomListResult.h @@ -38,6 +38,7 @@ namespace AlibabaCloud std::string anchorId; std::string createTime; std::string roomId; + std::string forbidStream; }; diff --git a/live/include/alibabacloud/live/model/ForbidLiveStreamRequest.h b/live/include/alibabacloud/live/model/ForbidLiveStreamRequest.h index 6273e95a2..4cca3719d 100644 --- a/live/include/alibabacloud/live/model/ForbidLiveStreamRequest.h +++ b/live/include/alibabacloud/live/model/ForbidLiveStreamRequest.h @@ -35,92 +35,35 @@ namespace AlibabaCloud ForbidLiveStreamRequest(); ~ForbidLiveStreamRequest(); - long getCallerParentId()const; - void setCallerParentId(long callerParentId); - bool getProxy_original_security_transport()const; - void setProxy_original_security_transport(bool proxy_original_security_transport); - std::string getProxy_original_source_ip()const; - void setProxy_original_source_ip(const std::string& proxy_original_source_ip); - std::string getOwnerIdLoginEmail()const; - void setOwnerIdLoginEmail(const std::string& ownerIdLoginEmail); - std::string getCallerType()const; - void setCallerType(const std::string& callerType); - std::string getAccessKeyId()const; - void setAccessKeyId(const std::string& accessKeyId); - std::string getAppName()const; - void setAppName(const std::string& appName); - std::string getSecurityToken()const; - void setSecurityToken(const std::string& securityToken); - std::string getRegionId()const; - void setRegionId(const std::string& regionId); - std::string getRequestContent()const; - void setRequestContent(const std::string& requestContent); - std::string getCallerBidEmail()const; - void setCallerBidEmail(const std::string& callerBidEmail); - std::string getCallerUidEmail()const; - void setCallerUidEmail(const std::string& callerUidEmail); - std::string getStreamName()const; - void setStreamName(const std::string& streamName); - long getCallerUid()const; - void setCallerUid(long callerUid); - std::string getControlStreamAction()const; - void setControlStreamAction(const std::string& controlStreamAction); std::string getResumeTime()const; void setResumeTime(const std::string& resumeTime); - std::string getApp_ip()const; - void setApp_ip(const std::string& app_ip); - std::string getPopProduct()const; - void setPopProduct(const std::string& popProduct); + std::string getAppName()const; + void setAppName(const std::string& appName); + std::string getRegionId()const; + void setRegionId(const std::string& regionId); std::string getLiveStreamType()const; void setLiveStreamType(const std::string& liveStreamType); std::string getDomainName()const; void setDomainName(const std::string& domainName); - std::string getCallerBid()const; - void setCallerBid(const std::string& callerBid); long getOwnerId()const; void setOwnerId(long ownerId); - std::string getVersion()const; - void setVersion(const std::string& version); std::string getOneshot()const; void setOneshot(const std::string& oneshot); - bool getProxy_trust_transport_info()const; - void setProxy_trust_transport_info(bool proxy_trust_transport_info); - bool getAk_mfa_present()const; - void setAk_mfa_present(bool ak_mfa_present); - bool getSecurity_transport()const; - void setSecurity_transport(bool security_transport); - std::string getRequestId()const; - void setRequestId(const std::string& requestId); + std::string getStreamName()const; + void setStreamName(const std::string& streamName); + std::string getControlStreamAction()const; + void setControlStreamAction(const std::string& controlStreamAction); private: - long callerParentId_; - bool proxy_original_security_transport_; - std::string proxy_original_source_ip_; - std::string ownerIdLoginEmail_; - std::string callerType_; - std::string accessKeyId_; - std::string appName_; - std::string securityToken_; - std::string regionId_; - std::string requestContent_; - std::string callerBidEmail_; - std::string callerUidEmail_; - std::string streamName_; - long callerUid_; - std::string controlStreamAction_; std::string resumeTime_; - std::string app_ip_; - std::string popProduct_; + std::string appName_; + std::string regionId_; std::string liveStreamType_; std::string domainName_; - std::string callerBid_; long ownerId_; - std::string version_; std::string oneshot_; - bool proxy_trust_transport_info_; - bool ak_mfa_present_; - bool security_transport_; - std::string requestId_; + std::string streamName_; + std::string controlStreamAction_; }; } diff --git a/live/include/alibabacloud/live/model/ForbidPushStreamRequest.h b/live/include/alibabacloud/live/model/ForbidPushStreamRequest.h index b94912df4..087a6c05f 100644 --- a/live/include/alibabacloud/live/model/ForbidPushStreamRequest.h +++ b/live/include/alibabacloud/live/model/ForbidPushStreamRequest.h @@ -65,8 +65,6 @@ namespace AlibabaCloud void setApp_ip(const std::string& app_ip); std::string getPopProduct()const; void setPopProduct(const std::string& popProduct); - std::string getProduct()const; - void setProduct(const std::string& product); std::string getEndTime()const; void setEndTime(const std::string& endTime); std::string getCallerBid()const; @@ -104,7 +102,6 @@ namespace AlibabaCloud long callerUid_; std::string app_ip_; std::string popProduct_; - std::string product_; std::string endTime_; std::string callerBid_; long ownerId_; diff --git a/live/include/alibabacloud/live/model/JoinBoardResult.h b/live/include/alibabacloud/live/model/JoinBoardResult.h index db45dcd2b..f1858c3a2 100644 --- a/live/include/alibabacloud/live/model/JoinBoardResult.h +++ b/live/include/alibabacloud/live/model/JoinBoardResult.h @@ -40,6 +40,8 @@ namespace AlibabaCloud std::string getBoardId()const; std::string getToken()const; std::string getTopicId()const; + std::string getKeepaliveTopic()const; + int getKeepaliveInterval()const; protected: void parse(const std::string &payload); @@ -47,6 +49,8 @@ namespace AlibabaCloud std::string boardId_; std::string token_; std::string topicId_; + std::string keepaliveTopic_; + int keepaliveInterval_; }; } diff --git a/live/include/alibabacloud/live/model/SetLiveStreamsNotifyUrlConfigRequest.h b/live/include/alibabacloud/live/model/SetLiveStreamsNotifyUrlConfigRequest.h index e4fdd0de0..8e953d193 100644 --- a/live/include/alibabacloud/live/model/SetLiveStreamsNotifyUrlConfigRequest.h +++ b/live/include/alibabacloud/live/model/SetLiveStreamsNotifyUrlConfigRequest.h @@ -35,23 +35,26 @@ namespace AlibabaCloud SetLiveStreamsNotifyUrlConfigRequest(); ~SetLiveStreamsNotifyUrlConfigRequest(); - std::string getSecurityToken()const; - void setSecurityToken(const std::string& securityToken); + std::string getAuthKey()const; + void setAuthKey(const std::string& authKey); + std::string getRegionId()const; + void setRegionId(const std::string& regionId); std::string getDomainName()const; void setDomainName(const std::string& domainName); std::string getNotifyUrl()const; void setNotifyUrl(const std::string& notifyUrl); long getOwnerId()const; void setOwnerId(long ownerId); - std::string getAccessKeyId()const; - void setAccessKeyId(const std::string& accessKeyId); + std::string getAuthType()const; + void setAuthType(const std::string& authType); private: - std::string securityToken_; + std::string authKey_; + std::string regionId_; std::string domainName_; std::string notifyUrl_; long ownerId_; - std::string accessKeyId_; + std::string authType_; }; } diff --git a/live/src/LiveClient.cc b/live/src/LiveClient.cc index b3a2b1e58..95cfc600f 100644 --- a/live/src/LiveClient.cc +++ b/live/src/LiveClient.cc @@ -3435,6 +3435,42 @@ LiveClient::DescribeLiveSnapshotConfigOutcomeCallable LiveClient::describeLiveSn return task->get_future(); } +LiveClient::DescribeLiveDomainTrafficDataOutcome LiveClient::describeLiveDomainTrafficData(const DescribeLiveDomainTrafficDataRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return DescribeLiveDomainTrafficDataOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return DescribeLiveDomainTrafficDataOutcome(DescribeLiveDomainTrafficDataResult(outcome.result())); + else + return DescribeLiveDomainTrafficDataOutcome(outcome.error()); +} + +void LiveClient::describeLiveDomainTrafficDataAsync(const DescribeLiveDomainTrafficDataRequest& request, const DescribeLiveDomainTrafficDataAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, describeLiveDomainTrafficData(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +LiveClient::DescribeLiveDomainTrafficDataOutcomeCallable LiveClient::describeLiveDomainTrafficDataCallable(const DescribeLiveDomainTrafficDataRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->describeLiveDomainTrafficData(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + LiveClient::DescribeCasterProgramOutcome LiveClient::describeCasterProgram(const DescribeCasterProgramRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); @@ -5127,6 +5163,42 @@ LiveClient::DeleteLiveAppRecordConfigOutcomeCallable LiveClient::deleteLiveAppRe return task->get_future(); } +LiveClient::DescribeLiveDomainBpsDataOutcome LiveClient::describeLiveDomainBpsData(const DescribeLiveDomainBpsDataRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return DescribeLiveDomainBpsDataOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return DescribeLiveDomainBpsDataOutcome(DescribeLiveDomainBpsDataResult(outcome.result())); + else + return DescribeLiveDomainBpsDataOutcome(outcome.error()); +} + +void LiveClient::describeLiveDomainBpsDataAsync(const DescribeLiveDomainBpsDataRequest& request, const DescribeLiveDomainBpsDataAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, describeLiveDomainBpsData(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +LiveClient::DescribeLiveDomainBpsDataOutcomeCallable LiveClient::describeLiveDomainBpsDataCallable(const DescribeLiveDomainBpsDataRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->describeLiveDomainBpsData(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + LiveClient::DeleteCasterOutcome LiveClient::deleteCaster(const DeleteCasterRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/live/src/model/DescribeDomainUsageDataRequest.cc b/live/src/model/DescribeDomainUsageDataRequest.cc index 6e98a8e26..7b2260729 100644 --- a/live/src/model/DescribeDomainUsageDataRequest.cc +++ b/live/src/model/DescribeDomainUsageDataRequest.cc @@ -333,3 +333,14 @@ void DescribeDomainUsageDataRequest::setRequestId(const std::string& requestId) setParameter("RequestId", requestId); } +std::string DescribeDomainUsageDataRequest::getInterval()const +{ + return interval_; +} + +void DescribeDomainUsageDataRequest::setInterval(const std::string& interval) +{ + interval_ = interval; + setParameter("Interval", interval); +} + diff --git a/live/src/model/DescribeLiveDomainBpsDataRequest.cc b/live/src/model/DescribeLiveDomainBpsDataRequest.cc new file mode 100644 index 000000000..03dae7a63 --- /dev/null +++ b/live/src/model/DescribeLiveDomainBpsDataRequest.cc @@ -0,0 +1,115 @@ +/* + * 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::Live::Model::DescribeLiveDomainBpsDataRequest; + +DescribeLiveDomainBpsDataRequest::DescribeLiveDomainBpsDataRequest() : + RpcServiceRequest("live", "2016-11-01", "DescribeLiveDomainBpsData") +{} + +DescribeLiveDomainBpsDataRequest::~DescribeLiveDomainBpsDataRequest() +{} + +std::string DescribeLiveDomainBpsDataRequest::getRegionId()const +{ + return regionId_; +} + +void DescribeLiveDomainBpsDataRequest::setRegionId(const std::string& regionId) +{ + regionId_ = regionId; + setParameter("RegionId", regionId); +} + +std::string DescribeLiveDomainBpsDataRequest::getDomainName()const +{ + return domainName_; +} + +void DescribeLiveDomainBpsDataRequest::setDomainName(const std::string& domainName) +{ + domainName_ = domainName; + setParameter("DomainName", domainName); +} + +std::string DescribeLiveDomainBpsDataRequest::getEndTime()const +{ + return endTime_; +} + +void DescribeLiveDomainBpsDataRequest::setEndTime(const std::string& endTime) +{ + endTime_ = endTime; + setParameter("EndTime", endTime); +} + +std::string DescribeLiveDomainBpsDataRequest::getInterval()const +{ + return interval_; +} + +void DescribeLiveDomainBpsDataRequest::setInterval(const std::string& interval) +{ + interval_ = interval; + setParameter("Interval", interval); +} + +std::string DescribeLiveDomainBpsDataRequest::getLocationNameEn()const +{ + return locationNameEn_; +} + +void DescribeLiveDomainBpsDataRequest::setLocationNameEn(const std::string& locationNameEn) +{ + locationNameEn_ = locationNameEn; + setParameter("LocationNameEn", locationNameEn); +} + +std::string DescribeLiveDomainBpsDataRequest::getStartTime()const +{ + return startTime_; +} + +void DescribeLiveDomainBpsDataRequest::setStartTime(const std::string& startTime) +{ + startTime_ = startTime; + setParameter("StartTime", startTime); +} + +std::string DescribeLiveDomainBpsDataRequest::getIspNameEn()const +{ + return ispNameEn_; +} + +void DescribeLiveDomainBpsDataRequest::setIspNameEn(const std::string& ispNameEn) +{ + ispNameEn_ = ispNameEn; + setParameter("IspNameEn", ispNameEn); +} + +long DescribeLiveDomainBpsDataRequest::getOwnerId()const +{ + return ownerId_; +} + +void DescribeLiveDomainBpsDataRequest::setOwnerId(long ownerId) +{ + ownerId_ = ownerId; + setParameter("OwnerId", std::to_string(ownerId)); +} + diff --git a/live/src/model/DescribeLiveDomainBpsDataResult.cc b/live/src/model/DescribeLiveDomainBpsDataResult.cc new file mode 100644 index 000000000..2848a7024 --- /dev/null +++ b/live/src/model/DescribeLiveDomainBpsDataResult.cc @@ -0,0 +1,92 @@ +/* + * 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::Live; +using namespace AlibabaCloud::Live::Model; + +DescribeLiveDomainBpsDataResult::DescribeLiveDomainBpsDataResult() : + ServiceResult() +{} + +DescribeLiveDomainBpsDataResult::DescribeLiveDomainBpsDataResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +DescribeLiveDomainBpsDataResult::~DescribeLiveDomainBpsDataResult() +{} + +void DescribeLiveDomainBpsDataResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + + setRequestId(value["RequestId"].asString()); + auto allBpsDataPerInterval = value["BpsDataPerInterval"]["DataModule"]; + for (auto value : allBpsDataPerInterval) + { + DataModule bpsDataPerIntervalObject; + if(!value["TimeStamp"].isNull()) + bpsDataPerIntervalObject.timeStamp = value["TimeStamp"].asString(); + if(!value["BpsValue"].isNull()) + bpsDataPerIntervalObject.bpsValue = value["BpsValue"].asString(); + if(!value["HttpBpsValue"].isNull()) + bpsDataPerIntervalObject.httpBpsValue = value["HttpBpsValue"].asString(); + if(!value["HttpsBpsValue"].isNull()) + bpsDataPerIntervalObject.httpsBpsValue = value["HttpsBpsValue"].asString(); + bpsDataPerInterval_.push_back(bpsDataPerIntervalObject); + } + if(!value["DomainName"].isNull()) + domainName_ = value["DomainName"].asString(); + if(!value["StartTime"].isNull()) + startTime_ = value["StartTime"].asString(); + if(!value["EndTime"].isNull()) + endTime_ = value["EndTime"].asString(); + if(!value["DataInterval"].isNull()) + dataInterval_ = value["DataInterval"].asString(); + +} + +std::string DescribeLiveDomainBpsDataResult::getEndTime()const +{ + return endTime_; +} + +std::string DescribeLiveDomainBpsDataResult::getDomainName()const +{ + return domainName_; +} + +std::string DescribeLiveDomainBpsDataResult::getStartTime()const +{ + return startTime_; +} + +std::string DescribeLiveDomainBpsDataResult::getDataInterval()const +{ + return dataInterval_; +} + +std::vector DescribeLiveDomainBpsDataResult::getBpsDataPerInterval()const +{ + return bpsDataPerInterval_; +} + diff --git a/live/src/model/DescribeLiveDomainTrafficDataRequest.cc b/live/src/model/DescribeLiveDomainTrafficDataRequest.cc new file mode 100644 index 000000000..dfb8ed91b --- /dev/null +++ b/live/src/model/DescribeLiveDomainTrafficDataRequest.cc @@ -0,0 +1,115 @@ +/* + * 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::Live::Model::DescribeLiveDomainTrafficDataRequest; + +DescribeLiveDomainTrafficDataRequest::DescribeLiveDomainTrafficDataRequest() : + RpcServiceRequest("live", "2016-11-01", "DescribeLiveDomainTrafficData") +{} + +DescribeLiveDomainTrafficDataRequest::~DescribeLiveDomainTrafficDataRequest() +{} + +std::string DescribeLiveDomainTrafficDataRequest::getRegionId()const +{ + return regionId_; +} + +void DescribeLiveDomainTrafficDataRequest::setRegionId(const std::string& regionId) +{ + regionId_ = regionId; + setParameter("RegionId", regionId); +} + +std::string DescribeLiveDomainTrafficDataRequest::getDomainName()const +{ + return domainName_; +} + +void DescribeLiveDomainTrafficDataRequest::setDomainName(const std::string& domainName) +{ + domainName_ = domainName; + setParameter("DomainName", domainName); +} + +std::string DescribeLiveDomainTrafficDataRequest::getEndTime()const +{ + return endTime_; +} + +void DescribeLiveDomainTrafficDataRequest::setEndTime(const std::string& endTime) +{ + endTime_ = endTime; + setParameter("EndTime", endTime); +} + +std::string DescribeLiveDomainTrafficDataRequest::getInterval()const +{ + return interval_; +} + +void DescribeLiveDomainTrafficDataRequest::setInterval(const std::string& interval) +{ + interval_ = interval; + setParameter("Interval", interval); +} + +std::string DescribeLiveDomainTrafficDataRequest::getLocationNameEn()const +{ + return locationNameEn_; +} + +void DescribeLiveDomainTrafficDataRequest::setLocationNameEn(const std::string& locationNameEn) +{ + locationNameEn_ = locationNameEn; + setParameter("LocationNameEn", locationNameEn); +} + +std::string DescribeLiveDomainTrafficDataRequest::getStartTime()const +{ + return startTime_; +} + +void DescribeLiveDomainTrafficDataRequest::setStartTime(const std::string& startTime) +{ + startTime_ = startTime; + setParameter("StartTime", startTime); +} + +std::string DescribeLiveDomainTrafficDataRequest::getIspNameEn()const +{ + return ispNameEn_; +} + +void DescribeLiveDomainTrafficDataRequest::setIspNameEn(const std::string& ispNameEn) +{ + ispNameEn_ = ispNameEn; + setParameter("IspNameEn", ispNameEn); +} + +long DescribeLiveDomainTrafficDataRequest::getOwnerId()const +{ + return ownerId_; +} + +void DescribeLiveDomainTrafficDataRequest::setOwnerId(long ownerId) +{ + ownerId_ = ownerId; + setParameter("OwnerId", std::to_string(ownerId)); +} + diff --git a/live/src/model/DescribeLiveDomainTrafficDataResult.cc b/live/src/model/DescribeLiveDomainTrafficDataResult.cc new file mode 100644 index 000000000..daf95fd4f --- /dev/null +++ b/live/src/model/DescribeLiveDomainTrafficDataResult.cc @@ -0,0 +1,92 @@ +/* + * 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::Live; +using namespace AlibabaCloud::Live::Model; + +DescribeLiveDomainTrafficDataResult::DescribeLiveDomainTrafficDataResult() : + ServiceResult() +{} + +DescribeLiveDomainTrafficDataResult::DescribeLiveDomainTrafficDataResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +DescribeLiveDomainTrafficDataResult::~DescribeLiveDomainTrafficDataResult() +{} + +void DescribeLiveDomainTrafficDataResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + + setRequestId(value["RequestId"].asString()); + auto allTrafficDataPerInterval = value["TrafficDataPerInterval"]["DataModule"]; + for (auto value : allTrafficDataPerInterval) + { + DataModule trafficDataPerIntervalObject; + if(!value["TimeStamp"].isNull()) + trafficDataPerIntervalObject.timeStamp = value["TimeStamp"].asString(); + if(!value["TrafficValue"].isNull()) + trafficDataPerIntervalObject.trafficValue = value["TrafficValue"].asString(); + if(!value["HttpTrafficValue"].isNull()) + trafficDataPerIntervalObject.httpTrafficValue = value["HttpTrafficValue"].asString(); + if(!value["HttpsTrafficValue"].isNull()) + trafficDataPerIntervalObject.httpsTrafficValue = value["HttpsTrafficValue"].asString(); + trafficDataPerInterval_.push_back(trafficDataPerIntervalObject); + } + if(!value["DomainName"].isNull()) + domainName_ = value["DomainName"].asString(); + if(!value["StartTime"].isNull()) + startTime_ = value["StartTime"].asString(); + if(!value["EndTime"].isNull()) + endTime_ = value["EndTime"].asString(); + if(!value["DataInterval"].isNull()) + dataInterval_ = value["DataInterval"].asString(); + +} + +std::string DescribeLiveDomainTrafficDataResult::getEndTime()const +{ + return endTime_; +} + +std::vector DescribeLiveDomainTrafficDataResult::getTrafficDataPerInterval()const +{ + return trafficDataPerInterval_; +} + +std::string DescribeLiveDomainTrafficDataResult::getDomainName()const +{ + return domainName_; +} + +std::string DescribeLiveDomainTrafficDataResult::getStartTime()const +{ + return startTime_; +} + +std::string DescribeLiveDomainTrafficDataResult::getDataInterval()const +{ + return dataInterval_; +} + diff --git a/live/src/model/DescribeRoomListRequest.cc b/live/src/model/DescribeRoomListRequest.cc index 4f263a8e5..9fe8c3830 100644 --- a/live/src/model/DescribeRoomListRequest.cc +++ b/live/src/model/DescribeRoomListRequest.cc @@ -47,6 +47,17 @@ void DescribeRoomListRequest::setProxy_original_security_transport(bool proxy_or setParameter("Proxy_original_security_transport", std::to_string(proxy_original_security_transport)); } +std::string DescribeRoomListRequest::getStartTime()const +{ + return startTime_; +} + +void DescribeRoomListRequest::setStartTime(const std::string& startTime) +{ + startTime_ = startTime; + setParameter("StartTime", startTime); +} + std::string DescribeRoomListRequest::getProxy_original_source_ip()const { return proxy_original_source_ip_; @@ -58,6 +69,17 @@ void DescribeRoomListRequest::setProxy_original_source_ip(const std::string& pro setParameter("Proxy_original_source_ip", proxy_original_source_ip); } +std::string DescribeRoomListRequest::getAnchorId()const +{ + return anchorId_; +} + +void DescribeRoomListRequest::setAnchorId(const std::string& anchorId) +{ + anchorId_ = anchorId; + setParameter("AnchorId", anchorId); +} + int DescribeRoomListRequest::getPageNum()const { return pageNum_; @@ -223,15 +245,15 @@ void DescribeRoomListRequest::setPopProduct(const std::string& popProduct) setParameter("PopProduct", popProduct); } -std::string DescribeRoomListRequest::getProduct()const +std::string DescribeRoomListRequest::getEndTime()const { - return product_; + return endTime_; } -void DescribeRoomListRequest::setProduct(const std::string& product) +void DescribeRoomListRequest::setEndTime(const std::string& endTime) { - product_ = product; - setParameter("Product", product); + endTime_ = endTime; + setParameter("EndTime", endTime); } std::string DescribeRoomListRequest::getCallerBid()const @@ -289,6 +311,17 @@ void DescribeRoomListRequest::setAk_mfa_present(bool ak_mfa_present) setParameter("Ak_mfa_present", std::to_string(ak_mfa_present)); } +std::string DescribeRoomListRequest::getRoomId()const +{ + return roomId_; +} + +void DescribeRoomListRequest::setRoomId(const std::string& roomId) +{ + roomId_ = roomId; + setParameter("RoomId", roomId); +} + bool DescribeRoomListRequest::getSecurity_transport()const { return security_transport_; diff --git a/live/src/model/DescribeRoomListResult.cc b/live/src/model/DescribeRoomListResult.cc index 0aee6e4ea..c99762b3f 100644 --- a/live/src/model/DescribeRoomListResult.cc +++ b/live/src/model/DescribeRoomListResult.cc @@ -50,6 +50,8 @@ void DescribeRoomListResult::parse(const std::string &payload) roomListObject.anchorId = value["AnchorId"].asString(); if(!value["RoomStatus"].isNull()) roomListObject.roomStatus = std::stoi(value["RoomStatus"].asString()); + if(!value["ForbidStream"].isNull()) + roomListObject.forbidStream = value["ForbidStream"].asString(); if(!value["CreateTime"].isNull()) roomListObject.createTime = value["CreateTime"].asString(); roomList_.push_back(roomListObject); diff --git a/live/src/model/ForbidLiveStreamRequest.cc b/live/src/model/ForbidLiveStreamRequest.cc index e3fba7516..55b60ea76 100644 --- a/live/src/model/ForbidLiveStreamRequest.cc +++ b/live/src/model/ForbidLiveStreamRequest.cc @@ -25,70 +25,15 @@ ForbidLiveStreamRequest::ForbidLiveStreamRequest() : ForbidLiveStreamRequest::~ForbidLiveStreamRequest() {} -long ForbidLiveStreamRequest::getCallerParentId()const +std::string ForbidLiveStreamRequest::getResumeTime()const { - return callerParentId_; + return resumeTime_; } -void ForbidLiveStreamRequest::setCallerParentId(long callerParentId) +void ForbidLiveStreamRequest::setResumeTime(const std::string& resumeTime) { - callerParentId_ = callerParentId; - setParameter("CallerParentId", std::to_string(callerParentId)); -} - -bool ForbidLiveStreamRequest::getProxy_original_security_transport()const -{ - return proxy_original_security_transport_; -} - -void ForbidLiveStreamRequest::setProxy_original_security_transport(bool proxy_original_security_transport) -{ - proxy_original_security_transport_ = proxy_original_security_transport; - setParameter("Proxy_original_security_transport", std::to_string(proxy_original_security_transport)); -} - -std::string ForbidLiveStreamRequest::getProxy_original_source_ip()const -{ - return proxy_original_source_ip_; -} - -void ForbidLiveStreamRequest::setProxy_original_source_ip(const std::string& proxy_original_source_ip) -{ - proxy_original_source_ip_ = proxy_original_source_ip; - setParameter("Proxy_original_source_ip", proxy_original_source_ip); -} - -std::string ForbidLiveStreamRequest::getOwnerIdLoginEmail()const -{ - return ownerIdLoginEmail_; -} - -void ForbidLiveStreamRequest::setOwnerIdLoginEmail(const std::string& ownerIdLoginEmail) -{ - ownerIdLoginEmail_ = ownerIdLoginEmail; - setParameter("OwnerIdLoginEmail", ownerIdLoginEmail); -} - -std::string ForbidLiveStreamRequest::getCallerType()const -{ - return callerType_; -} - -void ForbidLiveStreamRequest::setCallerType(const std::string& callerType) -{ - callerType_ = callerType; - setParameter("CallerType", callerType); -} - -std::string ForbidLiveStreamRequest::getAccessKeyId()const -{ - return accessKeyId_; -} - -void ForbidLiveStreamRequest::setAccessKeyId(const std::string& accessKeyId) -{ - accessKeyId_ = accessKeyId; - setParameter("AccessKeyId", accessKeyId); + resumeTime_ = resumeTime; + setParameter("ResumeTime", resumeTime); } std::string ForbidLiveStreamRequest::getAppName()const @@ -102,17 +47,6 @@ void ForbidLiveStreamRequest::setAppName(const std::string& appName) setParameter("AppName", appName); } -std::string ForbidLiveStreamRequest::getSecurityToken()const -{ - return securityToken_; -} - -void ForbidLiveStreamRequest::setSecurityToken(const std::string& securityToken) -{ - securityToken_ = securityToken; - setParameter("SecurityToken", securityToken); -} - std::string ForbidLiveStreamRequest::getRegionId()const { return regionId_; @@ -124,105 +58,6 @@ void ForbidLiveStreamRequest::setRegionId(const std::string& regionId) setParameter("RegionId", regionId); } -std::string ForbidLiveStreamRequest::getRequestContent()const -{ - return requestContent_; -} - -void ForbidLiveStreamRequest::setRequestContent(const std::string& requestContent) -{ - requestContent_ = requestContent; - setParameter("RequestContent", requestContent); -} - -std::string ForbidLiveStreamRequest::getCallerBidEmail()const -{ - return callerBidEmail_; -} - -void ForbidLiveStreamRequest::setCallerBidEmail(const std::string& callerBidEmail) -{ - callerBidEmail_ = callerBidEmail; - setParameter("CallerBidEmail", callerBidEmail); -} - -std::string ForbidLiveStreamRequest::getCallerUidEmail()const -{ - return callerUidEmail_; -} - -void ForbidLiveStreamRequest::setCallerUidEmail(const std::string& callerUidEmail) -{ - callerUidEmail_ = callerUidEmail; - setParameter("CallerUidEmail", callerUidEmail); -} - -std::string ForbidLiveStreamRequest::getStreamName()const -{ - return streamName_; -} - -void ForbidLiveStreamRequest::setStreamName(const std::string& streamName) -{ - streamName_ = streamName; - setParameter("StreamName", streamName); -} - -long ForbidLiveStreamRequest::getCallerUid()const -{ - return callerUid_; -} - -void ForbidLiveStreamRequest::setCallerUid(long callerUid) -{ - callerUid_ = callerUid; - setParameter("CallerUid", std::to_string(callerUid)); -} - -std::string ForbidLiveStreamRequest::getControlStreamAction()const -{ - return controlStreamAction_; -} - -void ForbidLiveStreamRequest::setControlStreamAction(const std::string& controlStreamAction) -{ - controlStreamAction_ = controlStreamAction; - setParameter("ControlStreamAction", controlStreamAction); -} - -std::string ForbidLiveStreamRequest::getResumeTime()const -{ - return resumeTime_; -} - -void ForbidLiveStreamRequest::setResumeTime(const std::string& resumeTime) -{ - resumeTime_ = resumeTime; - setParameter("ResumeTime", resumeTime); -} - -std::string ForbidLiveStreamRequest::getApp_ip()const -{ - return app_ip_; -} - -void ForbidLiveStreamRequest::setApp_ip(const std::string& app_ip) -{ - app_ip_ = app_ip; - setParameter("App_ip", app_ip); -} - -std::string ForbidLiveStreamRequest::getPopProduct()const -{ - return popProduct_; -} - -void ForbidLiveStreamRequest::setPopProduct(const std::string& popProduct) -{ - popProduct_ = popProduct; - setParameter("PopProduct", popProduct); -} - std::string ForbidLiveStreamRequest::getLiveStreamType()const { return liveStreamType_; @@ -245,17 +80,6 @@ void ForbidLiveStreamRequest::setDomainName(const std::string& domainName) setParameter("DomainName", domainName); } -std::string ForbidLiveStreamRequest::getCallerBid()const -{ - return callerBid_; -} - -void ForbidLiveStreamRequest::setCallerBid(const std::string& callerBid) -{ - callerBid_ = callerBid; - setParameter("CallerBid", callerBid); -} - long ForbidLiveStreamRequest::getOwnerId()const { return ownerId_; @@ -267,17 +91,6 @@ void ForbidLiveStreamRequest::setOwnerId(long ownerId) setParameter("OwnerId", std::to_string(ownerId)); } -std::string ForbidLiveStreamRequest::getVersion()const -{ - return version_; -} - -void ForbidLiveStreamRequest::setVersion(const std::string& version) -{ - version_ = version; - setParameter("Version", version); -} - std::string ForbidLiveStreamRequest::getOneshot()const { return oneshot_; @@ -289,47 +102,25 @@ void ForbidLiveStreamRequest::setOneshot(const std::string& oneshot) setParameter("Oneshot", oneshot); } -bool ForbidLiveStreamRequest::getProxy_trust_transport_info()const +std::string ForbidLiveStreamRequest::getStreamName()const { - return proxy_trust_transport_info_; + return streamName_; } -void ForbidLiveStreamRequest::setProxy_trust_transport_info(bool proxy_trust_transport_info) +void ForbidLiveStreamRequest::setStreamName(const std::string& streamName) { - proxy_trust_transport_info_ = proxy_trust_transport_info; - setParameter("Proxy_trust_transport_info", std::to_string(proxy_trust_transport_info)); + streamName_ = streamName; + setParameter("StreamName", streamName); } -bool ForbidLiveStreamRequest::getAk_mfa_present()const +std::string ForbidLiveStreamRequest::getControlStreamAction()const { - return ak_mfa_present_; + return controlStreamAction_; } -void ForbidLiveStreamRequest::setAk_mfa_present(bool ak_mfa_present) +void ForbidLiveStreamRequest::setControlStreamAction(const std::string& controlStreamAction) { - ak_mfa_present_ = ak_mfa_present; - setParameter("Ak_mfa_present", std::to_string(ak_mfa_present)); -} - -bool ForbidLiveStreamRequest::getSecurity_transport()const -{ - return security_transport_; -} - -void ForbidLiveStreamRequest::setSecurity_transport(bool security_transport) -{ - security_transport_ = security_transport; - setParameter("Security_transport", std::to_string(security_transport)); -} - -std::string ForbidLiveStreamRequest::getRequestId()const -{ - return requestId_; -} - -void ForbidLiveStreamRequest::setRequestId(const std::string& requestId) -{ - requestId_ = requestId; - setParameter("RequestId", requestId); + controlStreamAction_ = controlStreamAction; + setParameter("ControlStreamAction", controlStreamAction); } diff --git a/live/src/model/ForbidPushStreamRequest.cc b/live/src/model/ForbidPushStreamRequest.cc index 8b0e7bc08..97f61f4dc 100644 --- a/live/src/model/ForbidPushStreamRequest.cc +++ b/live/src/model/ForbidPushStreamRequest.cc @@ -190,17 +190,6 @@ void ForbidPushStreamRequest::setPopProduct(const std::string& popProduct) setParameter("PopProduct", popProduct); } -std::string ForbidPushStreamRequest::getProduct()const -{ - return product_; -} - -void ForbidPushStreamRequest::setProduct(const std::string& product) -{ - product_ = product; - setParameter("Product", product); -} - std::string ForbidPushStreamRequest::getEndTime()const { return endTime_; diff --git a/live/src/model/JoinBoardResult.cc b/live/src/model/JoinBoardResult.cc index da464e641..1f4ceb494 100644 --- a/live/src/model/JoinBoardResult.cc +++ b/live/src/model/JoinBoardResult.cc @@ -46,6 +46,10 @@ void JoinBoardResult::parse(const std::string &payload) boardId_ = value["BoardId"].asString(); if(!value["TopicId"].isNull()) topicId_ = value["TopicId"].asString(); + if(!value["KeepaliveTopic"].isNull()) + keepaliveTopic_ = value["KeepaliveTopic"].asString(); + if(!value["KeepaliveInterval"].isNull()) + keepaliveInterval_ = std::stoi(value["KeepaliveInterval"].asString()); } @@ -64,3 +68,13 @@ std::string JoinBoardResult::getTopicId()const return topicId_; } +std::string JoinBoardResult::getKeepaliveTopic()const +{ + return keepaliveTopic_; +} + +int JoinBoardResult::getKeepaliveInterval()const +{ + return keepaliveInterval_; +} + diff --git a/live/src/model/SetLiveStreamsNotifyUrlConfigRequest.cc b/live/src/model/SetLiveStreamsNotifyUrlConfigRequest.cc index cbdf6c025..ad384305a 100644 --- a/live/src/model/SetLiveStreamsNotifyUrlConfigRequest.cc +++ b/live/src/model/SetLiveStreamsNotifyUrlConfigRequest.cc @@ -25,15 +25,26 @@ SetLiveStreamsNotifyUrlConfigRequest::SetLiveStreamsNotifyUrlConfigRequest() : SetLiveStreamsNotifyUrlConfigRequest::~SetLiveStreamsNotifyUrlConfigRequest() {} -std::string SetLiveStreamsNotifyUrlConfigRequest::getSecurityToken()const +std::string SetLiveStreamsNotifyUrlConfigRequest::getAuthKey()const { - return securityToken_; + return authKey_; } -void SetLiveStreamsNotifyUrlConfigRequest::setSecurityToken(const std::string& securityToken) +void SetLiveStreamsNotifyUrlConfigRequest::setAuthKey(const std::string& authKey) { - securityToken_ = securityToken; - setParameter("SecurityToken", securityToken); + authKey_ = authKey; + setParameter("AuthKey", authKey); +} + +std::string SetLiveStreamsNotifyUrlConfigRequest::getRegionId()const +{ + return regionId_; +} + +void SetLiveStreamsNotifyUrlConfigRequest::setRegionId(const std::string& regionId) +{ + regionId_ = regionId; + setParameter("RegionId", regionId); } std::string SetLiveStreamsNotifyUrlConfigRequest::getDomainName()const @@ -69,14 +80,14 @@ void SetLiveStreamsNotifyUrlConfigRequest::setOwnerId(long ownerId) setParameter("OwnerId", std::to_string(ownerId)); } -std::string SetLiveStreamsNotifyUrlConfigRequest::getAccessKeyId()const +std::string SetLiveStreamsNotifyUrlConfigRequest::getAuthType()const { - return accessKeyId_; + return authType_; } -void SetLiveStreamsNotifyUrlConfigRequest::setAccessKeyId(const std::string& accessKeyId) +void SetLiveStreamsNotifyUrlConfigRequest::setAuthType(const std::string& authType) { - accessKeyId_ = accessKeyId; - setParameter("AccessKeyId", accessKeyId); + authType_ = authType; + setParameter("AuthType", authType); }