Support the IP restrictions in ram policy.

CHANGELOG

@@ -1,3 +1,6 @@
+2021-11-23 Version: 1.36.939
+- Support the IP restrictions in ram policy.
+
 2021-11-19 Version: 1.36.938
 - Add site monitoring dial DNS_ match_ rule.
 

VERSION

@@ -1 +1 @@
-1.36.938
+1.36.939

ons/include/alibabacloud/ons/model/ListTagResourcesResult.h

@@ -34,8 +34,8 @@ namespace AlibabaCloud
 			public:
 				struct TagResource
 				{
-					std::string resourceId;
 					std::string instanceId;
+					std::string resourceId;
 					std::string tagKey;
 					std::string resourceType;
 					std::string tagValue;

ons/include/alibabacloud/ons/model/OnsConsumerAccumulateResult.h

@@ -38,14 +38,14 @@ namespace AlibabaCloud
 					{
 						long lastTimestamp;
 						long totalDiff;
-						std::string topic;
 						long delayTime;
+						std::string topic;
 					};
 					float consumeTps;
 					long lastTimestamp;
 					long totalDiff;
-					bool online;
 					long delayTime;
+					bool online;
 					std::vector<DetailInTopicDo> detailInTopicList;
 				};
 

ons/include/alibabacloud/ons/model/OnsConsumerStatusResult.h

@@ -38,26 +38,12 @@ namespace AlibabaCloud
 					{
 						std::string clientAddr;
 						std::string language;
-						std::string version;
 						std::string remoteIP;
+						std::string version;
 						std::string clientId;
 					};
-					struct DetailInTopicDo
-					{
-						long lastTimestamp;
-						long totalDiff;
-						std::string topic;
-						long delayTime;
-					};
 					struct ConsumerConnectionInfoDo
 					{
-						struct SubscriptionData
-						{
-							std::string subString;
-							std::vector<std::string> tagsSet;
-							std::string topic;
-							long subVersion;
-						};
 						struct ConsumerRunningDataDo
 						{
 							float okTps;
@@ -67,6 +53,13 @@ namespace AlibabaCloud
 							long failedCountPerHour;
 							std::string groupId;
 						};
+						struct SubscriptionData
+						{
+							std::string subString;
+							std::vector<std::string> tagsSet;
+							std::string topic;
+							long subVersion;
+						};
 						struct ThreadTrackDo
 						{
 							std::vector<std::string> trackList;
@@ -85,6 +78,13 @@ namespace AlibabaCloud
 						long startTimeStamp;
 						std::vector<ConsumerConnectionInfoDo::ThreadTrackDo> jstack;
 					};
+					struct DetailInTopicDo
+					{
+						long lastTimestamp;
+						long totalDiff;
+						long delayTime;
+						std::string topic;
+					};
 					std::vector<ConsumerConnectionInfoDo> consumerConnectionInfoList;
 					std::string consumeModel;
 					float consumeTps;
@@ -94,8 +94,8 @@ namespace AlibabaCloud
 					bool rebalanceOK;
 					long totalDiff;
 					std::vector<ConnectionDo> connectionSet;
-					bool online;
 					long delayTime;
+					bool online;
 					std::vector<DetailInTopicDo> detailInTopicList;
 				};
 

ons/include/alibabacloud/ons/model/OnsDLQMessageGetByIdResult.h

@@ -51,8 +51,8 @@ namespace AlibabaCloud
 					std::string storeHost;
 					std::vector<MessageProperty> propertyList;
 					std::string topic;
-					std::string body;
 					int reconsumeTimes;
+					std::string body;
 				};
 
 

ons/include/alibabacloud/ons/model/OnsDLQMessagePageQueryByGroupIdResult.h

@@ -53,8 +53,8 @@ namespace AlibabaCloud
 						std::string storeHost;
 						std::vector<OnsRestMessageDo::MessageProperty> propertyList;
 						std::string topic;
-						std::string body;
 						int reconsumeTimes;
+						std::string body;
 					};
 					std::string taskId;
 					long currentPage;

ons/include/alibabacloud/ons/model/OnsInstanceBaseInfoResult.h

@@ -42,11 +42,11 @@ namespace AlibabaCloud
 						std::string httpInternetSecureEndpoint;
 					};
 					Endpoints endpoints;
-					std::string instanceName;
 					long maxTps;
+					std::string instanceName;
 					int topicCapacity;
-					std::string instanceId;
 					long releaseTime;
+					std::string instanceId;
 					int instanceStatus;
 					bool independentNaming;
 					int instanceType;

ons/include/alibabacloud/ons/model/OnsInstanceInServiceListResult.h

@@ -40,8 +40,8 @@ namespace AlibabaCloud
 						std::string key;
 					};
 					std::string instanceName;
-					std::string instanceId;
 					long releaseTime;
+					std::string instanceId;
 					int instanceStatus;
 					bool independentNaming;
 					int instanceType;

ons/include/alibabacloud/ons/model/OnsMessageGetByKeyResult.h

@@ -51,8 +51,8 @@ namespace AlibabaCloud
 					std::string storeHost;
 					std::vector<OnsRestMessageDo::MessageProperty> propertyList;
 					std::string topic;
-					std::string body;
 					int reconsumeTimes;
+					std::string body;
 				};
 
 

ons/include/alibabacloud/ons/model/OnsMessageGetByMsgIdResult.h

@@ -51,8 +51,8 @@ namespace AlibabaCloud
 					std::string storeHost;
 					std::vector<MessageProperty> propertyList;
 					std::string topic;
-					std::string body;
 					int reconsumeTimes;
+					std::string body;
 				};
 
 

ons/include/alibabacloud/ons/model/OnsMessagePageQueryByTopicResult.h

@@ -53,8 +53,8 @@ namespace AlibabaCloud
 						std::string storeHost;
 						std::vector<OnsRestMessageDo::MessageProperty> propertyList;
 						std::string topic;
-						std::string body;
 						int reconsumeTimes;
+						std::string body;
 					};
 					std::string taskId;
 					long currentPage;

ons/include/alibabacloud/ons/model/OnsMqttGroupIdListResult.h

@@ -39,10 +39,10 @@ namespace AlibabaCloud
 					std::string instanceId;
 					long createTime;
 					long updateTime;
-					long id;
 					bool independentNaming;
-					int channelId;
+					long id;
 					std::string topic;
+					int channelId;
 					std::string groupId;
 				};
 

ons/include/alibabacloud/ons/model/OnsTraceGetResultResult.h

