Generate SDK by new Generator

push/src/model/BindAliasRequest.cc

@@ -25,28 +25,6 @@ BindAliasRequest::BindAliasRequest() :
 BindAliasRequest::~BindAliasRequest()
 {}
 
-std::string BindAliasRequest::getAliasName()const
-{
-	return aliasName_;
-}
-
-void BindAliasRequest::setAliasName(const std::string& aliasName)
-{
-	aliasName_ = aliasName;
-	setCoreParameter("AliasName", aliasName);
-}
-
-long BindAliasRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void BindAliasRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string BindAliasRequest::getDeviceId()const
 {
 	return deviceId_;
@@ -69,3 +47,25 @@ void BindAliasRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+std::string BindAliasRequest::getAliasName()const
+{
+	return aliasName_;
+}
+
+void BindAliasRequest::setAliasName(const std::string& aliasName)
+{
+	aliasName_ = aliasName;
+	setCoreParameter("AliasName", aliasName);
+}
+
+long BindAliasRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void BindAliasRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+

push/src/model/BindAliasResult.cc

@@ -35,13 +35,9 @@ BindAliasResult::~BindAliasResult()
 
 void BindAliasResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 
 }

push/src/model/BindPhoneRequest.cc

@@ -36,17 +36,6 @@ void BindPhoneRequest::setPhoneNumber(const std::string& phoneNumber)
 	setCoreParameter("PhoneNumber", phoneNumber);
 }
 
-long BindPhoneRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void BindPhoneRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string BindPhoneRequest::getDeviceId()const
 {
 	return deviceId_;
@@ -69,3 +58,14 @@ void BindPhoneRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+long BindPhoneRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void BindPhoneRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+

push/src/model/BindPhoneResult.cc

@@ -35,13 +35,9 @@ BindPhoneResult::~BindPhoneResult()
 
 void BindPhoneResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 
 }

push/src/model/BindTagRequest.cc

@@ -25,6 +25,28 @@ BindTagRequest::BindTagRequest() :
 BindTagRequest::~BindTagRequest()
 {}
 
+std::string BindTagRequest::getKeyType()const
+{
+	return keyType_;
+}
+
+void BindTagRequest::setKeyType(const std::string& keyType)
+{
+	keyType_ = keyType;
+	setCoreParameter("KeyType", keyType);
+}
+
+std::string BindTagRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void BindTagRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setCoreParameter("AccessKeyId", accessKeyId);
+}
+
 std::string BindTagRequest::getTagName()const
 {
 	return tagName_;
@@ -58,25 +80,3 @@ void BindTagRequest::setAppKey(long appKey)
 	setCoreParameter("AppKey", std::to_string(appKey));
 }
 
-std::string BindTagRequest::getKeyType()const
-{
-	return keyType_;
-}
-
-void BindTagRequest::setKeyType(const std::string& keyType)
-{
-	keyType_ = keyType;
-	setCoreParameter("KeyType", keyType);
-}
-
-std::string BindTagRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void BindTagRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setCoreParameter("AccessKeyId", accessKeyId);
-}
-

push/src/model/BindTagResult.cc

@@ -35,13 +35,9 @@ BindTagResult::~BindTagResult()
 
 void BindTagResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 
 }

push/src/model/CancelPushRequest.cc

@@ -36,17 +36,6 @@ void CancelPushRequest::setMessageId(long messageId)
 	setCoreParameter("MessageId", std::to_string(messageId));
 }
 
-long CancelPushRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void CancelPushRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string CancelPushRequest::getAccessKeyId()const
 {
 	return accessKeyId_;
@@ -58,3 +47,14 @@ void CancelPushRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+long CancelPushRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void CancelPushRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+

push/src/model/CancelPushResult.cc

@@ -35,13 +35,9 @@ CancelPushResult::~CancelPushResult()
 
 void CancelPushResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 
 }

push/src/model/CheckDeviceRequest.cc

@@ -25,17 +25,6 @@ CheckDeviceRequest::CheckDeviceRequest() :
 CheckDeviceRequest::~CheckDeviceRequest()
 {}
 
-long CheckDeviceRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void CheckDeviceRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string CheckDeviceRequest::getDeviceId()const
 {
 	return deviceId_;
@@ -58,3 +47,14 @@ void CheckDeviceRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+long CheckDeviceRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void CheckDeviceRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+

push/src/model/CheckDeviceResult.cc

@@ -35,13 +35,9 @@ CheckDeviceResult::~CheckDeviceResult()
 
 void CheckDeviceResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	if(!value["Available"].isNull())
 		available_ = value["Available"].asString() == "true";

push/src/model/CheckDevicesRequest.cc

@@ -36,17 +36,6 @@ void CheckDevicesRequest::setDeviceIds(const std::string& deviceIds)
 	setCoreParameter("DeviceIds", deviceIds);
 }
 
