Generate SDK by new Generator

ons/src/model/OnsConsumerAccumulateRequest.cc

@@ -25,17 +25,6 @@ OnsConsumerAccumulateRequest::OnsConsumerAccumulateRequest() :
 OnsConsumerAccumulateRequest::~OnsConsumerAccumulateRequest()
 {}
 
-std::string OnsConsumerAccumulateRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsConsumerAccumulateRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsConsumerAccumulateRequest::getGroupId()const
 {
 	return groupId_;
@@ -47,6 +36,17 @@ void OnsConsumerAccumulateRequest::setGroupId(const std::string& groupId)
 	setCoreParameter("GroupId", groupId);
 }
 
+std::string OnsConsumerAccumulateRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsConsumerAccumulateRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
 bool OnsConsumerAccumulateRequest::getDetail()const
 {
 	return detail_;

ons/src/model/OnsConsumerAccumulateResult.cc

@@ -35,13 +35,9 @@ OnsConsumerAccumulateResult::~OnsConsumerAccumulateResult()
 
 void OnsConsumerAccumulateResult::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 dataNode = value["Data"];
 	if(!dataNode["Online"].isNull())

ons/src/model/OnsConsumerGetConnectionRequest.cc

@@ -25,17 +25,6 @@ OnsConsumerGetConnectionRequest::OnsConsumerGetConnectionRequest() :
 OnsConsumerGetConnectionRequest::~OnsConsumerGetConnectionRequest()
 {}
 
-std::string OnsConsumerGetConnectionRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsConsumerGetConnectionRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsConsumerGetConnectionRequest::getGroupId()const
 {
 	return groupId_;
@@ -47,3 +36,14 @@ void OnsConsumerGetConnectionRequest::setGroupId(const std::string& groupId)
 	setCoreParameter("GroupId", groupId);
 }
 
+std::string OnsConsumerGetConnectionRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsConsumerGetConnectionRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+

ons/src/model/OnsConsumerGetConnectionResult.cc

@@ -35,13 +35,9 @@ OnsConsumerGetConnectionResult::~OnsConsumerGetConnectionResult()
 
 void OnsConsumerGetConnectionResult::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 dataNode = value["Data"];
 	auto allConnectionList = value["ConnectionList"]["ConnectionDo"];

ons/src/model/OnsConsumerResetOffsetRequest.cc

@@ -25,17 +25,6 @@ OnsConsumerResetOffsetRequest::OnsConsumerResetOffsetRequest() :
 OnsConsumerResetOffsetRequest::~OnsConsumerResetOffsetRequest()
 {}
 
-std::string OnsConsumerResetOffsetRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsConsumerResetOffsetRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsConsumerResetOffsetRequest::getGroupId()const
 {
 	return groupId_;
@@ -47,17 +36,6 @@ void OnsConsumerResetOffsetRequest::setGroupId(const std::string& groupId)
 	setCoreParameter("GroupId", groupId);
 }
 
-std::string OnsConsumerResetOffsetRequest::getTopic()const
-{
-	return topic_;
-}
-
-void OnsConsumerResetOffsetRequest::setTopic(const std::string& topic)
-{
-	topic_ = topic;
-	setCoreParameter("Topic", topic);
-}
-
 long OnsConsumerResetOffsetRequest::getResetTimestamp()const
 {
 	return resetTimestamp_;
@@ -80,3 +58,25 @@ void OnsConsumerResetOffsetRequest::setType(int type)
 	setCoreParameter("Type", std::to_string(type));
 }
 
+std::string OnsConsumerResetOffsetRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsConsumerResetOffsetRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
+std::string OnsConsumerResetOffsetRequest::getTopic()const
+{
+	return topic_;
+}
+
+void OnsConsumerResetOffsetRequest::setTopic(const std::string& topic)
+{
+	topic_ = topic;
+	setCoreParameter("Topic", topic);
+}
+

ons/src/model/OnsConsumerResetOffsetResult.cc

@@ -35,13 +35,9 @@ OnsConsumerResetOffsetResult::~OnsConsumerResetOffsetResult()
 
 void OnsConsumerResetOffsetResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsConsumerStatusRequest.cc

@@ -25,6 +25,17 @@ OnsConsumerStatusRequest::OnsConsumerStatusRequest() :
 OnsConsumerStatusRequest::~OnsConsumerStatusRequest()
 {}
 
+std::string OnsConsumerStatusRequest::getGroupId()const
+{
+	return groupId_;
+}
+
+void OnsConsumerStatusRequest::setGroupId(const std::string& groupId)
+{
+	groupId_ = groupId;
+	setCoreParameter("GroupId", groupId);
+}
+
 std::string OnsConsumerStatusRequest::getInstanceId()const
 {
 	return instanceId_;
@@ -47,17 +58,6 @@ void OnsConsumerStatusRequest::setNeedJstack(bool needJstack)
 	setCoreParameter("NeedJstack", needJstack ? "true" : "false");
 }
 
-std::string OnsConsumerStatusRequest::getGroupId()const
-{
-	return groupId_;
-}
-
-void OnsConsumerStatusRequest::setGroupId(const std::string& groupId)
-{
-	groupId_ = groupId;
-	setCoreParameter("GroupId", groupId);
-}
-
 bool OnsConsumerStatusRequest::getDetail()const
 {
 	return detail_;

ons/src/model/OnsConsumerStatusResult.cc

@@ -35,13 +35,9 @@ OnsConsumerStatusResult::~OnsConsumerStatusResult()
 
 void OnsConsumerStatusResult::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 dataNode = value["Data"];
 	if(!dataNode["Online"].isNull())

ons/src/model/OnsConsumerTimeSpanRequest.cc

@@ -25,17 +25,6 @@ OnsConsumerTimeSpanRequest::OnsConsumerTimeSpanRequest() :
 OnsConsumerTimeSpanRequest::~OnsConsumerTimeSpanRequest()
 {}
 
-std::string OnsConsumerTimeSpanRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsConsumerTimeSpanRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsConsumerTimeSpanRequest::getGroupId()const
 {
 	return groupId_;
@@ -47,6 +36,17 @@ void OnsConsumerTimeSpanRequest::setGroupId(const std::string& groupId)
 	setCoreParameter("GroupId", groupId);
 }
 
+std::string OnsConsumerTimeSpanRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsConsumerTimeSpanRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
 std::string OnsConsumerTimeSpanRequest::getTopic()const
 {
 	return topic_;

ons/src/model/OnsConsumerTimeSpanResult.cc

@@ -35,13 +35,9 @@ OnsConsumerTimeSpanResult::~OnsConsumerTimeSpanResult()
 
 void OnsConsumerTimeSpanResult::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 dataNode = value["Data"];
 	if(!dataNode["Topic"].isNull())

ons/src/model/OnsDLQMessageGetByIdRequest.cc

@@ -25,17 +25,6 @@ OnsDLQMessageGetByIdRequest::OnsDLQMessageGetByIdRequest() :
 OnsDLQMessageGetByIdRequest::~OnsDLQMessageGetByIdRequest()
 {}
 
-std::string OnsDLQMessageGetByIdRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsDLQMessageGetByIdRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsDLQMessageGetByIdRequest::getGroupId()const
 {
 	return groupId_;
@@ -58,3 +47,14 @@ void OnsDLQMessageGetByIdRequest::setMsgId(const std::string& msgId)
 	setCoreParameter("MsgId", msgId);
 }
 
+std::string OnsDLQMessageGetByIdRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsDLQMessageGetByIdRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+

ons/src/model/OnsDLQMessageGetByIdResult.cc

@@ -35,13 +35,9 @@ OnsDLQMessageGetByIdResult::~OnsDLQMessageGetByIdResult()
 
 void OnsDLQMessageGetByIdResult::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 dataNode = value["Data"];
 	if(!dataNode["Topic"].isNull())

ons/src/model/OnsDLQMessagePageQueryByGroupIdRequest.cc

@@ -25,17 +25,6 @@ OnsDLQMessagePageQueryByGroupIdRequest::OnsDLQMessagePageQueryByGroupIdRequest()
 OnsDLQMessagePageQueryByGroupIdRequest::~OnsDLQMessagePageQueryByGroupIdRequest()
 {}
 
-std::string OnsDLQMessagePageQueryByGroupIdRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsDLQMessagePageQueryByGroupIdRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsDLQMessagePageQueryByGroupIdRequest::getGroupId()const
 {
 	return groupId_;
@@ -47,17 +36,6 @@ void OnsDLQMessagePageQueryByGroupIdRequest::setGroupId(const std::string& group
 	setCoreParameter("GroupId", groupId);
 }
 
-int OnsDLQMessagePageQueryByGroupIdRequest::getPageSize()const
-{
-	return pageSize_;
-}
-
-void OnsDLQMessagePageQueryByGroupIdRequest::setPageSize(int pageSize)
-{
-	pageSize_ = pageSize;
-	setCoreParameter("PageSize", std::to_string(pageSize));
-}
-
 long OnsDLQMessagePageQueryByGroupIdRequest::getEndTime()const
 {
 	return endTime_;
@@ -91,6 +69,28 @@ void OnsDLQMessagePageQueryByGroupIdRequest::setCurrentPage(int currentPage)
 	setCoreParameter("CurrentPage", std::to_string(currentPage));
 }
 
+std::string OnsDLQMessagePageQueryByGroupIdRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsDLQMessagePageQueryByGroupIdRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
+int OnsDLQMessagePageQueryByGroupIdRequest::getPageSize()const
+{
+	return pageSize_;
+}
+
+void OnsDLQMessagePageQueryByGroupIdRequest::setPageSize(int pageSize)
+{
+	pageSize_ = pageSize;
+	setCoreParameter("PageSize", std::to_string(pageSize));
+}
+
 std::string OnsDLQMessagePageQueryByGroupIdRequest::getTaskId()const
 {
 	return taskId_;

ons/src/model/OnsDLQMessagePageQueryByGroupIdResult.cc

@@ -35,13 +35,9 @@ OnsDLQMessagePageQueryByGroupIdResult::~OnsDLQMessagePageQueryByGroupIdResult()
 
 void OnsDLQMessagePageQueryByGroupIdResult::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 msgFoundDoNode = value["MsgFoundDo"];
 	if(!msgFoundDoNode["TaskId"].isNull())

ons/src/model/OnsDLQMessageResendByIdRequest.cc

@@ -25,17 +25,6 @@ OnsDLQMessageResendByIdRequest::OnsDLQMessageResendByIdRequest() :
 OnsDLQMessageResendByIdRequest::~OnsDLQMessageResendByIdRequest()
 {}
 
-std::string OnsDLQMessageResendByIdRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsDLQMessageResendByIdRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsDLQMessageResendByIdRequest::getGroupId()const
 {
 	return groupId_;
@@ -58,3 +47,14 @@ void OnsDLQMessageResendByIdRequest::setMsgId(const std::string& msgId)
 	setCoreParameter("MsgId", msgId);
 }
 
+std::string OnsDLQMessageResendByIdRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsDLQMessageResendByIdRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+

ons/src/model/OnsDLQMessageResendByIdResult.cc

@@ -35,13 +35,9 @@ OnsDLQMessageResendByIdResult::~OnsDLQMessageResendByIdResult()
 
 void OnsDLQMessageResendByIdResult::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 allData = value["Data"]["MsgId"];
 	for (const auto &item : allData)

ons/src/model/OnsGroupConsumerUpdateRequest.cc

@@ -25,6 +25,17 @@ OnsGroupConsumerUpdateRequest::OnsGroupConsumerUpdateRequest() :
 OnsGroupConsumerUpdateRequest::~OnsGroupConsumerUpdateRequest()
 {}
 
+std::string OnsGroupConsumerUpdateRequest::getGroupId()const
+{
+	return groupId_;
+}
+
+void OnsGroupConsumerUpdateRequest::setGroupId(const std::string& groupId)
+{
+	groupId_ = groupId;
+	setCoreParameter("GroupId", groupId);
+}
+
 bool OnsGroupConsumerUpdateRequest::getReadEnable()const
 {
 	return readEnable_;
@@ -47,14 +58,3 @@ void OnsGroupConsumerUpdateRequest::setInstanceId(const std::string& instanceId)
 	setCoreParameter("InstanceId", instanceId);
 }
 
-std::string OnsGroupConsumerUpdateRequest::getGroupId()const
-{
-	return groupId_;
-}
-
-void OnsGroupConsumerUpdateRequest::setGroupId(const std::string& groupId)
-{
-	groupId_ = groupId;
-	setCoreParameter("GroupId", groupId);
-}
-

ons/src/model/OnsGroupConsumerUpdateResult.cc

@@ -35,13 +35,9 @@ OnsGroupConsumerUpdateResult::~OnsGroupConsumerUpdateResult()
 
 void OnsGroupConsumerUpdateResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsGroupCreateRequest.cc

@@ -25,17 +25,6 @@ OnsGroupCreateRequest::OnsGroupCreateRequest() :
 OnsGroupCreateRequest::~OnsGroupCreateRequest()
 {}
 
-std::string OnsGroupCreateRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsGroupCreateRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsGroupCreateRequest::getGroupId()const
 {
 	return groupId_;
@@ -58,3 +47,14 @@ void OnsGroupCreateRequest::setRemark(const std::string& remark)
 	setCoreParameter("Remark", remark);
 }
 
+std::string OnsGroupCreateRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsGroupCreateRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+

ons/src/model/OnsGroupCreateResult.cc

@@ -35,13 +35,9 @@ OnsGroupCreateResult::~OnsGroupCreateResult()
 
 void OnsGroupCreateResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsGroupDeleteRequest.cc

@@ -25,17 +25,6 @@ OnsGroupDeleteRequest::OnsGroupDeleteRequest() :
 OnsGroupDeleteRequest::~OnsGroupDeleteRequest()
 {}
 
-std::string OnsGroupDeleteRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsGroupDeleteRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsGroupDeleteRequest::getGroupId()const
 {
 	return groupId_;
@@ -47,3 +36,14 @@ void OnsGroupDeleteRequest::setGroupId(const std::string& groupId)
 	setCoreParameter("GroupId", groupId);
 }
 
+std::string OnsGroupDeleteRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsGroupDeleteRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+

ons/src/model/OnsGroupDeleteResult.cc

@@ -35,13 +35,9 @@ OnsGroupDeleteResult::~OnsGroupDeleteResult()
 
 void OnsGroupDeleteResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsGroupListRequest.cc

@@ -25,17 +25,6 @@ OnsGroupListRequest::OnsGroupListRequest() :
 OnsGroupListRequest::~OnsGroupListRequest()
 {}
 
-std::string OnsGroupListRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsGroupListRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsGroupListRequest::getGroupId()const
 {
 	return groupId_;
@@ -47,3 +36,14 @@ void OnsGroupListRequest::setGroupId(const std::string& groupId)
 	setCoreParameter("GroupId", groupId);
 }
 
+std::string OnsGroupListRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsGroupListRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+

ons/src/model/OnsGroupListResult.cc

@@ -35,13 +35,9 @@ OnsGroupListResult::~OnsGroupListResult()
 
 void OnsGroupListResult::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 allData = value["Data"]["SubscribeInfoDo"];
 	for (auto value : allData)

ons/src/model/OnsGroupSubDetailRequest.cc

@@ -25,17 +25,6 @@ OnsGroupSubDetailRequest::OnsGroupSubDetailRequest() :
 OnsGroupSubDetailRequest::~OnsGroupSubDetailRequest()
 {}
 
-std::string OnsGroupSubDetailRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsGroupSubDetailRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsGroupSubDetailRequest::getGroupId()const
 {
 	return groupId_;
@@ -47,3 +36,14 @@ void OnsGroupSubDetailRequest::setGroupId(const std::string& groupId)
 	setCoreParameter("GroupId", groupId);
 }
 
+std::string OnsGroupSubDetailRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsGroupSubDetailRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+

ons/src/model/OnsGroupSubDetailResult.cc

@@ -35,13 +35,9 @@ OnsGroupSubDetailResult::~OnsGroupSubDetailResult()
 
 void OnsGroupSubDetailResult::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 dataNode = value["Data"];
 	if(!dataNode["GroupId"].isNull())

ons/src/model/OnsInstanceBaseInfoResult.cc

@@ -35,13 +35,9 @@ OnsInstanceBaseInfoResult::~OnsInstanceBaseInfoResult()
 
 void OnsInstanceBaseInfoResult::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 instanceBaseInfoNode = value["InstanceBaseInfo"];
 	if(!instanceBaseInfoNode["InstanceId"].isNull())

ons/src/model/OnsInstanceCreateRequest.cc

@@ -25,17 +25,6 @@ OnsInstanceCreateRequest::OnsInstanceCreateRequest() :
 OnsInstanceCreateRequest::~OnsInstanceCreateRequest()
 {}
 
-std::string OnsInstanceCreateRequest::getInstanceName()const
-{
-	return instanceName_;
-}
-
-void OnsInstanceCreateRequest::setInstanceName(const std::string& instanceName)
-{
-	instanceName_ = instanceName;
-	setCoreParameter("InstanceName", instanceName);
-}
-
 std::string OnsInstanceCreateRequest::getRemark()const
 {
 	return remark_;
@@ -47,3 +36,14 @@ void OnsInstanceCreateRequest::setRemark(const std::string& remark)
 	setCoreParameter("Remark", remark);
 }
 
+std::string OnsInstanceCreateRequest::getInstanceName()const
+{
+	return instanceName_;
+}
+
+void OnsInstanceCreateRequest::setInstanceName(const std::string& instanceName)
+{
+	instanceName_ = instanceName;
+	setCoreParameter("InstanceName", instanceName);
+}
+

ons/src/model/OnsInstanceCreateResult.cc

@@ -35,13 +35,9 @@ OnsInstanceCreateResult::~OnsInstanceCreateResult()
 
 void OnsInstanceCreateResult::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 dataNode = value["Data"];
 	if(!dataNode["InstanceId"].isNull())

ons/src/model/OnsInstanceDeleteResult.cc

@@ -35,13 +35,9 @@ OnsInstanceDeleteResult::~OnsInstanceDeleteResult()
 
 void OnsInstanceDeleteResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsInstanceInServiceListResult.cc

@@ -35,13 +35,9 @@ OnsInstanceInServiceListResult::~OnsInstanceInServiceListResult()
 
 void OnsInstanceInServiceListResult::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 allData = value["Data"]["InstanceVO"];
 	for (auto value : allData)

ons/src/model/OnsInstanceUpdateRequest.cc

@@ -25,6 +25,17 @@ OnsInstanceUpdateRequest::OnsInstanceUpdateRequest() :
 OnsInstanceUpdateRequest::~OnsInstanceUpdateRequest()
 {}
 
+std::string OnsInstanceUpdateRequest::getRemark()const
+{
+	return remark_;
+}
+
+void OnsInstanceUpdateRequest::setRemark(const std::string& remark)
+{
+	remark_ = remark;
+	setCoreParameter("Remark", remark);
+}
+
 std::string OnsInstanceUpdateRequest::getInstanceName()const
 {
 	return instanceName_;
@@ -47,14 +58,3 @@ void OnsInstanceUpdateRequest::setInstanceId(const std::string& instanceId)
 	setCoreParameter("InstanceId", instanceId);
 }
 
-std::string OnsInstanceUpdateRequest::getRemark()const
-{
-	return remark_;
-}
-
-void OnsInstanceUpdateRequest::setRemark(const std::string& remark)
-{
-	remark_ = remark;
-	setCoreParameter("Remark", remark);
-}
-

ons/src/model/OnsInstanceUpdateResult.cc

@@ -35,13 +35,9 @@ OnsInstanceUpdateResult::~OnsInstanceUpdateResult()
 
 void OnsInstanceUpdateResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsMessageGetByKeyResult.cc

@@ -35,13 +35,9 @@ OnsMessageGetByKeyResult::~OnsMessageGetByKeyResult()
 
 void OnsMessageGetByKeyResult::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 allData = value["Data"]["OnsRestMessageDo"];
 	for (auto value : allData)

ons/src/model/OnsMessageGetByMsgIdRequest.cc

@@ -25,17 +25,6 @@ OnsMessageGetByMsgIdRequest::OnsMessageGetByMsgIdRequest() :
 OnsMessageGetByMsgIdRequest::~OnsMessageGetByMsgIdRequest()
 {}
 
-std::string OnsMessageGetByMsgIdRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsMessageGetByMsgIdRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsMessageGetByMsgIdRequest::getMsgId()const
 {
 	return msgId_;
@@ -47,6 +36,17 @@ void OnsMessageGetByMsgIdRequest::setMsgId(const std::string& msgId)
 	setCoreParameter("MsgId", msgId);
 }
 
+std::string OnsMessageGetByMsgIdRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsMessageGetByMsgIdRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
 std::string OnsMessageGetByMsgIdRequest::getTopic()const
 {
 	return topic_;

ons/src/model/OnsMessageGetByMsgIdResult.cc

@@ -35,13 +35,9 @@ OnsMessageGetByMsgIdResult::~OnsMessageGetByMsgIdResult()
 
 void OnsMessageGetByMsgIdResult::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 dataNode = value["Data"];
 	if(!dataNode["Topic"].isNull())

ons/src/model/OnsMessagePageQueryByTopicRequest.cc

@@ -25,39 +25,6 @@ OnsMessagePageQueryByTopicRequest::OnsMessagePageQueryByTopicRequest() :
 OnsMessagePageQueryByTopicRequest::~OnsMessagePageQueryByTopicRequest()
 {}
 
-std::string OnsMessagePageQueryByTopicRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsMessagePageQueryByTopicRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
-int OnsMessagePageQueryByTopicRequest::getPageSize()const
-{
-	return pageSize_;
-}
-
-void OnsMessagePageQueryByTopicRequest::setPageSize(int pageSize)
-{
-	pageSize_ = pageSize;
-	setCoreParameter("PageSize", std::to_string(pageSize));
-}
-
-std::string OnsMessagePageQueryByTopicRequest::getTopic()const
-{
-	return topic_;
-}
-
-void OnsMessagePageQueryByTopicRequest::setTopic(const std::string& topic)
-{
-	topic_ = topic;
-	setCoreParameter("Topic", topic);
-}
-
 long OnsMessagePageQueryByTopicRequest::getEndTime()const
 {
 	return endTime_;
@@ -91,6 +58,39 @@ void OnsMessagePageQueryByTopicRequest::setCurrentPage(int currentPage)
 	setCoreParameter("CurrentPage", std::to_string(currentPage));
 }
 
+std::string OnsMessagePageQueryByTopicRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsMessagePageQueryByTopicRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
+int OnsMessagePageQueryByTopicRequest::getPageSize()const
+{
+	return pageSize_;
+}
+
+void OnsMessagePageQueryByTopicRequest::setPageSize(int pageSize)
+{
+	pageSize_ = pageSize;
+	setCoreParameter("PageSize", std::to_string(pageSize));
+}
+
+std::string OnsMessagePageQueryByTopicRequest::getTopic()const
+{
+	return topic_;
+}
+
+void OnsMessagePageQueryByTopicRequest::setTopic(const std::string& topic)
+{
+	topic_ = topic;
+	setCoreParameter("Topic", topic);
+}
+
 std::string OnsMessagePageQueryByTopicRequest::getTaskId()const
 {
 	return taskId_;

ons/src/model/OnsMessagePageQueryByTopicResult.cc

@@ -35,13 +35,9 @@ OnsMessagePageQueryByTopicResult::~OnsMessagePageQueryByTopicResult()
 
 void OnsMessagePageQueryByTopicResult::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 msgFoundDoNode = value["MsgFoundDo"];
 	if(!msgFoundDoNode["TaskId"].isNull())

ons/src/model/OnsMessagePushRequest.cc

@@ -36,17 +36,6 @@ void OnsMessagePushRequest::setClientId(const std::string& clientId)
 	setCoreParameter("ClientId", clientId);
 }
 
-std::string OnsMessagePushRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsMessagePushRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsMessagePushRequest::getGroupId()const
 {
 	return groupId_;
@@ -69,6 +58,17 @@ void OnsMessagePushRequest::setMsgId(const std::string& msgId)
 	setCoreParameter("MsgId", msgId);
 }
 
+std::string OnsMessagePushRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsMessagePushRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
 std::string OnsMessagePushRequest::getTopic()const
 {
 	return topic_;

ons/src/model/OnsMessagePushResult.cc

@@ -35,13 +35,9 @@ OnsMessagePushResult::~OnsMessagePushResult()
 
 void OnsMessagePushResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsMessageSendRequest.cc

@@ -25,6 +25,17 @@ OnsMessageSendRequest::OnsMessageSendRequest() :
 OnsMessageSendRequest::~OnsMessageSendRequest()
 {}
 
+std::string OnsMessageSendRequest::getMessage()const
+{
+	return message_;
+}
+
+void OnsMessageSendRequest::setMessage(const std::string& message)
+{
+	message_ = message;
+	setCoreParameter("Message", message);
+}
+
 std::string OnsMessageSendRequest::getInstanceId()const
 {
 	return instanceId_;
@@ -58,17 +69,6 @@ void OnsMessageSendRequest::setTag(const std::string& tag)
 	setCoreParameter("Tag", tag);
 }
 
-std::string OnsMessageSendRequest::getMessage()const
-{
-	return message_;
-}
-
-void OnsMessageSendRequest::setMessage(const std::string& message)
-{
-	message_ = message;
-	setCoreParameter("Message", message);
-}
-
 std::string OnsMessageSendRequest::getKey()const
 {
 	return key_;

ons/src/model/OnsMessageSendResult.cc

@@ -35,13 +35,9 @@ OnsMessageSendResult::~OnsMessageSendResult()
 
 void OnsMessageSendResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsMessageTraceRequest.cc

@@ -25,6 +25,17 @@ OnsMessageTraceRequest::OnsMessageTraceRequest() :
 OnsMessageTraceRequest::~OnsMessageTraceRequest()
 {}
 
+std::string OnsMessageTraceRequest::getMsgId()const
+{
+	return msgId_;
+}
+
+void OnsMessageTraceRequest::setMsgId(const std::string& msgId)
+{
+	msgId_ = msgId;
+	setCoreParameter("MsgId", msgId);
+}
+
 std::string OnsMessageTraceRequest::getInstanceId()const
 {
 	return instanceId_;
@@ -47,14 +58,3 @@ void OnsMessageTraceRequest::setTopic(const std::string& topic)
 	setCoreParameter("Topic", topic);
 }
 
-std::string OnsMessageTraceRequest::getMsgId()const
-{
-	return msgId_;
-}
-
-void OnsMessageTraceRequest::setMsgId(const std::string& msgId)
-{
-	msgId_ = msgId;
-	setCoreParameter("MsgId", msgId);
-}
-

ons/src/model/OnsMessageTraceResult.cc

@@ -35,13 +35,9 @@ OnsMessageTraceResult::~OnsMessageTraceResult()
 
 void OnsMessageTraceResult::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 allData = value["Data"]["MessageTrack"];
 	for (auto value : allData)

ons/src/model/OnsMqttGroupIdCreateRequest.cc

@@ -25,28 +25,6 @@ OnsMqttGroupIdCreateRequest::OnsMqttGroupIdCreateRequest() :
 OnsMqttGroupIdCreateRequest::~OnsMqttGroupIdCreateRequest()
 {}
 
-std::string OnsMqttGroupIdCreateRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsMqttGroupIdCreateRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
-std::string OnsMqttGroupIdCreateRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void OnsMqttGroupIdCreateRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setCoreParameter("RegionId", regionId);
-}
-
 std::string OnsMqttGroupIdCreateRequest::getGroupId()const
 {
 	return groupId_;
@@ -58,6 +36,17 @@ void OnsMqttGroupIdCreateRequest::setGroupId(const std::string& groupId)
 	setCoreParameter("GroupId", groupId);
 }
 
+std::string OnsMqttGroupIdCreateRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsMqttGroupIdCreateRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
 std::string OnsMqttGroupIdCreateRequest::getTopic()const
 {
 	return topic_;

ons/src/model/OnsMqttGroupIdCreateResult.cc

@@ -35,13 +35,9 @@ OnsMqttGroupIdCreateResult::~OnsMqttGroupIdCreateResult()
 
 void OnsMqttGroupIdCreateResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsMqttGroupIdDeleteRequest.cc

@@ -25,28 +25,6 @@ OnsMqttGroupIdDeleteRequest::OnsMqttGroupIdDeleteRequest() :
 OnsMqttGroupIdDeleteRequest::~OnsMqttGroupIdDeleteRequest()
 {}
 
-std::string OnsMqttGroupIdDeleteRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsMqttGroupIdDeleteRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
-std::string OnsMqttGroupIdDeleteRequest::getRegionId()const
-{
-	return regionId_;
-}
-
-void OnsMqttGroupIdDeleteRequest::setRegionId(const std::string& regionId)
-{
-	regionId_ = regionId;
-	setCoreParameter("RegionId", regionId);
-}
-
 std::string OnsMqttGroupIdDeleteRequest::getGroupId()const
 {
 	return groupId_;
@@ -58,3 +36,14 @@ void OnsMqttGroupIdDeleteRequest::setGroupId(const std::string& groupId)
 	setCoreParameter("GroupId", groupId);
 }
 
+std::string OnsMqttGroupIdDeleteRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsMqttGroupIdDeleteRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+

ons/src/model/OnsMqttGroupIdDeleteResult.cc

@@ -35,13 +35,9 @@ OnsMqttGroupIdDeleteResult::~OnsMqttGroupIdDeleteResult()
 
 void OnsMqttGroupIdDeleteResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsMqttGroupIdListResult.cc

@@ -35,13 +35,9 @@ OnsMqttGroupIdListResult::~OnsMqttGroupIdListResult()
 
 void OnsMqttGroupIdListResult::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 allData = value["Data"]["MqttGroupIdDo"];
 	for (auto value : allData)

ons/src/model/OnsMqttQueryClientByClientIdResult.cc

@@ -35,13 +35,9 @@ OnsMqttQueryClientByClientIdResult::~OnsMqttQueryClientByClientIdResult()
 
 void OnsMqttQueryClientByClientIdResult::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 mqttClientInfoDoNode = value["MqttClientInfoDo"];
 	if(!mqttClientInfoDoNode["Online"].isNull())

ons/src/model/OnsMqttQueryClientByGroupIdRequest.cc

@@ -25,17 +25,6 @@ OnsMqttQueryClientByGroupIdRequest::OnsMqttQueryClientByGroupIdRequest() :
 OnsMqttQueryClientByGroupIdRequest::~OnsMqttQueryClientByGroupIdRequest()
 {}
 
-std::string OnsMqttQueryClientByGroupIdRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsMqttQueryClientByGroupIdRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsMqttQueryClientByGroupIdRequest::getGroupId()const
 {
 	return groupId_;
@@ -47,3 +36,14 @@ void OnsMqttQueryClientByGroupIdRequest::setGroupId(const std::string& groupId)
 	setCoreParameter("GroupId", groupId);
 }
 
+std::string OnsMqttQueryClientByGroupIdRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsMqttQueryClientByGroupIdRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+

ons/src/model/OnsMqttQueryClientByGroupIdResult.cc

@@ -35,13 +35,9 @@ OnsMqttQueryClientByGroupIdResult::~OnsMqttQueryClientByGroupIdResult()
 
 void OnsMqttQueryClientByGroupIdResult::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 mqttClientSetDoNode = value["MqttClientSetDo"];
 	if(!mqttClientSetDoNode["OnlineCount"].isNull())

ons/src/model/OnsMqttQueryClientByTopicRequest.cc

@@ -25,17 +25,6 @@ OnsMqttQueryClientByTopicRequest::OnsMqttQueryClientByTopicRequest() :
 OnsMqttQueryClientByTopicRequest::~OnsMqttQueryClientByTopicRequest()
 {}
 
-std::string OnsMqttQueryClientByTopicRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsMqttQueryClientByTopicRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsMqttQueryClientByTopicRequest::getParentTopic()const
 {
 	return parentTopic_;
@@ -47,6 +36,17 @@ void OnsMqttQueryClientByTopicRequest::setParentTopic(const std::string& parentT
 	setCoreParameter("ParentTopic", parentTopic);
 }
 
+std::string OnsMqttQueryClientByTopicRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsMqttQueryClientByTopicRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
 std::string OnsMqttQueryClientByTopicRequest::getSubTopic()const
 {
 	return subTopic_;

ons/src/model/OnsMqttQueryClientByTopicResult.cc

@@ -35,13 +35,9 @@ OnsMqttQueryClientByTopicResult::~OnsMqttQueryClientByTopicResult()
 
 void OnsMqttQueryClientByTopicResult::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 mqttClientSetDoNode = value["MqttClientSetDo"];
 	if(!mqttClientSetDoNode["OnlineCount"].isNull())

ons/src/model/OnsMqttQueryHistoryOnlineRequest.cc

@@ -25,17 +25,6 @@ OnsMqttQueryHistoryOnlineRequest::OnsMqttQueryHistoryOnlineRequest() :
 OnsMqttQueryHistoryOnlineRequest::~OnsMqttQueryHistoryOnlineRequest()
 {}
 
-std::string OnsMqttQueryHistoryOnlineRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsMqttQueryHistoryOnlineRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsMqttQueryHistoryOnlineRequest::getGroupId()const
 {
 	return groupId_;
@@ -69,3 +58,14 @@ void OnsMqttQueryHistoryOnlineRequest::setBeginTime(long beginTime)
 	setCoreParameter("BeginTime", std::to_string(beginTime));
 }
 
+std::string OnsMqttQueryHistoryOnlineRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsMqttQueryHistoryOnlineRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+

ons/src/model/OnsMqttQueryHistoryOnlineResult.cc

@@ -35,13 +35,9 @@ OnsMqttQueryHistoryOnlineResult::~OnsMqttQueryHistoryOnlineResult()
 
 void OnsMqttQueryHistoryOnlineResult::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 dataNode = value["Data"];
 	if(!dataNode["Title"].isNull())

ons/src/model/OnsMqttQueryMsgTransTrendRequest.cc

@@ -25,28 +25,6 @@ OnsMqttQueryMsgTransTrendRequest::OnsMqttQueryMsgTransTrendRequest() :
 OnsMqttQueryMsgTransTrendRequest::~OnsMqttQueryMsgTransTrendRequest()
 {}
 
-std::string OnsMqttQueryMsgTransTrendRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsMqttQueryMsgTransTrendRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
-int OnsMqttQueryMsgTransTrendRequest::getQos()const
-{
-	return qos_;
-}
-
-void OnsMqttQueryMsgTransTrendRequest::setQos(int qos)
-{
-	qos_ = qos;
-	setCoreParameter("Qos", std::to_string(qos));
-}
-
 std::string OnsMqttQueryMsgTransTrendRequest::getTransType()const
 {
 	return transType_;
@@ -102,6 +80,28 @@ void OnsMqttQueryMsgTransTrendRequest::setParentTopic(const std::string& parentT
 	setCoreParameter("ParentTopic", parentTopic);
 }
 
+std::string OnsMqttQueryMsgTransTrendRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsMqttQueryMsgTransTrendRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
+int OnsMqttQueryMsgTransTrendRequest::getQos()const
+{
+	return qos_;
+}
+
+void OnsMqttQueryMsgTransTrendRequest::setQos(int qos)
+{
+	qos_ = qos;
+	setCoreParameter("Qos", std::to_string(qos));
+}
+
 std::string OnsMqttQueryMsgTransTrendRequest::getMsgType()const
 {
 	return msgType_;

ons/src/model/OnsMqttQueryMsgTransTrendResult.cc

@@ -35,13 +35,9 @@ OnsMqttQueryMsgTransTrendResult::~OnsMqttQueryMsgTransTrendResult()
 
 void OnsMqttQueryMsgTransTrendResult::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 dataNode = value["Data"];
 	if(!dataNode["Title"].isNull())

ons/src/model/OnsRegionListResult.cc

@@ -35,13 +35,9 @@ OnsRegionListResult::~OnsRegionListResult()
 
 void OnsRegionListResult::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 allData = value["Data"]["RegionDo"];
 	for (auto value : allData)

ons/src/model/OnsTopicCreateRequest.cc

@@ -25,17 +25,6 @@ OnsTopicCreateRequest::OnsTopicCreateRequest() :
 OnsTopicCreateRequest::~OnsTopicCreateRequest()
 {}
 
-std::string OnsTopicCreateRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsTopicCreateRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 int OnsTopicCreateRequest::getMessageType()const
 {
 	return messageType_;
@@ -47,17 +36,6 @@ void OnsTopicCreateRequest::setMessageType(int messageType)
 	setCoreParameter("MessageType", std::to_string(messageType));
 }
 
-std::string OnsTopicCreateRequest::getTopic()const
-{
-	return topic_;
-}
-
-void OnsTopicCreateRequest::setTopic(const std::string& topic)
-{
-	topic_ = topic;
-	setCoreParameter("Topic", topic);
-}
-
 std::string OnsTopicCreateRequest::getRemark()const
 {
 	return remark_;
@@ -69,3 +47,25 @@ void OnsTopicCreateRequest::setRemark(const std::string& remark)
 	setCoreParameter("Remark", remark);
 }
 
+std::string OnsTopicCreateRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsTopicCreateRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
+std::string OnsTopicCreateRequest::getTopic()const
+{
+	return topic_;
+}
+
+void OnsTopicCreateRequest::setTopic(const std::string& topic)
+{
+	topic_ = topic;
+	setCoreParameter("Topic", topic);
+}
+

ons/src/model/OnsTopicCreateResult.cc

@@ -35,13 +35,9 @@ OnsTopicCreateResult::~OnsTopicCreateResult()
 
 void OnsTopicCreateResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsTopicDeleteResult.cc

@@ -35,13 +35,9 @@ OnsTopicDeleteResult::~OnsTopicDeleteResult()
 
 void OnsTopicDeleteResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsTopicListResult.cc

@@ -35,13 +35,9 @@ OnsTopicListResult::~OnsTopicListResult()
 
 void OnsTopicListResult::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 allData = value["Data"]["PublishInfoDo"];
 	for (auto value : allData)

ons/src/model/OnsTopicStatusResult.cc

@@ -35,13 +35,9 @@ OnsTopicStatusResult::~OnsTopicStatusResult()
 
 void OnsTopicStatusResult::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 dataNode = value["Data"];
 	if(!dataNode["TotalCount"].isNull())

ons/src/model/OnsTopicSubDetailResult.cc

@@ -35,13 +35,9 @@ OnsTopicSubDetailResult::~OnsTopicSubDetailResult()
 
 void OnsTopicSubDetailResult::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 dataNode = value["Data"];
 	if(!dataNode["Topic"].isNull())

ons/src/model/OnsTopicUpdateRequest.cc

@@ -25,17 +25,6 @@ OnsTopicUpdateRequest::OnsTopicUpdateRequest() :
 OnsTopicUpdateRequest::~OnsTopicUpdateRequest()
 {}
 
-std::string OnsTopicUpdateRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsTopicUpdateRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 int OnsTopicUpdateRequest::getPerm()const
 {
 	return perm_;
@@ -47,6 +36,17 @@ void OnsTopicUpdateRequest::setPerm(int perm)
 	setCoreParameter("Perm", std::to_string(perm));
 }
 
+std::string OnsTopicUpdateRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsTopicUpdateRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
 std::string OnsTopicUpdateRequest::getTopic()const
 {
 	return topic_;

ons/src/model/OnsTopicUpdateResult.cc

@@ -35,13 +35,9 @@ OnsTopicUpdateResult::~OnsTopicUpdateResult()
 
 void OnsTopicUpdateResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsTraceGetResultResult.cc

@@ -35,13 +35,9 @@ OnsTraceGetResultResult::~OnsTraceGetResultResult()
 
 void OnsTraceGetResultResult::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 traceDataNode = value["TraceData"];
 	if(!traceDataNode["QueryId"].isNull())

ons/src/model/OnsTraceQueryByMsgIdRequest.cc

@@ -25,28 +25,6 @@ OnsTraceQueryByMsgIdRequest::OnsTraceQueryByMsgIdRequest() :
 OnsTraceQueryByMsgIdRequest::~OnsTraceQueryByMsgIdRequest()
 {}
 
-std::string OnsTraceQueryByMsgIdRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsTraceQueryByMsgIdRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
-std::string OnsTraceQueryByMsgIdRequest::getTopic()const
-{
-	return topic_;
-}
-
-void OnsTraceQueryByMsgIdRequest::setTopic(const std::string& topic)
-{
-	topic_ = topic;
-	setCoreParameter("Topic", topic);
-}
-
 std::string OnsTraceQueryByMsgIdRequest::getMsgId()const
 {
 	return msgId_;
@@ -80,3 +58,25 @@ void OnsTraceQueryByMsgIdRequest::setBeginTime(long beginTime)
 	setCoreParameter("BeginTime", std::to_string(beginTime));
 }
 
+std::string OnsTraceQueryByMsgIdRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsTraceQueryByMsgIdRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
+std::string OnsTraceQueryByMsgIdRequest::getTopic()const
+{
+	return topic_;
+}
+
+void OnsTraceQueryByMsgIdRequest::setTopic(const std::string& topic)
+{
+	topic_ = topic;
+	setCoreParameter("Topic", topic);
+}
+

ons/src/model/OnsTraceQueryByMsgIdResult.cc

@@ -35,13 +35,9 @@ OnsTraceQueryByMsgIdResult::~OnsTraceQueryByMsgIdResult()
 
 void OnsTraceQueryByMsgIdResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsTraceQueryByMsgKeyRequest.cc

@@ -25,28 +25,6 @@ OnsTraceQueryByMsgKeyRequest::OnsTraceQueryByMsgKeyRequest() :
 OnsTraceQueryByMsgKeyRequest::~OnsTraceQueryByMsgKeyRequest()
 {}
 
-std::string OnsTraceQueryByMsgKeyRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsTraceQueryByMsgKeyRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
-std::string OnsTraceQueryByMsgKeyRequest::getTopic()const
-{
-	return topic_;
-}
-
-void OnsTraceQueryByMsgKeyRequest::setTopic(const std::string& topic)
-{
-	topic_ = topic;
-	setCoreParameter("Topic", topic);
-}
-
 long OnsTraceQueryByMsgKeyRequest::getEndTime()const
 {
 	return endTime_;
@@ -69,6 +47,28 @@ void OnsTraceQueryByMsgKeyRequest::setBeginTime(long beginTime)
 	setCoreParameter("BeginTime", std::to_string(beginTime));
 }
 
+std::string OnsTraceQueryByMsgKeyRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsTraceQueryByMsgKeyRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
+std::string OnsTraceQueryByMsgKeyRequest::getTopic()const
+{
+	return topic_;
+}
+
+void OnsTraceQueryByMsgKeyRequest::setTopic(const std::string& topic)
+{
+	topic_ = topic;
+	setCoreParameter("Topic", topic);
+}
+
 std::string OnsTraceQueryByMsgKeyRequest::getMsgKey()const
 {
 	return msgKey_;

ons/src/model/OnsTraceQueryByMsgKeyResult.cc

@@ -35,13 +35,9 @@ OnsTraceQueryByMsgKeyResult::~OnsTraceQueryByMsgKeyResult()
 
 void OnsTraceQueryByMsgKeyResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsTrendGroupOutputTpsRequest.cc

@@ -36,17 +36,6 @@ void OnsTrendGroupOutputTpsRequest::setPeriod(long period)
 	setCoreParameter("Period", std::to_string(period));
 }
 
-std::string OnsTrendGroupOutputTpsRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsTrendGroupOutputTpsRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsTrendGroupOutputTpsRequest::getGroupId()const
 {
 	return groupId_;
@@ -58,17 +47,6 @@ void OnsTrendGroupOutputTpsRequest::setGroupId(const std::string& groupId)
 	setCoreParameter("GroupId", groupId);
 }
 
-std::string OnsTrendGroupOutputTpsRequest::getTopic()const
-{
-	return topic_;
-}
-
-void OnsTrendGroupOutputTpsRequest::setTopic(const std::string& topic)
-{
-	topic_ = topic;
-	setCoreParameter("Topic", topic);
-}
-
 long OnsTrendGroupOutputTpsRequest::getEndTime()const
 {
 	return endTime_;
@@ -102,3 +80,25 @@ void OnsTrendGroupOutputTpsRequest::setType(int type)
 	setCoreParameter("Type", std::to_string(type));
 }
 
+std::string OnsTrendGroupOutputTpsRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsTrendGroupOutputTpsRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
+std::string OnsTrendGroupOutputTpsRequest::getTopic()const
+{
+	return topic_;
+}
+
+void OnsTrendGroupOutputTpsRequest::setTopic(const std::string& topic)
+{
+	topic_ = topic;
+	setCoreParameter("Topic", topic);
+}
+

ons/src/model/OnsTrendGroupOutputTpsResult.cc

@@ -35,13 +35,9 @@ OnsTrendGroupOutputTpsResult::~OnsTrendGroupOutputTpsResult()
 
 void OnsTrendGroupOutputTpsResult::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 dataNode = value["Data"];
 	if(!dataNode["Title"].isNull())

ons/src/model/OnsTrendTopicInputTpsRequest.cc

@@ -36,28 +36,6 @@ void OnsTrendTopicInputTpsRequest::setPeriod(long period)
 	setCoreParameter("Period", std::to_string(period));
 }
 
-std::string OnsTrendTopicInputTpsRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsTrendTopicInputTpsRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
-std::string OnsTrendTopicInputTpsRequest::getTopic()const
-{
-	return topic_;
-}
-
-void OnsTrendTopicInputTpsRequest::setTopic(const std::string& topic)
-{
-	topic_ = topic;
-	setCoreParameter("Topic", topic);
-}
-
 long OnsTrendTopicInputTpsRequest::getEndTime()const
 {
 	return endTime_;
@@ -91,3 +69,25 @@ void OnsTrendTopicInputTpsRequest::setType(int type)
 	setCoreParameter("Type", std::to_string(type));
 }
 
+std::string OnsTrendTopicInputTpsRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsTrendTopicInputTpsRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
+std::string OnsTrendTopicInputTpsRequest::getTopic()const
+{
+	return topic_;
+}
+
+void OnsTrendTopicInputTpsRequest::setTopic(const std::string& topic)
+{
+	topic_ = topic;
+	setCoreParameter("Topic", topic);
+}
+

ons/src/model/OnsTrendTopicInputTpsResult.cc

@@ -35,13 +35,9 @@ OnsTrendTopicInputTpsResult::~OnsTrendTopicInputTpsResult()
 
 void OnsTrendTopicInputTpsResult::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 dataNode = value["Data"];
 	if(!dataNode["Title"].isNull())

ons/src/model/OnsWarnCreateRequest.cc

@@ -25,28 +25,6 @@ OnsWarnCreateRequest::OnsWarnCreateRequest() :
 OnsWarnCreateRequest::~OnsWarnCreateRequest()
 {}
 
-std::string OnsWarnCreateRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsWarnCreateRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
-std::string OnsWarnCreateRequest::getBlockTime()const
-{
-	return blockTime_;
-}
-
-void OnsWarnCreateRequest::setBlockTime(const std::string& blockTime)
-{
-	blockTime_ = blockTime;
-	setCoreParameter("BlockTime", blockTime);
-}
-
 std::string OnsWarnCreateRequest::getLevel()const
 {
 	return level_;
@@ -80,17 +58,6 @@ void OnsWarnCreateRequest::setDelayTime(const std::string& delayTime)
 	setCoreParameter("DelayTime", delayTime);
 }
 
-std::string OnsWarnCreateRequest::getTopic()const
-{
-	return topic_;
-}
-
-void OnsWarnCreateRequest::setTopic(const std::string& topic)
-{
-	topic_ = topic;
-	setCoreParameter("Topic", topic);
-}
-
 std::string OnsWarnCreateRequest::getThreshold()const
 {
 	return threshold_;
@@ -113,6 +80,39 @@ void OnsWarnCreateRequest::setAlertTime(const std::string& alertTime)
 	setCoreParameter("AlertTime", alertTime);
 }
 
+std::string OnsWarnCreateRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsWarnCreateRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
+std::string OnsWarnCreateRequest::getBlockTime()const
+{
+	return blockTime_;
+}
+
+void OnsWarnCreateRequest::setBlockTime(const std::string& blockTime)
+{
+	blockTime_ = blockTime;
+	setCoreParameter("BlockTime", blockTime);
+}
+
+std::string OnsWarnCreateRequest::getTopic()const
+{
+	return topic_;
+}
+
+void OnsWarnCreateRequest::setTopic(const std::string& topic)
+{
+	topic_ = topic;
+	setCoreParameter("Topic", topic);
+}
+
 std::string OnsWarnCreateRequest::getContacts()const
 {
 	return contacts_;

ons/src/model/OnsWarnCreateResult.cc

@@ -35,13 +35,9 @@ OnsWarnCreateResult::~OnsWarnCreateResult()
 
 void OnsWarnCreateResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();

ons/src/model/OnsWarnDeleteRequest.cc

@@ -25,17 +25,6 @@ OnsWarnDeleteRequest::OnsWarnDeleteRequest() :
 OnsWarnDeleteRequest::~OnsWarnDeleteRequest()
 {}
 
-std::string OnsWarnDeleteRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void OnsWarnDeleteRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setCoreParameter("InstanceId", instanceId);
-}
-
 std::string OnsWarnDeleteRequest::getGroupId()const
 {
 	return groupId_;
@@ -47,6 +36,17 @@ void OnsWarnDeleteRequest::setGroupId(const std::string& groupId)
 	setCoreParameter("GroupId", groupId);
 }
 
+std::string OnsWarnDeleteRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void OnsWarnDeleteRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setCoreParameter("InstanceId", instanceId);
+}
+
 std::string OnsWarnDeleteRequest::getTopic()const
 {
 	return topic_;

ons/src/model/OnsWarnDeleteResult.cc

@@ -35,13 +35,9 @@ OnsWarnDeleteResult::~OnsWarnDeleteResult()
 
 void OnsWarnDeleteResult::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["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();