@@ -40,8 +40,8 @@ namespace AlibabaCloud
 						{
 							struct SubClientInfoDo
 							{
-								int costTime;
 								std::string status;
+								int costTime;
 								std::string clientHost;
 								long subTime;
 								std::string subGroupName;
@@ -52,8 +52,8 @@ namespace AlibabaCloud
 							int successCount;
 							std::vector<SubMapDo::SubClientInfoDo> clientList;
 						};
-						int costTime;
 						std::string status;
+						int costTime;
 						std::string msgKey;
 						std::vector<TraceMapDo::SubMapDo> subList;
 						std::string tag;
@@ -66,9 +66,9 @@ namespace AlibabaCloud
 					std::string status;
 					std::string instanceId;
 					std::string userId;
-					std::string queryId;
 					std::string msgKey;
 					long createTime;
+					std::string queryId;
 					long updateTime;
 					std::vector<TraceMapDo> traceList;
 					std::string topic;

ons/src/model/ListTagResourcesResult.cc

@@ -43,16 +43,16 @@ void ListTagResourcesResult::parse(const std::string &payload)
 	for (auto valueTagResourcesTagResource : allTagResourcesNode)
 	{
 		TagResource tagResourcesObject;
-		if(!valueTagResourcesTagResource["TagKey"].isNull())
-			tagResourcesObject.tagKey = valueTagResourcesTagResource["TagKey"].asString();
-		if(!valueTagResourcesTagResource["TagValue"].isNull())
-			tagResourcesObject.tagValue = valueTagResourcesTagResource["TagValue"].asString();
 		if(!valueTagResourcesTagResource["ResourceType"].isNull())
 			tagResourcesObject.resourceType = valueTagResourcesTagResource["ResourceType"].asString();
-		if(!valueTagResourcesTagResource["ResourceId"].isNull())
-			tagResourcesObject.resourceId = valueTagResourcesTagResource["ResourceId"].asString();
 		if(!valueTagResourcesTagResource["InstanceId"].isNull())
 			tagResourcesObject.instanceId = valueTagResourcesTagResource["InstanceId"].asString();
+		if(!valueTagResourcesTagResource["TagValue"].isNull())
+			tagResourcesObject.tagValue = valueTagResourcesTagResource["TagValue"].asString();
+		if(!valueTagResourcesTagResource["ResourceId"].isNull())
+			tagResourcesObject.resourceId = valueTagResourcesTagResource["ResourceId"].asString();
+		if(!valueTagResourcesTagResource["TagKey"].isNull())
+			tagResourcesObject.tagKey = valueTagResourcesTagResource["TagKey"].asString();
 		tagResources_.push_back(tagResourcesObject);
 	}
 	if(!value["NextToken"].isNull())

ons/src/model/OnsConsumerAccumulateResult.cc

@@ -40,28 +40,28 @@ void OnsConsumerAccumulateResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
-	if(!dataNode["Online"].isNull())
-		data_.online = dataNode["Online"].asString() == "true";
-	if(!dataNode["TotalDiff"].isNull())
-		data_.totalDiff = std::stol(dataNode["TotalDiff"].asString());
 	if(!dataNode["ConsumeTps"].isNull())
 		data_.consumeTps = std::stof(dataNode["ConsumeTps"].asString());
-	if(!dataNode["LastTimestamp"].isNull())
-		data_.lastTimestamp = std::stol(dataNode["LastTimestamp"].asString());
 	if(!dataNode["DelayTime"].isNull())
 		data_.delayTime = std::stol(dataNode["DelayTime"].asString());
+	if(!dataNode["LastTimestamp"].isNull())
+		data_.lastTimestamp = std::stol(dataNode["LastTimestamp"].asString());
+	if(!dataNode["TotalDiff"].isNull())
+		data_.totalDiff = std::stol(dataNode["TotalDiff"].asString());
+	if(!dataNode["Online"].isNull())
+		data_.online = dataNode["Online"].asString() == "true";
 	auto allDetailInTopicListNode = dataNode["DetailInTopicList"]["DetailInTopicDo"];
 	for (auto dataNodeDetailInTopicListDetailInTopicDo : allDetailInTopicListNode)
 	{
 		Data::DetailInTopicDo detailInTopicDoObject;
-		if(!dataNodeDetailInTopicListDetailInTopicDo["Topic"].isNull())
-			detailInTopicDoObject.topic = dataNodeDetailInTopicListDetailInTopicDo["Topic"].asString();
+		if(!dataNodeDetailInTopicListDetailInTopicDo["DelayTime"].isNull())
+			detailInTopicDoObject.delayTime = std::stol(dataNodeDetailInTopicListDetailInTopicDo["DelayTime"].asString());
 		if(!dataNodeDetailInTopicListDetailInTopicDo["TotalDiff"].isNull())
 			detailInTopicDoObject.totalDiff = std::stol(dataNodeDetailInTopicListDetailInTopicDo["TotalDiff"].asString());
 		if(!dataNodeDetailInTopicListDetailInTopicDo["LastTimestamp"].isNull())
 			detailInTopicDoObject.lastTimestamp = std::stol(dataNodeDetailInTopicListDetailInTopicDo["LastTimestamp"].asString());
-		if(!dataNodeDetailInTopicListDetailInTopicDo["DelayTime"].isNull())
-			detailInTopicDoObject.delayTime = std::stol(dataNodeDetailInTopicListDetailInTopicDo["DelayTime"].asString());
+		if(!dataNodeDetailInTopicListDetailInTopicDo["Topic"].isNull())
+			detailInTopicDoObject.topic = dataNodeDetailInTopicListDetailInTopicDo["Topic"].asString();
 		data_.detailInTopicList.push_back(detailInTopicDoObject);
 	}
 	if(!value["HelpUrl"].isNull())

ons/src/model/OnsConsumerGetConnectionResult.cc

@@ -44,14 +44,14 @@ void OnsConsumerGetConnectionResult::parse(const std::string &payload)
 	for (auto dataNodeConnectionListConnectionDo : allConnectionListNode)
 	{
 		Data::ConnectionDo connectionDoObject;
-		if(!dataNodeConnectionListConnectionDo["ClientId"].isNull())
-			connectionDoObject.clientId = dataNodeConnectionListConnectionDo["ClientId"].asString();
+		if(!dataNodeConnectionListConnectionDo["Version"].isNull())
+			connectionDoObject.version = dataNodeConnectionListConnectionDo["Version"].asString();
 		if(!dataNodeConnectionListConnectionDo["ClientAddr"].isNull())
 			connectionDoObject.clientAddr = dataNodeConnectionListConnectionDo["ClientAddr"].asString();
 		if(!dataNodeConnectionListConnectionDo["Language"].isNull())
 			connectionDoObject.language = dataNodeConnectionListConnectionDo["Language"].asString();
-		if(!dataNodeConnectionListConnectionDo["Version"].isNull())
-			connectionDoObject.version = dataNodeConnectionListConnectionDo["Version"].asString();
+		if(!dataNodeConnectionListConnectionDo["ClientId"].isNull())
+			connectionDoObject.clientId = dataNodeConnectionListConnectionDo["ClientId"].asString();
 		data_.connectionList.push_back(connectionDoObject);
 	}
 	if(!value["HelpUrl"].isNull())

ons/src/model/OnsConsumerStatusResult.cc

@@ -40,109 +40,95 @@ void OnsConsumerStatusResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
-	if(!dataNode["Online"].isNull())
-		data_.online = dataNode["Online"].asString() == "true";
-	if(!dataNode["TotalDiff"].isNull())
-		data_.totalDiff = std::stol(dataNode["TotalDiff"].asString());
 	if(!dataNode["ConsumeTps"].isNull())
 		data_.consumeTps = std::stof(dataNode["ConsumeTps"].asString());
-	if(!dataNode["LastTimestamp"].isNull())
-		data_.lastTimestamp = std::stol(dataNode["LastTimestamp"].asString());
-	if(!dataNode["DelayTime"].isNull())
-		data_.delayTime = std::stol(dataNode["DelayTime"].asString());
 	if(!dataNode["ConsumeModel"].isNull())
 		data_.consumeModel = dataNode["ConsumeModel"].asString();
+	if(!dataNode["TotalDiff"].isNull())
+		data_.totalDiff = std::stol(dataNode["TotalDiff"].asString());
+	if(!dataNode["InstanceId"].isNull())
+		data_.instanceId = dataNode["InstanceId"].asString();
 	if(!dataNode["SubscriptionSame"].isNull())
 		data_.subscriptionSame = dataNode["SubscriptionSame"].asString() == "true";
+	if(!dataNode["DelayTime"].isNull())
+		data_.delayTime = std::stol(dataNode["DelayTime"].asString());
+	if(!dataNode["LastTimestamp"].isNull())
+		data_.lastTimestamp = std::stol(dataNode["LastTimestamp"].asString());
+	if(!dataNode["Online"].isNull())
+		data_.online = dataNode["Online"].asString() == "true";
 	if(!dataNode["RebalanceOK"].isNull())
 		data_.rebalanceOK = dataNode["RebalanceOK"].asString() == "true";
-	if(!dataNode["InstanceId"].isNull())
-		data_.instanceId = dataNode["InstanceId"].asString();
 	auto allConnectionSetNode = dataNode["ConnectionSet"]["ConnectionDo"];
 	for (auto dataNodeConnectionSetConnectionDo : allConnectionSetNode)
 	{
 		Data::ConnectionDo connectionDoObject;
-		if(!dataNodeConnectionSetConnectionDo["ClientId"].isNull())
-			connectionDoObject.clientId = dataNodeConnectionSetConnectionDo["ClientId"].asString();
+		if(!dataNodeConnectionSetConnectionDo["RemoteIP"].isNull())
+			connectionDoObject.remoteIP = dataNodeConnectionSetConnectionDo["RemoteIP"].asString();
+		if(!dataNodeConnectionSetConnectionDo["Version"].isNull())
+			connectionDoObject.version = dataNodeConnectionSetConnectionDo["Version"].asString();
 		if(!dataNodeConnectionSetConnectionDo["ClientAddr"].isNull())
 			connectionDoObject.clientAddr = dataNodeConnectionSetConnectionDo["ClientAddr"].asString();
 		if(!dataNodeConnectionSetConnectionDo["Language"].isNull())
 			connectionDoObject.language = dataNodeConnectionSetConnectionDo["Language"].asString();
-		if(!dataNodeConnectionSetConnectionDo["Version"].isNull())
-			connectionDoObject.version = dataNodeConnectionSetConnectionDo["Version"].asString();
-		if(!dataNodeConnectionSetConnectionDo["RemoteIP"].isNull())
-			connectionDoObject.remoteIP = dataNodeConnectionSetConnectionDo["RemoteIP"].asString();
+		if(!dataNodeConnectionSetConnectionDo["ClientId"].isNull())
+			connectionDoObject.clientId = dataNodeConnectionSetConnectionDo["ClientId"].asString();
 		data_.connectionSet.push_back(connectionDoObject);
 	}
-	auto allDetailInTopicListNode = dataNode["DetailInTopicList"]["DetailInTopicDo"];
-	for (auto dataNodeDetailInTopicListDetailInTopicDo : allDetailInTopicListNode)
-	{
-		Data::DetailInTopicDo detailInTopicDoObject;
-		if(!dataNodeDetailInTopicListDetailInTopicDo["Topic"].isNull())
-			detailInTopicDoObject.topic = dataNodeDetailInTopicListDetailInTopicDo["Topic"].asString();
-		if(!dataNodeDetailInTopicListDetailInTopicDo["TotalDiff"].isNull())
-			detailInTopicDoObject.totalDiff = std::stol(dataNodeDetailInTopicListDetailInTopicDo["TotalDiff"].asString());
-		if(!dataNodeDetailInTopicListDetailInTopicDo["LastTimestamp"].isNull())
-			detailInTopicDoObject.lastTimestamp = std::stol(dataNodeDetailInTopicListDetailInTopicDo["LastTimestamp"].asString());
-		if(!dataNodeDetailInTopicListDetailInTopicDo["DelayTime"].isNull())
-			detailInTopicDoObject.delayTime = std::stol(dataNodeDetailInTopicListDetailInTopicDo["DelayTime"].asString());
-		data_.detailInTopicList.push_back(detailInTopicDoObject);
-	}
 	auto allConsumerConnectionInfoListNode = dataNode["ConsumerConnectionInfoList"]["ConsumerConnectionInfoDo"];
 	for (auto dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo : allConsumerConnectionInfoListNode)
 	{
 		Data::ConsumerConnectionInfoDo consumerConnectionInfoDoObject;
+		if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["ConsumeModel"].isNull())
+			consumerConnectionInfoDoObject.consumeModel = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["ConsumeModel"].asString();
+		if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["LastTimeStamp"].isNull())
+			consumerConnectionInfoDoObject.lastTimeStamp = std::stol(dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["LastTimeStamp"].asString());
+		if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["StartTimeStamp"].isNull())
+			consumerConnectionInfoDoObject.startTimeStamp = std::stol(dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["StartTimeStamp"].asString());
+		if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["Language"].isNull())
+			consumerConnectionInfoDoObject.language = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["Language"].asString();
 		if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["ClientId"].isNull())
 			consumerConnectionInfoDoObject.clientId = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["ClientId"].asString();
 		if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["Connection"].isNull())
 			consumerConnectionInfoDoObject.connection = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["Connection"].asString();
-		if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["Language"].isNull())
-			consumerConnectionInfoDoObject.language = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["Language"].asString();
 		if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["Version"].isNull())
 			consumerConnectionInfoDoObject.version = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["Version"].asString();
-		if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["ConsumeModel"].isNull())
-			consumerConnectionInfoDoObject.consumeModel = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["ConsumeModel"].asString();
 		if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["ConsumeType"].isNull())
 			consumerConnectionInfoDoObject.consumeType = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["ConsumeType"].asString();
 		if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["ThreadCount"].isNull())
 			consumerConnectionInfoDoObject.threadCount = std::stoi(dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["ThreadCount"].asString());
-		if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["StartTimeStamp"].isNull())
-			consumerConnectionInfoDoObject.startTimeStamp = std::stol(dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["StartTimeStamp"].asString());
-		if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["LastTimeStamp"].isNull())
-			consumerConnectionInfoDoObject.lastTimeStamp = std::stol(dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["LastTimeStamp"].asString());
-		auto allSubscriptionSetNode = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["SubscriptionSet"]["SubscriptionData"];
-		for (auto dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoSubscriptionSetSubscriptionData : allSubscriptionSetNode)
-		{
-			Data::ConsumerConnectionInfoDo::SubscriptionData subscriptionSetObject;
-			if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoSubscriptionSetSubscriptionData["Topic"].isNull())
-				subscriptionSetObject.topic = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoSubscriptionSetSubscriptionData["Topic"].asString();
-			if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoSubscriptionSetSubscriptionData["SubString"].isNull())
-				subscriptionSetObject.subString = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoSubscriptionSetSubscriptionData["SubString"].asString();
-			if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoSubscriptionSetSubscriptionData["SubVersion"].isNull())
-				subscriptionSetObject.subVersion = std::stol(dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoSubscriptionSetSubscriptionData["SubVersion"].asString());
-			auto allTagsSet = value["TagsSet"]["Tag"];
-			for (auto value : allTagsSet)
-				subscriptionSetObject.tagsSet.push_back(value.asString());
-			consumerConnectionInfoDoObject.subscriptionSet.push_back(subscriptionSetObject);
-		}
 		auto allRunningDataListNode = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["RunningDataList"]["ConsumerRunningDataDo"];
 		for (auto dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo : allRunningDataListNode)
 		{
 			Data::ConsumerConnectionInfoDo::ConsumerRunningDataDo runningDataListObject;
 			if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["GroupId"].isNull())
 				runningDataListObject.groupId = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["GroupId"].asString();
-			if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["Topic"].isNull())
-				runningDataListObject.topic = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["Topic"].asString();
 			if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["Rt"].isNull())
 				runningDataListObject.rt = std::stof(dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["Rt"].asString());
+			if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["Topic"].isNull())
+				runningDataListObject.topic = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["Topic"].asString();
+			if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["FailedCountPerHour"].isNull())
+				runningDataListObject.failedCountPerHour = std::stol(dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["FailedCountPerHour"].asString());
 			if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["OkTps"].isNull())
 				runningDataListObject.okTps = std::stof(dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["OkTps"].asString());
 			if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["FailedTps"].isNull())
 				runningDataListObject.failedTps = std::stof(dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["FailedTps"].asString());