-long CheckDevicesRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void CheckDevicesRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string CheckDevicesRequest::getAccessKeyId()const
 {
 	return accessKeyId_;
@@ -58,3 +47,14 @@ void CheckDevicesRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+long CheckDevicesRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void CheckDevicesRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+

push/src/model/CheckDevicesResult.cc

@@ -35,13 +35,9 @@ CheckDevicesResult::~CheckDevicesResult()
 
 void CheckDevicesResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allDeviceCheckInfos = value["DeviceCheckInfos"]["DeviceCheckInfo"];
 	for (auto value : allDeviceCheckInfos)

push/src/model/ListPushRecordsRequest.cc

@@ -25,17 +25,6 @@ ListPushRecordsRequest::ListPushRecordsRequest() :
 ListPushRecordsRequest::~ListPushRecordsRequest()
 {}
 
-int ListPushRecordsRequest::getPageSize()const
-{
-	return pageSize_;
-}
-
-void ListPushRecordsRequest::setPageSize(int pageSize)
-{
-	pageSize_ = pageSize;
-	setCoreParameter("PageSize", std::to_string(pageSize));
-}
-
 std::string ListPushRecordsRequest::getEndTime()const
 {
 	return endTime_;
@@ -47,17 +36,6 @@ void ListPushRecordsRequest::setEndTime(const std::string& endTime)
 	setCoreParameter("EndTime", endTime);
 }
 
-long ListPushRecordsRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void ListPushRecordsRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string ListPushRecordsRequest::getStartTime()const
 {
 	return startTime_;
@@ -69,6 +47,39 @@ void ListPushRecordsRequest::setStartTime(const std::string& 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_;
@@ -91,14 +102,3 @@ void ListPushRecordsRequest::setPushType(const std::string& pushType)
 	setCoreParameter("PushType", pushType);
 }
 
-std::string ListPushRecordsRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void ListPushRecordsRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setCoreParameter("AccessKeyId", accessKeyId);
-}
-

push/src/model/ListPushRecordsResult.cc

@@ -35,13 +35,9 @@ ListPushRecordsResult::~ListPushRecordsResult()
 
 void ListPushRecordsResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allPushMessageInfos = value["PushMessageInfos"]["PushMessageInfo"];
 	for (auto value : allPushMessageInfos)

push/src/model/ListSummaryAppsResult.cc

@@ -35,13 +35,9 @@ ListSummaryAppsResult::~ListSummaryAppsResult()
 
 void ListSummaryAppsResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allSummaryAppInfos = value["SummaryAppInfos"]["SummaryAppInfo"];
 	for (auto value : allSummaryAppInfos)

push/src/model/ListTagsRequest.cc

@@ -25,17 +25,6 @@ ListTagsRequest::ListTagsRequest() :
 ListTagsRequest::~ListTagsRequest()
 {}
 
-long ListTagsRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void ListTagsRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string ListTagsRequest::getAccessKeyId()const
 {
 	return accessKeyId_;
@@ -47,3 +36,14 @@ void ListTagsRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+long ListTagsRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void ListTagsRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+

push/src/model/ListTagsResult.cc

@@ -35,13 +35,9 @@ ListTagsResult::~ListTagsResult()
 
 void ListTagsResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allTagInfos = value["TagInfos"]["TagInfo"];
 	for (auto value : allTagInfos)

push/src/model/PushMessageToAndroidRequest.cc

@@ -25,28 +25,6 @@ PushMessageToAndroidRequest::PushMessageToAndroidRequest() :
 PushMessageToAndroidRequest::~PushMessageToAndroidRequest()
 {}
 
-long PushMessageToAndroidRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void PushMessageToAndroidRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
-std::string PushMessageToAndroidRequest::getTargetValue()const
-{
-	return targetValue_;
-}
-
-void PushMessageToAndroidRequest::setTargetValue(const std::string& targetValue)
-{
-	targetValue_ = targetValue;
-	setCoreParameter("TargetValue", targetValue);
-}
-
 std::string PushMessageToAndroidRequest::getTitle()const
 {
 	return title_;
@@ -102,3 +80,25 @@ void PushMessageToAndroidRequest::setTarget(const std::string& target)
 	setCoreParameter("Target", target);
 }
 
+long PushMessageToAndroidRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void PushMessageToAndroidRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+
+std::string PushMessageToAndroidRequest::getTargetValue()const
+{
+	return targetValue_;
+}
+
+void PushMessageToAndroidRequest::setTargetValue(const std::string& targetValue)
+{
+	targetValue_ = targetValue;
+	setCoreParameter("TargetValue", targetValue);
+}
+

push/src/model/PushMessageToAndroidResult.cc

@@ -35,13 +35,9 @@ PushMessageToAndroidResult::~PushMessageToAndroidResult()
 
 void PushMessageToAndroidResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	if(!value["MessageId"].isNull())
 		messageId_ = value["MessageId"].asString();

push/src/model/PushMessageToiOSRequest.cc

@@ -25,28 +25,6 @@ PushMessageToiOSRequest::PushMessageToiOSRequest() :
 PushMessageToiOSRequest::~PushMessageToiOSRequest()
 {}
 
-long PushMessageToiOSRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void PushMessageToiOSRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
-std::string PushMessageToiOSRequest::getTargetValue()const
-{
-	return targetValue_;
-}
-
-void PushMessageToiOSRequest::setTargetValue(const std::string& targetValue)
-{
-	targetValue_ = targetValue;
-	setCoreParameter("TargetValue", targetValue);
-}
-
 std::string PushMessageToiOSRequest::getTitle()const
 {
 	return title_;
@@ -102,3 +80,25 @@ void PushMessageToiOSRequest::setTarget(const std::string& target)
 	setCoreParameter("Target", target);
 }
 
+long PushMessageToiOSRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void PushMessageToiOSRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+
+std::string PushMessageToiOSRequest::getTargetValue()const
+{
+	return targetValue_;
+}
+
+void PushMessageToiOSRequest::setTargetValue(const std::string& targetValue)
+{
+	targetValue_ = targetValue;
+	setCoreParameter("TargetValue", targetValue);
+}
+

push/src/model/PushMessageToiOSResult.cc

@@ -35,13 +35,9 @@ PushMessageToiOSResult::~PushMessageToiOSResult()
 
 void PushMessageToiOSResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	if(!value["MessageId"].isNull())
 		messageId_ = value["MessageId"].asString();

push/src/model/PushNoticeToAndroidRequest.cc

@@ -36,28 +36,6 @@ void PushNoticeToAndroidRequest::setExtParameters(const std::string& extParamete
 	setCoreParameter("ExtParameters", extParameters);
 }
 
-long PushNoticeToAndroidRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void PushNoticeToAndroidRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
-std::string PushNoticeToAndroidRequest::getTargetValue()const
-{
-	return targetValue_;
-}
-
-void PushNoticeToAndroidRequest::setTargetValue(const std::string& targetValue)
-{
-	targetValue_ = targetValue;
-	setCoreParameter("TargetValue", targetValue);
-}
-
 std::string PushNoticeToAndroidRequest::getTitle()const
 {
 	return title_;
@@ -113,3 +91,25 @@ void PushNoticeToAndroidRequest::setTarget(const std::string& target)
 	setCoreParameter("Target", target);
 }
 
+long PushNoticeToAndroidRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void PushNoticeToAndroidRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+
+std::string PushNoticeToAndroidRequest::getTargetValue()const
+{
+	return targetValue_;
+}
+
+void PushNoticeToAndroidRequest::setTargetValue(const std::string& targetValue)
+{
+	targetValue_ = targetValue;
+	setCoreParameter("TargetValue", targetValue);
+}
+

push/src/model/PushNoticeToAndroidResult.cc

@@ -35,13 +35,9 @@ PushNoticeToAndroidResult::~PushNoticeToAndroidResult()
 
 void PushNoticeToAndroidResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	if(!value["MessageId"].isNull())
 		messageId_ = value["MessageId"].asString();

push/src/model/PushNoticeToiOSRequest.cc

@@ -47,28 +47,6 @@ void PushNoticeToiOSRequest::setApnsEnv(const std::string& apnsEnv)
 	setCoreParameter("ApnsEnv", apnsEnv);
 }
 
-long PushNoticeToiOSRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void PushNoticeToiOSRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
-std::string PushNoticeToiOSRequest::getTargetValue()const
-{
-	return targetValue_;
-}
-
-void PushNoticeToiOSRequest::setTargetValue(const std::string& targetValue)
-{
-	targetValue_ = targetValue;
-	setCoreParameter("TargetValue", targetValue);
-}
-
 std::string PushNoticeToiOSRequest::getTitle()const
 {
 	return title_;
@@ -124,3 +102,25 @@ void PushNoticeToiOSRequest::setTarget(const std::string& target)
 	setCoreParameter("Target", target);
 }
 
+long PushNoticeToiOSRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void PushNoticeToiOSRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+
+std::string PushNoticeToiOSRequest::getTargetValue()const
+{
+	return targetValue_;
+}
+
+void PushNoticeToiOSRequest::setTargetValue(const std::string& targetValue)
+{
+	targetValue_ = targetValue;
+	setCoreParameter("TargetValue", targetValue);
+}
+

push/src/model/PushNoticeToiOSResult.cc

@@ -35,13 +35,9 @@ PushNoticeToiOSResult::~PushNoticeToiOSResult()
 
 void PushNoticeToiOSResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	if(!value["MessageId"].isNull())
 		messageId_ = value["MessageId"].asString();

push/src/model/PushRequest.cc

@@ -47,61 +47,6 @@ void PushRequest::setSmsSendPolicy(int smsSendPolicy)
 	setCoreParameter("SmsSendPolicy", std::to_string(smsSendPolicy));
 }
 