-			if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["FailedCountPerHour"].isNull())
-				runningDataListObject.failedCountPerHour = std::stol(dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoRunningDataListConsumerRunningDataDo["FailedCountPerHour"].asString());
 			consumerConnectionInfoDoObject.runningDataList.push_back(runningDataListObject);
 		}
+		auto allSubscriptionSetNode = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["SubscriptionSet"]["SubscriptionData"];
+		for (auto dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoSubscriptionSetSubscriptionData : allSubscriptionSetNode)
+		{
+			Data::ConsumerConnectionInfoDo::SubscriptionData subscriptionSetObject;
+			if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoSubscriptionSetSubscriptionData["SubString"].isNull())
+				subscriptionSetObject.subString = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoSubscriptionSetSubscriptionData["SubString"].asString();
+			if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoSubscriptionSetSubscriptionData["SubVersion"].isNull())
+				subscriptionSetObject.subVersion = std::stol(dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoSubscriptionSetSubscriptionData["SubVersion"].asString());
+			if(!dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoSubscriptionSetSubscriptionData["Topic"].isNull())
+				subscriptionSetObject.topic = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoSubscriptionSetSubscriptionData["Topic"].asString();
+			auto allTagsSet = value["TagsSet"]["Tag"];
+			for (auto value : allTagsSet)
+				subscriptionSetObject.tagsSet.push_back(value.asString());
+			consumerConnectionInfoDoObject.subscriptionSet.push_back(subscriptionSetObject);
+		}
 		auto allJstackNode = dataNodeConsumerConnectionInfoListConsumerConnectionInfoDo["Jstack"]["ThreadTrackDo"];
 		for (auto dataNodeConsumerConnectionInfoListConsumerConnectionInfoDoJstackThreadTrackDo : allJstackNode)
 		{
@@ -156,6 +142,20 @@ void OnsConsumerStatusResult::parse(const std::string &payload)
 		}
 		data_.consumerConnectionInfoList.push_back(consumerConnectionInfoDoObject);
 	}