-std::string PushRequest::getAndroidExtParameters()const
-{
-	return androidExtParameters_;
-}
-
-void PushRequest::setAndroidExtParameters(const std::string& androidExtParameters)
-{
-	androidExtParameters_ = androidExtParameters;
-	setCoreParameter("AndroidExtParameters", androidExtParameters);
-}
-
-int PushRequest::getIOSBadge()const
-{
-	return iOSBadge_;
-}
-
-void PushRequest::setIOSBadge(int iOSBadge)
-{
-	iOSBadge_ = iOSBadge;
-	setCoreParameter("IOSBadge", std::to_string(iOSBadge));
-}
-
-bool PushRequest::getIOSBadgeAutoIncrement()const
-{
-	return iOSBadgeAutoIncrement_;
-}
-
-void PushRequest::setIOSBadgeAutoIncrement(bool iOSBadgeAutoIncrement)
-{
-	iOSBadgeAutoIncrement_ = iOSBadgeAutoIncrement;
-	setCoreParameter("IOSBadgeAutoIncrement", iOSBadgeAutoIncrement ? "true" : "false");
-}
-
-std::string PushRequest::getAndroidOpenType()const
-{
-	return androidOpenType_;
-}
-
-void PushRequest::setAndroidOpenType(const std::string& androidOpenType)
-{
-	androidOpenType_ = androidOpenType;
-	setCoreParameter("AndroidOpenType", androidOpenType);
-}
-
-std::string PushRequest::getTitle()const
-{
-	return title_;
-}
-
-void PushRequest::setTitle(const std::string& title)
-{
-	title_ = title;
-	setCoreParameter("Title", title);
-}
-
 std::string PushRequest::getBody()const
 {
 	return body_;
@@ -135,28 +80,6 @@ void PushRequest::setPushTime(const std::string& pushTime)
 	setCoreParameter("PushTime", pushTime);
 }
 
-std::string PushRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void PushRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setCoreParameter("AccessKeyId", accessKeyId);
-}
-
-int PushRequest::getSmsDelaySecs()const
-{
-	return smsDelaySecs_;
-}
-
-void PushRequest::setSmsDelaySecs(int smsDelaySecs)
-{
-	smsDelaySecs_ = smsDelaySecs;
-	setCoreParameter("SmsDelaySecs", std::to_string(smsDelaySecs));
-}
-
 int PushRequest::getSendSpeed()const
 {
 	return sendSpeed_;
@@ -190,17 +113,6 @@ void PushRequest::setIOSRemindBody(const std::string& iOSRemindBody)
 	setCoreParameter("IOSRemindBody", iOSRemindBody);
 }
 
-std::string PushRequest::getIOSExtParameters()const
-{
-	return iOSExtParameters_;
-}
-
-void PushRequest::setIOSExtParameters(const std::string& iOSExtParameters)
-{
-	iOSExtParameters_ = iOSExtParameters;
-	setCoreParameter("IOSExtParameters", iOSExtParameters);
-}
-
 std::string PushRequest::getAndroidNotifyType()const
 {
 	return androidNotifyType_;
@@ -278,28 +190,6 @@ void PushRequest::setExpireTime(const std::string& expireTime)
 	setCoreParameter("ExpireTime", expireTime);
 }
 