+	auto allDetailInTopicListNode = dataNode["DetailInTopicList"]["DetailInTopicDo"];
+	for (auto dataNodeDetailInTopicListDetailInTopicDo : allDetailInTopicListNode)
+	{
+		Data::DetailInTopicDo detailInTopicDoObject;
+		if(!dataNodeDetailInTopicListDetailInTopicDo["DelayTime"].isNull())
+			detailInTopicDoObject.delayTime = std::stol(dataNodeDetailInTopicListDetailInTopicDo["DelayTime"].asString());
+		if(!dataNodeDetailInTopicListDetailInTopicDo["TotalDiff"].isNull())
+			detailInTopicDoObject.totalDiff = std::stol(dataNodeDetailInTopicListDetailInTopicDo["TotalDiff"].asString());
+		if(!dataNodeDetailInTopicListDetailInTopicDo["LastTimestamp"].isNull())
+			detailInTopicDoObject.lastTimestamp = std::stol(dataNodeDetailInTopicListDetailInTopicDo["LastTimestamp"].asString());
+		if(!dataNodeDetailInTopicListDetailInTopicDo["Topic"].isNull())
+			detailInTopicDoObject.topic = dataNodeDetailInTopicListDetailInTopicDo["Topic"].asString();
+		data_.detailInTopicList.push_back(detailInTopicDoObject);
+	}
 	if(!value["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();
 

ons/src/model/OnsConsumerTimeSpanResult.cc

@@ -40,14 +40,14 @@ void OnsConsumerTimeSpanResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
-	if(!dataNode["Topic"].isNull())
-		data_.topic = dataNode["Topic"].asString();
-	if(!dataNode["MinTimeStamp"].isNull())
-		data_.minTimeStamp = std::stol(dataNode["MinTimeStamp"].asString());
 	if(!dataNode["MaxTimeStamp"].isNull())
 		data_.maxTimeStamp = std::stol(dataNode["MaxTimeStamp"].asString());
 	if(!dataNode["ConsumeTimeStamp"].isNull())
 		data_.consumeTimeStamp = std::stol(dataNode["ConsumeTimeStamp"].asString());
+	if(!dataNode["Topic"].isNull())
+		data_.topic = dataNode["Topic"].asString();
+	if(!dataNode["MinTimeStamp"].isNull())
+		data_.minTimeStamp = std::stol(dataNode["MinTimeStamp"].asString());
 	if(!dataNode["InstanceId"].isNull())
 		data_.instanceId = dataNode["InstanceId"].asString();
 	if(!value["HelpUrl"].isNull())

ons/src/model/OnsDLQMessageGetByIdResult.cc

@@ -40,40 +40,40 @@ void OnsDLQMessageGetByIdResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
-	if(!dataNode["Topic"].isNull())
-		data_.topic = dataNode["Topic"].asString();
-	if(!dataNode["Flag"].isNull())
-		data_.flag = std::stoi(dataNode["Flag"].asString());
-	if(!dataNode["Body"].isNull())
-		data_.body = dataNode["Body"].asString();
+	if(!dataNode["OffsetId"].isNull())
+		data_.offsetId = dataNode["OffsetId"].asString();
 	if(!dataNode["StoreSize"].isNull())
 		data_.storeSize = std::stoi(dataNode["StoreSize"].asString());
-	if(!dataNode["BornTimestamp"].isNull())
-		data_.bornTimestamp = std::stol(dataNode["BornTimestamp"].asString());
-	if(!dataNode["BornHost"].isNull())
-		data_.bornHost = dataNode["BornHost"].asString();
+	if(!dataNode["ReconsumeTimes"].isNull())
+		data_.reconsumeTimes = std::stoi(dataNode["ReconsumeTimes"].asString());
 	if(!dataNode["StoreTimestamp"].isNull())
 		data_.storeTimestamp = std::stol(dataNode["StoreTimestamp"].asString());
-	if(!dataNode["StoreHost"].isNull())
-		data_.storeHost = dataNode["StoreHost"].asString();
+	if(!dataNode["Body"].isNull())
+		data_.body = dataNode["Body"].asString();
+	if(!dataNode["InstanceId"].isNull())
+		data_.instanceId = dataNode["InstanceId"].asString();
 	if(!dataNode["MsgId"].isNull())
 		data_.msgId = dataNode["MsgId"].asString();
-	if(!dataNode["OffsetId"].isNull())
-		data_.offsetId = dataNode["OffsetId"].asString();
+	if(!dataNode["Flag"].isNull())
+		data_.flag = std::stoi(dataNode["Flag"].asString());
+	if(!dataNode["StoreHost"].isNull())
+		data_.storeHost = dataNode["StoreHost"].asString();
+	if(!dataNode["Topic"].isNull())
+		data_.topic = dataNode["Topic"].asString();
+	if(!dataNode["BornTimestamp"].isNull())
+		data_.bornTimestamp = std::stol(dataNode["BornTimestamp"].asString());
 	if(!dataNode["BodyCRC"].isNull())
 		data_.bodyCRC = std::stoi(dataNode["BodyCRC"].asString());
-	if(!dataNode["ReconsumeTimes"].isNull())
-		data_.reconsumeTimes = std::stoi(dataNode["ReconsumeTimes"].asString());
-	if(!dataNode["InstanceId"].isNull())
-		data_.instanceId = dataNode["InstanceId"].asString();
+	if(!dataNode["BornHost"].isNull())
+		data_.bornHost = dataNode["BornHost"].asString();
 	auto allPropertyListNode = dataNode["PropertyList"]["MessageProperty"];
 	for (auto dataNodePropertyListMessageProperty : allPropertyListNode)
 	{
 		Data::MessageProperty messagePropertyObject;
-		if(!dataNodePropertyListMessageProperty["Name"].isNull())
-			messagePropertyObject.name = dataNodePropertyListMessageProperty["Name"].asString();
 		if(!dataNodePropertyListMessageProperty["Value"].isNull())
 			messagePropertyObject.value = dataNodePropertyListMessageProperty["Value"].asString();
+		if(!dataNodePropertyListMessageProperty["Name"].isNull())
+			messagePropertyObject.name = dataNodePropertyListMessageProperty["Name"].asString();
 		data_.propertyList.push_back(messagePropertyObject);
 	}
 	if(!value["HelpUrl"].isNull())

ons/src/model/OnsDLQMessagePageQueryByGroupIdResult.cc

@@ -40,50 +40,50 @@ void OnsDLQMessagePageQueryByGroupIdResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto msgFoundDoNode = value["MsgFoundDo"];
-	if(!msgFoundDoNode["TaskId"].isNull())
-		msgFoundDo_.taskId = msgFoundDoNode["TaskId"].asString();
-	if(!msgFoundDoNode["MaxPageCount"].isNull())
-		msgFoundDo_.maxPageCount = std::stol(msgFoundDoNode["MaxPageCount"].asString());
 	if(!msgFoundDoNode["CurrentPage"].isNull())
 		msgFoundDo_.currentPage = std::stol(msgFoundDoNode["CurrentPage"].asString());
+	if(!msgFoundDoNode["MaxPageCount"].isNull())
+		msgFoundDo_.maxPageCount = std::stol(msgFoundDoNode["MaxPageCount"].asString());
+	if(!msgFoundDoNode["TaskId"].isNull())
+		msgFoundDo_.taskId = msgFoundDoNode["TaskId"].asString();
 	auto allMsgFoundListNode = msgFoundDoNode["MsgFoundList"]["OnsRestMessageDo"];
 	for (auto msgFoundDoNodeMsgFoundListOnsRestMessageDo : allMsgFoundListNode)
 	{
 		MsgFoundDo::OnsRestMessageDo onsRestMessageDoObject;
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["Topic"].isNull())
-			onsRestMessageDoObject.topic = msgFoundDoNodeMsgFoundListOnsRestMessageDo["Topic"].asString();
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["Flag"].isNull())
-			onsRestMessageDoObject.flag = std::stoi(msgFoundDoNodeMsgFoundListOnsRestMessageDo["Flag"].asString());
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["Body"].isNull())
-			onsRestMessageDoObject.body = msgFoundDoNodeMsgFoundListOnsRestMessageDo["Body"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["OffsetId"].isNull())
+			onsRestMessageDoObject.offsetId = msgFoundDoNodeMsgFoundListOnsRestMessageDo["OffsetId"].asString();
 		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreSize"].isNull())
 			onsRestMessageDoObject.storeSize = std::stoi(msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreSize"].asString());
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornTimestamp"].isNull())
-			onsRestMessageDoObject.bornTimestamp = std::stol(msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornTimestamp"].asString());
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornHost"].isNull())
-			onsRestMessageDoObject.bornHost = msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornHost"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["ReconsumeTimes"].isNull())
+			onsRestMessageDoObject.reconsumeTimes = std::stoi(msgFoundDoNodeMsgFoundListOnsRestMessageDo["ReconsumeTimes"].asString());
 		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreTimestamp"].isNull())
 			onsRestMessageDoObject.storeTimestamp = std::stol(msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreTimestamp"].asString());
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreHost"].isNull())
-			onsRestMessageDoObject.storeHost = msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreHost"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["Body"].isNull())
+			onsRestMessageDoObject.body = msgFoundDoNodeMsgFoundListOnsRestMessageDo["Body"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["InstanceId"].isNull())
+			onsRestMessageDoObject.instanceId = msgFoundDoNodeMsgFoundListOnsRestMessageDo["InstanceId"].asString();
 		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["MsgId"].isNull())
 			onsRestMessageDoObject.msgId = msgFoundDoNodeMsgFoundListOnsRestMessageDo["MsgId"].asString();
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["OffsetId"].isNull())
-			onsRestMessageDoObject.offsetId = msgFoundDoNodeMsgFoundListOnsRestMessageDo["OffsetId"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["Flag"].isNull())
+			onsRestMessageDoObject.flag = std::stoi(msgFoundDoNodeMsgFoundListOnsRestMessageDo["Flag"].asString());
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreHost"].isNull())
+			onsRestMessageDoObject.storeHost = msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreHost"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["Topic"].isNull())
+			onsRestMessageDoObject.topic = msgFoundDoNodeMsgFoundListOnsRestMessageDo["Topic"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornTimestamp"].isNull())
+			onsRestMessageDoObject.bornTimestamp = std::stol(msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornTimestamp"].asString());
 		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["BodyCRC"].isNull())
 			onsRestMessageDoObject.bodyCRC = std::stoi(msgFoundDoNodeMsgFoundListOnsRestMessageDo["BodyCRC"].asString());
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["ReconsumeTimes"].isNull())
-			onsRestMessageDoObject.reconsumeTimes = std::stoi(msgFoundDoNodeMsgFoundListOnsRestMessageDo["ReconsumeTimes"].asString());
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["InstanceId"].isNull())
-			onsRestMessageDoObject.instanceId = msgFoundDoNodeMsgFoundListOnsRestMessageDo["InstanceId"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornHost"].isNull())
+			onsRestMessageDoObject.bornHost = msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornHost"].asString();
 		auto allPropertyListNode = msgFoundDoNodeMsgFoundListOnsRestMessageDo["PropertyList"]["MessageProperty"];
 		for (auto msgFoundDoNodeMsgFoundListOnsRestMessageDoPropertyListMessageProperty : allPropertyListNode)
 		{
 			MsgFoundDo::OnsRestMessageDo::MessageProperty propertyListObject;
-			if(!msgFoundDoNodeMsgFoundListOnsRestMessageDoPropertyListMessageProperty["Name"].isNull())
-				propertyListObject.name = msgFoundDoNodeMsgFoundListOnsRestMessageDoPropertyListMessageProperty["Name"].asString();
 			if(!msgFoundDoNodeMsgFoundListOnsRestMessageDoPropertyListMessageProperty["Value"].isNull())
 				propertyListObject.value = msgFoundDoNodeMsgFoundListOnsRestMessageDoPropertyListMessageProperty["Value"].asString();
+			if(!msgFoundDoNodeMsgFoundListOnsRestMessageDoPropertyListMessageProperty["Name"].isNull())
+				propertyListObject.name = msgFoundDoNodeMsgFoundListOnsRestMessageDoPropertyListMessageProperty["Name"].asString();
 			onsRestMessageDoObject.propertyList.push_back(propertyListObject);
 		}
 		msgFoundDo_.msgFoundList.push_back(onsRestMessageDoObject);

ons/src/model/OnsGroupListResult.cc

@@ -45,18 +45,18 @@ void OnsGroupListResult::parse(const std::string &payload)
 		SubscribeInfoDo dataObject;
 		if(!valueDataSubscribeInfoDo["Owner"].isNull())
 			dataObject.owner = valueDataSubscribeInfoDo["Owner"].asString();
-		if(!valueDataSubscribeInfoDo["GroupId"].isNull())
-			dataObject.groupId = valueDataSubscribeInfoDo["GroupId"].asString();
 		if(!valueDataSubscribeInfoDo["UpdateTime"].isNull())
 			dataObject.updateTime = std::stol(valueDataSubscribeInfoDo["UpdateTime"].asString());
-		if(!valueDataSubscribeInfoDo["Remark"].isNull())
-			dataObject.remark = valueDataSubscribeInfoDo["Remark"].asString();
-		if(!valueDataSubscribeInfoDo["InstanceId"].isNull())
-			dataObject.instanceId = valueDataSubscribeInfoDo["InstanceId"].asString();
 		if(!valueDataSubscribeInfoDo["IndependentNaming"].isNull())
 			dataObject.independentNaming = valueDataSubscribeInfoDo["IndependentNaming"].asString() == "true";
+		if(!valueDataSubscribeInfoDo["GroupId"].isNull())
+			dataObject.groupId = valueDataSubscribeInfoDo["GroupId"].asString();
+		if(!valueDataSubscribeInfoDo["Remark"].isNull())
+			dataObject.remark = valueDataSubscribeInfoDo["Remark"].asString();
 		if(!valueDataSubscribeInfoDo["CreateTime"].isNull())
 			dataObject.createTime = std::stol(valueDataSubscribeInfoDo["CreateTime"].asString());
+		if(!valueDataSubscribeInfoDo["InstanceId"].isNull())
+			dataObject.instanceId = valueDataSubscribeInfoDo["InstanceId"].asString();
 		if(!valueDataSubscribeInfoDo["GroupType"].isNull())
 			dataObject.groupType = valueDataSubscribeInfoDo["GroupType"].asString();
 		auto allTagsNode = valueDataSubscribeInfoDo["Tags"]["Tag"];

ons/src/model/OnsGroupSubDetailResult.cc

@@ -42,18 +42,18 @@ void OnsGroupSubDetailResult::parse(const std::string &payload)
 	auto dataNode = value["Data"];
 	if(!dataNode["GroupId"].isNull())
 		data_.groupId = dataNode["GroupId"].asString();
-	if(!dataNode["Online"].isNull())
-		data_.online = dataNode["Online"].asString() == "true";
 	if(!dataNode["MessageModel"].isNull())
 		data_.messageModel = dataNode["MessageModel"].asString();
+	if(!dataNode["Online"].isNull())
+		data_.online = dataNode["Online"].asString() == "true";
 	auto allSubscriptionDataListNode = dataNode["SubscriptionDataList"]["SubscriptionDataListItem"];
 	for (auto dataNodeSubscriptionDataListSubscriptionDataListItem : allSubscriptionDataListNode)
 	{
 		Data::SubscriptionDataListItem subscriptionDataListItemObject;
-		if(!dataNodeSubscriptionDataListSubscriptionDataListItem["Topic"].isNull())
-			subscriptionDataListItemObject.topic = dataNodeSubscriptionDataListSubscriptionDataListItem["Topic"].asString();
 		if(!dataNodeSubscriptionDataListSubscriptionDataListItem["SubString"].isNull())
 			subscriptionDataListItemObject.subString = dataNodeSubscriptionDataListSubscriptionDataListItem["SubString"].asString();
+		if(!dataNodeSubscriptionDataListSubscriptionDataListItem["Topic"].isNull())
+			subscriptionDataListItemObject.topic = dataNodeSubscriptionDataListSubscriptionDataListItem["Topic"].asString();
 		data_.subscriptionDataList.push_back(subscriptionDataListItemObject);
 	}
 

ons/src/model/OnsInstanceBaseInfoResult.cc

@@ -40,33 +40,33 @@ void OnsInstanceBaseInfoResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto instanceBaseInfoNode = value["InstanceBaseInfo"];
-	if(!instanceBaseInfoNode["InstanceId"].isNull())
-		instanceBaseInfo_.instanceId = instanceBaseInfoNode["InstanceId"].asString();
-	if(!instanceBaseInfoNode["InstanceStatus"].isNull())
-		instanceBaseInfo_.instanceStatus = std::stoi(instanceBaseInfoNode["InstanceStatus"].asString());
-	if(!instanceBaseInfoNode["ReleaseTime"].isNull())
-		instanceBaseInfo_.releaseTime = std::stol(instanceBaseInfoNode["ReleaseTime"].asString());
-	if(!instanceBaseInfoNode["InstanceType"].isNull())
-		instanceBaseInfo_.instanceType = std::stoi(instanceBaseInfoNode["InstanceType"].asString());
-	if(!instanceBaseInfoNode["InstanceName"].isNull())
-		instanceBaseInfo_.instanceName = instanceBaseInfoNode["InstanceName"].asString();
 	if(!instanceBaseInfoNode["IndependentNaming"].isNull())
 		instanceBaseInfo_.independentNaming = instanceBaseInfoNode["IndependentNaming"].asString() == "true";
+	if(!instanceBaseInfoNode["MaxTps"].isNull())
+		instanceBaseInfo_.maxTps = std::stol(instanceBaseInfoNode["MaxTps"].asString());
 	if(!instanceBaseInfoNode["Remark"].isNull())
 		instanceBaseInfo_.remark = instanceBaseInfoNode["Remark"].asString();
+	if(!instanceBaseInfoNode["InstanceName"].isNull())
+		instanceBaseInfo_.instanceName = instanceBaseInfoNode["InstanceName"].asString();
+	if(!instanceBaseInfoNode["ReleaseTime"].isNull())
+		instanceBaseInfo_.releaseTime = std::stol(instanceBaseInfoNode["ReleaseTime"].asString());
 	if(!instanceBaseInfoNode["TopicCapacity"].isNull())
 		instanceBaseInfo_.topicCapacity = std::stoi(instanceBaseInfoNode["TopicCapacity"].asString());
-	if(!instanceBaseInfoNode["MaxTps"].isNull())
-		instanceBaseInfo_.maxTps = std::stol(instanceBaseInfoNode["MaxTps"].asString());
+	if(!instanceBaseInfoNode["InstanceStatus"].isNull())
+		instanceBaseInfo_.instanceStatus = std::stoi(instanceBaseInfoNode["InstanceStatus"].asString());
+	if(!instanceBaseInfoNode["InstanceId"].isNull())
+		instanceBaseInfo_.instanceId = instanceBaseInfoNode["InstanceId"].asString();
+	if(!instanceBaseInfoNode["InstanceType"].isNull())
+		instanceBaseInfo_.instanceType = std::stoi(instanceBaseInfoNode["InstanceType"].asString());
 	auto endpointsNode = instanceBaseInfoNode["Endpoints"];
 	if(!endpointsNode["TcpEndpoint"].isNull())
 		instanceBaseInfo_.endpoints.tcpEndpoint = endpointsNode["TcpEndpoint"].asString();
 	if(!endpointsNode["HttpInternetEndpoint"].isNull())
 		instanceBaseInfo_.endpoints.httpInternetEndpoint = endpointsNode["HttpInternetEndpoint"].asString();
-	if(!endpointsNode["HttpInternetSecureEndpoint"].isNull())
-		instanceBaseInfo_.endpoints.httpInternetSecureEndpoint = endpointsNode["HttpInternetSecureEndpoint"].asString();
 	if(!endpointsNode["HttpInternalEndpoint"].isNull())
 		instanceBaseInfo_.endpoints.httpInternalEndpoint = endpointsNode["HttpInternalEndpoint"].asString();
+	if(!endpointsNode["HttpInternetSecureEndpoint"].isNull())
+		instanceBaseInfo_.endpoints.httpInternetSecureEndpoint = endpointsNode["HttpInternetSecureEndpoint"].asString();
 	if(!value["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();
 

ons/src/model/OnsInstanceInServiceListResult.cc

@@ -43,18 +43,18 @@ void OnsInstanceInServiceListResult::parse(const std::string &payload)
 	for (auto valueDataInstanceVO : allDataNode)
 	{
 		InstanceVO dataObject;
-		if(!valueDataInstanceVO["InstanceId"].isNull())
-			dataObject.instanceId = valueDataInstanceVO["InstanceId"].asString();
-		if(!valueDataInstanceVO["InstanceStatus"].isNull())
-			dataObject.instanceStatus = std::stoi(valueDataInstanceVO["InstanceStatus"].asString());
+		if(!valueDataInstanceVO["IndependentNaming"].isNull())
+			dataObject.independentNaming = valueDataInstanceVO["IndependentNaming"].asString() == "true";
+		if(!valueDataInstanceVO["InstanceName"].isNull())
+			dataObject.instanceName = valueDataInstanceVO["InstanceName"].asString();
 		if(!valueDataInstanceVO["ReleaseTime"].isNull())
 			dataObject.releaseTime = std::stol(valueDataInstanceVO["ReleaseTime"].asString());
+		if(!valueDataInstanceVO["InstanceStatus"].isNull())
+			dataObject.instanceStatus = std::stoi(valueDataInstanceVO["InstanceStatus"].asString());
+		if(!valueDataInstanceVO["InstanceId"].isNull())
+			dataObject.instanceId = valueDataInstanceVO["InstanceId"].asString();
 		if(!valueDataInstanceVO["InstanceType"].isNull())
 			dataObject.instanceType = std::stoi(valueDataInstanceVO["InstanceType"].asString());
-		if(!valueDataInstanceVO["InstanceName"].isNull())
-			dataObject.instanceName = valueDataInstanceVO["InstanceName"].asString();
-		if(!valueDataInstanceVO["IndependentNaming"].isNull())
-			dataObject.independentNaming = valueDataInstanceVO["IndependentNaming"].asString() == "true";
 		auto allTagsNode = valueDataInstanceVO["Tags"]["Tag"];
 		for (auto valueDataInstanceVOTagsTag : allTagsNode)
 		{

ons/src/model/OnsMessageGetByKeyResult.cc

@@ -43,40 +43,40 @@ void OnsMessageGetByKeyResult::parse(const std::string &payload)
 	for (auto valueDataOnsRestMessageDo : allDataNode)
 	{
 		OnsRestMessageDo dataObject;
-		if(!valueDataOnsRestMessageDo["Topic"].isNull())
-			dataObject.topic = valueDataOnsRestMessageDo["Topic"].asString();
-		if(!valueDataOnsRestMessageDo["Flag"].isNull())
-			dataObject.flag = std::stoi(valueDataOnsRestMessageDo["Flag"].asString());
-		if(!valueDataOnsRestMessageDo["Body"].isNull())
-			dataObject.body = valueDataOnsRestMessageDo["Body"].asString();
+		if(!valueDataOnsRestMessageDo["OffsetId"].isNull())
+			dataObject.offsetId = valueDataOnsRestMessageDo["OffsetId"].asString();
 		if(!valueDataOnsRestMessageDo["StoreSize"].isNull())
 			dataObject.storeSize = std::stoi(valueDataOnsRestMessageDo["StoreSize"].asString());
-		if(!valueDataOnsRestMessageDo["BornTimestamp"].isNull())
-			dataObject.bornTimestamp = std::stol(valueDataOnsRestMessageDo["BornTimestamp"].asString());
-		if(!valueDataOnsRestMessageDo["BornHost"].isNull())
-			dataObject.bornHost = valueDataOnsRestMessageDo["BornHost"].asString();
+		if(!valueDataOnsRestMessageDo["ReconsumeTimes"].isNull())
+			dataObject.reconsumeTimes = std::stoi(valueDataOnsRestMessageDo["ReconsumeTimes"].asString());
 		if(!valueDataOnsRestMessageDo["StoreTimestamp"].isNull())
 			dataObject.storeTimestamp = std::stol(valueDataOnsRestMessageDo["StoreTimestamp"].asString());
-		if(!valueDataOnsRestMessageDo["StoreHost"].isNull())
-			dataObject.storeHost = valueDataOnsRestMessageDo["StoreHost"].asString();
+		if(!valueDataOnsRestMessageDo["Body"].isNull())
+			dataObject.body = valueDataOnsRestMessageDo["Body"].asString();
+		if(!valueDataOnsRestMessageDo["InstanceId"].isNull())
+			dataObject.instanceId = valueDataOnsRestMessageDo["InstanceId"].asString();
 		if(!valueDataOnsRestMessageDo["MsgId"].isNull())
 			dataObject.msgId = valueDataOnsRestMessageDo["MsgId"].asString();
-		if(!valueDataOnsRestMessageDo["OffsetId"].isNull())
-			dataObject.offsetId = valueDataOnsRestMessageDo["OffsetId"].asString();
+		if(!valueDataOnsRestMessageDo["Flag"].isNull())
+			dataObject.flag = std::stoi(valueDataOnsRestMessageDo["Flag"].asString());
+		if(!valueDataOnsRestMessageDo["StoreHost"].isNull())
+			dataObject.storeHost = valueDataOnsRestMessageDo["StoreHost"].asString();
+		if(!valueDataOnsRestMessageDo["Topic"].isNull())
+			dataObject.topic = valueDataOnsRestMessageDo["Topic"].asString();
+		if(!valueDataOnsRestMessageDo["BornTimestamp"].isNull())
+			dataObject.bornTimestamp = std::stol(valueDataOnsRestMessageDo["BornTimestamp"].asString());
 		if(!valueDataOnsRestMessageDo["BodyCRC"].isNull())
 			dataObject.bodyCRC = std::stoi(valueDataOnsRestMessageDo["BodyCRC"].asString());
-		if(!valueDataOnsRestMessageDo["ReconsumeTimes"].isNull())
-			dataObject.reconsumeTimes = std::stoi(valueDataOnsRestMessageDo["ReconsumeTimes"].asString());
-		if(!valueDataOnsRestMessageDo["InstanceId"].isNull())
-			dataObject.instanceId = valueDataOnsRestMessageDo["InstanceId"].asString();
+		if(!valueDataOnsRestMessageDo["BornHost"].isNull())
+			dataObject.bornHost = valueDataOnsRestMessageDo["BornHost"].asString();
 		auto allPropertyListNode = valueDataOnsRestMessageDo["PropertyList"]["MessageProperty"];
 		for (auto valueDataOnsRestMessageDoPropertyListMessageProperty : allPropertyListNode)
 		{
 			OnsRestMessageDo::MessageProperty propertyListObject;
-			if(!valueDataOnsRestMessageDoPropertyListMessageProperty["Name"].isNull())
-				propertyListObject.name = valueDataOnsRestMessageDoPropertyListMessageProperty["Name"].asString();
 			if(!valueDataOnsRestMessageDoPropertyListMessageProperty["Value"].isNull())
 				propertyListObject.value = valueDataOnsRestMessageDoPropertyListMessageProperty["Value"].asString();
+			if(!valueDataOnsRestMessageDoPropertyListMessageProperty["Name"].isNull())
+				propertyListObject.name = valueDataOnsRestMessageDoPropertyListMessageProperty["Name"].asString();
 			dataObject.propertyList.push_back(propertyListObject);
 		}
 		data_.push_back(dataObject);

ons/src/model/OnsMessageGetByMsgIdResult.cc

@@ -40,40 +40,40 @@ void OnsMessageGetByMsgIdResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
-	if(!dataNode["Topic"].isNull())
-		data_.topic = dataNode["Topic"].asString();
-	if(!dataNode["Flag"].isNull())
-		data_.flag = std::stoi(dataNode["Flag"].asString());
-	if(!dataNode["Body"].isNull())
-		data_.body = dataNode["Body"].asString();
+	if(!dataNode["OffsetId"].isNull())
+		data_.offsetId = dataNode["OffsetId"].asString();
 	if(!dataNode["StoreSize"].isNull())
 		data_.storeSize = std::stoi(dataNode["StoreSize"].asString());
-	if(!dataNode["BornTimestamp"].isNull())
-		data_.bornTimestamp = std::stol(dataNode["BornTimestamp"].asString());
-	if(!dataNode["BornHost"].isNull())
-		data_.bornHost = dataNode["BornHost"].asString();
+	if(!dataNode["ReconsumeTimes"].isNull())
+		data_.reconsumeTimes = std::stoi(dataNode["ReconsumeTimes"].asString());
 	if(!dataNode["StoreTimestamp"].isNull())
 		data_.storeTimestamp = std::stol(dataNode["StoreTimestamp"].asString());
-	if(!dataNode["StoreHost"].isNull())
-		data_.storeHost = dataNode["StoreHost"].asString();
+	if(!dataNode["Body"].isNull())
+		data_.body = dataNode["Body"].asString();
+	if(!dataNode["InstanceId"].isNull())
+		data_.instanceId = dataNode["InstanceId"].asString();
 	if(!dataNode["MsgId"].isNull())
 		data_.msgId = dataNode["MsgId"].asString();
-	if(!dataNode["OffsetId"].isNull())
-		data_.offsetId = dataNode["OffsetId"].asString();
+	if(!dataNode["Flag"].isNull())
+		data_.flag = std::stoi(dataNode["Flag"].asString());
+	if(!dataNode["StoreHost"].isNull())
+		data_.storeHost = dataNode["StoreHost"].asString();
+	if(!dataNode["Topic"].isNull())
+		data_.topic = dataNode["Topic"].asString();
+	if(!dataNode["BornTimestamp"].isNull())
+		data_.bornTimestamp = std::stol(dataNode["BornTimestamp"].asString());
 	if(!dataNode["BodyCRC"].isNull())
 		data_.bodyCRC = std::stoi(dataNode["BodyCRC"].asString());
-	if(!dataNode["ReconsumeTimes"].isNull())
-		data_.reconsumeTimes = std::stoi(dataNode["ReconsumeTimes"].asString());
-	if(!dataNode["InstanceId"].isNull())
-		data_.instanceId = dataNode["InstanceId"].asString();
+	if(!dataNode["BornHost"].isNull())
+		data_.bornHost = dataNode["BornHost"].asString();
 	auto allPropertyListNode = dataNode["PropertyList"]["MessageProperty"];
 	for (auto dataNodePropertyListMessageProperty : allPropertyListNode)
 	{
 		Data::MessageProperty messagePropertyObject;
-		if(!dataNodePropertyListMessageProperty["Name"].isNull())
-			messagePropertyObject.name = dataNodePropertyListMessageProperty["Name"].asString();
 		if(!dataNodePropertyListMessageProperty["Value"].isNull())
 			messagePropertyObject.value = dataNodePropertyListMessageProperty["Value"].asString();
+		if(!dataNodePropertyListMessageProperty["Name"].isNull())
+			messagePropertyObject.name = dataNodePropertyListMessageProperty["Name"].asString();
 		data_.propertyList.push_back(messagePropertyObject);
 	}
 	if(!value["HelpUrl"].isNull())

ons/src/model/OnsMessagePageQueryByTopicResult.cc

@@ -40,50 +40,50 @@ void OnsMessagePageQueryByTopicResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto msgFoundDoNode = value["MsgFoundDo"];
-	if(!msgFoundDoNode["TaskId"].isNull())
-		msgFoundDo_.taskId = msgFoundDoNode["TaskId"].asString();
-	if(!msgFoundDoNode["MaxPageCount"].isNull())
-		msgFoundDo_.maxPageCount = std::stol(msgFoundDoNode["MaxPageCount"].asString());
 	if(!msgFoundDoNode["CurrentPage"].isNull())
 		msgFoundDo_.currentPage = std::stol(msgFoundDoNode["CurrentPage"].asString());
+	if(!msgFoundDoNode["MaxPageCount"].isNull())
+		msgFoundDo_.maxPageCount = std::stol(msgFoundDoNode["MaxPageCount"].asString());
+	if(!msgFoundDoNode["TaskId"].isNull())
+		msgFoundDo_.taskId = msgFoundDoNode["TaskId"].asString();
 	auto allMsgFoundListNode = msgFoundDoNode["MsgFoundList"]["OnsRestMessageDo"];
 	for (auto msgFoundDoNodeMsgFoundListOnsRestMessageDo : allMsgFoundListNode)
 	{
 		MsgFoundDo::OnsRestMessageDo onsRestMessageDoObject;
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["Topic"].isNull())
-			onsRestMessageDoObject.topic = msgFoundDoNodeMsgFoundListOnsRestMessageDo["Topic"].asString();
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["Flag"].isNull())
-			onsRestMessageDoObject.flag = std::stoi(msgFoundDoNodeMsgFoundListOnsRestMessageDo["Flag"].asString());
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["Body"].isNull())
-			onsRestMessageDoObject.body = msgFoundDoNodeMsgFoundListOnsRestMessageDo["Body"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["OffsetId"].isNull())
+			onsRestMessageDoObject.offsetId = msgFoundDoNodeMsgFoundListOnsRestMessageDo["OffsetId"].asString();
 		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreSize"].isNull())
 			onsRestMessageDoObject.storeSize = std::stoi(msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreSize"].asString());
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornTimestamp"].isNull())
-			onsRestMessageDoObject.bornTimestamp = std::stol(msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornTimestamp"].asString());
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornHost"].isNull())
-			onsRestMessageDoObject.bornHost = msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornHost"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["ReconsumeTimes"].isNull())
+			onsRestMessageDoObject.reconsumeTimes = std::stoi(msgFoundDoNodeMsgFoundListOnsRestMessageDo["ReconsumeTimes"].asString());
 		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreTimestamp"].isNull())
 			onsRestMessageDoObject.storeTimestamp = std::stol(msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreTimestamp"].asString());
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreHost"].isNull())
-			onsRestMessageDoObject.storeHost = msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreHost"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["Body"].isNull())
+			onsRestMessageDoObject.body = msgFoundDoNodeMsgFoundListOnsRestMessageDo["Body"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["InstanceId"].isNull())
+			onsRestMessageDoObject.instanceId = msgFoundDoNodeMsgFoundListOnsRestMessageDo["InstanceId"].asString();
 		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["MsgId"].isNull())
 			onsRestMessageDoObject.msgId = msgFoundDoNodeMsgFoundListOnsRestMessageDo["MsgId"].asString();
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["OffsetId"].isNull())
-			onsRestMessageDoObject.offsetId = msgFoundDoNodeMsgFoundListOnsRestMessageDo["OffsetId"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["Flag"].isNull())
+			onsRestMessageDoObject.flag = std::stoi(msgFoundDoNodeMsgFoundListOnsRestMessageDo["Flag"].asString());
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreHost"].isNull())
+			onsRestMessageDoObject.storeHost = msgFoundDoNodeMsgFoundListOnsRestMessageDo["StoreHost"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["Topic"].isNull())
+			onsRestMessageDoObject.topic = msgFoundDoNodeMsgFoundListOnsRestMessageDo["Topic"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornTimestamp"].isNull())
+			onsRestMessageDoObject.bornTimestamp = std::stol(msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornTimestamp"].asString());
 		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["BodyCRC"].isNull())
 			onsRestMessageDoObject.bodyCRC = std::stoi(msgFoundDoNodeMsgFoundListOnsRestMessageDo["BodyCRC"].asString());
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["ReconsumeTimes"].isNull())
-			onsRestMessageDoObject.reconsumeTimes = std::stoi(msgFoundDoNodeMsgFoundListOnsRestMessageDo["ReconsumeTimes"].asString());
-		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["InstanceId"].isNull())
-			onsRestMessageDoObject.instanceId = msgFoundDoNodeMsgFoundListOnsRestMessageDo["InstanceId"].asString();
+		if(!msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornHost"].isNull())
+			onsRestMessageDoObject.bornHost = msgFoundDoNodeMsgFoundListOnsRestMessageDo["BornHost"].asString();
 		auto allPropertyListNode = msgFoundDoNodeMsgFoundListOnsRestMessageDo["PropertyList"]["MessageProperty"];
 		for (auto msgFoundDoNodeMsgFoundListOnsRestMessageDoPropertyListMessageProperty : allPropertyListNode)
 		{
 			MsgFoundDo::OnsRestMessageDo::MessageProperty propertyListObject;
-			if(!msgFoundDoNodeMsgFoundListOnsRestMessageDoPropertyListMessageProperty["Name"].isNull())
-				propertyListObject.name = msgFoundDoNodeMsgFoundListOnsRestMessageDoPropertyListMessageProperty["Name"].asString();
 			if(!msgFoundDoNodeMsgFoundListOnsRestMessageDoPropertyListMessageProperty["Value"].isNull())
 				propertyListObject.value = msgFoundDoNodeMsgFoundListOnsRestMessageDoPropertyListMessageProperty["Value"].asString();
+			if(!msgFoundDoNodeMsgFoundListOnsRestMessageDoPropertyListMessageProperty["Name"].isNull())
+				propertyListObject.name = msgFoundDoNodeMsgFoundListOnsRestMessageDoPropertyListMessageProperty["Name"].asString();
 			onsRestMessageDoObject.propertyList.push_back(propertyListObject);
 		}
 		msgFoundDo_.msgFoundList.push_back(onsRestMessageDoObject);

ons/src/model/OnsMessageSendResult.cc

@@ -39,10 +39,10 @@ void OnsMessageSendResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	if(!value["HelpUrl"].isNull())
-		helpUrl_ = value["HelpUrl"].asString();
 	if(!value["Data"].isNull())
 		data_ = value["Data"].asString();
+	if(!value["HelpUrl"].isNull())
+		helpUrl_ = value["HelpUrl"].asString();
 
 }
 

ons/src/model/OnsMessageTraceResult.cc

@@ -43,12 +43,12 @@ void OnsMessageTraceResult::parse(const std::string &payload)
 	for (auto valueDataMessageTrack : allDataNode)
 	{
 		MessageTrack dataObject;
-		if(!valueDataMessageTrack["ConsumerGroup"].isNull())
-			dataObject.consumerGroup = valueDataMessageTrack["ConsumerGroup"].asString();
-		if(!valueDataMessageTrack["TrackType"].isNull())
-			dataObject.trackType = valueDataMessageTrack["TrackType"].asString();
 		if(!valueDataMessageTrack["ExceptionDesc"].isNull())
 			dataObject.exceptionDesc = valueDataMessageTrack["ExceptionDesc"].asString();
+		if(!valueDataMessageTrack["TrackType"].isNull())
+			dataObject.trackType = valueDataMessageTrack["TrackType"].asString();
+		if(!valueDataMessageTrack["ConsumerGroup"].isNull())
+			dataObject.consumerGroup = valueDataMessageTrack["ConsumerGroup"].asString();
 		if(!valueDataMessageTrack["InstanceId"].isNull())
 			dataObject.instanceId = valueDataMessageTrack["InstanceId"].asString();
 		data_.push_back(dataObject);

ons/src/model/OnsMqttGroupIdListResult.cc

@@ -43,26 +43,26 @@ void OnsMqttGroupIdListResult::parse(const std::string &payload)
 	for (auto valueDataMqttGroupIdDo : allDataNode)
 	{
 		MqttGroupIdDo dataObject;
-		if(!valueDataMqttGroupIdDo["Id"].isNull())
-			dataObject.id = std::stol(valueDataMqttGroupIdDo["Id"].asString());
-		if(!valueDataMqttGroupIdDo["ChannelId"].isNull())
-			dataObject.channelId = std::stoi(valueDataMqttGroupIdDo["ChannelId"].asString());
+		if(!valueDataMqttGroupIdDo["Status"].isNull())
+			dataObject.status = std::stoi(valueDataMqttGroupIdDo["Status"].asString());
+		if(!valueDataMqttGroupIdDo["UpdateTime"].isNull())
+			dataObject.updateTime = std::stol(valueDataMqttGroupIdDo["UpdateTime"].asString());
 		if(!valueDataMqttGroupIdDo["Owner"].isNull())
 			dataObject.owner = valueDataMqttGroupIdDo["Owner"].asString();
+		if(!valueDataMqttGroupIdDo["IndependentNaming"].isNull())
+			dataObject.independentNaming = valueDataMqttGroupIdDo["IndependentNaming"].asString() == "true";
 		if(!valueDataMqttGroupIdDo["GroupId"].isNull())
 			dataObject.groupId = valueDataMqttGroupIdDo["GroupId"].asString();
-		if(!valueDataMqttGroupIdDo["Topic"].isNull())
-			dataObject.topic = valueDataMqttGroupIdDo["Topic"].asString();
-		if(!valueDataMqttGroupIdDo["Status"].isNull())
-			dataObject.status = std::stoi(valueDataMqttGroupIdDo["Status"].asString());
 		if(!valueDataMqttGroupIdDo["CreateTime"].isNull())
 			dataObject.createTime = std::stol(valueDataMqttGroupIdDo["CreateTime"].asString());
-		if(!valueDataMqttGroupIdDo["UpdateTime"].isNull())
-			dataObject.updateTime = std::stol(valueDataMqttGroupIdDo["UpdateTime"].asString());
+		if(!valueDataMqttGroupIdDo["Topic"].isNull())
+			dataObject.topic = valueDataMqttGroupIdDo["Topic"].asString();
+		if(!valueDataMqttGroupIdDo["ChannelId"].isNull())
+			dataObject.channelId = std::stoi(valueDataMqttGroupIdDo["ChannelId"].asString());
 		if(!valueDataMqttGroupIdDo["InstanceId"].isNull())
 			dataObject.instanceId = valueDataMqttGroupIdDo["InstanceId"].asString();
-		if(!valueDataMqttGroupIdDo["IndependentNaming"].isNull())
-			dataObject.independentNaming = valueDataMqttGroupIdDo["IndependentNaming"].asString() == "true";
+		if(!valueDataMqttGroupIdDo["Id"].isNull())
+			dataObject.id = std::stol(valueDataMqttGroupIdDo["Id"].asString());
 		data_.push_back(dataObject);
 	}
 	if(!value["HelpUrl"].isNull())

ons/src/model/OnsMqttQueryClientByClientIdResult.cc

@@ -42,20 +42,20 @@ void OnsMqttQueryClientByClientIdResult::parse(const std::string &payload)
 	auto mqttClientInfoDoNode = value["MqttClientInfoDo"];
 	if(!mqttClientInfoDoNode["Online"].isNull())
 		mqttClientInfoDo_.online = mqttClientInfoDoNode["Online"].asString() == "true";
-	if(!mqttClientInfoDoNode["ClientId"].isNull())
-		mqttClientInfoDo_.clientId = mqttClientInfoDoNode["ClientId"].asString();
-	if(!mqttClientInfoDoNode["SocketChannel"].isNull())
-		mqttClientInfoDo_.socketChannel = mqttClientInfoDoNode["SocketChannel"].asString();
 	if(!mqttClientInfoDoNode["LastTouch"].isNull())
 		mqttClientInfoDo_.lastTouch = std::stol(mqttClientInfoDoNode["LastTouch"].asString());
+	if(!mqttClientInfoDoNode["SocketChannel"].isNull())
+		mqttClientInfoDo_.socketChannel = mqttClientInfoDoNode["SocketChannel"].asString();
+	if(!mqttClientInfoDoNode["ClientId"].isNull())
+		mqttClientInfoDo_.clientId = mqttClientInfoDoNode["ClientId"].asString();
 	auto allSubScriptonDataNode = mqttClientInfoDoNode["SubScriptonData"]["SubscriptionDo"];
 	for (auto mqttClientInfoDoNodeSubScriptonDataSubscriptionDo : allSubScriptonDataNode)
 	{
 		MqttClientInfoDo::SubscriptionDo subscriptionDoObject;
-		if(!mqttClientInfoDoNodeSubScriptonDataSubscriptionDo["ParentTopic"].isNull())
-			subscriptionDoObject.parentTopic = mqttClientInfoDoNodeSubScriptonDataSubscriptionDo["ParentTopic"].asString();
 		if(!mqttClientInfoDoNodeSubScriptonDataSubscriptionDo["SubTopic"].isNull())
 			subscriptionDoObject.subTopic = mqttClientInfoDoNodeSubScriptonDataSubscriptionDo["SubTopic"].asString();
+		if(!mqttClientInfoDoNodeSubScriptonDataSubscriptionDo["ParentTopic"].isNull())
+			subscriptionDoObject.parentTopic = mqttClientInfoDoNodeSubScriptonDataSubscriptionDo["ParentTopic"].asString();
 		if(!mqttClientInfoDoNodeSubScriptonDataSubscriptionDo["Qos"].isNull())
 			subscriptionDoObject.qos = std::stoi(mqttClientInfoDoNodeSubScriptonDataSubscriptionDo["Qos"].asString());
 		mqttClientInfoDo_.subScriptonData.push_back(subscriptionDoObject);

ons/src/model/OnsMqttQueryClientByGroupIdResult.cc

@@ -40,10 +40,10 @@ void OnsMqttQueryClientByGroupIdResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto mqttClientSetDoNode = value["MqttClientSetDo"];
-	if(!mqttClientSetDoNode["OnlineCount"].isNull())
-		mqttClientSetDo_.onlineCount = std::stol(mqttClientSetDoNode["OnlineCount"].asString());
 	if(!mqttClientSetDoNode["PersistCount"].isNull())
 		mqttClientSetDo_.persistCount = std::stol(mqttClientSetDoNode["PersistCount"].asString());
+	if(!mqttClientSetDoNode["OnlineCount"].isNull())
+		mqttClientSetDo_.onlineCount = std::stol(mqttClientSetDoNode["OnlineCount"].asString());
 	if(!value["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();
 

ons/src/model/OnsMqttQueryClientByTopicResult.cc

@@ -40,10 +40,10 @@ void OnsMqttQueryClientByTopicResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto mqttClientSetDoNode = value["MqttClientSetDo"];
-	if(!mqttClientSetDoNode["OnlineCount"].isNull())
-		mqttClientSetDo_.onlineCount = std::stol(mqttClientSetDoNode["OnlineCount"].asString());
 	if(!mqttClientSetDoNode["PersistCount"].isNull())
 		mqttClientSetDo_.persistCount = std::stol(mqttClientSetDoNode["PersistCount"].asString());
+	if(!mqttClientSetDoNode["OnlineCount"].isNull())
+		mqttClientSetDo_.onlineCount = std::stol(mqttClientSetDoNode["OnlineCount"].asString());
 	if(!value["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();
 

ons/src/model/OnsMqttQueryHistoryOnlineResult.cc

@@ -40,20 +40,20 @@ void OnsMqttQueryHistoryOnlineResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
-	if(!dataNode["Title"].isNull())
-		data_.title = dataNode["Title"].asString();
 	if(!dataNode["XUnit"].isNull())
 		data_.xUnit = dataNode["XUnit"].asString();
 	if(!dataNode["YUnit"].isNull())
 		data_.yUnit = dataNode["YUnit"].asString();
+	if(!dataNode["Title"].isNull())
+		data_.title = dataNode["Title"].asString();
 	auto allRecordsNode = dataNode["Records"]["StatsDataDo"];
 	for (auto dataNodeRecordsStatsDataDo : allRecordsNode)
 	{
 		Data::StatsDataDo statsDataDoObject;
-		if(!dataNodeRecordsStatsDataDo["X"].isNull())
-			statsDataDoObject.x = std::stol(dataNodeRecordsStatsDataDo["X"].asString());
 		if(!dataNodeRecordsStatsDataDo["Y"].isNull())
 			statsDataDoObject.y = std::stof(dataNodeRecordsStatsDataDo["Y"].asString());
+		if(!dataNodeRecordsStatsDataDo["X"].isNull())
+			statsDataDoObject.x = std::stol(dataNodeRecordsStatsDataDo["X"].asString());
 		data_.records.push_back(statsDataDoObject);
 	}
 	if(!value["HelpUrl"].isNull())

ons/src/model/OnsMqttQueryMsgTransTrendResult.cc

@@ -40,20 +40,20 @@ void OnsMqttQueryMsgTransTrendResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
-	if(!dataNode["Title"].isNull())
-		data_.title = dataNode["Title"].asString();
 	if(!dataNode["XUnit"].isNull())
 		data_.xUnit = dataNode["XUnit"].asString();
 	if(!dataNode["YUnit"].isNull())
 		data_.yUnit = dataNode["YUnit"].asString();
+	if(!dataNode["Title"].isNull())
+		data_.title = dataNode["Title"].asString();
 	auto allRecordsNode = dataNode["Records"]["StatsDataDo"];
 	for (auto dataNodeRecordsStatsDataDo : allRecordsNode)
 	{
 		Data::StatsDataDo statsDataDoObject;
-		if(!dataNodeRecordsStatsDataDo["X"].isNull())
-			statsDataDoObject.x = std::stol(dataNodeRecordsStatsDataDo["X"].asString());
 		if(!dataNodeRecordsStatsDataDo["Y"].isNull())
 			statsDataDoObject.y = std::stof(dataNodeRecordsStatsDataDo["Y"].asString());
+		if(!dataNodeRecordsStatsDataDo["X"].isNull())
+			statsDataDoObject.x = std::stol(dataNodeRecordsStatsDataDo["X"].asString());
 		data_.records.push_back(statsDataDoObject);
 	}
 	if(!value["HelpUrl"].isNull())

ons/src/model/OnsTopicListResult.cc

@@ -43,24 +43,24 @@ void OnsTopicListResult::parse(const std::string &payload)
 	for (auto valueDataPublishInfoDo : allDataNode)
 	{
 		PublishInfoDo dataObject;
-		if(!valueDataPublishInfoDo["Topic"].isNull())
-			dataObject.topic = valueDataPublishInfoDo["Topic"].asString();
+		if(!valueDataPublishInfoDo["MessageType"].isNull())
+			dataObject.messageType = std::stoi(valueDataPublishInfoDo["MessageType"].asString());
+		if(!valueDataPublishInfoDo["RelationName"].isNull())
+			dataObject.relationName = valueDataPublishInfoDo["RelationName"].asString();
 		if(!valueDataPublishInfoDo["Owner"].isNull())
 			dataObject.owner = valueDataPublishInfoDo["Owner"].asString();
+		if(!valueDataPublishInfoDo["IndependentNaming"].isNull())
+			dataObject.independentNaming = valueDataPublishInfoDo["IndependentNaming"].asString() == "true";
+		if(!valueDataPublishInfoDo["Remark"].isNull())
+			dataObject.remark = valueDataPublishInfoDo["Remark"].asString();
 		if(!valueDataPublishInfoDo["Relation"].isNull())
 			dataObject.relation = std::stoi(valueDataPublishInfoDo["Relation"].asString());
-		if(!valueDataPublishInfoDo["RelationName"].isNull())
-			dataObject.relationName = valueDataPublishInfoDo["RelationName"].asString();
 		if(!valueDataPublishInfoDo["CreateTime"].isNull())
 			dataObject.createTime = std::stol(valueDataPublishInfoDo["CreateTime"].asString());
-		if(!valueDataPublishInfoDo["Remark"].isNull())
-			dataObject.remark = valueDataPublishInfoDo["Remark"].asString();
-		if(!valueDataPublishInfoDo["MessageType"].isNull())
-			dataObject.messageType = std::stoi(valueDataPublishInfoDo["MessageType"].asString());
+		if(!valueDataPublishInfoDo["Topic"].isNull())
+			dataObject.topic = valueDataPublishInfoDo["Topic"].asString();
 		if(!valueDataPublishInfoDo["InstanceId"].isNull())
 			dataObject.instanceId = valueDataPublishInfoDo["InstanceId"].asString();
-		if(!valueDataPublishInfoDo["IndependentNaming"].isNull())
-			dataObject.independentNaming = valueDataPublishInfoDo["IndependentNaming"].asString() == "true";
 		auto allTagsNode = valueDataPublishInfoDo["Tags"]["Tag"];
 		for (auto valueDataPublishInfoDoTagsTag : allTagsNode)
 		{

ons/src/model/OnsTopicStatusResult.cc

@@ -40,12 +40,12 @@ void OnsTopicStatusResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
-	if(!dataNode["TotalCount"].isNull())
-		data_.totalCount = std::stol(dataNode["TotalCount"].asString());
-	if(!dataNode["LastTimeStamp"].isNull())
-		data_.lastTimeStamp = std::stol(dataNode["LastTimeStamp"].asString());
 	if(!dataNode["Perm"].isNull())
 		data_.perm = std::stoi(dataNode["Perm"].asString());
+	if(!dataNode["LastTimeStamp"].isNull())
+		data_.lastTimeStamp = std::stol(dataNode["LastTimeStamp"].asString());
+	if(!dataNode["TotalCount"].isNull())
+		data_.totalCount = std::stol(dataNode["TotalCount"].asString());
 	if(!value["HelpUrl"].isNull())
 		helpUrl_ = value["HelpUrl"].asString();
 

ons/src/model/OnsTopicSubDetailResult.cc

@@ -48,10 +48,10 @@ void OnsTopicSubDetailResult::parse(const std::string &payload)
 		Data::SubscriptionDataListItem subscriptionDataListItemObject;
 		if(!dataNodeSubscriptionDataListSubscriptionDataListItem["GroupId"].isNull())
 			subscriptionDataListItemObject.groupId = dataNodeSubscriptionDataListSubscriptionDataListItem["GroupId"].asString();
-		if(!dataNodeSubscriptionDataListSubscriptionDataListItem["SubString"].isNull())
-			subscriptionDataListItemObject.subString = dataNodeSubscriptionDataListSubscriptionDataListItem["SubString"].asString();
 		if(!dataNodeSubscriptionDataListSubscriptionDataListItem["MessageModel"].isNull())
 			subscriptionDataListItemObject.messageModel = dataNodeSubscriptionDataListSubscriptionDataListItem["MessageModel"].asString();
+		if(!dataNodeSubscriptionDataListSubscriptionDataListItem["SubString"].isNull())
+			subscriptionDataListItemObject.subString = dataNodeSubscriptionDataListSubscriptionDataListItem["SubString"].asString();
 		data_.subscriptionDataList.push_back(subscriptionDataListItemObject);
 	}
 

ons/src/model/OnsTraceGetResultResult.cc

@@ -40,72 +40,72 @@ void OnsTraceGetResultResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto traceDataNode = value["TraceData"];
-	if(!traceDataNode["QueryId"].isNull())
-		traceData_.queryId = traceDataNode["QueryId"].asString();
-	if(!traceDataNode["UserId"].isNull())
-		traceData_.userId = traceDataNode["UserId"].asString();
-	if(!traceDataNode["Topic"].isNull())
-		traceData_.topic = traceDataNode["Topic"].asString();
-	if(!traceDataNode["MsgId"].isNull())
-		traceData_.msgId = traceDataNode["MsgId"].asString();
-	if(!traceDataNode["MsgKey"].isNull())
-		traceData_.msgKey = traceDataNode["MsgKey"].asString();
 	if(!traceDataNode["Status"].isNull())
 		traceData_.status = traceDataNode["Status"].asString();
-	if(!traceDataNode["CreateTime"].isNull())
-		traceData_.createTime = std::stol(traceDataNode["CreateTime"].asString());
+	if(!traceDataNode["MsgKey"].isNull())
+		traceData_.msgKey = traceDataNode["MsgKey"].asString();
 	if(!traceDataNode["UpdateTime"].isNull())
 		traceData_.updateTime = std::stol(traceDataNode["UpdateTime"].asString());
+	if(!traceDataNode["CreateTime"].isNull())
+		traceData_.createTime = std::stol(traceDataNode["CreateTime"].asString());
+	if(!traceDataNode["Topic"].isNull())
+		traceData_.topic = traceDataNode["Topic"].asString();
+	if(!traceDataNode["UserId"].isNull())
+		traceData_.userId = traceDataNode["UserId"].asString();
 	if(!traceDataNode["InstanceId"].isNull())
 		traceData_.instanceId = traceDataNode["InstanceId"].asString();
+	if(!traceDataNode["MsgId"].isNull())
+		traceData_.msgId = traceDataNode["MsgId"].asString();
+	if(!traceDataNode["QueryId"].isNull())
+		traceData_.queryId = traceDataNode["QueryId"].asString();
 	auto allTraceListNode = traceDataNode["TraceList"]["TraceMapDo"];
 	for (auto traceDataNodeTraceListTraceMapDo : allTraceListNode)
 	{
 		TraceData::TraceMapDo traceMapDoObject;
+		if(!traceDataNodeTraceListTraceMapDo["Status"].isNull())
+			traceMapDoObject.status = traceDataNodeTraceListTraceMapDo["Status"].asString();
+		if(!traceDataNodeTraceListTraceMapDo["MsgKey"].isNull())
+			traceMapDoObject.msgKey = traceDataNodeTraceListTraceMapDo["MsgKey"].asString();
 		if(!traceDataNodeTraceListTraceMapDo["PubTime"].isNull())
 			traceMapDoObject.pubTime = std::stol(traceDataNodeTraceListTraceMapDo["PubTime"].asString());
 		if(!traceDataNodeTraceListTraceMapDo["Topic"].isNull())
 			traceMapDoObject.topic = traceDataNodeTraceListTraceMapDo["Topic"].asString();
-		if(!traceDataNodeTraceListTraceMapDo["PubGroupName"].isNull())
-			traceMapDoObject.pubGroupName = traceDataNodeTraceListTraceMapDo["PubGroupName"].asString();
-		if(!traceDataNodeTraceListTraceMapDo["MsgId"].isNull())
-			traceMapDoObject.msgId = traceDataNodeTraceListTraceMapDo["MsgId"].asString();
+		if(!traceDataNodeTraceListTraceMapDo["CostTime"].isNull())
+			traceMapDoObject.costTime = std::stoi(traceDataNodeTraceListTraceMapDo["CostTime"].asString());
 		if(!traceDataNodeTraceListTraceMapDo["Tag"].isNull())
 			traceMapDoObject.tag = traceDataNodeTraceListTraceMapDo["Tag"].asString();
-		if(!traceDataNodeTraceListTraceMapDo["MsgKey"].isNull())
-			traceMapDoObject.msgKey = traceDataNodeTraceListTraceMapDo["MsgKey"].asString();
+		if(!traceDataNodeTraceListTraceMapDo["MsgId"].isNull())
+			traceMapDoObject.msgId = traceDataNodeTraceListTraceMapDo["MsgId"].asString();
+		if(!traceDataNodeTraceListTraceMapDo["PubGroupName"].isNull())
+			traceMapDoObject.pubGroupName = traceDataNodeTraceListTraceMapDo["PubGroupName"].asString();
 		if(!traceDataNodeTraceListTraceMapDo["BornHost"].isNull())
 			traceMapDoObject.bornHost = traceDataNodeTraceListTraceMapDo["BornHost"].asString();
-		if(!traceDataNodeTraceListTraceMapDo["CostTime"].isNull())
-			traceMapDoObject.costTime = std::stoi(traceDataNodeTraceListTraceMapDo["CostTime"].asString());
-		if(!traceDataNodeTraceListTraceMapDo["Status"].isNull())
-			traceMapDoObject.status = traceDataNodeTraceListTraceMapDo["Status"].asString();
 		auto allSubListNode = traceDataNodeTraceListTraceMapDo["SubList"]["SubMapDo"];
 		for (auto traceDataNodeTraceListTraceMapDoSubListSubMapDo : allSubListNode)
 		{
 			TraceData::TraceMapDo::SubMapDo subListObject;
+			if(!traceDataNodeTraceListTraceMapDoSubListSubMapDo["FailCount"].isNull())
+				subListObject.failCount = std::stoi(traceDataNodeTraceListTraceMapDoSubListSubMapDo["FailCount"].asString());
 			if(!traceDataNodeTraceListTraceMapDoSubListSubMapDo["SubGroupName"].isNull())
 				subListObject.subGroupName = traceDataNodeTraceListTraceMapDoSubListSubMapDo["SubGroupName"].asString();
 			if(!traceDataNodeTraceListTraceMapDoSubListSubMapDo["SuccessCount"].isNull())
 				subListObject.successCount = std::stoi(traceDataNodeTraceListTraceMapDoSubListSubMapDo["SuccessCount"].asString());
-			if(!traceDataNodeTraceListTraceMapDoSubListSubMapDo["FailCount"].isNull())
-				subListObject.failCount = std::stoi(traceDataNodeTraceListTraceMapDoSubListSubMapDo["FailCount"].asString());
 			auto allClientListNode = traceDataNodeTraceListTraceMapDoSubListSubMapDo["ClientList"]["SubClientInfoDo"];
 			for (auto traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo : allClientListNode)
 			{
 				TraceData::TraceMapDo::SubMapDo::SubClientInfoDo clientListObject;
-				if(!traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["SubGroupName"].isNull())
-					clientListObject.subGroupName = traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["SubGroupName"].asString();
+				if(!traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["Status"].isNull())
+					clientListObject.status = traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["Status"].asString();
 				if(!traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["SubTime"].isNull())
 					clientListObject.subTime = std::stol(traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["SubTime"].asString());
-				if(!traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["ClientHost"].isNull())
-					clientListObject.clientHost = traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["ClientHost"].asString();
 				if(!traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["ReconsumeTimes"].isNull())
 					clientListObject.reconsumeTimes = std::stoi(traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["ReconsumeTimes"].asString());
+				if(!traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["SubGroupName"].isNull())
+					clientListObject.subGroupName = traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["SubGroupName"].asString();
+				if(!traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["ClientHost"].isNull())
+					clientListObject.clientHost = traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["ClientHost"].asString();
 				if(!traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["CostTime"].isNull())
 					clientListObject.costTime = std::stoi(traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["CostTime"].asString());
-				if(!traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["Status"].isNull())
-					clientListObject.status = traceDataNodeTraceListTraceMapDoSubListSubMapDoClientListSubClientInfoDo["Status"].asString();
 				subListObject.clientList.push_back(clientListObject);
 			}
 			traceMapDoObject.subList.push_back(subListObject);

ons/src/model/OnsTraceQueryByMsgIdResult.cc

@@ -39,10 +39,10 @@ void OnsTraceQueryByMsgIdResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	if(!value["HelpUrl"].isNull())
-		helpUrl_ = value["HelpUrl"].asString();
 	if(!value["QueryId"].isNull())
 		queryId_ = value["QueryId"].asString();
+	if(!value["HelpUrl"].isNull())
+		helpUrl_ = value["HelpUrl"].asString();
 
 }
 

ons/src/model/OnsTraceQueryByMsgKeyResult.cc

@@ -39,10 +39,10 @@ void OnsTraceQueryByMsgKeyResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	if(!value["HelpUrl"].isNull())
-		helpUrl_ = value["HelpUrl"].asString();
 	if(!value["QueryId"].isNull())
 		queryId_ = value["QueryId"].asString();
+	if(!value["HelpUrl"].isNull())
+		helpUrl_ = value["HelpUrl"].asString();
 
 }
 

ons/src/model/OnsTrendGroupOutputTpsResult.cc

@@ -40,20 +40,20 @@ void OnsTrendGroupOutputTpsResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
-	if(!dataNode["Title"].isNull())
-		data_.title = dataNode["Title"].asString();
 	if(!dataNode["XUnit"].isNull())
 		data_.xUnit = dataNode["XUnit"].asString();
 	if(!dataNode["YUnit"].isNull())
 		data_.yUnit = dataNode["YUnit"].asString();
+	if(!dataNode["Title"].isNull())
+		data_.title = dataNode["Title"].asString();
 	auto allRecordsNode = dataNode["Records"]["StatsDataDo"];
 	for (auto dataNodeRecordsStatsDataDo : allRecordsNode)
 	{
 		Data::StatsDataDo statsDataDoObject;
-		if(!dataNodeRecordsStatsDataDo["X"].isNull())
-			statsDataDoObject.x = std::stol(dataNodeRecordsStatsDataDo["X"].asString());
 		if(!dataNodeRecordsStatsDataDo["Y"].isNull())
 			statsDataDoObject.y = std::stof(dataNodeRecordsStatsDataDo["Y"].asString());
+		if(!dataNodeRecordsStatsDataDo["X"].isNull())
+			statsDataDoObject.x = std::stol(dataNodeRecordsStatsDataDo["X"].asString());
 		data_.records.push_back(statsDataDoObject);
 	}
 	if(!value["HelpUrl"].isNull())

ons/src/model/OnsTrendTopicInputTpsResult.cc

@@ -40,20 +40,20 @@ void OnsTrendTopicInputTpsResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
-	if(!dataNode["Title"].isNull())
-		data_.title = dataNode["Title"].asString();
 	if(!dataNode["XUnit"].isNull())
 		data_.xUnit = dataNode["XUnit"].asString();
 	if(!dataNode["YUnit"].isNull())
 		data_.yUnit = dataNode["YUnit"].asString();
+	if(!dataNode["Title"].isNull())
+		data_.title = dataNode["Title"].asString();
 	auto allRecordsNode = dataNode["Records"]["StatsDataDo"];
 	for (auto dataNodeRecordsStatsDataDo : allRecordsNode)
 	{
 		Data::StatsDataDo statsDataDoObject;
-		if(!dataNodeRecordsStatsDataDo["X"].isNull())
-			statsDataDoObject.x = std::stol(dataNodeRecordsStatsDataDo["X"].asString());
 		if(!dataNodeRecordsStatsDataDo["Y"].isNull())
 			statsDataDoObject.y = std::stof(dataNodeRecordsStatsDataDo["Y"].asString());
+		if(!dataNodeRecordsStatsDataDo["X"].isNull())
+			statsDataDoObject.x = std::stol(dataNodeRecordsStatsDataDo["X"].asString());
 		data_.records.push_back(statsDataDoObject);
 	}
 	if(!value["HelpUrl"].isNull())