-std::string PushRequest::getSmsTemplateName()const
-{
-	return smsTemplateName_;
-}
-
-void PushRequest::setSmsTemplateName(const std::string& smsTemplateName)
-{
-	smsTemplateName_ = smsTemplateName;
-	setCoreParameter("SmsTemplateName", smsTemplateName);
-}
-
-std::string PushRequest::getAndroidPopupBody()const
-{
-	return androidPopupBody_;
-}
-
-void PushRequest::setAndroidPopupBody(const std::string& androidPopupBody)
-{
-	androidPopupBody_ = androidPopupBody;
-	setCoreParameter("AndroidPopupBody", androidPopupBody);
-}
-
 std::string PushRequest::getIOSNotificationCategory()const
 {
 	return iOSNotificationCategory_;
@@ -322,17 +212,6 @@ void PushRequest::setStoreOffline(bool storeOffline)
 	setCoreParameter("StoreOffline", storeOffline ? "true" : "false");
 }
 
-bool PushRequest::getIOSSilentNotification()const
-{
-	return iOSSilentNotification_;
-}
-
-void PushRequest::setIOSSilentNotification(bool iOSSilentNotification)
-{
-	iOSSilentNotification_ = iOSSilentNotification;
-	setCoreParameter("IOSSilentNotification", iOSSilentNotification ? "true" : "false");
-}
-
 std::string PushRequest::getSmsParams()const
 {
 	return smsParams_;
@@ -355,17 +234,6 @@ void PushRequest::setJobKey(const std::string& jobKey)
 	setCoreParameter("JobKey", jobKey);
 }
 
-std::string PushRequest::getTarget()const
-{
-	return target_;
-}
-
-void PushRequest::setTarget(const std::string& target)
-{
-	target_ = target;
-	setCoreParameter("Target", target);
-}
-
 std::string PushRequest::getAndroidOpenUrl()const
 {
 	return androidOpenUrl_;
@@ -377,6 +245,193 @@ void PushRequest::setAndroidOpenUrl(const std::string& androidOpenUrl)
 	setCoreParameter("AndroidOpenUrl", androidOpenUrl);
 }
 
+std::string PushRequest::getAndroidXiaoMiNotifyBody()const
+{
+	return androidXiaoMiNotifyBody_;
+}
+
+void PushRequest::setAndroidXiaoMiNotifyBody(const std::string& androidXiaoMiNotifyBody)
+{
+	androidXiaoMiNotifyBody_ = androidXiaoMiNotifyBody;
+	setCoreParameter("AndroidXiaoMiNotifyBody", androidXiaoMiNotifyBody);
+}
+
+std::string PushRequest::getIOSSubtitle()const
+{
+	return iOSSubtitle_;
+}
+
+void PushRequest::setIOSSubtitle(const std::string& iOSSubtitle)
+{
+	iOSSubtitle_ = iOSSubtitle;
+	setCoreParameter("IOSSubtitle", iOSSubtitle);
+}
+
+bool PushRequest::getIOSRemind()const
+{
+	return iOSRemind_;
+}
+
+void PushRequest::setIOSRemind(bool iOSRemind)
+{
+	iOSRemind_ = iOSRemind;
+	setCoreParameter("IOSRemind", iOSRemind ? "true" : "false");
+}
+
+std::string PushRequest::getAndroidMusic()const
+{
+	return androidMusic_;
+}
+
+void PushRequest::setAndroidMusic(const std::string& androidMusic)
+{
+	androidMusic_ = androidMusic;
+	setCoreParameter("AndroidMusic", androidMusic);
+}
+
+std::string PushRequest::getPushType()const
+{
+	return pushType_;
+}
+
+void PushRequest::setPushType(const std::string& pushType)
+{
+	pushType_ = pushType;
+	setCoreParameter("PushType", pushType);
+}
+
+std::string PushRequest::getAndroidExtParameters()const
+{
+	return androidExtParameters_;
+}
+
+void PushRequest::setAndroidExtParameters(const std::string& androidExtParameters)
+{
+	androidExtParameters_ = androidExtParameters;
+	setCoreParameter("AndroidExtParameters", androidExtParameters);
+}
+
+int PushRequest::getIOSBadge()const
+{
+	return iOSBadge_;
+}
+
+void PushRequest::setIOSBadge(int iOSBadge)
+{
+	iOSBadge_ = iOSBadge;
+	setCoreParameter("IOSBadge", std::to_string(iOSBadge));
+}
+
+bool PushRequest::getIOSBadgeAutoIncrement()const
+{
+	return iOSBadgeAutoIncrement_;
+}
+
+void PushRequest::setIOSBadgeAutoIncrement(bool iOSBadgeAutoIncrement)
+{
+	iOSBadgeAutoIncrement_ = iOSBadgeAutoIncrement;
+	setCoreParameter("IOSBadgeAutoIncrement", iOSBadgeAutoIncrement ? "true" : "false");
+}
+
+std::string PushRequest::getAndroidOpenType()const
+{
+	return androidOpenType_;
+}
+
+void PushRequest::setAndroidOpenType(const std::string& androidOpenType)
+{
+	androidOpenType_ = androidOpenType;
+	setCoreParameter("AndroidOpenType", androidOpenType);
+}
+
+std::string PushRequest::getTitle()const
+{
+	return title_;
+}
+
+void PushRequest::setTitle(const std::string& title)
+{
+	title_ = title;
+	setCoreParameter("Title", title);
+}
+
+std::string PushRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void PushRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setCoreParameter("AccessKeyId", accessKeyId);
+}
+
+int PushRequest::getSmsDelaySecs()const
+{
+	return smsDelaySecs_;
+}
+
+void PushRequest::setSmsDelaySecs(int smsDelaySecs)
+{
+	smsDelaySecs_ = smsDelaySecs;
+	setCoreParameter("SmsDelaySecs", std::to_string(smsDelaySecs));
+}
+
+std::string PushRequest::getIOSExtParameters()const
+{
+	return iOSExtParameters_;
+}
+
+void PushRequest::setIOSExtParameters(const std::string& iOSExtParameters)
+{
+	iOSExtParameters_ = iOSExtParameters;
+	setCoreParameter("IOSExtParameters", iOSExtParameters);
+}
+
+std::string PushRequest::getSmsTemplateName()const
+{
+	return smsTemplateName_;
+}
+
+void PushRequest::setSmsTemplateName(const std::string& smsTemplateName)
+{
+	smsTemplateName_ = smsTemplateName;
+	setCoreParameter("SmsTemplateName", smsTemplateName);
+}
+
+std::string PushRequest::getAndroidPopupBody()const
+{
+	return androidPopupBody_;
+}
+
+void PushRequest::setAndroidPopupBody(const std::string& androidPopupBody)
+{
+	androidPopupBody_ = androidPopupBody;
+	setCoreParameter("AndroidPopupBody", androidPopupBody);
+}
+
+bool PushRequest::getIOSSilentNotification()const
+{
+	return iOSSilentNotification_;
+}
+
+void PushRequest::setIOSSilentNotification(bool iOSSilentNotification)
+{
+	iOSSilentNotification_ = iOSSilentNotification;
+	setCoreParameter("IOSSilentNotification", iOSSilentNotification ? "true" : "false");
+}
+
+std::string PushRequest::getTarget()const
+{
+	return target_;
+}
+
+void PushRequest::setTarget(const std::string& target)
+{
+	target_ = target;
+	setCoreParameter("Target", target);
+}
+
 std::string PushRequest::getAndroidNotificationChannel()const
 {
 	return androidNotificationChannel_;
@@ -410,28 +465,6 @@ void PushRequest::setAndroidActivity(const std::string& androidActivity)
 	setCoreParameter("AndroidActivity", androidActivity);
 }
 
-std::string PushRequest::getAndroidXiaoMiNotifyBody()const
-{
-	return androidXiaoMiNotifyBody_;
-}
-
-void PushRequest::setAndroidXiaoMiNotifyBody(const std::string& androidXiaoMiNotifyBody)
-{
-	androidXiaoMiNotifyBody_ = androidXiaoMiNotifyBody;
-	setCoreParameter("AndroidXiaoMiNotifyBody", androidXiaoMiNotifyBody);
-}
-
-std::string PushRequest::getIOSSubtitle()const
-{
-	return iOSSubtitle_;
-}
-
-void PushRequest::setIOSSubtitle(const std::string& iOSSubtitle)
-{
-	iOSSubtitle_ = iOSSubtitle;
-	setCoreParameter("IOSSubtitle", iOSSubtitle);
-}
-
 std::string PushRequest::getSmsSignName()const
 {
 	return smsSignName_;
@@ -443,17 +476,6 @@ void PushRequest::setSmsSignName(const std::string& smsSignName)
 	setCoreParameter("SmsSignName", smsSignName);
 }
 
-bool PushRequest::getIOSRemind()const
-{
-	return iOSRemind_;
-}
-
-void PushRequest::setIOSRemind(bool iOSRemind)
-{
-	iOSRemind_ = iOSRemind;
-	setCoreParameter("IOSRemind", iOSRemind ? "true" : "false");
-}
-
 long PushRequest::getAppKey()const
 {
 	return appKey_;
@@ -476,17 +498,6 @@ void PushRequest::setTargetValue(const std::string& targetValue)
 	setCoreParameter("TargetValue", targetValue);
 }
 
-std::string PushRequest::getAndroidMusic()const
-{
-	return androidMusic_;
-}
-
-void PushRequest::setAndroidMusic(const std::string& androidMusic)
-{
-	androidMusic_ = androidMusic;
-	setCoreParameter("AndroidMusic", androidMusic);
-}
-
 std::string PushRequest::getAndroidXiaoMiActivity()const
 {
 	return androidXiaoMiActivity_;
@@ -509,14 +520,3 @@ void PushRequest::setAndroidXiaoMiNotifyTitle(const std::string& androidXiaoMiNo
 	setCoreParameter("AndroidXiaoMiNotifyTitle", androidXiaoMiNotifyTitle);
 }
 
-std::string PushRequest::getPushType()const
-{
-	return pushType_;
-}
-
-void PushRequest::setPushType(const std::string& pushType)
-{
-	pushType_ = pushType;
-	setCoreParameter("PushType", pushType);
-}
-

push/src/model/PushResult.cc

@@ -35,13 +35,9 @@ PushResult::~PushResult()
 
 void PushResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	if(!value["MessageId"].isNull())
 		messageId_ = value["MessageId"].asString();

push/src/model/QueryAliasesRequest.cc

@@ -25,17 +25,6 @@ QueryAliasesRequest::QueryAliasesRequest() :
 QueryAliasesRequest::~QueryAliasesRequest()
 {}
 
-long QueryAliasesRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void QueryAliasesRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string QueryAliasesRequest::getDeviceId()const
 {
 	return deviceId_;
@@ -58,3 +47,14 @@ void QueryAliasesRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+long QueryAliasesRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void QueryAliasesRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+

push/src/model/QueryAliasesResult.cc

@@ -35,13 +35,9 @@ QueryAliasesResult::~QueryAliasesResult()
 
 void QueryAliasesResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allAliasInfos = value["AliasInfos"]["AliasInfo"];
 	for (auto value : allAliasInfos)

push/src/model/QueryDeviceInfoRequest.cc

@@ -25,17 +25,6 @@ QueryDeviceInfoRequest::QueryDeviceInfoRequest() :
 QueryDeviceInfoRequest::~QueryDeviceInfoRequest()
 {}
 
-long QueryDeviceInfoRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void QueryDeviceInfoRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string QueryDeviceInfoRequest::getDeviceId()const
 {
 	return deviceId_;
@@ -58,3 +47,14 @@ void QueryDeviceInfoRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+long QueryDeviceInfoRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void QueryDeviceInfoRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+

push/src/model/QueryDeviceInfoResult.cc

@@ -35,13 +35,9 @@ QueryDeviceInfoResult::~QueryDeviceInfoResult()
 
 void QueryDeviceInfoResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto deviceInfoNode = value["DeviceInfo"];
 	if(!deviceInfoNode["DeviceId"].isNull())

push/src/model/QueryDeviceStatRequest.cc

@@ -36,17 +36,6 @@ void QueryDeviceStatRequest::setEndTime(const std::string& endTime)
 	setCoreParameter("EndTime", endTime);
 }
 
-long QueryDeviceStatRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void QueryDeviceStatRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string QueryDeviceStatRequest::getStartTime()const
 {
 	return startTime_;
@@ -69,17 +58,6 @@ void QueryDeviceStatRequest::setDeviceType(const std::string& deviceType)
 	setCoreParameter("DeviceType", deviceType);
 }
 
-std::string QueryDeviceStatRequest::getQueryType()const
-{
-	return queryType_;
-}
-
-void QueryDeviceStatRequest::setQueryType(const std::string& queryType)
-{
-	queryType_ = queryType;
-	setCoreParameter("QueryType", queryType);
-}
-
 std::string QueryDeviceStatRequest::getAccessKeyId()const
 {
 	return accessKeyId_;
@@ -91,3 +69,25 @@ void QueryDeviceStatRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+long QueryDeviceStatRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void QueryDeviceStatRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+
+std::string QueryDeviceStatRequest::getQueryType()const
+{
+	return queryType_;
+}
+
+void QueryDeviceStatRequest::setQueryType(const std::string& queryType)
+{
+	queryType_ = queryType;
+	setCoreParameter("QueryType", queryType);
+}
+

push/src/model/QueryDeviceStatResult.cc

@@ -35,13 +35,9 @@ QueryDeviceStatResult::~QueryDeviceStatResult()
 
 void QueryDeviceStatResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allAppDeviceStats = value["AppDeviceStats"]["AppDeviceStat"];
 	for (auto value : allAppDeviceStats)

push/src/model/QueryDevicesByAccountRequest.cc

@@ -25,6 +25,17 @@ QueryDevicesByAccountRequest::QueryDevicesByAccountRequest() :
 QueryDevicesByAccountRequest::~QueryDevicesByAccountRequest()
 {}
 
+std::string QueryDevicesByAccountRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void QueryDevicesByAccountRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setCoreParameter("AccessKeyId", accessKeyId);
+}
+
 long QueryDevicesByAccountRequest::getAppKey()const
 {
 	return appKey_;
@@ -47,14 +58,3 @@ void QueryDevicesByAccountRequest::setAccount(const std::string& account)
 	setCoreParameter("Account", account);
 }
 
-std::string QueryDevicesByAccountRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void QueryDevicesByAccountRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setCoreParameter("AccessKeyId", accessKeyId);
-}
-

push/src/model/QueryDevicesByAccountResult.cc

@@ -35,13 +35,9 @@ QueryDevicesByAccountResult::~QueryDevicesByAccountResult()
 
 void QueryDevicesByAccountResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allDeviceIds = value["DeviceIds"]["DeviceId"];
 	for (const auto &item : allDeviceIds)

push/src/model/QueryDevicesByAliasRequest.cc

@@ -25,6 +25,17 @@ QueryDevicesByAliasRequest::QueryDevicesByAliasRequest() :
 QueryDevicesByAliasRequest::~QueryDevicesByAliasRequest()
 {}
 
+std::string QueryDevicesByAliasRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void QueryDevicesByAliasRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setCoreParameter("AccessKeyId", accessKeyId);
+}
+
 std::string QueryDevicesByAliasRequest::getAlias()const
 {
 	return alias_;
@@ -47,14 +58,3 @@ void QueryDevicesByAliasRequest::setAppKey(long appKey)
 	setCoreParameter("AppKey", std::to_string(appKey));
 }
 
-std::string QueryDevicesByAliasRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void QueryDevicesByAliasRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setCoreParameter("AccessKeyId", accessKeyId);
-}
-

push/src/model/QueryDevicesByAliasResult.cc

@@ -35,13 +35,9 @@ QueryDevicesByAliasResult::~QueryDevicesByAliasResult()
 
 void QueryDevicesByAliasResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allDeviceIds = value["DeviceIds"]["DeviceId"];
 	for (const auto &item : allDeviceIds)

push/src/model/QueryPushListRequest.cc

@@ -25,17 +25,6 @@ QueryPushListRequest::QueryPushListRequest() :
 QueryPushListRequest::~QueryPushListRequest()
 {}
 
-int QueryPushListRequest::getPageSize()const
-{
-	return pageSize_;
-}
-
-void QueryPushListRequest::setPageSize(int pageSize)
-{
-	pageSize_ = pageSize;
-	setCoreParameter("PageSize", std::to_string(pageSize));
-}
-
 std::string QueryPushListRequest::getEndTime()const
 {
 	return endTime_;
@@ -47,17 +36,6 @@ void QueryPushListRequest::setEndTime(const std::string& endTime)
 	setCoreParameter("EndTime", endTime);
 }
 
-long QueryPushListRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void QueryPushListRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string QueryPushListRequest::getStartTime()const
 {
 	return startTime_;
@@ -69,6 +47,39 @@ void QueryPushListRequest::setStartTime(const std::string& 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_;
@@ -91,14 +102,3 @@ void QueryPushListRequest::setPushType(const std::string& pushType)
 	setCoreParameter("PushType", pushType);
 }
 
-std::string QueryPushListRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void QueryPushListRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setCoreParameter("AccessKeyId", accessKeyId);
-}
-

push/src/model/QueryPushListResult.cc

@@ -35,13 +35,9 @@ QueryPushListResult::~QueryPushListResult()
 
 void QueryPushListResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allPushMessageInfos = value["PushMessageInfos"]["PushMessageInfo"];
 	for (auto value : allPushMessageInfos)

push/src/model/QueryPushStatByAppRequest.cc

@@ -25,17 +25,6 @@ QueryPushStatByAppRequest::QueryPushStatByAppRequest() :
 QueryPushStatByAppRequest::~QueryPushStatByAppRequest()
 {}
 
-std::string QueryPushStatByAppRequest::getGranularity()const
-{
-	return granularity_;
-}
-
-void QueryPushStatByAppRequest::setGranularity(const std::string& granularity)
-{
-	granularity_ = granularity;
-	setCoreParameter("Granularity", granularity);
-}
-
 std::string QueryPushStatByAppRequest::getEndTime()const
 {
 	return endTime_;
@@ -47,17 +36,6 @@ void QueryPushStatByAppRequest::setEndTime(const std::string& endTime)
 	setCoreParameter("EndTime", endTime);
 }
 
-long QueryPushStatByAppRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void QueryPushStatByAppRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string QueryPushStatByAppRequest::getStartTime()const
 {
 	return startTime_;
@@ -80,3 +58,25 @@ void QueryPushStatByAppRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+std::string QueryPushStatByAppRequest::getGranularity()const
+{
+	return granularity_;
+}
+
+void QueryPushStatByAppRequest::setGranularity(const std::string& granularity)
+{
+	granularity_ = granularity;
+	setCoreParameter("Granularity", granularity);
+}
+
+long QueryPushStatByAppRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void QueryPushStatByAppRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+

push/src/model/QueryPushStatByAppResult.cc

@@ -35,13 +35,9 @@ QueryPushStatByAppResult::~QueryPushStatByAppResult()
 
 void QueryPushStatByAppResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allAppPushStats = value["AppPushStats"]["AppPushStat"];
 	for (auto value : allAppPushStats)

push/src/model/QueryPushStatByMsgRequest.cc

@@ -36,17 +36,6 @@ void QueryPushStatByMsgRequest::setMessageId(long messageId)
 	setCoreParameter("MessageId", std::to_string(messageId));
 }
 
-long QueryPushStatByMsgRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void QueryPushStatByMsgRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string QueryPushStatByMsgRequest::getAccessKeyId()const
 {
 	return accessKeyId_;
@@ -58,3 +47,14 @@ void QueryPushStatByMsgRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+long QueryPushStatByMsgRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void QueryPushStatByMsgRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+

push/src/model/QueryPushStatByMsgResult.cc

@@ -35,13 +35,9 @@ QueryPushStatByMsgResult::~QueryPushStatByMsgResult()
 
 void QueryPushStatByMsgResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allPushStats = value["PushStats"]["PushStat"];
 	for (auto value : allPushStats)

push/src/model/QueryTagsRequest.cc

@@ -25,28 +25,6 @@ QueryTagsRequest::QueryTagsRequest() :
 QueryTagsRequest::~QueryTagsRequest()
 {}
 
-std::string QueryTagsRequest::getClientKey()const
-{
-	return clientKey_;
-}
-
-void QueryTagsRequest::setClientKey(const std::string& clientKey)
-{
-	clientKey_ = clientKey;
-	setCoreParameter("ClientKey", clientKey);
-}
-
-long QueryTagsRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void QueryTagsRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string QueryTagsRequest::getKeyType()const
 {
 	return keyType_;
@@ -69,3 +47,25 @@ void QueryTagsRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+std::string QueryTagsRequest::getClientKey()const
+{
+	return clientKey_;
+}
+
+void QueryTagsRequest::setClientKey(const std::string& clientKey)
+{
+	clientKey_ = clientKey;
+	setCoreParameter("ClientKey", clientKey);
+}
+
+long QueryTagsRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void QueryTagsRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+

push/src/model/QueryTagsResult.cc

@@ -35,13 +35,9 @@ QueryTagsResult::~QueryTagsResult()
 
 void QueryTagsResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allTagInfos = value["TagInfos"]["TagInfo"];
 	for (auto value : allTagInfos)

push/src/model/QueryUniqueDeviceStatRequest.cc

@@ -25,17 +25,6 @@ QueryUniqueDeviceStatRequest::QueryUniqueDeviceStatRequest() :
 QueryUniqueDeviceStatRequest::~QueryUniqueDeviceStatRequest()
 {}
 
-std::string QueryUniqueDeviceStatRequest::getGranularity()const
-{
-	return granularity_;
-}
-
-void QueryUniqueDeviceStatRequest::setGranularity(const std::string& granularity)
-{
-	granularity_ = granularity;
-	setCoreParameter("Granularity", granularity);
-}
-
 std::string QueryUniqueDeviceStatRequest::getEndTime()const
 {
 	return endTime_;
@@ -47,17 +36,6 @@ void QueryUniqueDeviceStatRequest::setEndTime(const std::string& endTime)
 	setCoreParameter("EndTime", endTime);
 }
 
-long QueryUniqueDeviceStatRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void QueryUniqueDeviceStatRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string QueryUniqueDeviceStatRequest::getStartTime()const
 {
 	return startTime_;
@@ -80,3 +58,25 @@ void QueryUniqueDeviceStatRequest::setAccessKeyId(const std::string& accessKeyId
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+std::string QueryUniqueDeviceStatRequest::getGranularity()const
+{
+	return granularity_;
+}
+
+void QueryUniqueDeviceStatRequest::setGranularity(const std::string& granularity)
+{
+	granularity_ = granularity;
+	setCoreParameter("Granularity", granularity);
+}
+
+long QueryUniqueDeviceStatRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void QueryUniqueDeviceStatRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+

push/src/model/QueryUniqueDeviceStatResult.cc

@@ -35,13 +35,9 @@ QueryUniqueDeviceStatResult::~QueryUniqueDeviceStatResult()
 
 void QueryUniqueDeviceStatResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto allAppDeviceStats = value["AppDeviceStats"]["AppDeviceStat"];
 	for (auto value : allAppDeviceStats)

push/src/model/RemoveTagRequest.cc

@@ -25,6 +25,17 @@ RemoveTagRequest::RemoveTagRequest() :
 RemoveTagRequest::~RemoveTagRequest()
 {}
 
+std::string RemoveTagRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void RemoveTagRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setCoreParameter("AccessKeyId", accessKeyId);
+}
+
 std::string RemoveTagRequest::getTagName()const
 {
 	return tagName_;
@@ -47,14 +58,3 @@ void RemoveTagRequest::setAppKey(long appKey)
 	setCoreParameter("AppKey", std::to_string(appKey));
 }
 
-std::string RemoveTagRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void RemoveTagRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setCoreParameter("AccessKeyId", accessKeyId);
-}
-

push/src/model/RemoveTagResult.cc

@@ -35,13 +35,9 @@ RemoveTagResult::~RemoveTagResult()
 
 void RemoveTagResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 
 }

push/src/model/UnbindAliasRequest.cc

@@ -25,28 +25,6 @@ UnbindAliasRequest::UnbindAliasRequest() :
 UnbindAliasRequest::~UnbindAliasRequest()
 {}
 
-std::string UnbindAliasRequest::getAliasName()const
-{
-	return aliasName_;
-}
-
-void UnbindAliasRequest::setAliasName(const std::string& aliasName)
-{
-	aliasName_ = aliasName;
-	setCoreParameter("AliasName", aliasName);
-}
-
-long UnbindAliasRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void UnbindAliasRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string UnbindAliasRequest::getDeviceId()const
 {
 	return deviceId_;
@@ -69,6 +47,28 @@ void UnbindAliasRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+std::string UnbindAliasRequest::getAliasName()const
+{
+	return aliasName_;
+}
+
+void UnbindAliasRequest::setAliasName(const std::string& aliasName)
+{
+	aliasName_ = aliasName;
+	setCoreParameter("AliasName", aliasName);
+}
+
+long UnbindAliasRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void UnbindAliasRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+
 bool UnbindAliasRequest::getUnbindAll()const
 {
 	return unbindAll_;

push/src/model/UnbindAliasResult.cc

@@ -35,13 +35,9 @@ UnbindAliasResult::~UnbindAliasResult()
 
 void UnbindAliasResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 
 }

push/src/model/UnbindPhoneRequest.cc

@@ -25,17 +25,6 @@ UnbindPhoneRequest::UnbindPhoneRequest() :
 UnbindPhoneRequest::~UnbindPhoneRequest()
 {}
 
-long UnbindPhoneRequest::getAppKey()const
-{
-	return appKey_;
-}
-
-void UnbindPhoneRequest::setAppKey(long appKey)
-{
-	appKey_ = appKey;
-	setCoreParameter("AppKey", std::to_string(appKey));
-}
-
 std::string UnbindPhoneRequest::getDeviceId()const
 {
 	return deviceId_;
@@ -58,3 +47,14 @@ void UnbindPhoneRequest::setAccessKeyId(const std::string& accessKeyId)
 	setCoreParameter("AccessKeyId", accessKeyId);
 }
 
+long UnbindPhoneRequest::getAppKey()const
+{
+	return appKey_;
+}
+
+void UnbindPhoneRequest::setAppKey(long appKey)
+{
+	appKey_ = appKey;
+	setCoreParameter("AppKey", std::to_string(appKey));
+}
+

push/src/model/UnbindPhoneResult.cc

@@ -35,13 +35,9 @@ UnbindPhoneResult::~UnbindPhoneResult()
 
 void UnbindPhoneResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 
 }

push/src/model/UnbindTagRequest.cc

@@ -25,6 +25,28 @@ UnbindTagRequest::UnbindTagRequest() :
 UnbindTagRequest::~UnbindTagRequest()
 {}
 
+std::string UnbindTagRequest::getKeyType()const
+{
+	return keyType_;
+}
+
+void UnbindTagRequest::setKeyType(const std::string& keyType)
+{
+	keyType_ = keyType;
+	setCoreParameter("KeyType", keyType);
+}
+
+std::string UnbindTagRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void UnbindTagRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setCoreParameter("AccessKeyId", accessKeyId);
+}
+
 std::string UnbindTagRequest::getTagName()const
 {
 	return tagName_;
@@ -58,25 +80,3 @@ void UnbindTagRequest::setAppKey(long appKey)
 	setCoreParameter("AppKey", std::to_string(appKey));
 }
 
-std::string UnbindTagRequest::getKeyType()const
-{
-	return keyType_;
-}
-
-void UnbindTagRequest::setKeyType(const std::string& keyType)
-{
-	keyType_ = keyType;
-	setCoreParameter("KeyType", keyType);
-}
-
-std::string UnbindTagRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void UnbindTagRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setCoreParameter("AccessKeyId", accessKeyId);
-}
-

push/src/model/UnbindTagResult.cc

@@ -35,13 +35,9 @@ UnbindTagResult::~UnbindTagResult()
 
 void UnbindTagResult::parse(const std::string &payload)
 {
-	Json::CharReaderBuilder builder;
-	Json::CharReader *reader = builder.newCharReader();
-	Json::Value *val;
+	Json::Reader reader;
 	Json::Value value;
-	JSONCPP_STRING *errs;
-	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
-	value = *val;
+	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 
 }