wb-hx510875 7 anos atrás
pai
commit
ba463ae2dc
100 arquivos alterados com 1853 adições e 1836 exclusões
  1. 3 0
      aegis/include/alibabacloud/aegis/model/DescribeSuspEventsRequest.h
  2. 1 0
      aegis/include/alibabacloud/aegis/model/DescribeSuspEventsResult.h
  3. 22 22
      aegis/src/model/DescribeAccesskeyLeakListResult.cc
  4. 10 10
      aegis/src/model/DescribeAgentInstallStatusResult.cc
  5. 12 12
      aegis/src/model/DescribeAlarmEventDetailResult.cc
  6. 50 50
      aegis/src/model/DescribeAlarmEventListResult.cc
  7. 12 12
      aegis/src/model/DescribeAnalysisCurveResult.cc
  8. 24 24
      aegis/src/model/DescribeAssetListResult.cc
  9. 4 4
      aegis/src/model/DescribeBizStatSimpleQueryResultResult.cc
  10. 18 18
      aegis/src/model/DescribeChartDataResult.cc
  11. 12 12
      aegis/src/model/DescribeChartListResult.cc
  12. 24 24
      aegis/src/model/DescribeCheckWarningSummaryResult.cc
  13. 18 18
      aegis/src/model/DescribeCheckWarningsResult.cc
  14. 22 22
      aegis/src/model/DescribeCustomizeReportChartDataResult.cc
  15. 8 8
      aegis/src/model/DescribeCustomizeReportChartListResult.cc
  16. 12 12
      aegis/src/model/DescribeCustomizeReportListResult.cc
  17. 26 26
      aegis/src/model/DescribeDataSourceResult.cc
  18. 16 16
      aegis/src/model/DescribeDingTalkResult.cc
  19. 14 14
      aegis/src/model/DescribeEmgNoticeResult.cc
  20. 18 18
      aegis/src/model/DescribeEmgVulGroupResult.cc
  21. 24 24
      aegis/src/model/DescribeEntityListResult.cc
  22. 20 20
      aegis/src/model/DescribeEventCountCurveResult.cc
  23. 4 4
      aegis/src/model/DescribeFilterFieldsResult.cc
  24. 20 20
      aegis/src/model/DescribeGroupListResult.cc
  25. 22 22
      aegis/src/model/DescribeGroupedVulResult.cc
  26. 2 2
      aegis/src/model/DescribeHistogramResult.cc
  27. 14 14
      aegis/src/model/DescribeInstanceStatisticsResult.cc
  28. 30 30
      aegis/src/model/DescribeJoinRuleListResult.cc
  29. 14 14
      aegis/src/model/DescribeLogInfoResult.cc
  30. 14 14
      aegis/src/model/DescribeLogItemsResult.cc
  31. 14 14
      aegis/src/model/DescribeLogMetaResult.cc
  32. 8 8
      aegis/src/model/DescribeLogQueryResult.cc
  33. 36 36
      aegis/src/model/DescribeLoginLogsResult.cc
  34. 30 30
      aegis/src/model/DescribeMacConfigResult.cc
  35. 8 8
      aegis/src/model/DescribeMachineConfigResult.cc
  36. 16 16
      aegis/src/model/DescribeMetaDataResult.cc
  37. 8 8
      aegis/src/model/DescribeNsasSuspEventTypeResult.cc
  38. 18 18
      aegis/src/model/DescribeQuaraFileResult.cc
  39. 42 42
      aegis/src/model/DescribeResultListResult.cc
  40. 16 16
      aegis/src/model/DescribeRiskTypeResult.cc
  41. 8 8
      aegis/src/model/DescribeRiskWhiteListResult.cc
  42. 16 16
      aegis/src/model/DescribeRisksResult.cc
  43. 42 42
      aegis/src/model/DescribeRuleListResult.cc
  44. 10 10
      aegis/src/model/DescribeSasAssetStatisticsResult.cc
  45. 8 8
      aegis/src/model/DescribeSasLeftConditionResult.cc
  46. 38 38
      aegis/src/model/DescribeScreenAlarmEventListResult.cc
  47. 4 4
      aegis/src/model/DescribeScreenBizStatSimpleQueryResultResult.cc
  48. 8 8
      aegis/src/model/DescribeScreenCityMonitorDataResult.cc
  49. 10 10
      aegis/src/model/DescribeScreenCloudHcRiskResult.cc
  50. 20 20
      aegis/src/model/DescribeScreenDataMapResult.cc
  51. 8 8
      aegis/src/model/DescribeScreenEmerRiskResult.cc
  52. 6 6
      aegis/src/model/DescribeScreenRequestTopTypeResult.cc
  53. 6 6
      aegis/src/model/DescribeScreenSettingsResult.cc
  54. 6 6
      aegis/src/model/DescribeScreenTitlesResult.cc
  55. 6 6
      aegis/src/model/DescribeScreenTopRequestAndFlowResult.cc
  56. 20 20
      aegis/src/model/DescribeSearchConditionResult.cc
  57. 14 14
      aegis/src/model/DescribeSecureSuggestionResult.cc
  58. 4 4
      aegis/src/model/DescribeSlsProjectResult.cc
  59. 12 12
      aegis/src/model/DescribeStrategyExecDetailResult.cc
  60. 8 8
      aegis/src/model/DescribeStrategyTargetResult.cc
  61. 16 16
      aegis/src/model/DescribeStratetyDetailResult.cc
  62. 30 30
      aegis/src/model/DescribeStratetyResult.cc
  63. 18 18
      aegis/src/model/DescribeSuspEventDetailResult.cc
  64. 26 26
      aegis/src/model/DescribeSuspEventQuaraFilesResult.cc
  65. 6 6
      aegis/src/model/DescribeSuspEventTypesResult.cc
  66. 11 0
      aegis/src/model/DescribeSuspEventsRequest.cc
  67. 42 40
      aegis/src/model/DescribeSuspEventsResult.cc
  68. 42 42
      aegis/src/model/DescribeSuspiciousEventsResult.cc
  69. 8 8
      aegis/src/model/DescribeTargetConfigResult.cc
  70. 8 8
      aegis/src/model/DescribeTargetResult.cc
  71. 14 14
      aegis/src/model/DescribeTopRiskyAssetsResult.cc
  72. 68 68
      aegis/src/model/DescribeTraceInfoDetailResult.cc
  73. 16 16
      aegis/src/model/DescribeTraceInfoNodeListResult.cc
  74. 6 6
      aegis/src/model/DescribeTraceInfoNodeResult.cc
  75. 8 8
      aegis/src/model/DescribeVulConfigResult.cc
  76. 48 48
      aegis/src/model/DescribeVulDetailsResult.cc
  77. 32 32
      aegis/src/model/DescribeVulLevelStatisticsResult.cc
  78. 92 92
      aegis/src/model/DescribeVulListResult.cc
  79. 30 30
      aegis/src/model/DescribeVulMachineListResult.cc
  80. 12 12
      aegis/src/model/DescribeVulRelatedProcessResult.cc
  81. 16 16
      aegis/src/model/DescribeVulTargetStatisticsResult.cc
  82. 10 10
      aegis/src/model/DescribeVulWhitelistResult.cc
  83. 20 20
      aegis/src/model/DescribeWarningMachinesResult.cc
  84. 34 34
      aegis/src/model/DescribeWarningResult.cc
  85. 24 24
      aegis/src/model/DescribeWebLockBindListResult.cc
  86. 20 20
      aegis/src/model/DescribeWebLockConfigListResult.cc
  87. 28 28
      aegis/src/model/DescribeWebLockEventsResult.cc
  88. 14 14
      aegis/src/model/DescribeWebLockMachineListResult.cc
  89. 24 24
      aegis/src/model/DescribeWebshellListResult.cc
  90. 30 30
      aegis/src/model/DescribeWebshellResult.cc
  91. 16 16
      aegis/src/model/DescribeWhiteListAssetResult.cc
  92. 18 18
      aegis/src/model/DescribeWhiteListEffectiveAssetsResult.cc
  93. 18 18
      aegis/src/model/DescribeWhiteListProcessResult.cc
  94. 10 10
      aegis/src/model/DescribeWhiteListStrategyListResult.cc
  95. 20 20
      aegis/src/model/DescribeWhiteListStrategyStatisticsResult.cc
  96. 20 20
      aegis/src/model/DescribesummaryResult.cc
  97. 12 12
      aegis/src/model/DownloadLogResult.cc
  98. 24 24
      aegis/src/model/GetEntityListResult.cc
  99. 14 14
      aegis/src/model/GetStatisticsByUuidResult.cc
  100. 8 8
      aegis/src/model/OperateAgentClientInstallResult.cc

+ 3 - 0
aegis/include/alibabacloud/aegis/model/DescribeSuspEventsRequest.h

@@ -57,6 +57,8 @@ namespace AlibabaCloud
 				void setLevels(const std::string& levels);
 				std::string getParentEventTypes()const;
 				void setParentEventTypes(const std::string& parentEventTypes);
+				std::string getStatus()const;
+				void setStatus(const std::string& status);
 
             private:
 				std::string remark_;
@@ -70,6 +72,7 @@ namespace AlibabaCloud
 				std::string name_;
 				std::string levels_;
 				std::string parentEventTypes_;
+				std::string status_;
 
 			};
 		}

+ 1 - 0
aegis/include/alibabacloud/aegis/model/DescribeSuspEventsResult.h

@@ -34,6 +34,7 @@ namespace AlibabaCloud
 			public:
 				struct WarningSummary
 				{
+					std::string uniqueInfo;
 					std::string alarmEventName;
 					int eventStatus;
 					std::string saleVersion;

+ 22 - 22
aegis/src/model/DescribeAccesskeyLeakListResult.cc

@@ -39,30 +39,30 @@ void DescribeAccesskeyLeakListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allAccessKeyLeakList = value["AccessKeyLeakList"]["AccessKeyLeak"];
-	for (auto value : allAccessKeyLeakList)
+	auto allAccessKeyLeakListNode = value["AccessKeyLeakList"]["AccessKeyLeak"];
+	for (auto valueAccessKeyLeakListAccessKeyLeak : allAccessKeyLeakListNode)
 	{
 		AccessKeyLeak accessKeyLeakListObject;
-		if(!value["Id"].isNull())
-			accessKeyLeakListObject.id = std::stol(value["Id"].asString());
-		if(!value["GmtModified"].isNull())
-			accessKeyLeakListObject.gmtModified = std::stol(value["GmtModified"].asString());
-		if(!value["Asset"].isNull())
-			accessKeyLeakListObject.asset = value["Asset"].asString();
-		if(!value["Type"].isNull())
-			accessKeyLeakListObject.type = value["Type"].asString();
-		if(!value["AccesskeyId"].isNull())
-			accessKeyLeakListObject.accesskeyId = value["AccesskeyId"].asString();
-		if(!value["Status"].isNull())
-			accessKeyLeakListObject.status = value["Status"].asString();
-		if(!value["AliUserName"].isNull())
-			accessKeyLeakListObject.aliUserName = value["AliUserName"].asString();
-		if(!value["DealType"].isNull())
-			accessKeyLeakListObject.dealType = value["DealType"].asString();
-		if(!value["DealTime"].isNull())
-			accessKeyLeakListObject.dealTime = value["DealTime"].asString();
-		if(!value["UserType"].isNull())
-			accessKeyLeakListObject.userType = value["UserType"].asString();
+		if(!valueAccessKeyLeakListAccessKeyLeak["Id"].isNull())
+			accessKeyLeakListObject.id = std::stol(valueAccessKeyLeakListAccessKeyLeak["Id"].asString());
+		if(!valueAccessKeyLeakListAccessKeyLeak["GmtModified"].isNull())
+			accessKeyLeakListObject.gmtModified = std::stol(valueAccessKeyLeakListAccessKeyLeak["GmtModified"].asString());
+		if(!valueAccessKeyLeakListAccessKeyLeak["Asset"].isNull())
+			accessKeyLeakListObject.asset = valueAccessKeyLeakListAccessKeyLeak["Asset"].asString();
+		if(!valueAccessKeyLeakListAccessKeyLeak["Type"].isNull())
+			accessKeyLeakListObject.type = valueAccessKeyLeakListAccessKeyLeak["Type"].asString();
+		if(!valueAccessKeyLeakListAccessKeyLeak["AccesskeyId"].isNull())
+			accessKeyLeakListObject.accesskeyId = valueAccessKeyLeakListAccessKeyLeak["AccesskeyId"].asString();
+		if(!valueAccessKeyLeakListAccessKeyLeak["Status"].isNull())
+			accessKeyLeakListObject.status = valueAccessKeyLeakListAccessKeyLeak["Status"].asString();
+		if(!valueAccessKeyLeakListAccessKeyLeak["AliUserName"].isNull())
+			accessKeyLeakListObject.aliUserName = valueAccessKeyLeakListAccessKeyLeak["AliUserName"].asString();
+		if(!valueAccessKeyLeakListAccessKeyLeak["DealType"].isNull())
+			accessKeyLeakListObject.dealType = valueAccessKeyLeakListAccessKeyLeak["DealType"].asString();
+		if(!valueAccessKeyLeakListAccessKeyLeak["DealTime"].isNull())
+			accessKeyLeakListObject.dealTime = valueAccessKeyLeakListAccessKeyLeak["DealTime"].asString();
+		if(!valueAccessKeyLeakListAccessKeyLeak["UserType"].isNull())
+			accessKeyLeakListObject.userType = valueAccessKeyLeakListAccessKeyLeak["UserType"].asString();
 		accessKeyLeakList_.push_back(accessKeyLeakListObject);
 	}
 	if(!value["GmtLast"].isNull())

+ 10 - 10
aegis/src/model/DescribeAgentInstallStatusResult.cc

@@ -39,18 +39,18 @@ void DescribeAgentInstallStatusResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allAegisClientInvokeStatusResponseList = value["AegisClientInvokeStatusResponseList"]["AegisClientInvokeStatusResponse"];
-	for (auto value : allAegisClientInvokeStatusResponseList)
+	auto allAegisClientInvokeStatusResponseListNode = value["AegisClientInvokeStatusResponseList"]["AegisClientInvokeStatusResponse"];
+	for (auto valueAegisClientInvokeStatusResponseListAegisClientInvokeStatusResponse : allAegisClientInvokeStatusResponseListNode)
 	{
 		AegisClientInvokeStatusResponse aegisClientInvokeStatusResponseListObject;
-		if(!value["Uuid"].isNull())
-			aegisClientInvokeStatusResponseListObject.uuid = value["Uuid"].asString();
-		if(!value["Message"].isNull())
-			aegisClientInvokeStatusResponseListObject.message = value["Message"].asString();
-		if(!value["Result"].isNull())
-			aegisClientInvokeStatusResponseListObject.result = std::stoi(value["Result"].asString());
-		if(!value["ResuleCode"].isNull())
-			aegisClientInvokeStatusResponseListObject.resuleCode = value["ResuleCode"].asString();
+		if(!valueAegisClientInvokeStatusResponseListAegisClientInvokeStatusResponse["Uuid"].isNull())
+			aegisClientInvokeStatusResponseListObject.uuid = valueAegisClientInvokeStatusResponseListAegisClientInvokeStatusResponse["Uuid"].asString();
+		if(!valueAegisClientInvokeStatusResponseListAegisClientInvokeStatusResponse["Message"].isNull())
+			aegisClientInvokeStatusResponseListObject.message = valueAegisClientInvokeStatusResponseListAegisClientInvokeStatusResponse["Message"].asString();
+		if(!valueAegisClientInvokeStatusResponseListAegisClientInvokeStatusResponse["Result"].isNull())
+			aegisClientInvokeStatusResponseListObject.result = std::stoi(valueAegisClientInvokeStatusResponseListAegisClientInvokeStatusResponse["Result"].asString());
+		if(!valueAegisClientInvokeStatusResponseListAegisClientInvokeStatusResponse["ResuleCode"].isNull())
+			aegisClientInvokeStatusResponseListObject.resuleCode = valueAegisClientInvokeStatusResponseListAegisClientInvokeStatusResponse["ResuleCode"].asString();
 		aegisClientInvokeStatusResponseList_.push_back(aegisClientInvokeStatusResponseListObject);
 	}
 

+ 12 - 12
aegis/src/model/DescribeAlarmEventDetailResult.cc

@@ -76,22 +76,22 @@ void DescribeAlarmEventDetailResult::parse(const std::string &payload)
 		data_.accessCode = dataNode["AccessCode"].asString();
 	if(!dataNode["Dealed"].isNull())
 		data_.dealed = dataNode["Dealed"].asString() == "true";
-	auto allCauseDetails = value["CauseDetails"]["CauseDetail"];
-	for (auto value : allCauseDetails)
+	auto allCauseDetailsNode = dataNode["CauseDetails"]["CauseDetail"];
+	for (auto dataNodeCauseDetailsCauseDetail : allCauseDetailsNode)
 	{
 		Data::CauseDetail causeDetailObject;
-		if(!value["Key"].isNull())
-			causeDetailObject.key = value["Key"].asString();
-		auto allValue = value["Value"]["ValueItem"];
-		for (auto value : allValue)
+		if(!dataNodeCauseDetailsCauseDetail["Key"].isNull())
+			causeDetailObject.key = dataNodeCauseDetailsCauseDetail["Key"].asString();
+		auto allValueNode = allCauseDetailsNode["Value"]["ValueItem"];
+		for (auto allCauseDetailsNodeValueValueItem : allValueNode)
 		{
 			Data::CauseDetail::ValueItem valueObject;
-			if(!value["Name"].isNull())
-				valueObject.name = value["Name"].asString();
-			if(!value["Type"].isNull())
-				valueObject.type = value["Type"].asString();
-			if(!value["Value"].isNull())
-				valueObject.value = value["Value"].asString();
+			if(!allCauseDetailsNodeValueValueItem["Name"].isNull())
+				valueObject.name = allCauseDetailsNodeValueValueItem["Name"].asString();
+			if(!allCauseDetailsNodeValueValueItem["Type"].isNull())
+				valueObject.type = allCauseDetailsNodeValueValueItem["Type"].asString();
+			if(!allCauseDetailsNodeValueValueItem["Value"].isNull())
+				valueObject.value = allCauseDetailsNodeValueValueItem["Value"].asString();
 			causeDetailObject.value.push_back(valueObject);
 		}
 		data_.causeDetails.push_back(causeDetailObject);

+ 50 - 50
aegis/src/model/DescribeAlarmEventListResult.cc

@@ -39,58 +39,58 @@ void DescribeAlarmEventListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allSuspEvents = value["SuspEvents"]["SuspEventsItem"];
-	for (auto value : allSuspEvents)
+	auto allSuspEventsNode = value["SuspEvents"]["SuspEventsItem"];
+	for (auto valueSuspEventsSuspEventsItem : allSuspEventsNode)
 	{
 		SuspEventsItem suspEventsObject;
-		if(!value["AlarmUniqueInfo"].isNull())
-			suspEventsObject.alarmUniqueInfo = value["AlarmUniqueInfo"].asString();
-		if(!value["Solution"].isNull())
-			suspEventsObject.solution = value["Solution"].asString();
-		if(!value["Level"].isNull())
-			suspEventsObject.level = value["Level"].asString();
-		if(!value["CanBeDealOnLine"].isNull())
-			suspEventsObject.canBeDealOnLine = value["CanBeDealOnLine"].asString() == "true";
-		if(!value["Description"].isNull())
-			suspEventsObject.description = value["Description"].asString();
-		if(!value["StartTime"].isNull())
-			suspEventsObject.startTime = std::stol(value["StartTime"].asString());
-		if(!value["EndTime"].isNull())
-			suspEventsObject.endTime = std::stol(value["EndTime"].asString());
-		if(!value["AlarmEventType"].isNull())
-			suspEventsObject.alarmEventType = value["AlarmEventType"].asString();
-		if(!value["SuspiciousEventCount"].isNull())
-			suspEventsObject.suspiciousEventCount = std::stoi(value["SuspiciousEventCount"].asString());
-		if(!value["Uuid"].isNull())
-			suspEventsObject.uuid = value["Uuid"].asString();
-		if(!value["InstanceName"].isNull())
-			suspEventsObject.instanceName = value["InstanceName"].asString();
-		if(!value["InternetIp"].isNull())
-			suspEventsObject.internetIp = value["InternetIp"].asString();
-		if(!value["IntranetIp"].isNull())
-			suspEventsObject.intranetIp = value["IntranetIp"].asString();
-		if(!value["AlarmEventName"].isNull())
-			suspEventsObject.alarmEventName = value["AlarmEventName"].asString();
-		if(!value["SaleVersion"].isNull())
-			suspEventsObject.saleVersion = value["SaleVersion"].asString();
-		if(!value["DataSource"].isNull())
-			suspEventsObject.dataSource = value["DataSource"].asString();
-		if(!value["CanCancelFault"].isNull())
-			suspEventsObject.canCancelFault = value["CanCancelFault"].asString() == "true";
-		if(!value["Dealed"].isNull())
-			suspEventsObject.dealed = value["Dealed"].asString() == "true";
-		if(!value["GmtModified"].isNull())
-			suspEventsObject.gmtModified = std::stol(value["GmtModified"].asString());
-		if(!value["HasTraceInfo"].isNull())
-			suspEventsObject.hasTraceInfo = value["HasTraceInfo"].asString() == "true";
-		if(!value["SecurityEventIds"].isNull())
-			suspEventsObject.securityEventIds = value["SecurityEventIds"].asString();
-		if(!value["OperateErrorCode"].isNull())
-			suspEventsObject.operateErrorCode = value["OperateErrorCode"].asString();
-		if(!value["AlarmEventNameOriginal"].isNull())
-			suspEventsObject.alarmEventNameOriginal = value["AlarmEventNameOriginal"].asString();
-		if(!value["InstanceId"].isNull())
-			suspEventsObject.instanceId = value["InstanceId"].asString();
+		if(!valueSuspEventsSuspEventsItem["AlarmUniqueInfo"].isNull())
+			suspEventsObject.alarmUniqueInfo = valueSuspEventsSuspEventsItem["AlarmUniqueInfo"].asString();
+		if(!valueSuspEventsSuspEventsItem["Solution"].isNull())
+			suspEventsObject.solution = valueSuspEventsSuspEventsItem["Solution"].asString();
+		if(!valueSuspEventsSuspEventsItem["Level"].isNull())
+			suspEventsObject.level = valueSuspEventsSuspEventsItem["Level"].asString();
+		if(!valueSuspEventsSuspEventsItem["CanBeDealOnLine"].isNull())
+			suspEventsObject.canBeDealOnLine = valueSuspEventsSuspEventsItem["CanBeDealOnLine"].asString() == "true";
+		if(!valueSuspEventsSuspEventsItem["Description"].isNull())
+			suspEventsObject.description = valueSuspEventsSuspEventsItem["Description"].asString();
+		if(!valueSuspEventsSuspEventsItem["StartTime"].isNull())
+			suspEventsObject.startTime = std::stol(valueSuspEventsSuspEventsItem["StartTime"].asString());
+		if(!valueSuspEventsSuspEventsItem["EndTime"].isNull())
+			suspEventsObject.endTime = std::stol(valueSuspEventsSuspEventsItem["EndTime"].asString());
+		if(!valueSuspEventsSuspEventsItem["AlarmEventType"].isNull())
+			suspEventsObject.alarmEventType = valueSuspEventsSuspEventsItem["AlarmEventType"].asString();
+		if(!valueSuspEventsSuspEventsItem["SuspiciousEventCount"].isNull())
+			suspEventsObject.suspiciousEventCount = std::stoi(valueSuspEventsSuspEventsItem["SuspiciousEventCount"].asString());
+		if(!valueSuspEventsSuspEventsItem["Uuid"].isNull())
+			suspEventsObject.uuid = valueSuspEventsSuspEventsItem["Uuid"].asString();
+		if(!valueSuspEventsSuspEventsItem["InstanceName"].isNull())
+			suspEventsObject.instanceName = valueSuspEventsSuspEventsItem["InstanceName"].asString();
+		if(!valueSuspEventsSuspEventsItem["InternetIp"].isNull())
+			suspEventsObject.internetIp = valueSuspEventsSuspEventsItem["InternetIp"].asString();
+		if(!valueSuspEventsSuspEventsItem["IntranetIp"].isNull())
+			suspEventsObject.intranetIp = valueSuspEventsSuspEventsItem["IntranetIp"].asString();
+		if(!valueSuspEventsSuspEventsItem["AlarmEventName"].isNull())
+			suspEventsObject.alarmEventName = valueSuspEventsSuspEventsItem["AlarmEventName"].asString();
+		if(!valueSuspEventsSuspEventsItem["SaleVersion"].isNull())
+			suspEventsObject.saleVersion = valueSuspEventsSuspEventsItem["SaleVersion"].asString();
+		if(!valueSuspEventsSuspEventsItem["DataSource"].isNull())
+			suspEventsObject.dataSource = valueSuspEventsSuspEventsItem["DataSource"].asString();
+		if(!valueSuspEventsSuspEventsItem["CanCancelFault"].isNull())
+			suspEventsObject.canCancelFault = valueSuspEventsSuspEventsItem["CanCancelFault"].asString() == "true";
+		if(!valueSuspEventsSuspEventsItem["Dealed"].isNull())
+			suspEventsObject.dealed = valueSuspEventsSuspEventsItem["Dealed"].asString() == "true";
+		if(!valueSuspEventsSuspEventsItem["GmtModified"].isNull())
+			suspEventsObject.gmtModified = std::stol(valueSuspEventsSuspEventsItem["GmtModified"].asString());
+		if(!valueSuspEventsSuspEventsItem["HasTraceInfo"].isNull())
+			suspEventsObject.hasTraceInfo = valueSuspEventsSuspEventsItem["HasTraceInfo"].asString() == "true";
+		if(!valueSuspEventsSuspEventsItem["SecurityEventIds"].isNull())
+			suspEventsObject.securityEventIds = valueSuspEventsSuspEventsItem["SecurityEventIds"].asString();
+		if(!valueSuspEventsSuspEventsItem["OperateErrorCode"].isNull())
+			suspEventsObject.operateErrorCode = valueSuspEventsSuspEventsItem["OperateErrorCode"].asString();
+		if(!valueSuspEventsSuspEventsItem["AlarmEventNameOriginal"].isNull())
+			suspEventsObject.alarmEventNameOriginal = valueSuspEventsSuspEventsItem["AlarmEventNameOriginal"].asString();
+		if(!valueSuspEventsSuspEventsItem["InstanceId"].isNull())
+			suspEventsObject.instanceId = valueSuspEventsSuspEventsItem["InstanceId"].asString();
 		suspEvents_.push_back(suspEventsObject);
 	}
 	auto pageInfoNode = value["PageInfo"];

+ 12 - 12
aegis/src/model/DescribeAnalysisCurveResult.cc

@@ -40,24 +40,24 @@ void DescribeAnalysisCurveResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto curvesNode = value["Curves"];
-	auto allOriginalCurveList = value["OriginalCurveList"]["OriginalCurve"];
-	for (auto value : allOriginalCurveList)
+	auto allOriginalCurveListNode = curvesNode["OriginalCurveList"]["OriginalCurve"];
+	for (auto curvesNodeOriginalCurveListOriginalCurve : allOriginalCurveListNode)
 	{
 		Curves::OriginalCurve originalCurveObject;
-		if(!value["Count"].isNull())
-			originalCurveObject.count = std::stoi(value["Count"].asString());
-		if(!value["DsTimestamp"].isNull())
-			originalCurveObject.dsTimestamp = std::stol(value["DsTimestamp"].asString());
+		if(!curvesNodeOriginalCurveListOriginalCurve["Count"].isNull())
+			originalCurveObject.count = std::stoi(curvesNodeOriginalCurveListOriginalCurve["Count"].asString());
+		if(!curvesNodeOriginalCurveListOriginalCurve["DsTimestamp"].isNull())
+			originalCurveObject.dsTimestamp = std::stol(curvesNodeOriginalCurveListOriginalCurve["DsTimestamp"].asString());
 		curves_.originalCurveList.push_back(originalCurveObject);
 	}
-	auto allResultCurveList = value["ResultCurveList"]["ResultCurve"];
-	for (auto value : allResultCurveList)
+	auto allResultCurveListNode = curvesNode["ResultCurveList"]["ResultCurve"];
+	for (auto curvesNodeResultCurveListResultCurve : allResultCurveListNode)
 	{
 		Curves::ResultCurve resultCurveObject;
-		if(!value["Count"].isNull())
-			resultCurveObject.count = std::stoi(value["Count"].asString());
-		if(!value["DsTimestamp"].isNull())
-			resultCurveObject.dsTimestamp = std::stol(value["DsTimestamp"].asString());
+		if(!curvesNodeResultCurveListResultCurve["Count"].isNull())
+			resultCurveObject.count = std::stoi(curvesNodeResultCurveListResultCurve["Count"].asString());
+		if(!curvesNodeResultCurveListResultCurve["DsTimestamp"].isNull())
+			resultCurveObject.dsTimestamp = std::stol(curvesNodeResultCurveListResultCurve["DsTimestamp"].asString());
 		curves_.resultCurveList.push_back(resultCurveObject);
 	}
 

+ 24 - 24
aegis/src/model/DescribeAssetListResult.cc

@@ -39,32 +39,32 @@ void DescribeAssetListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allAssetList = value["AssetList"]["Asset"];
-	for (auto value : allAssetList)
+	auto allAssetListNode = value["AssetList"]["Asset"];
+	for (auto valueAssetListAsset : allAssetListNode)
 	{
 		Asset assetListObject;
-		if(!value["InternetIp"].isNull())
-			assetListObject.internetIp = value["InternetIp"].asString();
-		if(!value["IntranetIp"].isNull())
-			assetListObject.intranetIp = value["IntranetIp"].asString();
-		if(!value["InstanceName"].isNull())
-			assetListObject.instanceName = value["InstanceName"].asString();
-		if(!value["Ip"].isNull())
-			assetListObject.ip = value["Ip"].asString();
-		if(!value["Uuid"].isNull())
-			assetListObject.uuid = value["Uuid"].asString();
-		if(!value["AssetType"].isNull())
-			assetListObject.assetType = value["AssetType"].asString();
-		if(!value["Os"].isNull())
-			assetListObject.os = value["Os"].asString();
-		if(!value["ClientStatus"].isNull())
-			assetListObject.clientStatus = value["ClientStatus"].asString();
-		if(!value["Region"].isNull())
-			assetListObject.region = value["Region"].asString();
-		if(!value["RegionName"].isNull())
-			assetListObject.regionName = value["RegionName"].asString();
-		if(!value["Status"].isNull())
-			assetListObject.status = value["Status"].asString();
+		if(!valueAssetListAsset["InternetIp"].isNull())
+			assetListObject.internetIp = valueAssetListAsset["InternetIp"].asString();
+		if(!valueAssetListAsset["IntranetIp"].isNull())
+			assetListObject.intranetIp = valueAssetListAsset["IntranetIp"].asString();
+		if(!valueAssetListAsset["InstanceName"].isNull())
+			assetListObject.instanceName = valueAssetListAsset["InstanceName"].asString();
+		if(!valueAssetListAsset["Ip"].isNull())
+			assetListObject.ip = valueAssetListAsset["Ip"].asString();
+		if(!valueAssetListAsset["Uuid"].isNull())
+			assetListObject.uuid = valueAssetListAsset["Uuid"].asString();
+		if(!valueAssetListAsset["AssetType"].isNull())
+			assetListObject.assetType = valueAssetListAsset["AssetType"].asString();
+		if(!valueAssetListAsset["Os"].isNull())
+			assetListObject.os = valueAssetListAsset["Os"].asString();
+		if(!valueAssetListAsset["ClientStatus"].isNull())
+			assetListObject.clientStatus = valueAssetListAsset["ClientStatus"].asString();
+		if(!valueAssetListAsset["Region"].isNull())
+			assetListObject.region = valueAssetListAsset["Region"].asString();
+		if(!valueAssetListAsset["RegionName"].isNull())
+			assetListObject.regionName = valueAssetListAsset["RegionName"].asString();
+		if(!valueAssetListAsset["Status"].isNull())
+			assetListObject.status = valueAssetListAsset["Status"].asString();
 		assetList_.push_back(assetListObject);
 	}
 	if(!value["PageSize"].isNull())

+ 4 - 4
aegis/src/model/DescribeBizStatSimpleQueryResultResult.cc

@@ -39,12 +39,12 @@ void DescribeBizStatSimpleQueryResultResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allTrendDataArr = value["TrendDataArr"]["BizStatTrendDOS"];
-	for (auto value : allTrendDataArr)
+	auto allTrendDataArrNode = value["TrendDataArr"]["BizStatTrendDOS"];
+	for (auto valueTrendDataArrBizStatTrendDOS : allTrendDataArrNode)
 	{
 		BizStatTrendDOS trendDataArrObject;
-		if(!value["BizName"].isNull())
-			trendDataArrObject.bizName = value["BizName"].asString();
+		if(!valueTrendDataArrBizStatTrendDOS["BizName"].isNull())
+			trendDataArrObject.bizName = valueTrendDataArrBizStatTrendDOS["BizName"].asString();
 		auto allValueArray = value["ValueArray"]["IntegerItem"];
 		for (auto value : allValueArray)
 			trendDataArrObject.valueArray.push_back(value.asString());

+ 18 - 18
aegis/src/model/DescribeChartDataResult.cc

@@ -39,31 +39,31 @@ void DescribeChartDataResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allMultipleData = value["MultipleData"]["MultipleDataItem"];
-	for (auto value : allMultipleData)
+	auto allMultipleDataNode = value["MultipleData"]["MultipleDataItem"];
+	for (auto valueMultipleDataMultipleDataItem : allMultipleDataNode)
 	{
 		MultipleDataItem multipleDataObject;
-		if(!value["Type"].isNull())
-			multipleDataObject.type = value["Type"].asString();
-		if(!value["Name"].isNull())
-			multipleDataObject.name = value["Name"].asString();
-		if(!value["Color"].isNull())
-			multipleDataObject.color = value["Color"].asString();
-		if(!value["Value"].isNull())
-			multipleDataObject.value = std::stol(value["Value"].asString());
+		if(!valueMultipleDataMultipleDataItem["Type"].isNull())
+			multipleDataObject.type = valueMultipleDataMultipleDataItem["Type"].asString();
+		if(!valueMultipleDataMultipleDataItem["Name"].isNull())
+			multipleDataObject.name = valueMultipleDataMultipleDataItem["Name"].asString();
+		if(!valueMultipleDataMultipleDataItem["Color"].isNull())
+			multipleDataObject.color = valueMultipleDataMultipleDataItem["Color"].asString();
+		if(!valueMultipleDataMultipleDataItem["Value"].isNull())
+			multipleDataObject.value = std::stol(valueMultipleDataMultipleDataItem["Value"].asString());
 		multipleData_.push_back(multipleDataObject);
 	}
 	auto coordinateDataNode = value["CoordinateData"];
-	auto allYAxisList = value["YAxisList"]["YAxisDo"];
-	for (auto value : allYAxisList)
+	auto allYAxisListNode = coordinateDataNode["YAxisList"]["YAxisDo"];
+	for (auto coordinateDataNodeYAxisListYAxisDo : allYAxisListNode)
 	{
 		CoordinateData::YAxisDo yAxisDoObject;
-		if(!value["Type"].isNull())
-			yAxisDoObject.type = value["Type"].asString();
-		if(!value["Name"].isNull())
-			yAxisDoObject.name = value["Name"].asString();
-		if(!value["Color"].isNull())
-			yAxisDoObject.color = value["Color"].asString();
+		if(!coordinateDataNodeYAxisListYAxisDo["Type"].isNull())
+			yAxisDoObject.type = coordinateDataNodeYAxisListYAxisDo["Type"].asString();
+		if(!coordinateDataNodeYAxisListYAxisDo["Name"].isNull())
+			yAxisDoObject.name = coordinateDataNodeYAxisListYAxisDo["Name"].asString();
+		if(!coordinateDataNodeYAxisListYAxisDo["Color"].isNull())
+			yAxisDoObject.color = coordinateDataNodeYAxisListYAxisDo["Color"].asString();
 		auto allValue = value["Value"]["LongItem"];
 		for (auto value : allValue)
 			yAxisDoObject.value.push_back(value.asString());

+ 12 - 12
aegis/src/model/DescribeChartListResult.cc

@@ -39,20 +39,20 @@ void DescribeChartListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allChartList = value["ChartList"]["chart"];
-	for (auto value : allChartList)
+	auto allChartListNode = value["ChartList"]["chart"];
+	for (auto valueChartListchart : allChartListNode)
 	{
 		Chart chartListObject;
-		if(!value["ChartId"].isNull())
-			chartListObject.chartId = value["ChartId"].asString();
-		if(!value["ChartName"].isNull())
-			chartListObject.chartName = value["ChartName"].asString();
-		if(!value["BusinessType"].isNull())
-			chartListObject.businessType = value["BusinessType"].asString();
-		if(!value["BusinessName"].isNull())
-			chartListObject.businessName = value["BusinessName"].asString();
-		if(!value["ChartType"].isNull())
-			chartListObject.chartType = value["ChartType"].asString();
+		if(!valueChartListchart["ChartId"].isNull())
+			chartListObject.chartId = valueChartListchart["ChartId"].asString();
+		if(!valueChartListchart["ChartName"].isNull())
+			chartListObject.chartName = valueChartListchart["ChartName"].asString();
+		if(!valueChartListchart["BusinessType"].isNull())
+			chartListObject.businessType = valueChartListchart["BusinessType"].asString();
+		if(!valueChartListchart["BusinessName"].isNull())
+			chartListObject.businessName = valueChartListchart["BusinessName"].asString();
+		if(!valueChartListchart["ChartType"].isNull())
+			chartListObject.chartType = valueChartListchart["ChartType"].asString();
 		chartList_.push_back(chartListObject);
 	}
 

+ 24 - 24
aegis/src/model/DescribeCheckWarningSummaryResult.cc

@@ -39,32 +39,32 @@ void DescribeCheckWarningSummaryResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allWarningSummarys = value["WarningSummarys"]["WarningSummary"];
-	for (auto value : allWarningSummarys)
+	auto allWarningSummarysNode = value["WarningSummarys"]["WarningSummary"];
+	for (auto valueWarningSummarysWarningSummary : allWarningSummarysNode)
 	{
 		WarningSummary warningSummarysObject;
-		if(!value["RiskId"].isNull())
-			warningSummarysObject.riskId = std::stol(value["RiskId"].asString());
-		if(!value["RiskName"].isNull())
-			warningSummarysObject.riskName = value["RiskName"].asString();
-		if(!value["TypeAlias"].isNull())
-			warningSummarysObject.typeAlias = value["TypeAlias"].asString();
-		if(!value["SubTypeAlias"].isNull())
-			warningSummarysObject.subTypeAlias = value["SubTypeAlias"].asString();
-		if(!value["LastFoundTime"].isNull())
-			warningSummarysObject.lastFoundTime = value["LastFoundTime"].asString();
-		if(!value["Level"].isNull())
-			warningSummarysObject.level = value["Level"].asString();
-		if(!value["CheckCount"].isNull())
-			warningSummarysObject.checkCount = std::stoi(value["CheckCount"].asString());
-		if(!value["HighWarningCount"].isNull())
-			warningSummarysObject.highWarningCount = std::stoi(value["HighWarningCount"].asString());
-		if(!value["MediumWarningCount"].isNull())
-			warningSummarysObject.mediumWarningCount = std::stoi(value["MediumWarningCount"].asString());
-		if(!value["LowWarningCount"].isNull())
-			warningSummarysObject.lowWarningCount = std::stoi(value["LowWarningCount"].asString());
-		if(!value["WarningMachineCount"].isNull())
-			warningSummarysObject.warningMachineCount = std::stoi(value["WarningMachineCount"].asString());
+		if(!valueWarningSummarysWarningSummary["RiskId"].isNull())
+			warningSummarysObject.riskId = std::stol(valueWarningSummarysWarningSummary["RiskId"].asString());
+		if(!valueWarningSummarysWarningSummary["RiskName"].isNull())
+			warningSummarysObject.riskName = valueWarningSummarysWarningSummary["RiskName"].asString();
+		if(!valueWarningSummarysWarningSummary["TypeAlias"].isNull())
+			warningSummarysObject.typeAlias = valueWarningSummarysWarningSummary["TypeAlias"].asString();
+		if(!valueWarningSummarysWarningSummary["SubTypeAlias"].isNull())
+			warningSummarysObject.subTypeAlias = valueWarningSummarysWarningSummary["SubTypeAlias"].asString();
+		if(!valueWarningSummarysWarningSummary["LastFoundTime"].isNull())
+			warningSummarysObject.lastFoundTime = valueWarningSummarysWarningSummary["LastFoundTime"].asString();
+		if(!valueWarningSummarysWarningSummary["Level"].isNull())
+			warningSummarysObject.level = valueWarningSummarysWarningSummary["Level"].asString();
+		if(!valueWarningSummarysWarningSummary["CheckCount"].isNull())
+			warningSummarysObject.checkCount = std::stoi(valueWarningSummarysWarningSummary["CheckCount"].asString());
+		if(!valueWarningSummarysWarningSummary["HighWarningCount"].isNull())
+			warningSummarysObject.highWarningCount = std::stoi(valueWarningSummarysWarningSummary["HighWarningCount"].asString());
+		if(!valueWarningSummarysWarningSummary["MediumWarningCount"].isNull())
+			warningSummarysObject.mediumWarningCount = std::stoi(valueWarningSummarysWarningSummary["MediumWarningCount"].asString());
+		if(!valueWarningSummarysWarningSummary["LowWarningCount"].isNull())
+			warningSummarysObject.lowWarningCount = std::stoi(valueWarningSummarysWarningSummary["LowWarningCount"].asString());
+		if(!valueWarningSummarysWarningSummary["WarningMachineCount"].isNull())
+			warningSummarysObject.warningMachineCount = std::stoi(valueWarningSummarysWarningSummary["WarningMachineCount"].asString());
 		warningSummarys_.push_back(warningSummarysObject);
 	}
 	if(!value["Count"].isNull())

+ 18 - 18
aegis/src/model/DescribeCheckWarningsResult.cc

@@ -39,26 +39,26 @@ void DescribeCheckWarningsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allCheckWarnings = value["CheckWarnings"]["CheckWarning"];
-	for (auto value : allCheckWarnings)
+	auto allCheckWarningsNode = value["CheckWarnings"]["CheckWarning"];
+	for (auto valueCheckWarningsCheckWarning : allCheckWarningsNode)
 	{
 		CheckWarning checkWarningsObject;
-		if(!value["Uuid"].isNull())
-			checkWarningsObject.uuid = value["Uuid"].asString();
-		if(!value["CheckId"].isNull())
-			checkWarningsObject.checkId = std::stol(value["CheckId"].asString());
-		if(!value["CheckWarningId"].isNull())
-			checkWarningsObject.checkWarningId = std::stol(value["CheckWarningId"].asString());
-		if(!value["Level"].isNull())
-			checkWarningsObject.level = value["Level"].asString();
-		if(!value["Item"].isNull())
-			checkWarningsObject.item = value["Item"].asString();
-		if(!value["Type"].isNull())
-			checkWarningsObject.type = value["Type"].asString();
-		if(!value["Status"].isNull())
-			checkWarningsObject.status = std::stoi(value["Status"].asString());
-		if(!value["Reason"].isNull())
-			checkWarningsObject.reason = value["Reason"].asString();
+		if(!valueCheckWarningsCheckWarning["Uuid"].isNull())
+			checkWarningsObject.uuid = valueCheckWarningsCheckWarning["Uuid"].asString();
+		if(!valueCheckWarningsCheckWarning["CheckId"].isNull())
+			checkWarningsObject.checkId = std::stol(valueCheckWarningsCheckWarning["CheckId"].asString());
+		if(!valueCheckWarningsCheckWarning["CheckWarningId"].isNull())
+			checkWarningsObject.checkWarningId = std::stol(valueCheckWarningsCheckWarning["CheckWarningId"].asString());
+		if(!valueCheckWarningsCheckWarning["Level"].isNull())
+			checkWarningsObject.level = valueCheckWarningsCheckWarning["Level"].asString();
+		if(!valueCheckWarningsCheckWarning["Item"].isNull())
+			checkWarningsObject.item = valueCheckWarningsCheckWarning["Item"].asString();
+		if(!valueCheckWarningsCheckWarning["Type"].isNull())
+			checkWarningsObject.type = valueCheckWarningsCheckWarning["Type"].asString();
+		if(!valueCheckWarningsCheckWarning["Status"].isNull())
+			checkWarningsObject.status = std::stoi(valueCheckWarningsCheckWarning["Status"].asString());
+		if(!valueCheckWarningsCheckWarning["Reason"].isNull())
+			checkWarningsObject.reason = valueCheckWarningsCheckWarning["Reason"].asString();
 		checkWarnings_.push_back(checkWarningsObject);
 	}
 	if(!value["Count"].isNull())

+ 22 - 22
aegis/src/model/DescribeCustomizeReportChartDataResult.cc

@@ -39,34 +39,34 @@ void DescribeCustomizeReportChartDataResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allChartList = value["ChartList"]["chart"];
-	for (auto value : allChartList)
+	auto allChartListNode = value["ChartList"]["chart"];
+	for (auto valueChartListchart : allChartListNode)
 	{
 		Chart chartListObject;
-		if(!value["ChartId"].isNull())
-			chartListObject.chartId = value["ChartId"].asString();
-		if(!value["ChartName"].isNull())
-			chartListObject.chartName = value["ChartName"].asString();
-		if(!value["Type"].isNull())
-			chartListObject.type = value["Type"].asString();
-		auto allDataList = value["DataList"]["data"];
-		for (auto value : allDataList)
+		if(!valueChartListchart["ChartId"].isNull())
+			chartListObject.chartId = valueChartListchart["ChartId"].asString();
+		if(!valueChartListchart["ChartName"].isNull())
+			chartListObject.chartName = valueChartListchart["ChartName"].asString();
+		if(!valueChartListchart["Type"].isNull())
+			chartListObject.type = valueChartListchart["Type"].asString();
+		auto allDataListNode = allChartListNode["DataList"]["data"];
+		for (auto allChartListNodeDataListdata : allDataListNode)
 		{
 			Chart::Data dataListObject;
-			if(!value["Name"].isNull())
-				dataListObject.name = value["Name"].asString();
-			if(!value["Count"].isNull())
-				dataListObject.count = std::stoi(value["Count"].asString());
-			if(!value["Old"].isNull())
-				dataListObject.old = std::stoi(value["Old"].asString());
-			auto allChartDataList = value["ChartDataList"]["chartData"];
-			for (auto value : allChartDataList)
+			if(!allChartListNodeDataListdata["Name"].isNull())
+				dataListObject.name = allChartListNodeDataListdata["Name"].asString();
+			if(!allChartListNodeDataListdata["Count"].isNull())
+				dataListObject.count = std::stoi(allChartListNodeDataListdata["Count"].asString());
+			if(!allChartListNodeDataListdata["Old"].isNull())
+				dataListObject.old = std::stoi(allChartListNodeDataListdata["Old"].asString());
+			auto allChartDataListNode = allDataListNode["ChartDataList"]["chartData"];
+			for (auto allDataListNodeChartDataListchartData : allChartDataListNode)
 			{
 				Chart::Data::ChartData chartDataListObject;
-				if(!value["Name"].isNull())
-					chartDataListObject.name = value["Name"].asString();
-				if(!value["Value"].isNull())
-					chartDataListObject.value = std::stoi(value["Value"].asString());
+				if(!allDataListNodeChartDataListchartData["Name"].isNull())
+					chartDataListObject.name = allDataListNodeChartDataListchartData["Name"].asString();
+				if(!allDataListNodeChartDataListchartData["Value"].isNull())
+					chartDataListObject.value = std::stoi(allDataListNodeChartDataListchartData["Value"].asString());
 				dataListObject.chartDataList.push_back(chartDataListObject);
 			}
 			chartListObject.dataList.push_back(dataListObject);

+ 8 - 8
aegis/src/model/DescribeCustomizeReportChartListResult.cc

@@ -39,16 +39,16 @@ void DescribeCustomizeReportChartListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allChartList = value["ChartList"]["chart"];
-	for (auto value : allChartList)
+	auto allChartListNode = value["ChartList"]["chart"];
+	for (auto valueChartListchart : allChartListNode)
 	{
 		Chart chartListObject;
-		if(!value["ChartId"].isNull())
-			chartListObject.chartId = value["ChartId"].asString();
-		if(!value["ChartName"].isNull())
-			chartListObject.chartName = value["ChartName"].asString();
-		if(!value["Area"].isNull())
-			chartListObject.area = value["Area"].asString();
+		if(!valueChartListchart["ChartId"].isNull())
+			chartListObject.chartId = valueChartListchart["ChartId"].asString();
+		if(!valueChartListchart["ChartName"].isNull())
+			chartListObject.chartName = valueChartListchart["ChartName"].asString();
+		if(!valueChartListchart["Area"].isNull())
+			chartListObject.area = valueChartListchart["Area"].asString();
 		chartList_.push_back(chartListObject);
 	}
 

+ 12 - 12
aegis/src/model/DescribeCustomizeReportListResult.cc

@@ -39,20 +39,20 @@ void DescribeCustomizeReportListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allReportList = value["ReportList"]["Report"];
-	for (auto value : allReportList)
+	auto allReportListNode = value["ReportList"]["Report"];
+	for (auto valueReportListReport : allReportListNode)
 	{
 		Report reportListObject;
-		if(!value["ReportId"].isNull())
-			reportListObject.reportId = std::stol(value["ReportId"].asString());
-		if(!value["Title"].isNull())
-			reportListObject.title = value["Title"].asString();
-		if(!value["ReportType"].isNull())
-			reportListObject.reportType = std::stoi(value["ReportType"].asString());
-		if(!value["ReportStatus"].isNull())
-			reportListObject.reportStatus = value["ReportStatus"].asString();
-		if(!value["IsDefault"].isNull())
-			reportListObject.isDefault = value["IsDefault"].asString();
+		if(!valueReportListReport["ReportId"].isNull())
+			reportListObject.reportId = std::stol(valueReportListReport["ReportId"].asString());
+		if(!valueReportListReport["Title"].isNull())
+			reportListObject.title = valueReportListReport["Title"].asString();
+		if(!valueReportListReport["ReportType"].isNull())
+			reportListObject.reportType = std::stoi(valueReportListReport["ReportType"].asString());
+		if(!valueReportListReport["ReportStatus"].isNull())
+			reportListObject.reportStatus = valueReportListReport["ReportStatus"].asString();
+		if(!valueReportListReport["IsDefault"].isNull())
+			reportListObject.isDefault = valueReportListReport["IsDefault"].asString();
 		reportList_.push_back(reportListObject);
 	}
 

+ 26 - 26
aegis/src/model/DescribeDataSourceResult.cc

@@ -39,38 +39,38 @@ void DescribeDataSourceResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allMetaDatas = value["MetaDatas"]["Data"];
-	for (auto value : allMetaDatas)
+	auto allMetaDatasNode = value["MetaDatas"]["Data"];
+	for (auto valueMetaDatasData : allMetaDatasNode)
 	{
 		Data metaDatasObject;
-		if(!value["DataSourceId"].isNull())
-			metaDatasObject.dataSourceId = std::stoi(value["DataSourceId"].asString());
-		if(!value["DateSourceName"].isNull())
-			metaDatasObject.dateSourceName = value["DateSourceName"].asString();
-		if(!value["DataSourceName"].isNull())
-			metaDatasObject.dataSourceName = value["DataSourceName"].asString();
-		if(!value["Description"].isNull())
-			metaDatasObject.description = value["Description"].asString();
-		auto allMetaDataFields = value["MetaDataFields"]["MetaDataField"];
-		for (auto value : allMetaDataFields)
+		if(!valueMetaDatasData["DataSourceId"].isNull())
+			metaDatasObject.dataSourceId = std::stoi(valueMetaDatasData["DataSourceId"].asString());
+		if(!valueMetaDatasData["DateSourceName"].isNull())
+			metaDatasObject.dateSourceName = valueMetaDatasData["DateSourceName"].asString();
+		if(!valueMetaDatasData["DataSourceName"].isNull())
+			metaDatasObject.dataSourceName = valueMetaDatasData["DataSourceName"].asString();
+		if(!valueMetaDatasData["Description"].isNull())
+			metaDatasObject.description = valueMetaDatasData["Description"].asString();
+		auto allMetaDataFieldsNode = allMetaDatasNode["MetaDataFields"]["MetaDataField"];
+		for (auto allMetaDatasNodeMetaDataFieldsMetaDataField : allMetaDataFieldsNode)
 		{
 			Data::MetaDataField metaDataFieldsObject;
-			if(!value["FiledName"].isNull())
-				metaDataFieldsObject.filedName = value["FiledName"].asString();
-			if(!value["Filed"].isNull())
-				metaDataFieldsObject.filed = value["Filed"].asString();
-			if(!value["ValueType"].isNull())
-				metaDataFieldsObject.valueType = value["ValueType"].asString();
-			if(!value["Sample"].isNull())
-				metaDataFieldsObject.sample = value["Sample"].asString();
-			auto allOperatorList = value["OperatorList"]["Operator"];
-			for (auto value : allOperatorList)
+			if(!allMetaDatasNodeMetaDataFieldsMetaDataField["FiledName"].isNull())
+				metaDataFieldsObject.filedName = allMetaDatasNodeMetaDataFieldsMetaDataField["FiledName"].asString();
+			if(!allMetaDatasNodeMetaDataFieldsMetaDataField["Filed"].isNull())
+				metaDataFieldsObject.filed = allMetaDatasNodeMetaDataFieldsMetaDataField["Filed"].asString();
+			if(!allMetaDatasNodeMetaDataFieldsMetaDataField["ValueType"].isNull())
+				metaDataFieldsObject.valueType = allMetaDatasNodeMetaDataFieldsMetaDataField["ValueType"].asString();
+			if(!allMetaDatasNodeMetaDataFieldsMetaDataField["Sample"].isNull())
+				metaDataFieldsObject.sample = allMetaDatasNodeMetaDataFieldsMetaDataField["Sample"].asString();
+			auto allOperatorListNode = allMetaDataFieldsNode["OperatorList"]["Operator"];
+			for (auto allMetaDataFieldsNodeOperatorListOperator : allOperatorListNode)
 			{
 				Data::MetaDataField::_Operator operatorListObject;
-				if(!value["Name"].isNull())
-					operatorListObject.name = value["Name"].asString();
-				if(!value["Description"].isNull())
-					operatorListObject.description = value["Description"].asString();
+				if(!allMetaDataFieldsNodeOperatorListOperator["Name"].isNull())
+					operatorListObject.name = allMetaDataFieldsNodeOperatorListOperator["Name"].asString();
+				if(!allMetaDataFieldsNodeOperatorListOperator["Description"].isNull())
+					operatorListObject.description = allMetaDataFieldsNodeOperatorListOperator["Description"].asString();
 				metaDataFieldsObject.operatorList.push_back(operatorListObject);
 			}
 			metaDatasObject.metaDataFields.push_back(metaDataFieldsObject);

+ 16 - 16
aegis/src/model/DescribeDingTalkResult.cc

@@ -39,24 +39,24 @@ void DescribeDingTalkResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allActionList = value["ActionList"]["ActionListArr"];
-	for (auto value : allActionList)
+	auto allActionListNode = value["ActionList"]["ActionListArr"];
+	for (auto valueActionListActionListArr : allActionListNode)
 	{
 		ActionListArr actionListObject;
-		if(!value["GmtModified"].isNull())
-			actionListObject.gmtModified = std::stol(value["GmtModified"].asString());
-		if(!value["Id"].isNull())
-			actionListObject.id = std::stoi(value["Id"].asString());
-		if(!value["AliUid"].isNull())
-			actionListObject.aliUid = std::stol(value["AliUid"].asString());
-		if(!value["GmtCreate"].isNull())
-			actionListObject.gmtCreate = std::stol(value["GmtCreate"].asString());
-		if(!value["Url"].isNull())
-			actionListObject.url = value["Url"].asString();
-		if(!value["IntervalTime"].isNull())
-			actionListObject.intervalTime = std::stoi(value["IntervalTime"].asString());
-		if(!value["ActionName"].isNull())
-			actionListObject.actionName = value["ActionName"].asString();
+		if(!valueActionListActionListArr["GmtModified"].isNull())
+			actionListObject.gmtModified = std::stol(valueActionListActionListArr["GmtModified"].asString());
+		if(!valueActionListActionListArr["Id"].isNull())
+			actionListObject.id = std::stoi(valueActionListActionListArr["Id"].asString());
+		if(!valueActionListActionListArr["AliUid"].isNull())
+			actionListObject.aliUid = std::stol(valueActionListActionListArr["AliUid"].asString());
+		if(!valueActionListActionListArr["GmtCreate"].isNull())
+			actionListObject.gmtCreate = std::stol(valueActionListActionListArr["GmtCreate"].asString());
+		if(!valueActionListActionListArr["Url"].isNull())
+			actionListObject.url = valueActionListActionListArr["Url"].asString();
+		if(!valueActionListActionListArr["IntervalTime"].isNull())
+			actionListObject.intervalTime = std::stoi(valueActionListActionListArr["IntervalTime"].asString());
+		if(!valueActionListActionListArr["ActionName"].isNull())
+			actionListObject.actionName = valueActionListActionListArr["ActionName"].asString();
 		actionList_.push_back(actionListObject);
 	}
 	auto pageInfoNode = value["PageInfo"];

+ 14 - 14
aegis/src/model/DescribeEmgNoticeResult.cc

@@ -39,22 +39,22 @@ void DescribeEmgNoticeResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allEmgVulGroupList = value["EmgVulGroupList"]["EmgVulGroup"];
-	for (auto value : allEmgVulGroupList)
+	auto allEmgVulGroupListNode = value["EmgVulGroupList"]["EmgVulGroup"];
+	for (auto valueEmgVulGroupListEmgVulGroup : allEmgVulGroupListNode)
 	{
 		EmgVulGroup emgVulGroupListObject;
-		if(!value["AliasName"].isNull())
-			emgVulGroupListObject.aliasName = value["AliasName"].asString();
-		if(!value["Name"].isNull())
-			emgVulGroupListObject.name = value["Name"].asString();
-		if(!value["GmtPublish"].isNull())
-			emgVulGroupListObject.gmtPublish = std::stol(value["GmtPublish"].asString());
-		if(!value["Description"].isNull())
-			emgVulGroupListObject.description = value["Description"].asString();
-		if(!value["Type"].isNull())
-			emgVulGroupListObject.type = value["Type"].asString();
-		if(!value["Status"].isNull())
-			emgVulGroupListObject.status = std::stoi(value["Status"].asString());
+		if(!valueEmgVulGroupListEmgVulGroup["AliasName"].isNull())
+			emgVulGroupListObject.aliasName = valueEmgVulGroupListEmgVulGroup["AliasName"].asString();
+		if(!valueEmgVulGroupListEmgVulGroup["Name"].isNull())
+			emgVulGroupListObject.name = valueEmgVulGroupListEmgVulGroup["Name"].asString();
+		if(!valueEmgVulGroupListEmgVulGroup["GmtPublish"].isNull())
+			emgVulGroupListObject.gmtPublish = std::stol(valueEmgVulGroupListEmgVulGroup["GmtPublish"].asString());
+		if(!valueEmgVulGroupListEmgVulGroup["Description"].isNull())
+			emgVulGroupListObject.description = valueEmgVulGroupListEmgVulGroup["Description"].asString();
+		if(!valueEmgVulGroupListEmgVulGroup["Type"].isNull())
+			emgVulGroupListObject.type = valueEmgVulGroupListEmgVulGroup["Type"].asString();
+		if(!valueEmgVulGroupListEmgVulGroup["Status"].isNull())
+			emgVulGroupListObject.status = std::stoi(valueEmgVulGroupListEmgVulGroup["Status"].asString());
 		emgVulGroupList_.push_back(emgVulGroupListObject);
 	}
 	if(!value["TotalCount"].isNull())

+ 18 - 18
aegis/src/model/DescribeEmgVulGroupResult.cc

@@ -39,26 +39,26 @@ void DescribeEmgVulGroupResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allEmgVulGroupList = value["EmgVulGroupList"]["EmgVulGroup"];
-	for (auto value : allEmgVulGroupList)
+	auto allEmgVulGroupListNode = value["EmgVulGroupList"]["EmgVulGroup"];
+	for (auto valueEmgVulGroupListEmgVulGroup : allEmgVulGroupListNode)
 	{
 		EmgVulGroup emgVulGroupListObject;
-		if(!value["AliasName"].isNull())
-			emgVulGroupListObject.aliasName = value["AliasName"].asString();
-		if(!value["PendingCount"].isNull())
-			emgVulGroupListObject.pendingCount = std::stoi(value["PendingCount"].asString());
-		if(!value["Name"].isNull())
-			emgVulGroupListObject.name = value["Name"].asString();
-		if(!value["GmtPublish"].isNull())
-			emgVulGroupListObject.gmtPublish = std::stol(value["GmtPublish"].asString());
-		if(!value["Description"].isNull())
-			emgVulGroupListObject.description = value["Description"].asString();
-		if(!value["Type"].isNull())
-			emgVulGroupListObject.type = value["Type"].asString();
-		if(!value["Status"].isNull())
-			emgVulGroupListObject.status = std::stoi(value["Status"].asString());
-		if(!value["Progress"].isNull())
-			emgVulGroupListObject.progress = std::stoi(value["Progress"].asString());
+		if(!valueEmgVulGroupListEmgVulGroup["AliasName"].isNull())
+			emgVulGroupListObject.aliasName = valueEmgVulGroupListEmgVulGroup["AliasName"].asString();
+		if(!valueEmgVulGroupListEmgVulGroup["PendingCount"].isNull())
+			emgVulGroupListObject.pendingCount = std::stoi(valueEmgVulGroupListEmgVulGroup["PendingCount"].asString());
+		if(!valueEmgVulGroupListEmgVulGroup["Name"].isNull())
+			emgVulGroupListObject.name = valueEmgVulGroupListEmgVulGroup["Name"].asString();
+		if(!valueEmgVulGroupListEmgVulGroup["GmtPublish"].isNull())
+			emgVulGroupListObject.gmtPublish = std::stol(valueEmgVulGroupListEmgVulGroup["GmtPublish"].asString());
+		if(!valueEmgVulGroupListEmgVulGroup["Description"].isNull())
+			emgVulGroupListObject.description = valueEmgVulGroupListEmgVulGroup["Description"].asString();
+		if(!valueEmgVulGroupListEmgVulGroup["Type"].isNull())
+			emgVulGroupListObject.type = valueEmgVulGroupListEmgVulGroup["Type"].asString();
+		if(!valueEmgVulGroupListEmgVulGroup["Status"].isNull())
+			emgVulGroupListObject.status = std::stoi(valueEmgVulGroupListEmgVulGroup["Status"].asString());
+		if(!valueEmgVulGroupListEmgVulGroup["Progress"].isNull())
+			emgVulGroupListObject.progress = std::stoi(valueEmgVulGroupListEmgVulGroup["Progress"].asString());
 		emgVulGroupList_.push_back(emgVulGroupListObject);
 	}
 	if(!value["TotalCount"].isNull())

+ 24 - 24
aegis/src/model/DescribeEntityListResult.cc

@@ -39,32 +39,32 @@ void DescribeEntityListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allEntityList = value["EntityList"]["Entity"];
-	for (auto value : allEntityList)
+	auto allEntityListNode = value["EntityList"]["Entity"];
+	for (auto valueEntityListEntity : allEntityListNode)
 	{
 		Entity entityListObject;
-		if(!value["AegisOnline"].isNull())
-			entityListObject.aegisOnline = value["AegisOnline"].asString() == "true";
-		if(!value["Flag"].isNull())
-			entityListObject.flag = std::stoi(value["Flag"].asString());
-		if(!value["Os"].isNull())
-			entityListObject.os = value["Os"].asString();
-		if(!value["InstanceName"].isNull())
-			entityListObject.instanceName = value["InstanceName"].asString();
-		if(!value["AegisVersion"].isNull())
-			entityListObject.aegisVersion = value["AegisVersion"].asString();
-		if(!value["GroupId"].isNull())
-			entityListObject.groupId = std::stol(value["GroupId"].asString());
-		if(!value["Ip"].isNull())
-			entityListObject.ip = value["Ip"].asString();
-		if(!value["ClientStatus"].isNull())
-			entityListObject.clientStatus = value["ClientStatus"].asString() == "true";
-		if(!value["Region"].isNull())
-			entityListObject.region = value["Region"].asString();
-		if(!value["BuyVersion"].isNull())
-			entityListObject.buyVersion = value["BuyVersion"].asString();
-		if(!value["Uuid"].isNull())
-			entityListObject.uuid = value["Uuid"].asString();
+		if(!valueEntityListEntity["AegisOnline"].isNull())
+			entityListObject.aegisOnline = valueEntityListEntity["AegisOnline"].asString() == "true";
+		if(!valueEntityListEntity["Flag"].isNull())
+			entityListObject.flag = std::stoi(valueEntityListEntity["Flag"].asString());
+		if(!valueEntityListEntity["Os"].isNull())
+			entityListObject.os = valueEntityListEntity["Os"].asString();
+		if(!valueEntityListEntity["InstanceName"].isNull())
+			entityListObject.instanceName = valueEntityListEntity["InstanceName"].asString();
+		if(!valueEntityListEntity["AegisVersion"].isNull())
+			entityListObject.aegisVersion = valueEntityListEntity["AegisVersion"].asString();
+		if(!valueEntityListEntity["GroupId"].isNull())
+			entityListObject.groupId = std::stol(valueEntityListEntity["GroupId"].asString());
+		if(!valueEntityListEntity["Ip"].isNull())
+			entityListObject.ip = valueEntityListEntity["Ip"].asString();
+		if(!valueEntityListEntity["ClientStatus"].isNull())
+			entityListObject.clientStatus = valueEntityListEntity["ClientStatus"].asString() == "true";
+		if(!valueEntityListEntity["Region"].isNull())
+			entityListObject.region = valueEntityListEntity["Region"].asString();
+		if(!valueEntityListEntity["BuyVersion"].isNull())
+			entityListObject.buyVersion = valueEntityListEntity["BuyVersion"].asString();
+		if(!valueEntityListEntity["Uuid"].isNull())
+			entityListObject.uuid = valueEntityListEntity["Uuid"].asString();
 		entityList_.push_back(entityListObject);
 	}
 	if(!value["PageSize"].isNull())

+ 20 - 20
aegis/src/model/DescribeEventCountCurveResult.cc

@@ -40,30 +40,30 @@ void DescribeEventCountCurveResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto curveDataNode = value["CurveData"];
-	auto allItems = value["Items"]["Item"];
-	for (auto value : allItems)
+	auto allItemsNode = curveDataNode["Items"]["Item"];
+	for (auto curveDataNodeItemsItem : allItemsNode)
 	{
 		CurveData::Item itemObject;
-		if(!value["Name"].isNull())
-			itemObject.name = value["Name"].asString();
-		auto allData = value["Data"]["DataItem"];
-		for (auto value : allData)
+		if(!curveDataNodeItemsItem["Name"].isNull())
+			itemObject.name = curveDataNodeItemsItem["Name"].asString();
+		auto allDataNode = allItemsNode["Data"]["DataItem"];
+		for (auto allItemsNodeDataDataItem : allDataNode)
 		{
 			CurveData::Item::DataItem dataObject;
-			if(!value["High"].isNull())
-				dataObject.high = std::stoi(value["High"].asString());
-			if(!value["Total"].isNull())
-				dataObject.total = std::stoi(value["Total"].asString());
-			if(!value["Low"].isNull())
-				dataObject.low = std::stoi(value["Low"].asString());
-			if(!value["Serious"].isNull())
-				dataObject.serious = std::stoi(value["Serious"].asString());
-			if(!value["Suspicious"].isNull())
-				dataObject.suspicious = std::stoi(value["Suspicious"].asString());
-			if(!value["Remind"].isNull())
-				dataObject.remind = std::stoi(value["Remind"].asString());
-			if(!value["Medium"].isNull())
-				dataObject.medium = std::stoi(value["Medium"].asString());
+			if(!allItemsNodeDataDataItem["High"].isNull())
+				dataObject.high = std::stoi(allItemsNodeDataDataItem["High"].asString());
+			if(!allItemsNodeDataDataItem["Total"].isNull())
+				dataObject.total = std::stoi(allItemsNodeDataDataItem["Total"].asString());
+			if(!allItemsNodeDataDataItem["Low"].isNull())
+				dataObject.low = std::stoi(allItemsNodeDataDataItem["Low"].asString());
+			if(!allItemsNodeDataDataItem["Serious"].isNull())
+				dataObject.serious = std::stoi(allItemsNodeDataDataItem["Serious"].asString());
+			if(!allItemsNodeDataDataItem["Suspicious"].isNull())
+				dataObject.suspicious = std::stoi(allItemsNodeDataDataItem["Suspicious"].asString());
+			if(!allItemsNodeDataDataItem["Remind"].isNull())
+				dataObject.remind = std::stoi(allItemsNodeDataDataItem["Remind"].asString());
+			if(!allItemsNodeDataDataItem["Medium"].isNull())
+				dataObject.medium = std::stoi(allItemsNodeDataDataItem["Medium"].asString());
 			itemObject.data.push_back(dataObject);
 		}
 		curveData_.items.push_back(itemObject);

+ 4 - 4
aegis/src/model/DescribeFilterFieldsResult.cc

@@ -39,12 +39,12 @@ void DescribeFilterFieldsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allLogFilterList = value["LogFilterList"]["LogFilterListItem"];
-	for (auto value : allLogFilterList)
+	auto allLogFilterListNode = value["LogFilterList"]["LogFilterListItem"];
+	for (auto valueLogFilterListLogFilterListItem : allLogFilterListNode)
 	{
 		LogFilterListItem logFilterListObject;
-		if(!value["Fields"].isNull())
-			logFilterListObject.fields = value["Fields"].asString();
+		if(!valueLogFilterListLogFilterListItem["Fields"].isNull())
+			logFilterListObject.fields = valueLogFilterListLogFilterListItem["Fields"].asString();
 		logFilterList_.push_back(logFilterListObject);
 	}
 	if(!value["Total"].isNull())

+ 20 - 20
aegis/src/model/DescribeGroupListResult.cc

@@ -39,28 +39,28 @@ void DescribeGroupListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allRuleGroups = value["RuleGroups"]["RuleGroupsItem"];
-	for (auto value : allRuleGroups)
+	auto allRuleGroupsNode = value["RuleGroups"]["RuleGroupsItem"];
+	for (auto valueRuleGroupsRuleGroupsItem : allRuleGroupsNode)
 	{
 		RuleGroupsItem ruleGroupsObject;
-		if(!value["GroupName"].isNull())
-			ruleGroupsObject.groupName = value["GroupName"].asString();
-		if(!value["RuleNum"].isNull())
-			ruleGroupsObject.ruleNum = std::stoi(value["RuleNum"].asString());
-		if(!value["Modified"].isNull())
-			ruleGroupsObject.modified = std::stol(value["Modified"].asString());
-		if(!value["Create"].isNull())
-			ruleGroupsObject.create = std::stol(value["Create"].asString());
-		if(!value["Description"].isNull())
-			ruleGroupsObject.description = value["Description"].asString();
-		if(!value["Id"].isNull())
-			ruleGroupsObject.id = std::stoi(value["Id"].asString());
-		if(!value["AliUid"].isNull())
-			ruleGroupsObject.aliUid = std::stol(value["AliUid"].asString());
-		if(!value["Status"].isNull())
-			ruleGroupsObject.status = std::stoi(value["Status"].asString());
-		if(!value["MachineGroupIds"].isNull())
-			ruleGroupsObject.machineGroupIds = value["MachineGroupIds"].asString();
+		if(!valueRuleGroupsRuleGroupsItem["GroupName"].isNull())
+			ruleGroupsObject.groupName = valueRuleGroupsRuleGroupsItem["GroupName"].asString();
+		if(!valueRuleGroupsRuleGroupsItem["RuleNum"].isNull())
+			ruleGroupsObject.ruleNum = std::stoi(valueRuleGroupsRuleGroupsItem["RuleNum"].asString());
+		if(!valueRuleGroupsRuleGroupsItem["Modified"].isNull())
+			ruleGroupsObject.modified = std::stol(valueRuleGroupsRuleGroupsItem["Modified"].asString());
+		if(!valueRuleGroupsRuleGroupsItem["Create"].isNull())
+			ruleGroupsObject.create = std::stol(valueRuleGroupsRuleGroupsItem["Create"].asString());
+		if(!valueRuleGroupsRuleGroupsItem["Description"].isNull())
+			ruleGroupsObject.description = valueRuleGroupsRuleGroupsItem["Description"].asString();
+		if(!valueRuleGroupsRuleGroupsItem["Id"].isNull())
+			ruleGroupsObject.id = std::stoi(valueRuleGroupsRuleGroupsItem["Id"].asString());
+		if(!valueRuleGroupsRuleGroupsItem["AliUid"].isNull())
+			ruleGroupsObject.aliUid = std::stol(valueRuleGroupsRuleGroupsItem["AliUid"].asString());
+		if(!valueRuleGroupsRuleGroupsItem["Status"].isNull())
+			ruleGroupsObject.status = std::stoi(valueRuleGroupsRuleGroupsItem["Status"].asString());
+		if(!valueRuleGroupsRuleGroupsItem["MachineGroupIds"].isNull())
+			ruleGroupsObject.machineGroupIds = valueRuleGroupsRuleGroupsItem["MachineGroupIds"].asString();
 		ruleGroups_.push_back(ruleGroupsObject);
 	}
 	auto pageInfoNode = value["PageInfo"];

+ 22 - 22
aegis/src/model/DescribeGroupedVulResult.cc

@@ -39,30 +39,30 @@ void DescribeGroupedVulResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allGroupedVulItems = value["GroupedVulItems"]["GroupedVulItem"];
-	for (auto value : allGroupedVulItems)
+	auto allGroupedVulItemsNode = value["GroupedVulItems"]["GroupedVulItem"];
+	for (auto valueGroupedVulItemsGroupedVulItem : allGroupedVulItemsNode)
 	{
 		GroupedVulItem groupedVulItemsObject;
-		if(!value["Name"].isNull())
-			groupedVulItemsObject.name = value["Name"].asString();
-		if(!value["AliasName"].isNull())
-			groupedVulItemsObject.aliasName = value["AliasName"].asString();
-		if(!value["Type"].isNull())
-			groupedVulItemsObject.type = value["Type"].asString();
-		if(!value["Status"].isNull())
-			groupedVulItemsObject.status = std::stoi(value["Status"].asString());
-		if(!value["GmtLast"].isNull())
-			groupedVulItemsObject.gmtLast = std::stol(value["GmtLast"].asString());
-		if(!value["AsapCount"].isNull())
-			groupedVulItemsObject.asapCount = std::stoi(value["AsapCount"].asString());
-		if(!value["LaterCount"].isNull())
-			groupedVulItemsObject.laterCount = std::stoi(value["LaterCount"].asString());
-		if(!value["NntfCount"].isNull())
-			groupedVulItemsObject.nntfCount = std::stoi(value["NntfCount"].asString());
-		if(!value["HandledCount"].isNull())
-			groupedVulItemsObject.handledCount = std::stoi(value["HandledCount"].asString());
-		if(!value["Tags"].isNull())
-			groupedVulItemsObject.tags = value["Tags"].asString();
+		if(!valueGroupedVulItemsGroupedVulItem["Name"].isNull())
+			groupedVulItemsObject.name = valueGroupedVulItemsGroupedVulItem["Name"].asString();
+		if(!valueGroupedVulItemsGroupedVulItem["AliasName"].isNull())
+			groupedVulItemsObject.aliasName = valueGroupedVulItemsGroupedVulItem["AliasName"].asString();
+		if(!valueGroupedVulItemsGroupedVulItem["Type"].isNull())
+			groupedVulItemsObject.type = valueGroupedVulItemsGroupedVulItem["Type"].asString();
+		if(!valueGroupedVulItemsGroupedVulItem["Status"].isNull())
+			groupedVulItemsObject.status = std::stoi(valueGroupedVulItemsGroupedVulItem["Status"].asString());
+		if(!valueGroupedVulItemsGroupedVulItem["GmtLast"].isNull())
+			groupedVulItemsObject.gmtLast = std::stol(valueGroupedVulItemsGroupedVulItem["GmtLast"].asString());
+		if(!valueGroupedVulItemsGroupedVulItem["AsapCount"].isNull())
+			groupedVulItemsObject.asapCount = std::stoi(valueGroupedVulItemsGroupedVulItem["AsapCount"].asString());
+		if(!valueGroupedVulItemsGroupedVulItem["LaterCount"].isNull())
+			groupedVulItemsObject.laterCount = std::stoi(valueGroupedVulItemsGroupedVulItem["LaterCount"].asString());
+		if(!valueGroupedVulItemsGroupedVulItem["NntfCount"].isNull())
+			groupedVulItemsObject.nntfCount = std::stoi(valueGroupedVulItemsGroupedVulItem["NntfCount"].asString());
+		if(!valueGroupedVulItemsGroupedVulItem["HandledCount"].isNull())
+			groupedVulItemsObject.handledCount = std::stoi(valueGroupedVulItemsGroupedVulItem["HandledCount"].asString());
+		if(!valueGroupedVulItemsGroupedVulItem["Tags"].isNull())
+			groupedVulItemsObject.tags = valueGroupedVulItemsGroupedVulItem["Tags"].asString();
 		groupedVulItems_.push_back(groupedVulItemsObject);
 	}
 	if(!value["PageSize"].isNull())

+ 2 - 2
aegis/src/model/DescribeHistogramResult.cc

@@ -39,8 +39,8 @@ void DescribeHistogramResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allItems = value["Items"]["ItemsItem"];
-	for (auto value : allItems)
+	auto allItemsNode = value["Items"]["ItemsItem"];
+	for (auto valueItemsItemsItem : allItemsNode)
 	{
 		ItemsItem itemsObject;
 		auto allData = value["Data"]["Data"];

+ 14 - 14
aegis/src/model/DescribeInstanceStatisticsResult.cc

@@ -39,22 +39,22 @@ void DescribeInstanceStatisticsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allData = value["Data"]["Entity"];
-	for (auto value : allData)
+	auto allDataNode = value["Data"]["Entity"];
+	for (auto valueDataEntity : allDataNode)
 	{
 		Entity dataObject;
-		if(!value["Uuid"].isNull())
-			dataObject.uuid = value["Uuid"].asString();
-		if(!value["Account"].isNull())
-			dataObject.account = std::stoi(value["Account"].asString());
-		if(!value["Health"].isNull())
-			dataObject.health = std::stoi(value["Health"].asString());
-		if(!value["Trojan"].isNull())
-			dataObject.trojan = std::stoi(value["Trojan"].asString());
-		if(!value["Suspicious"].isNull())
-			dataObject.suspicious = std::stoi(value["Suspicious"].asString());
-		if(!value["Vul"].isNull())
-			dataObject.vul = std::stoi(value["Vul"].asString());
+		if(!valueDataEntity["Uuid"].isNull())
+			dataObject.uuid = valueDataEntity["Uuid"].asString();
+		if(!valueDataEntity["Account"].isNull())
+			dataObject.account = std::stoi(valueDataEntity["Account"].asString());
+		if(!valueDataEntity["Health"].isNull())
+			dataObject.health = std::stoi(valueDataEntity["Health"].asString());
+		if(!valueDataEntity["Trojan"].isNull())
+			dataObject.trojan = std::stoi(valueDataEntity["Trojan"].asString());
+		if(!valueDataEntity["Suspicious"].isNull())
+			dataObject.suspicious = std::stoi(valueDataEntity["Suspicious"].asString());
+		if(!valueDataEntity["Vul"].isNull())
+			dataObject.vul = std::stoi(valueDataEntity["Vul"].asString());
 		data_.push_back(dataObject);
 	}
 

+ 30 - 30
aegis/src/model/DescribeJoinRuleListResult.cc

@@ -39,38 +39,38 @@ void DescribeJoinRuleListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allJoinRuleList = value["JoinRuleList"]["JoinRuleListArr"];
-	for (auto value : allJoinRuleList)
+	auto allJoinRuleListNode = value["JoinRuleList"]["JoinRuleListArr"];
+	for (auto valueJoinRuleListJoinRuleListArr : allJoinRuleListNode)
 	{
 		JoinRuleListArr joinRuleListObject;
-		if(!value["TimeWindow"].isNull())
-			joinRuleListObject.timeWindow = std::stoi(value["TimeWindow"].asString());
-		if(!value["WarnLevel"].isNull())
-			joinRuleListObject.warnLevel = value["WarnLevel"].asString();
-		if(!value["DataSourceId1"].isNull())
-			joinRuleListObject.dataSourceId1 = std::stoi(value["DataSourceId1"].asString());
-		if(!value["Description"].isNull())
-			joinRuleListObject.description = value["Description"].asString();
-		if(!value["RuleName"].isNull())
-			joinRuleListObject.ruleName = value["RuleName"].asString();
-		if(!value["JoinRelation"].isNull())
-			joinRuleListObject.joinRelation = value["JoinRelation"].asString();
-		if(!value["DataSourceId2"].isNull())
-			joinRuleListObject.dataSourceId2 = std::stoi(value["DataSourceId2"].asString());
-		if(!value["Expression2"].isNull())
-			joinRuleListObject.expression2 = value["Expression2"].asString();
-		if(!value["RuleId"].isNull())
-			joinRuleListObject.ruleId = std::stoi(value["RuleId"].asString());
-		if(!value["Expression1"].isNull())
-			joinRuleListObject.expression1 = value["Expression1"].asString();
-		if(!value["Actions"].isNull())
-			joinRuleListObject.actions = value["Actions"].asString();
-		if(!value["StatisticsRules"].isNull())
-			joinRuleListObject.statisticsRules = value["StatisticsRules"].asString();
-		if(!value["NeedGroup"].isNull())
-			joinRuleListObject.needGroup = value["NeedGroup"].asString() == "true";
-		if(!value["StatusCode"].isNull())
-			joinRuleListObject.statusCode = value["StatusCode"].asString();
+		if(!valueJoinRuleListJoinRuleListArr["TimeWindow"].isNull())
+			joinRuleListObject.timeWindow = std::stoi(valueJoinRuleListJoinRuleListArr["TimeWindow"].asString());
+		if(!valueJoinRuleListJoinRuleListArr["WarnLevel"].isNull())
+			joinRuleListObject.warnLevel = valueJoinRuleListJoinRuleListArr["WarnLevel"].asString();
+		if(!valueJoinRuleListJoinRuleListArr["DataSourceId1"].isNull())
+			joinRuleListObject.dataSourceId1 = std::stoi(valueJoinRuleListJoinRuleListArr["DataSourceId1"].asString());
+		if(!valueJoinRuleListJoinRuleListArr["Description"].isNull())
+			joinRuleListObject.description = valueJoinRuleListJoinRuleListArr["Description"].asString();
+		if(!valueJoinRuleListJoinRuleListArr["RuleName"].isNull())
+			joinRuleListObject.ruleName = valueJoinRuleListJoinRuleListArr["RuleName"].asString();
+		if(!valueJoinRuleListJoinRuleListArr["JoinRelation"].isNull())
+			joinRuleListObject.joinRelation = valueJoinRuleListJoinRuleListArr["JoinRelation"].asString();
+		if(!valueJoinRuleListJoinRuleListArr["DataSourceId2"].isNull())
+			joinRuleListObject.dataSourceId2 = std::stoi(valueJoinRuleListJoinRuleListArr["DataSourceId2"].asString());
+		if(!valueJoinRuleListJoinRuleListArr["Expression2"].isNull())
+			joinRuleListObject.expression2 = valueJoinRuleListJoinRuleListArr["Expression2"].asString();
+		if(!valueJoinRuleListJoinRuleListArr["RuleId"].isNull())
+			joinRuleListObject.ruleId = std::stoi(valueJoinRuleListJoinRuleListArr["RuleId"].asString());
+		if(!valueJoinRuleListJoinRuleListArr["Expression1"].isNull())
+			joinRuleListObject.expression1 = valueJoinRuleListJoinRuleListArr["Expression1"].asString();
+		if(!valueJoinRuleListJoinRuleListArr["Actions"].isNull())
+			joinRuleListObject.actions = valueJoinRuleListJoinRuleListArr["Actions"].asString();
+		if(!valueJoinRuleListJoinRuleListArr["StatisticsRules"].isNull())
+			joinRuleListObject.statisticsRules = valueJoinRuleListJoinRuleListArr["StatisticsRules"].asString();
+		if(!valueJoinRuleListJoinRuleListArr["NeedGroup"].isNull())
+			joinRuleListObject.needGroup = valueJoinRuleListJoinRuleListArr["NeedGroup"].asString() == "true";
+		if(!valueJoinRuleListJoinRuleListArr["StatusCode"].isNull())
+			joinRuleListObject.statusCode = valueJoinRuleListJoinRuleListArr["StatusCode"].asString();
 		joinRuleList_.push_back(joinRuleListObject);
 	}
 	auto pageInfoNode = value["PageInfo"];

+ 14 - 14
aegis/src/model/DescribeLogInfoResult.cc

@@ -39,24 +39,24 @@ void DescribeLogInfoResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allLogInfoItems = value["LogInfoItems"]["Item"];
-	for (auto value : allLogInfoItems)
+	auto allLogInfoItemsNode = value["LogInfoItems"]["Item"];
+	for (auto valueLogInfoItemsItem : allLogInfoItemsNode)
 	{
 		Item logInfoItemsObject;
-		if(!value["Name"].isNull())
-			logInfoItemsObject.name = value["Name"].asString();
-		if(!value["Id"].isNull())
-			logInfoItemsObject.id = value["Id"].asString();
-		auto allFields = value["Fields"]["Field"];
-		for (auto value : allFields)
+		if(!valueLogInfoItemsItem["Name"].isNull())
+			logInfoItemsObject.name = valueLogInfoItemsItem["Name"].asString();
+		if(!valueLogInfoItemsItem["Id"].isNull())
+			logInfoItemsObject.id = valueLogInfoItemsItem["Id"].asString();
+		auto allFieldsNode = allLogInfoItemsNode["Fields"]["Field"];
+		for (auto allLogInfoItemsNodeFieldsField : allFieldsNode)
 		{
 			Item::Field fieldsObject;
-			if(!value["Name"].isNull())
-				fieldsObject.name = value["Name"].asString();
-			if(!value["Type"].isNull())
-				fieldsObject.type = value["Type"].asString();
-			if(!value["Desc"].isNull())
-				fieldsObject.desc = value["Desc"].asString();
+			if(!allLogInfoItemsNodeFieldsField["Name"].isNull())
+				fieldsObject.name = allLogInfoItemsNodeFieldsField["Name"].asString();
+			if(!allLogInfoItemsNodeFieldsField["Type"].isNull())
+				fieldsObject.type = allLogInfoItemsNodeFieldsField["Type"].asString();
+			if(!allLogInfoItemsNodeFieldsField["Desc"].isNull())
+				fieldsObject.desc = allLogInfoItemsNodeFieldsField["Desc"].asString();
 			logInfoItemsObject.fields.push_back(fieldsObject);
 		}
 		logInfoItems_.push_back(logInfoItemsObject);

+ 14 - 14
aegis/src/model/DescribeLogItemsResult.cc

@@ -39,24 +39,24 @@ void DescribeLogItemsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allLogsList = value["LogsList"]["LogsListItem"];
-	for (auto value : allLogsList)
+	auto allLogsListNode = value["LogsList"]["LogsListItem"];
+	for (auto valueLogsListLogsListItem : allLogsListNode)
 	{
 		LogsListItem logsListObject;
-		if(!value["MLogTime"].isNull())
-			logsListObject.mLogTime = value["MLogTime"].asString();
-		if(!value["LogSourceId"].isNull())
-			logsListObject.logSourceId = value["LogSourceId"].asString();
-		if(!value["LogSource"].isNull())
-			logsListObject.logSource = value["LogSource"].asString();
-		auto allMContents = value["MContents"]["MContentsItem"];
-		for (auto value : allMContents)
+		if(!valueLogsListLogsListItem["MLogTime"].isNull())
+			logsListObject.mLogTime = valueLogsListLogsListItem["MLogTime"].asString();
+		if(!valueLogsListLogsListItem["LogSourceId"].isNull())
+			logsListObject.logSourceId = valueLogsListLogsListItem["LogSourceId"].asString();
+		if(!valueLogsListLogsListItem["LogSource"].isNull())
+			logsListObject.logSource = valueLogsListLogsListItem["LogSource"].asString();
+		auto allMContentsNode = allLogsListNode["MContents"]["MContentsItem"];
+		for (auto allLogsListNodeMContentsMContentsItem : allMContentsNode)
 		{
 			LogsListItem::MContentsItem mContentsObject;
-			if(!value["MKey"].isNull())
-				mContentsObject.mKey = value["MKey"].asString();
-			if(!value["MValue"].isNull())
-				mContentsObject.mValue = value["MValue"].asString();
+			if(!allLogsListNodeMContentsMContentsItem["MKey"].isNull())
+				mContentsObject.mKey = allLogsListNodeMContentsMContentsItem["MKey"].asString();
+			if(!allLogsListNodeMContentsMContentsItem["MValue"].isNull())
+				mContentsObject.mValue = allLogsListNodeMContentsMContentsItem["MValue"].asString();
 			logsListObject.mContents.push_back(mContentsObject);
 		}
 		logsList_.push_back(logsListObject);

+ 14 - 14
aegis/src/model/DescribeLogMetaResult.cc

@@ -39,22 +39,22 @@ void DescribeLogMetaResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allLogMetaList = value["LogMetaList"]["LogMeta"];
-	for (auto value : allLogMetaList)
+	auto allLogMetaListNode = value["LogMetaList"]["LogMeta"];
+	for (auto valueLogMetaListLogMeta : allLogMetaListNode)
 	{
 		LogMeta logMetaListObject;
-		if(!value["Project"].isNull())
-			logMetaListObject.project = value["Project"].asString();
-		if(!value["UserProject"].isNull())
-			logMetaListObject.userProject = value["UserProject"].asString();
-		if(!value["LogStore"].isNull())
-			logMetaListObject.logStore = value["LogStore"].asString();
-		if(!value["LogDesc"].isNull())
-			logMetaListObject.logDesc = value["LogDesc"].asString();
-		if(!value["Category"].isNull())
-			logMetaListObject.category = value["Category"].asString();
-		if(!value["Status"].isNull())
-			logMetaListObject.status = value["Status"].asString();
+		if(!valueLogMetaListLogMeta["Project"].isNull())
+			logMetaListObject.project = valueLogMetaListLogMeta["Project"].asString();
+		if(!valueLogMetaListLogMeta["UserProject"].isNull())
+			logMetaListObject.userProject = valueLogMetaListLogMeta["UserProject"].asString();
+		if(!valueLogMetaListLogMeta["LogStore"].isNull())
+			logMetaListObject.logStore = valueLogMetaListLogMeta["LogStore"].asString();
+		if(!valueLogMetaListLogMeta["LogDesc"].isNull())
+			logMetaListObject.logDesc = valueLogMetaListLogMeta["LogDesc"].asString();
+		if(!valueLogMetaListLogMeta["Category"].isNull())
+			logMetaListObject.category = valueLogMetaListLogMeta["Category"].asString();
+		if(!valueLogMetaListLogMeta["Status"].isNull())
+			logMetaListObject.status = valueLogMetaListLogMeta["Status"].asString();
 		logMetaList_.push_back(logMetaListObject);
 	}
 	if(!value["TotalCount"].isNull())

+ 8 - 8
aegis/src/model/DescribeLogQueryResult.cc

@@ -39,16 +39,16 @@ void DescribeLogQueryResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allQueryItems = value["QueryItems"]["QueryItemsItem"];
-	for (auto value : allQueryItems)
+	auto allQueryItemsNode = value["QueryItems"]["QueryItemsItem"];
+	for (auto valueQueryItemsQueryItemsItem : allQueryItemsNode)
 	{
 		QueryItemsItem queryItemsObject;
-		if(!value["QueryDetail"].isNull())
-			queryItemsObject.queryDetail = value["QueryDetail"].asString();
-		if(!value["QueryName"].isNull())
-			queryItemsObject.queryName = value["QueryName"].asString();
-		if(!value["Conditions"].isNull())
-			queryItemsObject.conditions = value["Conditions"].asString();
+		if(!valueQueryItemsQueryItemsItem["QueryDetail"].isNull())
+			queryItemsObject.queryDetail = valueQueryItemsQueryItemsItem["QueryDetail"].asString();
+		if(!valueQueryItemsQueryItemsItem["QueryName"].isNull())
+			queryItemsObject.queryName = valueQueryItemsQueryItemsItem["QueryName"].asString();
+		if(!valueQueryItemsQueryItemsItem["Conditions"].isNull())
+			queryItemsObject.conditions = valueQueryItemsQueryItemsItem["Conditions"].asString();
 		queryItems_.push_back(queryItemsObject);
 	}
 	if(!value["ListTotal"].isNull())

+ 36 - 36
aegis/src/model/DescribeLoginLogsResult.cc

@@ -39,44 +39,44 @@ void DescribeLoginLogsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allLogList = value["LogList"]["LogListItem"];
-	for (auto value : allLogList)
+	auto allLogListNode = value["LogList"]["LogListItem"];
+	for (auto valueLogListLogListItem : allLogListNode)
 	{
 		LogListItem logListObject;
-		if(!value["LoginSourceIp"].isNull())
-			logListObject.loginSourceIp = value["LoginSourceIp"].asString();
-		if(!value["InstanceName"].isNull())
-			logListObject.instanceName = value["InstanceName"].asString();
-		if(!value["GroupId"].isNull())
-			logListObject.groupId = std::stol(value["GroupId"].asString());
-		if(!value["Ip"].isNull())
-			logListObject.ip = value["Ip"].asString();
-		if(!value["Type"].isNull())
-			logListObject.type = value["Type"].asString();
-		if(!value["UserName"].isNull())
-			logListObject.userName = value["UserName"].asString();
-		if(!value["Uuid"].isNull())
-			logListObject.uuid = value["Uuid"].asString();
-		if(!value["Protocol"].isNull())
-			logListObject.protocol = std::stoi(value["Protocol"].asString());
-		if(!value["LoginTime"].isNull())
-			logListObject.loginTime = std::stol(value["LoginTime"].asString());
-		if(!value["InstanceId"].isNull())
-			logListObject.instanceId = value["InstanceId"].asString();
-		if(!value["OsVersion"].isNull())
-			logListObject.osVersion = value["OsVersion"].asString();
-		if(!value["ProtocolName"].isNull())
-			logListObject.protocolName = value["ProtocolName"].asString();
-		if(!value["Online"].isNull())
-			logListObject.online = value["Online"].asString();
-		if(!value["Location"].isNull())
-			logListObject.location = value["Location"].asString();
-		if(!value["id"].isNull())
-			logListObject.id = std::stol(value["id"].asString());
-		if(!value["Region"].isNull())
-			logListObject.region = value["Region"].asString();
-		if(!value["Status"].isNull())
-			logListObject.status = std::stoi(value["Status"].asString());
+		if(!valueLogListLogListItem["LoginSourceIp"].isNull())
+			logListObject.loginSourceIp = valueLogListLogListItem["LoginSourceIp"].asString();
+		if(!valueLogListLogListItem["InstanceName"].isNull())
+			logListObject.instanceName = valueLogListLogListItem["InstanceName"].asString();
+		if(!valueLogListLogListItem["GroupId"].isNull())
+			logListObject.groupId = std::stol(valueLogListLogListItem["GroupId"].asString());
+		if(!valueLogListLogListItem["Ip"].isNull())
+			logListObject.ip = valueLogListLogListItem["Ip"].asString();
+		if(!valueLogListLogListItem["Type"].isNull())
+			logListObject.type = valueLogListLogListItem["Type"].asString();
+		if(!valueLogListLogListItem["UserName"].isNull())
+			logListObject.userName = valueLogListLogListItem["UserName"].asString();
+		if(!valueLogListLogListItem["Uuid"].isNull())
+			logListObject.uuid = valueLogListLogListItem["Uuid"].asString();
+		if(!valueLogListLogListItem["Protocol"].isNull())
+			logListObject.protocol = std::stoi(valueLogListLogListItem["Protocol"].asString());
+		if(!valueLogListLogListItem["LoginTime"].isNull())
+			logListObject.loginTime = std::stol(valueLogListLogListItem["LoginTime"].asString());
+		if(!valueLogListLogListItem["InstanceId"].isNull())
+			logListObject.instanceId = valueLogListLogListItem["InstanceId"].asString();
+		if(!valueLogListLogListItem["OsVersion"].isNull())
+			logListObject.osVersion = valueLogListLogListItem["OsVersion"].asString();
+		if(!valueLogListLogListItem["ProtocolName"].isNull())
+			logListObject.protocolName = valueLogListLogListItem["ProtocolName"].asString();
+		if(!valueLogListLogListItem["Online"].isNull())
+			logListObject.online = valueLogListLogListItem["Online"].asString();
+		if(!valueLogListLogListItem["Location"].isNull())
+			logListObject.location = valueLogListLogListItem["Location"].asString();
+		if(!valueLogListLogListItem["id"].isNull())
+			logListObject.id = std::stol(valueLogListLogListItem["id"].asString());
+		if(!valueLogListLogListItem["Region"].isNull())
+			logListObject.region = valueLogListLogListItem["Region"].asString();
+		if(!valueLogListLogListItem["Status"].isNull())
+			logListObject.status = std::stoi(valueLogListLogListItem["Status"].asString());
 		logList_.push_back(logListObject);
 	}
 	if(!value["PageSize"].isNull())

+ 30 - 30
aegis/src/model/DescribeMacConfigResult.cc

@@ -39,40 +39,40 @@ void DescribeMacConfigResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allConfigs = value["Configs"]["Config"];
-	for (auto value : allConfigs)
+	auto allConfigsNode = value["Configs"]["Config"];
+	for (auto valueConfigsConfig : allConfigsNode)
 	{
 		Config configsObject;
-		if(!value["StartTime"].isNull())
-			configsObject.startTime = value["StartTime"].asString();
-		if(!value["EndTime"].isNull())
-			configsObject.endTime = value["EndTime"].asString();
-		if(!value["Ip"].isNull())
-			configsObject.ip = value["Ip"].asString();
-		if(!value["StrategyId"].isNull())
-			configsObject.strategyId = std::stol(value["StrategyId"].asString());
-		if(!value["Account"].isNull())
-			configsObject.account = value["Account"].asString();
-		if(!value["Location"].isNull())
-			configsObject.location = value["Location"].asString();
-		if(!value["Switcher"].isNull())
-			configsObject.switcher = value["Switcher"].asString();
-		if(!value["VulType"].isNull())
-			configsObject.vulType = value["VulType"].asString();
-		if(!value["UuidCount"].isNull())
-			configsObject.uuidCount = std::stoi(value["UuidCount"].asString());
-		if(!value["TotalCount"].isNull())
-			configsObject.totalCount = std::stoi(value["TotalCount"].asString());
-		auto allTargetList = value["TargetList"]["Target"];
-		for (auto value : allTargetList)
+		if(!valueConfigsConfig["StartTime"].isNull())
+			configsObject.startTime = valueConfigsConfig["StartTime"].asString();
+		if(!valueConfigsConfig["EndTime"].isNull())
+			configsObject.endTime = valueConfigsConfig["EndTime"].asString();
+		if(!valueConfigsConfig["Ip"].isNull())
+			configsObject.ip = valueConfigsConfig["Ip"].asString();
+		if(!valueConfigsConfig["StrategyId"].isNull())
+			configsObject.strategyId = std::stol(valueConfigsConfig["StrategyId"].asString());
+		if(!valueConfigsConfig["Account"].isNull())
+			configsObject.account = valueConfigsConfig["Account"].asString();
+		if(!valueConfigsConfig["Location"].isNull())
+			configsObject.location = valueConfigsConfig["Location"].asString();
+		if(!valueConfigsConfig["Switcher"].isNull())
+			configsObject.switcher = valueConfigsConfig["Switcher"].asString();
+		if(!valueConfigsConfig["VulType"].isNull())
+			configsObject.vulType = valueConfigsConfig["VulType"].asString();
+		if(!valueConfigsConfig["UuidCount"].isNull())
+			configsObject.uuidCount = std::stoi(valueConfigsConfig["UuidCount"].asString());
+		if(!valueConfigsConfig["TotalCount"].isNull())
+			configsObject.totalCount = std::stoi(valueConfigsConfig["TotalCount"].asString());
+		auto allTargetListNode = allConfigsNode["TargetList"]["Target"];
+		for (auto allConfigsNodeTargetListTarget : allTargetListNode)
 		{
 			Config::Target targetListObject;
-			if(!value["Flag"].isNull())
-				targetListObject.flag = value["Flag"].asString();
-			if(!value["TargetType"].isNull())
-				targetListObject.targetType = value["TargetType"].asString();
-			if(!value["Target"].isNull())
-				targetListObject.target = value["Target"].asString();
+			if(!allConfigsNodeTargetListTarget["Flag"].isNull())
+				targetListObject.flag = allConfigsNodeTargetListTarget["Flag"].asString();
+			if(!allConfigsNodeTargetListTarget["TargetType"].isNull())
+				targetListObject.targetType = allConfigsNodeTargetListTarget["TargetType"].asString();
+			if(!allConfigsNodeTargetListTarget["Target"].isNull())
+				targetListObject.target = allConfigsNodeTargetListTarget["Target"].asString();
 			configsObject.targetList.push_back(targetListObject);
 		}
 		configs_.push_back(configsObject);

+ 8 - 8
aegis/src/model/DescribeMachineConfigResult.cc

@@ -39,16 +39,16 @@ void DescribeMachineConfigResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allConfigTargets = value["ConfigTargets"]["ConfigTarget"];
-	for (auto value : allConfigTargets)
+	auto allConfigTargetsNode = value["ConfigTargets"]["ConfigTarget"];
+	for (auto valueConfigTargetsConfigTarget : allConfigTargetsNode)
 	{
 		ConfigTarget configTargetsObject;
-		if(!value["TargetType"].isNull())
-			configTargetsObject.targetType = value["TargetType"].asString();
-		if(!value["Target"].isNull())
-			configTargetsObject.target = value["Target"].asString();
-		if(!value["Flag"].isNull())
-			configTargetsObject.flag = value["Flag"].asString();
+		if(!valueConfigTargetsConfigTarget["TargetType"].isNull())
+			configTargetsObject.targetType = valueConfigTargetsConfigTarget["TargetType"].asString();
+		if(!valueConfigTargetsConfigTarget["Target"].isNull())
+			configTargetsObject.target = valueConfigTargetsConfigTarget["Target"].asString();
+		if(!valueConfigTargetsConfigTarget["Flag"].isNull())
+			configTargetsObject.flag = valueConfigTargetsConfigTarget["Flag"].asString();
 		configTargets_.push_back(configTargetsObject);
 	}
 	if(!value["Count"].isNull())

+ 16 - 16
aegis/src/model/DescribeMetaDataResult.cc

@@ -46,24 +46,24 @@ void DescribeMetaDataResult::parse(const std::string &payload)
 		metaData_.projectName = metaDataNode["ProjectName"].asString();
 	if(!metaDataNode["Status"].isNull())
 		metaData_.status = std::stoi(metaDataNode["Status"].asString());
-	auto allDatasourceFieldList = value["DatasourceFieldList"]["DatasourceField"];
-	for (auto value : allDatasourceFieldList)
+	auto allDatasourceFieldListNode = metaDataNode["DatasourceFieldList"]["DatasourceField"];
+	for (auto metaDataNodeDatasourceFieldListDatasourceField : allDatasourceFieldListNode)
 	{
 		MetaData::DatasourceField datasourceFieldObject;
-		if(!value["FieldName"].isNull())
-			datasourceFieldObject.fieldName = value["FieldName"].asString();
-		if(!value["ValueType"].isNull())
-			datasourceFieldObject.valueType = value["ValueType"].asString();
-		if(!value["FieldDescription"].isNull())
-			datasourceFieldObject.fieldDescription = value["FieldDescription"].asString();
-		if(!value["FieldAliasName"].isNull())
-			datasourceFieldObject.fieldAliasName = value["FieldAliasName"].asString();
-		if(!value["FieldType"].isNull())
-			datasourceFieldObject.fieldType = value["FieldType"].asString();
-		if(!value["FieldValue"].isNull())
-			datasourceFieldObject.fieldValue = value["FieldValue"].asString();
-		if(!value["IsIdentification"].isNull())
-			datasourceFieldObject.isIdentification = std::stoi(value["IsIdentification"].asString());
+		if(!metaDataNodeDatasourceFieldListDatasourceField["FieldName"].isNull())
+			datasourceFieldObject.fieldName = metaDataNodeDatasourceFieldListDatasourceField["FieldName"].asString();
+		if(!metaDataNodeDatasourceFieldListDatasourceField["ValueType"].isNull())
+			datasourceFieldObject.valueType = metaDataNodeDatasourceFieldListDatasourceField["ValueType"].asString();
+		if(!metaDataNodeDatasourceFieldListDatasourceField["FieldDescription"].isNull())
+			datasourceFieldObject.fieldDescription = metaDataNodeDatasourceFieldListDatasourceField["FieldDescription"].asString();
+		if(!metaDataNodeDatasourceFieldListDatasourceField["FieldAliasName"].isNull())
+			datasourceFieldObject.fieldAliasName = metaDataNodeDatasourceFieldListDatasourceField["FieldAliasName"].asString();
+		if(!metaDataNodeDatasourceFieldListDatasourceField["FieldType"].isNull())
+			datasourceFieldObject.fieldType = metaDataNodeDatasourceFieldListDatasourceField["FieldType"].asString();
+		if(!metaDataNodeDatasourceFieldListDatasourceField["FieldValue"].isNull())
+			datasourceFieldObject.fieldValue = metaDataNodeDatasourceFieldListDatasourceField["FieldValue"].asString();
+		if(!metaDataNodeDatasourceFieldListDatasourceField["IsIdentification"].isNull())
+			datasourceFieldObject.isIdentification = std::stoi(metaDataNodeDatasourceFieldListDatasourceField["IsIdentification"].asString());
 		metaData_.datasourceFieldList.push_back(datasourceFieldObject);
 	}
 

+ 8 - 8
aegis/src/model/DescribeNsasSuspEventTypeResult.cc

@@ -39,16 +39,16 @@ void DescribeNsasSuspEventTypeResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allEventTypes = value["EventTypes"]["Data"];
-	for (auto value : allEventTypes)
+	auto allEventTypesNode = value["EventTypes"]["Data"];
+	for (auto valueEventTypesData : allEventTypesNode)
 	{
 		Data eventTypesObject;
-		if(!value["Name"].isNull())
-			eventTypesObject.name = value["Name"].asString();
-		if(!value["Type"].isNull())
-			eventTypesObject.type = value["Type"].asString();
-		if(!value["SuspEventCount"].isNull())
-			eventTypesObject.suspEventCount = std::stoi(value["SuspEventCount"].asString());
+		if(!valueEventTypesData["Name"].isNull())
+			eventTypesObject.name = valueEventTypesData["Name"].asString();
+		if(!valueEventTypesData["Type"].isNull())
+			eventTypesObject.type = valueEventTypesData["Type"].asString();
+		if(!valueEventTypesData["SuspEventCount"].isNull())
+			eventTypesObject.suspEventCount = std::stoi(valueEventTypesData["SuspEventCount"].asString());
 		eventTypes_.push_back(eventTypesObject);
 	}
 

+ 18 - 18
aegis/src/model/DescribeQuaraFileResult.cc

@@ -39,26 +39,26 @@ void DescribeQuaraFileResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allQuaraFiles = value["QuaraFiles"]["QuaraFile"];
-	for (auto value : allQuaraFiles)
+	auto allQuaraFilesNode = value["QuaraFiles"]["QuaraFile"];
+	for (auto valueQuaraFilesQuaraFile : allQuaraFilesNode)
 	{
 		QuaraFile quaraFilesObject;
-		if(!value["Path"].isNull())
-			quaraFilesObject.path = value["Path"].asString();
-		if(!value["EventName"].isNull())
-			quaraFilesObject.eventName = value["EventName"].asString();
-		if(!value["Online"].isNull())
-			quaraFilesObject.online = value["Online"].asString() == "true";
-		if(!value["EventType"].isNull())
-			quaraFilesObject.eventType = value["EventType"].asString();
-		if(!value["Tag"].isNull())
-			quaraFilesObject.tag = value["Tag"].asString();
-		if(!value["Uuid"].isNull())
-			quaraFilesObject.uuid = value["Uuid"].asString();
-		if(!value["FileStatus"].isNull())
-			quaraFilesObject.fileStatus = value["FileStatus"].asString();
-		if(!value["Md5"].isNull())
-			quaraFilesObject.md5 = value["Md5"].asString();
+		if(!valueQuaraFilesQuaraFile["Path"].isNull())
+			quaraFilesObject.path = valueQuaraFilesQuaraFile["Path"].asString();
+		if(!valueQuaraFilesQuaraFile["EventName"].isNull())
+			quaraFilesObject.eventName = valueQuaraFilesQuaraFile["EventName"].asString();
+		if(!valueQuaraFilesQuaraFile["Online"].isNull())
+			quaraFilesObject.online = valueQuaraFilesQuaraFile["Online"].asString() == "true";
+		if(!valueQuaraFilesQuaraFile["EventType"].isNull())
+			quaraFilesObject.eventType = valueQuaraFilesQuaraFile["EventType"].asString();
+		if(!valueQuaraFilesQuaraFile["Tag"].isNull())
+			quaraFilesObject.tag = valueQuaraFilesQuaraFile["Tag"].asString();
+		if(!valueQuaraFilesQuaraFile["Uuid"].isNull())
+			quaraFilesObject.uuid = valueQuaraFilesQuaraFile["Uuid"].asString();
+		if(!valueQuaraFilesQuaraFile["FileStatus"].isNull())
+			quaraFilesObject.fileStatus = valueQuaraFilesQuaraFile["FileStatus"].asString();
+		if(!valueQuaraFilesQuaraFile["Md5"].isNull())
+			quaraFilesObject.md5 = valueQuaraFilesQuaraFile["Md5"].asString();
 		quaraFiles_.push_back(quaraFilesObject);
 	}
 	if(!value["PageSize"].isNull())

+ 42 - 42
aegis/src/model/DescribeResultListResult.cc

@@ -39,50 +39,50 @@ void DescribeResultListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allResultList = value["ResultList"]["ResultListArr"];
-	for (auto value : allResultList)
+	auto allResultListNode = value["ResultList"]["ResultListArr"];
+	for (auto valueResultListResultListArr : allResultListNode)
 	{
 		ResultListArr resultListObject;
-		if(!value["LastTimestamp"].isNull())
-			resultListObject.lastTimestamp = std::stol(value["LastTimestamp"].asString());
-		if(!value["ModifiedTimestamp"].isNull())
-			resultListObject.modifiedTimestamp = std::stol(value["ModifiedTimestamp"].asString());
-		if(!value["WarnLevel"].isNull())
-			resultListObject.warnLevel = value["WarnLevel"].asString();
-		if(!value["UniqueKey"].isNull())
-			resultListObject.uniqueKey = value["UniqueKey"].asString();
-		if(!value["LastOperate"].isNull())
-			resultListObject.lastOperate = std::stol(value["LastOperate"].asString());
-		if(!value["CreateTimestamp"].isNull())
-			resultListObject.createTimestamp = std::stol(value["CreateTimestamp"].asString());
-		if(!value["RuleDescription"].isNull())
-			resultListObject.ruleDescription = value["RuleDescription"].asString();
-		if(!value["RuleType"].isNull())
-			resultListObject.ruleType = value["RuleType"].asString();
-		if(!value["RuleName"].isNull())
-			resultListObject.ruleName = value["RuleName"].asString();
-		if(!value["Details"].isNull())
-			resultListObject.details = value["Details"].asString();
-		if(!value["Id"].isNull())
-			resultListObject.id = std::stoi(value["Id"].asString());
-		if(!value["AliUid"].isNull())
-			resultListObject.aliUid = std::stol(value["AliUid"].asString());
-		if(!value["RuleId"].isNull())
-			resultListObject.ruleId = std::stoi(value["RuleId"].asString());
-		if(!value["Status"].isNull())
-			resultListObject.status = std::stoi(value["Status"].asString());
-		if(!value["FieldKey"].isNull())
-			resultListObject.fieldKey = value["FieldKey"].asString();
-		if(!value["InternetIp"].isNull())
-			resultListObject.internetIp = value["InternetIp"].asString();
-		if(!value["IntranetIp"].isNull())
-			resultListObject.intranetIp = value["IntranetIp"].asString();
-		if(!value["InstanceId"].isNull())
-			resultListObject.instanceId = value["InstanceId"].asString();
-		if(!value["InstanceName"].isNull())
-			resultListObject.instanceName = value["InstanceName"].asString();
-		if(!value["FieldKey"].isNull())
-			resultListObject.fieldKey1 = value["FieldKey"].asString();
+		if(!valueResultListResultListArr["LastTimestamp"].isNull())
+			resultListObject.lastTimestamp = std::stol(valueResultListResultListArr["LastTimestamp"].asString());
+		if(!valueResultListResultListArr["ModifiedTimestamp"].isNull())
+			resultListObject.modifiedTimestamp = std::stol(valueResultListResultListArr["ModifiedTimestamp"].asString());
+		if(!valueResultListResultListArr["WarnLevel"].isNull())
+			resultListObject.warnLevel = valueResultListResultListArr["WarnLevel"].asString();
+		if(!valueResultListResultListArr["UniqueKey"].isNull())
+			resultListObject.uniqueKey = valueResultListResultListArr["UniqueKey"].asString();
+		if(!valueResultListResultListArr["LastOperate"].isNull())
+			resultListObject.lastOperate = std::stol(valueResultListResultListArr["LastOperate"].asString());
+		if(!valueResultListResultListArr["CreateTimestamp"].isNull())
+			resultListObject.createTimestamp = std::stol(valueResultListResultListArr["CreateTimestamp"].asString());
+		if(!valueResultListResultListArr["RuleDescription"].isNull())
+			resultListObject.ruleDescription = valueResultListResultListArr["RuleDescription"].asString();
+		if(!valueResultListResultListArr["RuleType"].isNull())
+			resultListObject.ruleType = valueResultListResultListArr["RuleType"].asString();
+		if(!valueResultListResultListArr["RuleName"].isNull())
+			resultListObject.ruleName = valueResultListResultListArr["RuleName"].asString();
+		if(!valueResultListResultListArr["Details"].isNull())
+			resultListObject.details = valueResultListResultListArr["Details"].asString();
+		if(!valueResultListResultListArr["Id"].isNull())
+			resultListObject.id = std::stoi(valueResultListResultListArr["Id"].asString());
+		if(!valueResultListResultListArr["AliUid"].isNull())
+			resultListObject.aliUid = std::stol(valueResultListResultListArr["AliUid"].asString());
+		if(!valueResultListResultListArr["RuleId"].isNull())
+			resultListObject.ruleId = std::stoi(valueResultListResultListArr["RuleId"].asString());
+		if(!valueResultListResultListArr["Status"].isNull())
+			resultListObject.status = std::stoi(valueResultListResultListArr["Status"].asString());
+		if(!valueResultListResultListArr["FieldKey"].isNull())
+			resultListObject.fieldKey = valueResultListResultListArr["FieldKey"].asString();
+		if(!valueResultListResultListArr["InternetIp"].isNull())
+			resultListObject.internetIp = valueResultListResultListArr["InternetIp"].asString();
+		if(!valueResultListResultListArr["IntranetIp"].isNull())
+			resultListObject.intranetIp = valueResultListResultListArr["IntranetIp"].asString();
+		if(!valueResultListResultListArr["InstanceId"].isNull())
+			resultListObject.instanceId = valueResultListResultListArr["InstanceId"].asString();
+		if(!valueResultListResultListArr["InstanceName"].isNull())
+			resultListObject.instanceName = valueResultListResultListArr["InstanceName"].asString();
+		if(!valueResultListResultListArr["FieldKey"].isNull())
+			resultListObject.fieldKey1 = valueResultListResultListArr["FieldKey"].asString();
 		resultList_.push_back(resultListObject);
 	}
 	auto pageInfoNode = value["PageInfo"];

+ 16 - 16
aegis/src/model/DescribeRiskTypeResult.cc

@@ -39,26 +39,26 @@ void DescribeRiskTypeResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allRiskTypes = value["RiskTypes"]["RiskType"];
-	for (auto value : allRiskTypes)
+	auto allRiskTypesNode = value["RiskTypes"]["RiskType"];
+	for (auto valueRiskTypesRiskType : allRiskTypesNode)
 	{
 		RiskType riskTypesObject;
-		if(!value["TypeName"].isNull())
-			riskTypesObject.typeName = value["TypeName"].asString();
-		if(!value["Alias"].isNull())
-			riskTypesObject.alias = value["Alias"].asString();
-		if(!value["WarnCount"].isNull())
-			riskTypesObject.warnCount = value["WarnCount"].asString();
-		auto allSubTypes = value["SubTypes"]["subType"];
-		for (auto value : allSubTypes)
+		if(!valueRiskTypesRiskType["TypeName"].isNull())
+			riskTypesObject.typeName = valueRiskTypesRiskType["TypeName"].asString();
+		if(!valueRiskTypesRiskType["Alias"].isNull())
+			riskTypesObject.alias = valueRiskTypesRiskType["Alias"].asString();
+		if(!valueRiskTypesRiskType["WarnCount"].isNull())
+			riskTypesObject.warnCount = valueRiskTypesRiskType["WarnCount"].asString();
+		auto allSubTypesNode = allRiskTypesNode["SubTypes"]["subType"];
+		for (auto allRiskTypesNodeSubTypessubType : allSubTypesNode)
 		{
 			RiskType::SubType subTypesObject;
-			if(!value["WarnCount"].isNull())
-				subTypesObject.warnCount = value["WarnCount"].asString();
-			if(!value["TypeName"].isNull())
-				subTypesObject.typeName = value["TypeName"].asString();
-			if(!value["Alias"].isNull())
-				subTypesObject.alias = value["Alias"].asString();
+			if(!allRiskTypesNodeSubTypessubType["WarnCount"].isNull())
+				subTypesObject.warnCount = allRiskTypesNodeSubTypessubType["WarnCount"].asString();
+			if(!allRiskTypesNodeSubTypessubType["TypeName"].isNull())
+				subTypesObject.typeName = allRiskTypesNodeSubTypessubType["TypeName"].asString();
+			if(!allRiskTypesNodeSubTypessubType["Alias"].isNull())
+				subTypesObject.alias = allRiskTypesNodeSubTypessubType["Alias"].asString();
 			riskTypesObject.subTypes.push_back(subTypesObject);
 		}
 		riskTypes_.push_back(riskTypesObject);

+ 8 - 8
aegis/src/model/DescribeRiskWhiteListResult.cc

@@ -39,16 +39,16 @@ void DescribeRiskWhiteListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allWhiteLists = value["WhiteLists"]["WhiteList"];
-	for (auto value : allWhiteLists)
+	auto allWhiteListsNode = value["WhiteLists"]["WhiteList"];
+	for (auto valueWhiteListsWhiteList : allWhiteListsNode)
 	{
 		WhiteList whiteListsObject;
-		if(!value["riskId"].isNull())
-			whiteListsObject.riskId = std::stol(value["riskId"].asString());
-		if(!value["riskName"].isNull())
-			whiteListsObject.riskName = value["riskName"].asString();
-		if(!value["reason"].isNull())
-			whiteListsObject.reason = value["reason"].asString();
+		if(!valueWhiteListsWhiteList["riskId"].isNull())
+			whiteListsObject.riskId = std::stol(valueWhiteListsWhiteList["riskId"].asString());
+		if(!valueWhiteListsWhiteList["riskName"].isNull())
+			whiteListsObject.riskName = valueWhiteListsWhiteList["riskName"].asString();
+		if(!valueWhiteListsWhiteList["reason"].isNull())
+			whiteListsObject.reason = valueWhiteListsWhiteList["reason"].asString();
 		whiteLists_.push_back(whiteListsObject);
 	}
 	if(!value["Count"].isNull())

+ 16 - 16
aegis/src/model/DescribeRisksResult.cc

@@ -39,24 +39,24 @@ void DescribeRisksResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allRisks = value["Risks"]["Risk"];
-	for (auto value : allRisks)
+	auto allRisksNode = value["Risks"]["Risk"];
+	for (auto valueRisksRisk : allRisksNode)
 	{
 		Risk risksObject;
-		if(!value["RiskId"].isNull())
-			risksObject.riskId = std::stol(value["RiskId"].asString());
-		if(!value["RiskName"].isNull())
-			risksObject.riskName = value["RiskName"].asString();
-		if(!value["RiskDetail"].isNull())
-			risksObject.riskDetail = value["RiskDetail"].asString();
-		if(!value["RiskType"].isNull())
-			risksObject.riskType = value["RiskType"].asString();
-		if(!value["TypeAlias"].isNull())
-			risksObject.typeAlias = value["TypeAlias"].asString();
-		if(!value["SubRiskType"].isNull())
-			risksObject.subRiskType = value["SubRiskType"].asString();
-		if(!value["SubTypeAlias"].isNull())
-			risksObject.subTypeAlias = value["SubTypeAlias"].asString();
+		if(!valueRisksRisk["RiskId"].isNull())
+			risksObject.riskId = std::stol(valueRisksRisk["RiskId"].asString());
+		if(!valueRisksRisk["RiskName"].isNull())
+			risksObject.riskName = valueRisksRisk["RiskName"].asString();
+		if(!valueRisksRisk["RiskDetail"].isNull())
+			risksObject.riskDetail = valueRisksRisk["RiskDetail"].asString();
+		if(!valueRisksRisk["RiskType"].isNull())
+			risksObject.riskType = valueRisksRisk["RiskType"].asString();
+		if(!valueRisksRisk["TypeAlias"].isNull())
+			risksObject.typeAlias = valueRisksRisk["TypeAlias"].asString();
+		if(!valueRisksRisk["SubRiskType"].isNull())
+			risksObject.subRiskType = valueRisksRisk["SubRiskType"].asString();
+		if(!valueRisksRisk["SubTypeAlias"].isNull())
+			risksObject.subTypeAlias = valueRisksRisk["SubTypeAlias"].asString();
 		risks_.push_back(risksObject);
 	}
 	if(!value["TotalCount"].isNull())

+ 42 - 42
aegis/src/model/DescribeRuleListResult.cc

@@ -39,52 +39,52 @@ void DescribeRuleListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allRules = value["Rules"]["RulesItem"];
-	for (auto value : allRules)
+	auto allRulesNode = value["Rules"]["RulesItem"];
+	for (auto valueRulesRulesItem : allRulesNode)
 	{
 		RulesItem rulesObject;
-		if(!value["WarnLevel"].isNull())
-			rulesObject.warnLevel = value["WarnLevel"].asString();
-		if(!value["Modified"].isNull())
-			rulesObject.modified = std::stol(value["Modified"].asString());
-		if(!value["Create"].isNull())
-			rulesObject.create = std::stol(value["Create"].asString());
-		if(!value["RuleName"].isNull())
-			rulesObject.ruleName = value["RuleName"].asString();
-		if(!value["Description"].isNull())
-			rulesObject.description = value["Description"].asString();
-		if(!value["Id"].isNull())
-			rulesObject.id = std::stoi(value["Id"].asString());
-		if(!value["DataSourceId"].isNull())
-			rulesObject.dataSourceId = std::stoi(value["DataSourceId"].asString());
-		if(!value["Expressions"].isNull())
-			rulesObject.expressions = value["Expressions"].asString();
-		if(!value["Actions"].isNull())
-			rulesObject.actions = value["Actions"].asString();
-		if(!value["StatisticsRules"].isNull())
-			rulesObject.statisticsRules = value["StatisticsRules"].asString();
-		if(!value["NeedGroup"].isNull())
-			rulesObject.needGroup = value["NeedGroup"].asString() == "true";
-		if(!value["StatusCode"].isNull())
-			rulesObject.statusCode = value["StatusCode"].asString();
-		auto allRuleGroups = value["RuleGroups"]["RuleGroup"];
-		for (auto value : allRuleGroups)
+		if(!valueRulesRulesItem["WarnLevel"].isNull())
+			rulesObject.warnLevel = valueRulesRulesItem["WarnLevel"].asString();
+		if(!valueRulesRulesItem["Modified"].isNull())
+			rulesObject.modified = std::stol(valueRulesRulesItem["Modified"].asString());
+		if(!valueRulesRulesItem["Create"].isNull())
+			rulesObject.create = std::stol(valueRulesRulesItem["Create"].asString());
+		if(!valueRulesRulesItem["RuleName"].isNull())
+			rulesObject.ruleName = valueRulesRulesItem["RuleName"].asString();
+		if(!valueRulesRulesItem["Description"].isNull())
+			rulesObject.description = valueRulesRulesItem["Description"].asString();
+		if(!valueRulesRulesItem["Id"].isNull())
+			rulesObject.id = std::stoi(valueRulesRulesItem["Id"].asString());
+		if(!valueRulesRulesItem["DataSourceId"].isNull())
+			rulesObject.dataSourceId = std::stoi(valueRulesRulesItem["DataSourceId"].asString());
+		if(!valueRulesRulesItem["Expressions"].isNull())
+			rulesObject.expressions = valueRulesRulesItem["Expressions"].asString();
+		if(!valueRulesRulesItem["Actions"].isNull())
+			rulesObject.actions = valueRulesRulesItem["Actions"].asString();
+		if(!valueRulesRulesItem["StatisticsRules"].isNull())
+			rulesObject.statisticsRules = valueRulesRulesItem["StatisticsRules"].asString();
+		if(!valueRulesRulesItem["NeedGroup"].isNull())
+			rulesObject.needGroup = valueRulesRulesItem["NeedGroup"].asString() == "true";
+		if(!valueRulesRulesItem["StatusCode"].isNull())
+			rulesObject.statusCode = valueRulesRulesItem["StatusCode"].asString();
+		auto allRuleGroupsNode = allRulesNode["RuleGroups"]["RuleGroup"];
+		for (auto allRulesNodeRuleGroupsRuleGroup : allRuleGroupsNode)
 		{
 			RulesItem::RuleGroup ruleGroupsObject;
-			if(!value["GroupName"].isNull())
-				ruleGroupsObject.groupName = value["GroupName"].asString();
-			if(!value["RuleNum"].isNull())
-				ruleGroupsObject.ruleNum = std::stoi(value["RuleNum"].asString());
-			if(!value["Modified"].isNull())
-				ruleGroupsObject.modified = std::stol(value["Modified"].asString());
-			if(!value["Create"].isNull())
-				ruleGroupsObject.create = std::stol(value["Create"].asString());
-			if(!value["Description"].isNull())
-				ruleGroupsObject.description = value["Description"].asString();
-			if(!value["Id"].isNull())
-				ruleGroupsObject.id = std::stoi(value["Id"].asString());
-			if(!value["AliUid"].isNull())
-				ruleGroupsObject.aliUid = std::stoi(value["AliUid"].asString());
+			if(!allRulesNodeRuleGroupsRuleGroup["GroupName"].isNull())
+				ruleGroupsObject.groupName = allRulesNodeRuleGroupsRuleGroup["GroupName"].asString();
+			if(!allRulesNodeRuleGroupsRuleGroup["RuleNum"].isNull())
+				ruleGroupsObject.ruleNum = std::stoi(allRulesNodeRuleGroupsRuleGroup["RuleNum"].asString());
+			if(!allRulesNodeRuleGroupsRuleGroup["Modified"].isNull())
+				ruleGroupsObject.modified = std::stol(allRulesNodeRuleGroupsRuleGroup["Modified"].asString());
+			if(!allRulesNodeRuleGroupsRuleGroup["Create"].isNull())
+				ruleGroupsObject.create = std::stol(allRulesNodeRuleGroupsRuleGroup["Create"].asString());
+			if(!allRulesNodeRuleGroupsRuleGroup["Description"].isNull())
+				ruleGroupsObject.description = allRulesNodeRuleGroupsRuleGroup["Description"].asString();
+			if(!allRulesNodeRuleGroupsRuleGroup["Id"].isNull())
+				ruleGroupsObject.id = std::stoi(allRulesNodeRuleGroupsRuleGroup["Id"].asString());
+			if(!allRulesNodeRuleGroupsRuleGroup["AliUid"].isNull())
+				ruleGroupsObject.aliUid = std::stoi(allRulesNodeRuleGroupsRuleGroup["AliUid"].asString());
 			rulesObject.ruleGroups.push_back(ruleGroupsObject);
 		}
 		rules_.push_back(rulesObject);

+ 10 - 10
aegis/src/model/DescribeSasAssetStatisticsResult.cc

@@ -39,18 +39,18 @@ void DescribeSasAssetStatisticsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allAssetList = value["AssetList"]["Asset"];
-	for (auto value : allAssetList)
+	auto allAssetListNode = value["AssetList"]["Asset"];
+	for (auto valueAssetListAsset : allAssetListNode)
 	{
 		Asset assetListObject;
-		if(!value["HealthCheckCount"].isNull())
-			assetListObject.healthCheckCount = std::stoi(value["HealthCheckCount"].asString());
-		if(!value["VulCount"].isNull())
-			assetListObject.vulCount = std::stoi(value["VulCount"].asString());
-		if(!value["SafeEventCount"].isNull())
-			assetListObject.safeEventCount = std::stoi(value["SafeEventCount"].asString());
-		if(!value["Uuid"].isNull())
-			assetListObject.uuid = value["Uuid"].asString();
+		if(!valueAssetListAsset["HealthCheckCount"].isNull())
+			assetListObject.healthCheckCount = std::stoi(valueAssetListAsset["HealthCheckCount"].asString());
+		if(!valueAssetListAsset["VulCount"].isNull())
+			assetListObject.vulCount = std::stoi(valueAssetListAsset["VulCount"].asString());
+		if(!valueAssetListAsset["SafeEventCount"].isNull())
+			assetListObject.safeEventCount = std::stoi(valueAssetListAsset["SafeEventCount"].asString());
+		if(!valueAssetListAsset["Uuid"].isNull())
+			assetListObject.uuid = valueAssetListAsset["Uuid"].asString();
 		assetList_.push_back(assetListObject);
 	}
 	if(!value["PageSize"].isNull())

+ 8 - 8
aegis/src/model/DescribeSasLeftConditionResult.cc

@@ -39,16 +39,16 @@ void DescribeSasLeftConditionResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allConditionList = value["ConditionList"]["Condition"];
-	for (auto value : allConditionList)
+	auto allConditionListNode = value["ConditionList"]["Condition"];
+	for (auto valueConditionListCondition : allConditionListNode)
 	{
 		Condition conditionListObject;
-		if(!value["Name"].isNull())
-			conditionListObject.name = value["Name"].asString();
-		if(!value["Count"].isNull())
-			conditionListObject.count = std::stoi(value["Count"].asString());
-		if(!value["Id"].isNull())
-			conditionListObject.id = value["Id"].asString();
+		if(!valueConditionListCondition["Name"].isNull())
+			conditionListObject.name = valueConditionListCondition["Name"].asString();
+		if(!valueConditionListCondition["Count"].isNull())
+			conditionListObject.count = std::stoi(valueConditionListCondition["Count"].asString());
+		if(!valueConditionListCondition["Id"].isNull())
+			conditionListObject.id = valueConditionListCondition["Id"].asString();
 		conditionList_.push_back(conditionListObject);
 	}
 

+ 38 - 38
aegis/src/model/DescribeScreenAlarmEventListResult.cc

@@ -39,46 +39,46 @@ void DescribeScreenAlarmEventListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allSuspEvents = value["SuspEvents"]["SuspEventsItem"];
-	for (auto value : allSuspEvents)
+	auto allSuspEventsNode = value["SuspEvents"]["SuspEventsItem"];
+	for (auto valueSuspEventsSuspEventsItem : allSuspEventsNode)
 	{
 		SuspEventsItem suspEventsObject;
-		if(!value["AlarmUniqueInfo"].isNull())
-			suspEventsObject.alarmUniqueInfo = value["AlarmUniqueInfo"].asString();
-		if(!value["Solution"].isNull())
-			suspEventsObject.solution = value["Solution"].asString();
-		if(!value["Level"].isNull())
-			suspEventsObject.level = value["Level"].asString();
-		if(!value["CanBeDealOnLine"].isNull())
-			suspEventsObject.canBeDealOnLine = value["CanBeDealOnLine"].asString() == "true";
-		if(!value["Description"].isNull())
-			suspEventsObject.description = value["Description"].asString();
-		if(!value["StartTime"].isNull())
-			suspEventsObject.startTime = std::stol(value["StartTime"].asString());
-		if(!value["EndTime"].isNull())
-			suspEventsObject.endTime = std::stol(value["EndTime"].asString());
-		if(!value["AlarmEventType"].isNull())
-			suspEventsObject.alarmEventType = value["AlarmEventType"].asString();
-		if(!value["SuspiciousEventCount"].isNull())
-			suspEventsObject.suspiciousEventCount = std::stoi(value["SuspiciousEventCount"].asString());
-		if(!value["Uuid"].isNull())
-			suspEventsObject.uuid = value["Uuid"].asString();
-		if(!value["InstanceName"].isNull())
-			suspEventsObject.instanceName = value["InstanceName"].asString();
-		if(!value["InternetIp"].isNull())
-			suspEventsObject.internetIp = value["InternetIp"].asString();
-		if(!value["IntranetIp"].isNull())
-			suspEventsObject.intranetIp = value["IntranetIp"].asString();
-		if(!value["AlarmEventName"].isNull())
-			suspEventsObject.alarmEventName = value["AlarmEventName"].asString();
-		if(!value["SaleVersion"].isNull())
-			suspEventsObject.saleVersion = value["SaleVersion"].asString();
-		if(!value["DataSource"].isNull())
-			suspEventsObject.dataSource = value["DataSource"].asString();
-		if(!value["CanCancelFault"].isNull())
-			suspEventsObject.canCancelFault = value["CanCancelFault"].asString() == "true";
-		if(!value["Dealed"].isNull())
-			suspEventsObject.dealed = value["Dealed"].asString() == "true";
+		if(!valueSuspEventsSuspEventsItem["AlarmUniqueInfo"].isNull())
+			suspEventsObject.alarmUniqueInfo = valueSuspEventsSuspEventsItem["AlarmUniqueInfo"].asString();
+		if(!valueSuspEventsSuspEventsItem["Solution"].isNull())
+			suspEventsObject.solution = valueSuspEventsSuspEventsItem["Solution"].asString();
+		if(!valueSuspEventsSuspEventsItem["Level"].isNull())
+			suspEventsObject.level = valueSuspEventsSuspEventsItem["Level"].asString();
+		if(!valueSuspEventsSuspEventsItem["CanBeDealOnLine"].isNull())
+			suspEventsObject.canBeDealOnLine = valueSuspEventsSuspEventsItem["CanBeDealOnLine"].asString() == "true";
+		if(!valueSuspEventsSuspEventsItem["Description"].isNull())
+			suspEventsObject.description = valueSuspEventsSuspEventsItem["Description"].asString();
+		if(!valueSuspEventsSuspEventsItem["StartTime"].isNull())
+			suspEventsObject.startTime = std::stol(valueSuspEventsSuspEventsItem["StartTime"].asString());
+		if(!valueSuspEventsSuspEventsItem["EndTime"].isNull())
+			suspEventsObject.endTime = std::stol(valueSuspEventsSuspEventsItem["EndTime"].asString());
+		if(!valueSuspEventsSuspEventsItem["AlarmEventType"].isNull())
+			suspEventsObject.alarmEventType = valueSuspEventsSuspEventsItem["AlarmEventType"].asString();
+		if(!valueSuspEventsSuspEventsItem["SuspiciousEventCount"].isNull())
+			suspEventsObject.suspiciousEventCount = std::stoi(valueSuspEventsSuspEventsItem["SuspiciousEventCount"].asString());
+		if(!valueSuspEventsSuspEventsItem["Uuid"].isNull())
+			suspEventsObject.uuid = valueSuspEventsSuspEventsItem["Uuid"].asString();
+		if(!valueSuspEventsSuspEventsItem["InstanceName"].isNull())
+			suspEventsObject.instanceName = valueSuspEventsSuspEventsItem["InstanceName"].asString();
+		if(!valueSuspEventsSuspEventsItem["InternetIp"].isNull())
+			suspEventsObject.internetIp = valueSuspEventsSuspEventsItem["InternetIp"].asString();
+		if(!valueSuspEventsSuspEventsItem["IntranetIp"].isNull())
+			suspEventsObject.intranetIp = valueSuspEventsSuspEventsItem["IntranetIp"].asString();
+		if(!valueSuspEventsSuspEventsItem["AlarmEventName"].isNull())
+			suspEventsObject.alarmEventName = valueSuspEventsSuspEventsItem["AlarmEventName"].asString();
+		if(!valueSuspEventsSuspEventsItem["SaleVersion"].isNull())
+			suspEventsObject.saleVersion = valueSuspEventsSuspEventsItem["SaleVersion"].asString();
+		if(!valueSuspEventsSuspEventsItem["DataSource"].isNull())
+			suspEventsObject.dataSource = valueSuspEventsSuspEventsItem["DataSource"].asString();
+		if(!valueSuspEventsSuspEventsItem["CanCancelFault"].isNull())
+			suspEventsObject.canCancelFault = valueSuspEventsSuspEventsItem["CanCancelFault"].asString() == "true";
+		if(!valueSuspEventsSuspEventsItem["Dealed"].isNull())
+			suspEventsObject.dealed = valueSuspEventsSuspEventsItem["Dealed"].asString() == "true";
 		suspEvents_.push_back(suspEventsObject);
 	}
 	auto pageInfoNode = value["PageInfo"];

+ 4 - 4
aegis/src/model/DescribeScreenBizStatSimpleQueryResultResult.cc

@@ -39,12 +39,12 @@ void DescribeScreenBizStatSimpleQueryResultResult::parse(const std::string &payl
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allTrendDataArr = value["TrendDataArr"]["BizStatTrendDOS"];
-	for (auto value : allTrendDataArr)
+	auto allTrendDataArrNode = value["TrendDataArr"]["BizStatTrendDOS"];
+	for (auto valueTrendDataArrBizStatTrendDOS : allTrendDataArrNode)
 	{
 		BizStatTrendDOS trendDataArrObject;
-		if(!value["BizName"].isNull())
-			trendDataArrObject.bizName = value["BizName"].asString();
+		if(!valueTrendDataArrBizStatTrendDOS["BizName"].isNull())
+			trendDataArrObject.bizName = valueTrendDataArrBizStatTrendDOS["BizName"].asString();
 		auto allValueArray = value["ValueArray"]["IntegerItem"];
 		for (auto value : allValueArray)
 			trendDataArrObject.valueArray.push_back(value.asString());

+ 8 - 8
aegis/src/model/DescribeScreenCityMonitorDataResult.cc

@@ -39,16 +39,16 @@ void DescribeScreenCityMonitorDataResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allMonitorData = value["MonitorData"]["MonitorDataItem"];
-	for (auto value : allMonitorData)
+	auto allMonitorDataNode = value["MonitorData"]["MonitorDataItem"];
+	for (auto valueMonitorDataMonitorDataItem : allMonitorDataNode)
 	{
 		MonitorDataItem monitorDataObject;
-		if(!value["City"].isNull())
-			monitorDataObject.city = value["City"].asString();
-		if(!value["Availability"].isNull())
-			monitorDataObject.availability = value["Availability"].asString();
-		if(!value["ReturnTime"].isNull())
-			monitorDataObject.returnTime = value["ReturnTime"].asString();
+		if(!valueMonitorDataMonitorDataItem["City"].isNull())
+			monitorDataObject.city = valueMonitorDataMonitorDataItem["City"].asString();
+		if(!valueMonitorDataMonitorDataItem["Availability"].isNull())
+			monitorDataObject.availability = valueMonitorDataMonitorDataItem["Availability"].asString();
+		if(!valueMonitorDataMonitorDataItem["ReturnTime"].isNull())
+			monitorDataObject.returnTime = valueMonitorDataMonitorDataItem["ReturnTime"].asString();
 		monitorData_.push_back(monitorDataObject);
 	}
 	if(!value["Success"].isNull())

+ 10 - 10
aegis/src/model/DescribeScreenCloudHcRiskResult.cc

@@ -39,18 +39,18 @@ void DescribeScreenCloudHcRiskResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allCloudHcRiskItems = value["CloudHcRiskItems"]["CloudHcRiskItem"];
-	for (auto value : allCloudHcRiskItems)
+	auto allCloudHcRiskItemsNode = value["CloudHcRiskItems"]["CloudHcRiskItem"];
+	for (auto valueCloudHcRiskItemsCloudHcRiskItem : allCloudHcRiskItemsNode)
 	{
 		CloudHcRiskItem cloudHcRiskItemsObject;
-		if(!value["Level"].isNull())
-			cloudHcRiskItemsObject.level = value["Level"].asString();
-		if(!value["CheckItem"].isNull())
-			cloudHcRiskItemsObject.checkItem = value["CheckItem"].asString();
-		if(!value["AffectCount"].isNull())
-			cloudHcRiskItemsObject.affectCount = std::stoi(value["AffectCount"].asString());
-		if(!value["Pass"].isNull())
-			cloudHcRiskItemsObject.pass = value["Pass"].asString() == "true";
+		if(!valueCloudHcRiskItemsCloudHcRiskItem["Level"].isNull())
+			cloudHcRiskItemsObject.level = valueCloudHcRiskItemsCloudHcRiskItem["Level"].asString();
+		if(!valueCloudHcRiskItemsCloudHcRiskItem["CheckItem"].isNull())
+			cloudHcRiskItemsObject.checkItem = valueCloudHcRiskItemsCloudHcRiskItem["CheckItem"].asString();
+		if(!valueCloudHcRiskItemsCloudHcRiskItem["AffectCount"].isNull())
+			cloudHcRiskItemsObject.affectCount = std::stoi(valueCloudHcRiskItemsCloudHcRiskItem["AffectCount"].asString());
+		if(!valueCloudHcRiskItemsCloudHcRiskItem["Pass"].isNull())
+			cloudHcRiskItemsObject.pass = valueCloudHcRiskItemsCloudHcRiskItem["Pass"].asString() == "true";
 		cloudHcRiskItems_.push_back(cloudHcRiskItemsObject);
 	}
 	if(!value["Success"].isNull())

+ 20 - 20
aegis/src/model/DescribeScreenDataMapResult.cc

@@ -39,32 +39,32 @@ void DescribeScreenDataMapResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allSasScreenTypeList = value["SasScreenTypeList"]["SasScreenType"];
-	for (auto value : allSasScreenTypeList)
+	auto allSasScreenTypeListNode = value["SasScreenTypeList"]["SasScreenType"];
+	for (auto valueSasScreenTypeListSasScreenType : allSasScreenTypeListNode)
 	{
 		SasScreenType sasScreenTypeListObject;
-		if(!value["Type"].isNull())
-			sasScreenTypeListObject.type = value["Type"].asString();
-		if(!value["TypeCode"].isNull())
-			sasScreenTypeListObject.typeCode = value["TypeCode"].asString();
-		auto allTypeData = value["TypeData"]["SasScreenModel"];
-		for (auto value : allTypeData)
+		if(!valueSasScreenTypeListSasScreenType["Type"].isNull())
+			sasScreenTypeListObject.type = valueSasScreenTypeListSasScreenType["Type"].asString();
+		if(!valueSasScreenTypeListSasScreenType["TypeCode"].isNull())
+			sasScreenTypeListObject.typeCode = valueSasScreenTypeListSasScreenType["TypeCode"].asString();
+		auto allTypeDataNode = allSasScreenTypeListNode["TypeData"]["SasScreenModel"];
+		for (auto allSasScreenTypeListNodeTypeDataSasScreenModel : allTypeDataNode)
 		{
 			SasScreenType::SasScreenModel typeDataObject;
-			if(!value["Code"].isNull())
-				typeDataObject.code = value["Code"].asString();
-			if(!value["Id"].isNull())
-				typeDataObject.id = value["Id"].asString();
-			if(!value["Title"].isNull())
-				typeDataObject.title = value["Title"].asString();
-			auto allDate = value["Date"]["IntegerItem"];
-			for (auto value : allDate)
+			if(!allSasScreenTypeListNodeTypeDataSasScreenModel["Code"].isNull())
+				typeDataObject.code = allSasScreenTypeListNodeTypeDataSasScreenModel["Code"].asString();
+			if(!allSasScreenTypeListNodeTypeDataSasScreenModel["Id"].isNull())
+				typeDataObject.id = allSasScreenTypeListNodeTypeDataSasScreenModel["Id"].asString();
+			if(!allSasScreenTypeListNodeTypeDataSasScreenModel["Title"].isNull())
+				typeDataObject.title = allSasScreenTypeListNodeTypeDataSasScreenModel["Title"].asString();
+			auto allDateNode = allTypeDataNode["Date"]["IntegerItem"];
+			for (auto allTypeDataNodeDateIntegerItem : allDateNode)
 			{
 				SasScreenType::SasScreenModel::IntegerItem dateObject;
-				if(!value["Value"].isNull())
-					dateObject.value = value["Value"].asString();
-				if(!value["Unit"].isNull())
-					dateObject.unit = value["Unit"].asString();
+				if(!allTypeDataNodeDateIntegerItem["Value"].isNull())
+					dateObject.value = allTypeDataNodeDateIntegerItem["Value"].asString();
+				if(!allTypeDataNodeDateIntegerItem["Unit"].isNull())
+					dateObject.unit = allTypeDataNodeDateIntegerItem["Unit"].asString();
 				typeDataObject.date.push_back(dateObject);
 			}
 			sasScreenTypeListObject.typeData.push_back(typeDataObject);

+ 8 - 8
aegis/src/model/DescribeScreenEmerRiskResult.cc

@@ -39,16 +39,16 @@ void DescribeScreenEmerRiskResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allCloudHcRiskItems = value["CloudHcRiskItems"]["CloudHcRiskItem"];
-	for (auto value : allCloudHcRiskItems)
+	auto allCloudHcRiskItemsNode = value["CloudHcRiskItems"]["CloudHcRiskItem"];
+	for (auto valueCloudHcRiskItemsCloudHcRiskItem : allCloudHcRiskItemsNode)
 	{
 		CloudHcRiskItem cloudHcRiskItemsObject;
-		if(!value["Level"].isNull())
-			cloudHcRiskItemsObject.level = value["Level"].asString();
-		if(!value["VulName"].isNull())
-			cloudHcRiskItemsObject.vulName = value["VulName"].asString();
-		if(!value["AffectCount"].isNull())
-			cloudHcRiskItemsObject.affectCount = std::stoi(value["AffectCount"].asString());
+		if(!valueCloudHcRiskItemsCloudHcRiskItem["Level"].isNull())
+			cloudHcRiskItemsObject.level = valueCloudHcRiskItemsCloudHcRiskItem["Level"].asString();
+		if(!valueCloudHcRiskItemsCloudHcRiskItem["VulName"].isNull())
+			cloudHcRiskItemsObject.vulName = valueCloudHcRiskItemsCloudHcRiskItem["VulName"].asString();
+		if(!valueCloudHcRiskItemsCloudHcRiskItem["AffectCount"].isNull())
+			cloudHcRiskItemsObject.affectCount = std::stoi(valueCloudHcRiskItemsCloudHcRiskItem["AffectCount"].asString());
 		cloudHcRiskItems_.push_back(cloudHcRiskItemsObject);
 	}
 	if(!value["Success"].isNull())

+ 6 - 6
aegis/src/model/DescribeScreenRequestTopTypeResult.cc

@@ -39,14 +39,14 @@ void DescribeScreenRequestTopTypeResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allTopTypes = value["TopTypes"]["TopType"];
-	for (auto value : allTopTypes)
+	auto allTopTypesNode = value["TopTypes"]["TopType"];
+	for (auto valueTopTypesTopType : allTopTypesNode)
 	{
 		TopType topTypesObject;
-		if(!value["Count"].isNull())
-			topTypesObject.count = std::stoi(value["Count"].asString());
-		if(!value["Type"].isNull())
-			topTypesObject.type = value["Type"].asString();
+		if(!valueTopTypesTopType["Count"].isNull())
+			topTypesObject.count = std::stoi(valueTopTypesTopType["Count"].asString());
+		if(!valueTopTypesTopType["Type"].isNull())
+			topTypesObject.type = valueTopTypesTopType["Type"].asString();
 		topTypes_.push_back(topTypesObject);
 	}
 	if(!value["TotalCount"].isNull())

+ 6 - 6
aegis/src/model/DescribeScreenSettingsResult.cc

@@ -39,14 +39,14 @@ void DescribeScreenSettingsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allSasScreenSettingList = value["SasScreenSettingList"]["SasScreenSettingListItem"];
-	for (auto value : allSasScreenSettingList)
+	auto allSasScreenSettingListNode = value["SasScreenSettingList"]["SasScreenSettingListItem"];
+	for (auto valueSasScreenSettingListSasScreenSettingListItem : allSasScreenSettingListNode)
 	{
 		SasScreenSettingListItem sasScreenSettingListObject;
-		if(!value["ScreenSettingTitle"].isNull())
-			sasScreenSettingListObject.screenSettingTitle = value["ScreenSettingTitle"].asString();
-		if(!value["ScreenSettingIdMap"].isNull())
-			sasScreenSettingListObject.screenSettingIdMap = value["ScreenSettingIdMap"].asString();
+		if(!valueSasScreenSettingListSasScreenSettingListItem["ScreenSettingTitle"].isNull())
+			sasScreenSettingListObject.screenSettingTitle = valueSasScreenSettingListSasScreenSettingListItem["ScreenSettingTitle"].asString();
+		if(!valueSasScreenSettingListSasScreenSettingListItem["ScreenSettingIdMap"].isNull())
+			sasScreenSettingListObject.screenSettingIdMap = valueSasScreenSettingListSasScreenSettingListItem["ScreenSettingIdMap"].asString();
 		sasScreenSettingList_.push_back(sasScreenSettingListObject);
 	}
 

+ 6 - 6
aegis/src/model/DescribeScreenTitlesResult.cc

@@ -39,14 +39,14 @@ void DescribeScreenTitlesResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allSasScreenSettingList = value["SasScreenSettingList"]["SasScreenSetting"];
-	for (auto value : allSasScreenSettingList)
+	auto allSasScreenSettingListNode = value["SasScreenSettingList"]["SasScreenSetting"];
+	for (auto valueSasScreenSettingListSasScreenSetting : allSasScreenSettingListNode)
 	{
 		SasScreenSetting sasScreenSettingListObject;
-		if(!value["ScreenID"].isNull())
-			sasScreenSettingListObject.screenID = std::stol(value["ScreenID"].asString());
-		if(!value["ScreenTitle"].isNull())
-			sasScreenSettingListObject.screenTitle = value["ScreenTitle"].asString();
+		if(!valueSasScreenSettingListSasScreenSetting["ScreenID"].isNull())
+			sasScreenSettingListObject.screenID = std::stol(valueSasScreenSettingListSasScreenSetting["ScreenID"].asString());
+		if(!valueSasScreenSettingListSasScreenSetting["ScreenTitle"].isNull())
+			sasScreenSettingListObject.screenTitle = valueSasScreenSettingListSasScreenSetting["ScreenTitle"].asString();
 		sasScreenSettingList_.push_back(sasScreenSettingListObject);
 	}
 	if(!value["Success"].isNull())

+ 6 - 6
aegis/src/model/DescribeScreenTopRequestAndFlowResult.cc

@@ -39,14 +39,14 @@ void DescribeScreenTopRequestAndFlowResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allTopRequestsIpCountDOS = value["TopRequestsIpCountDOS"]["TopRequestsIpCountDOSItem"];
-	for (auto value : allTopRequestsIpCountDOS)
+	auto allTopRequestsIpCountDOSNode = value["TopRequestsIpCountDOS"]["TopRequestsIpCountDOSItem"];
+	for (auto valueTopRequestsIpCountDOSTopRequestsIpCountDOSItem : allTopRequestsIpCountDOSNode)
 	{
 		TopRequestsIpCountDOSItem topRequestsIpCountDOSObject;
-		if(!value["ReqCount"].isNull())
-			topRequestsIpCountDOSObject.reqCount = std::stoi(value["ReqCount"].asString());
-		if(!value["Ip"].isNull())
-			topRequestsIpCountDOSObject.ip = value["Ip"].asString();
+		if(!valueTopRequestsIpCountDOSTopRequestsIpCountDOSItem["ReqCount"].isNull())
+			topRequestsIpCountDOSObject.reqCount = std::stoi(valueTopRequestsIpCountDOSTopRequestsIpCountDOSItem["ReqCount"].asString());
+		if(!valueTopRequestsIpCountDOSTopRequestsIpCountDOSItem["Ip"].isNull())
+			topRequestsIpCountDOSObject.ip = valueTopRequestsIpCountDOSTopRequestsIpCountDOSItem["Ip"].asString();
 		topRequestsIpCountDOS_.push_back(topRequestsIpCountDOSObject);
 	}
 	if(!value["Success"].isNull())

+ 20 - 20
aegis/src/model/DescribeSearchConditionResult.cc

@@ -39,28 +39,28 @@ void DescribeSearchConditionResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allConditionList = value["ConditionList"]["Condition"];
-	for (auto value : allConditionList)
+	auto allConditionListNode = value["ConditionList"]["Condition"];
+	for (auto valueConditionListCondition : allConditionListNode)
 	{
 		Condition conditionListObject;
-		if(!value["Name"].isNull())
-			conditionListObject.name = value["Name"].asString();
-		if(!value["AssetType"].isNull())
-			conditionListObject.assetType = value["AssetType"].asString();
-		if(!value["Tag"].isNull())
-			conditionListObject.tag = value["Tag"].asString();
-		if(!value["Region"].isNull())
-			conditionListObject.region = value["Region"].asString();
-		if(!value["SafeStatus"].isNull())
-			conditionListObject.safeStatus = value["SafeStatus"].asString();
-		if(!value["ClientStatus"].isNull())
-			conditionListObject.clientStatus = value["ClientStatus"].asString();
-		if(!value["GroupId"].isNull())
-			conditionListObject.groupId = value["GroupId"].asString();
-		if(!value["Os"].isNull())
-			conditionListObject.os = value["Os"].asString();
-		if(!value["Remark"].isNull())
-			conditionListObject.remark = value["Remark"].asString();
+		if(!valueConditionListCondition["Name"].isNull())
+			conditionListObject.name = valueConditionListCondition["Name"].asString();
+		if(!valueConditionListCondition["AssetType"].isNull())
+			conditionListObject.assetType = valueConditionListCondition["AssetType"].asString();
+		if(!valueConditionListCondition["Tag"].isNull())
+			conditionListObject.tag = valueConditionListCondition["Tag"].asString();
+		if(!valueConditionListCondition["Region"].isNull())
+			conditionListObject.region = valueConditionListCondition["Region"].asString();
+		if(!valueConditionListCondition["SafeStatus"].isNull())
+			conditionListObject.safeStatus = valueConditionListCondition["SafeStatus"].asString();
+		if(!valueConditionListCondition["ClientStatus"].isNull())
+			conditionListObject.clientStatus = valueConditionListCondition["ClientStatus"].asString();
+		if(!valueConditionListCondition["GroupId"].isNull())
+			conditionListObject.groupId = valueConditionListCondition["GroupId"].asString();
+		if(!valueConditionListCondition["Os"].isNull())
+			conditionListObject.os = valueConditionListCondition["Os"].asString();
+		if(!valueConditionListCondition["Remark"].isNull())
+			conditionListObject.remark = valueConditionListCondition["Remark"].asString();
 		conditionList_.push_back(conditionListObject);
 	}
 

+ 14 - 14
aegis/src/model/DescribeSecureSuggestionResult.cc

@@ -39,24 +39,24 @@ void DescribeSecureSuggestionResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allSuggestions = value["Suggestions"]["Suggestion"];
-	for (auto value : allSuggestions)
+	auto allSuggestionsNode = value["Suggestions"]["Suggestion"];
+	for (auto valueSuggestionsSuggestion : allSuggestionsNode)
 	{
 		Suggestion suggestionsObject;
-		if(!value["SuggestType"].isNull())
-			suggestionsObject.suggestType = value["SuggestType"].asString();
-		if(!value["Points"].isNull())
-			suggestionsObject.points = std::stoi(value["Points"].asString());
-		auto allDetail = value["Detail"]["DetailItem"];
-		for (auto value : allDetail)
+		if(!valueSuggestionsSuggestion["SuggestType"].isNull())
+			suggestionsObject.suggestType = valueSuggestionsSuggestion["SuggestType"].asString();
+		if(!valueSuggestionsSuggestion["Points"].isNull())
+			suggestionsObject.points = std::stoi(valueSuggestionsSuggestion["Points"].asString());
+		auto allDetailNode = allSuggestionsNode["Detail"]["DetailItem"];
+		for (auto allSuggestionsNodeDetailDetailItem : allDetailNode)
 		{
 			Suggestion::DetailItem detailObject;
-			if(!value["Description"].isNull())
-				detailObject.description = value["Description"].asString();
-			if(!value["SubType"].isNull())
-				detailObject.subType = value["SubType"].asString();
-			if(!value["Title"].isNull())
-				detailObject.title = value["Title"].asString();
+			if(!allSuggestionsNodeDetailDetailItem["Description"].isNull())
+				detailObject.description = allSuggestionsNodeDetailDetailItem["Description"].asString();
+			if(!allSuggestionsNodeDetailDetailItem["SubType"].isNull())
+				detailObject.subType = allSuggestionsNodeDetailDetailItem["SubType"].asString();
+			if(!allSuggestionsNodeDetailDetailItem["Title"].isNull())
+				detailObject.title = allSuggestionsNodeDetailDetailItem["Title"].asString();
 			suggestionsObject.detail.push_back(detailObject);
 		}
 		suggestions_.push_back(suggestionsObject);

+ 4 - 4
aegis/src/model/DescribeSlsProjectResult.cc

@@ -39,12 +39,12 @@ void DescribeSlsProjectResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allSlsProjectData = value["SlsProjectData"]["SlsProjectDataItem"];
-	for (auto value : allSlsProjectData)
+	auto allSlsProjectDataNode = value["SlsProjectData"]["SlsProjectDataItem"];
+	for (auto valueSlsProjectDataSlsProjectDataItem : allSlsProjectDataNode)
 	{
 		SlsProjectDataItem slsProjectDataObject;
-		if(!value["Project"].isNull())
-			slsProjectDataObject.project = value["Project"].asString();
+		if(!valueSlsProjectDataSlsProjectDataItem["Project"].isNull())
+			slsProjectDataObject.project = valueSlsProjectDataSlsProjectDataItem["Project"].asString();
 		auto allLogStore = value["LogStore"]["StringItem"];
 		for (auto value : allLogStore)
 			slsProjectDataObject.logStore.push_back(value.asString());

+ 12 - 12
aegis/src/model/DescribeStrategyExecDetailResult.cc

@@ -39,20 +39,20 @@ void DescribeStrategyExecDetailResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allFailedEcsList = value["FailedEcsList"]["FailedEcs"];
-	for (auto value : allFailedEcsList)
+	auto allFailedEcsListNode = value["FailedEcsList"]["FailedEcs"];
+	for (auto valueFailedEcsListFailedEcs : allFailedEcsListNode)
 	{
 		FailedEcs failedEcsListObject;
-		if(!value["Reason"].isNull())
-			failedEcsListObject.reason = value["Reason"].asString();
-		if(!value["InstanceName"].isNull())
-			failedEcsListObject.instanceName = value["InstanceName"].asString();
-		if(!value["IP"].isNull())
-			failedEcsListObject.iP = value["IP"].asString();
-		if(!value["InternetIp"].isNull())
-			failedEcsListObject.internetIp = value["InternetIp"].asString();
-		if(!value["IntranetIp"].isNull())
-			failedEcsListObject.intranetIp = value["IntranetIp"].asString();
+		if(!valueFailedEcsListFailedEcs["Reason"].isNull())
+			failedEcsListObject.reason = valueFailedEcsListFailedEcs["Reason"].asString();
+		if(!valueFailedEcsListFailedEcs["InstanceName"].isNull())
+			failedEcsListObject.instanceName = valueFailedEcsListFailedEcs["InstanceName"].asString();
+		if(!valueFailedEcsListFailedEcs["IP"].isNull())
+			failedEcsListObject.iP = valueFailedEcsListFailedEcs["IP"].asString();
+		if(!valueFailedEcsListFailedEcs["InternetIp"].isNull())
+			failedEcsListObject.internetIp = valueFailedEcsListFailedEcs["InternetIp"].asString();
+		if(!valueFailedEcsListFailedEcs["IntranetIp"].isNull())
+			failedEcsListObject.intranetIp = valueFailedEcsListFailedEcs["IntranetIp"].asString();
 		failedEcsList_.push_back(failedEcsListObject);
 	}
 	if(!value["StartTime"].isNull())

+ 8 - 8
aegis/src/model/DescribeStrategyTargetResult.cc

@@ -39,16 +39,16 @@ void DescribeStrategyTargetResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allStrategyTargets = value["StrategyTargets"]["StrategyTarget"];
-	for (auto value : allStrategyTargets)
+	auto allStrategyTargetsNode = value["StrategyTargets"]["StrategyTarget"];
+	for (auto valueStrategyTargetsStrategyTarget : allStrategyTargetsNode)
 	{
 		StrategyTarget strategyTargetsObject;
-		if(!value["Flag"].isNull())
-			strategyTargetsObject.flag = value["Flag"].asString();
-		if(!value["Target"].isNull())
-			strategyTargetsObject.target = value["Target"].asString();
-		if(!value["TargetType"].isNull())
-			strategyTargetsObject.targetType = value["TargetType"].asString();
+		if(!valueStrategyTargetsStrategyTarget["Flag"].isNull())
+			strategyTargetsObject.flag = valueStrategyTargetsStrategyTarget["Flag"].asString();
+		if(!valueStrategyTargetsStrategyTarget["Target"].isNull())
+			strategyTargetsObject.target = valueStrategyTargetsStrategyTarget["Target"].asString();
+		if(!valueStrategyTargetsStrategyTarget["TargetType"].isNull())
+			strategyTargetsObject.targetType = valueStrategyTargetsStrategyTarget["TargetType"].asString();
 		strategyTargets_.push_back(strategyTargetsObject);
 	}
 

+ 16 - 16
aegis/src/model/DescribeStratetyDetailResult.cc

@@ -50,26 +50,26 @@ void DescribeStratetyDetailResult::parse(const std::string &payload)
 		strategy_.cycleStartTime = std::stoi(strategyNode["CycleStartTime"].asString());
 	if(!strategyNode["Type"].isNull())
 		strategy_.type = std::stoi(strategyNode["Type"].asString());
-	auto allRiskTypeWhiteListQueryResultList = value["RiskTypeWhiteListQueryResultList"]["RiskTypeWhiteListQueryResult"];
-	for (auto value : allRiskTypeWhiteListQueryResultList)
+	auto allRiskTypeWhiteListQueryResultListNode = strategyNode["RiskTypeWhiteListQueryResultList"]["RiskTypeWhiteListQueryResult"];
+	for (auto strategyNodeRiskTypeWhiteListQueryResultListRiskTypeWhiteListQueryResult : allRiskTypeWhiteListQueryResultListNode)
 	{
 		Strategy::RiskTypeWhiteListQueryResult riskTypeWhiteListQueryResultObject;
-		if(!value["TypeName"].isNull())
-			riskTypeWhiteListQueryResultObject.typeName = value["TypeName"].asString();
-		if(!value["Alias"].isNull())
-			riskTypeWhiteListQueryResultObject.alias = value["Alias"].asString();
-		if(!value["On"].isNull())
-			riskTypeWhiteListQueryResultObject.on = value["On"].asString() == "true";
-		auto allSubTypes = value["SubTypes"]["SubType"];
-		for (auto value : allSubTypes)
+		if(!strategyNodeRiskTypeWhiteListQueryResultListRiskTypeWhiteListQueryResult["TypeName"].isNull())
+			riskTypeWhiteListQueryResultObject.typeName = strategyNodeRiskTypeWhiteListQueryResultListRiskTypeWhiteListQueryResult["TypeName"].asString();
+		if(!strategyNodeRiskTypeWhiteListQueryResultListRiskTypeWhiteListQueryResult["Alias"].isNull())
+			riskTypeWhiteListQueryResultObject.alias = strategyNodeRiskTypeWhiteListQueryResultListRiskTypeWhiteListQueryResult["Alias"].asString();
+		if(!strategyNodeRiskTypeWhiteListQueryResultListRiskTypeWhiteListQueryResult["On"].isNull())
+			riskTypeWhiteListQueryResultObject.on = strategyNodeRiskTypeWhiteListQueryResultListRiskTypeWhiteListQueryResult["On"].asString() == "true";
+		auto allSubTypesNode = allRiskTypeWhiteListQueryResultListNode["SubTypes"]["SubType"];
+		for (auto allRiskTypeWhiteListQueryResultListNodeSubTypesSubType : allSubTypesNode)
 		{
 			Strategy::RiskTypeWhiteListQueryResult::SubType subTypesObject;
-			if(!value["TypeName"].isNull())
-				subTypesObject.typeName = value["TypeName"].asString();
-			if(!value["Alias"].isNull())
-				subTypesObject.alias = value["Alias"].asString();
-			if(!value["On"].isNull())
-				subTypesObject.on = value["On"].asString() == "true";
+			if(!allRiskTypeWhiteListQueryResultListNodeSubTypesSubType["TypeName"].isNull())
+				subTypesObject.typeName = allRiskTypeWhiteListQueryResultListNodeSubTypesSubType["TypeName"].asString();
+			if(!allRiskTypeWhiteListQueryResultListNodeSubTypesSubType["Alias"].isNull())
+				subTypesObject.alias = allRiskTypeWhiteListQueryResultListNodeSubTypesSubType["Alias"].asString();
+			if(!allRiskTypeWhiteListQueryResultListNodeSubTypesSubType["On"].isNull())
+				subTypesObject.on = allRiskTypeWhiteListQueryResultListNodeSubTypesSubType["On"].asString() == "true";
 			riskTypeWhiteListQueryResultObject.subTypes.push_back(subTypesObject);
 		}
 		strategy_.riskTypeWhiteListQueryResultList.push_back(riskTypeWhiteListQueryResultObject);

+ 30 - 30
aegis/src/model/DescribeStratetyResult.cc

@@ -39,40 +39,40 @@ void DescribeStratetyResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allStrategies = value["Strategies"]["Strategy"];
-	for (auto value : allStrategies)
+	auto allStrategiesNode = value["Strategies"]["Strategy"];
+	for (auto valueStrategiesStrategy : allStrategiesNode)
 	{
 		Strategy strategiesObject;
-		if(!value["CycleDays"].isNull())
-			strategiesObject.cycleDays = std::stoi(value["CycleDays"].asString());
-		if(!value["Id"].isNull())
-			strategiesObject.id = std::stoi(value["Id"].asString());
-		if(!value["CycleStartTime"].isNull())
-			strategiesObject.cycleStartTime = std::stoi(value["CycleStartTime"].asString());
-		if(!value["Type"].isNull())
-			strategiesObject.type = std::stoi(value["Type"].asString());
-		if(!value["Name"].isNull())
-			strategiesObject.name = value["Name"].asString();
-		if(!value["RiskCount"].isNull())
-			strategiesObject.riskCount = std::stoi(value["RiskCount"].asString());
-		if(!value["EcsCount"].isNull())
-			strategiesObject.ecsCount = std::stoi(value["EcsCount"].asString());
-		if(!value["ExecStatus"].isNull())
-			strategiesObject.execStatus = std::stoi(value["ExecStatus"].asString());
-		if(!value["ProcessRate"].isNull())
-			strategiesObject.processRate = std::stoi(value["ProcessRate"].asString());
-		if(!value["PassRate"].isNull())
-			strategiesObject.passRate = std::stoi(value["PassRate"].asString());
-		auto allConfigTargets = value["ConfigTargets"]["ConfigTarget"];
-		for (auto value : allConfigTargets)
+		if(!valueStrategiesStrategy["CycleDays"].isNull())
+			strategiesObject.cycleDays = std::stoi(valueStrategiesStrategy["CycleDays"].asString());
+		if(!valueStrategiesStrategy["Id"].isNull())
+			strategiesObject.id = std::stoi(valueStrategiesStrategy["Id"].asString());
+		if(!valueStrategiesStrategy["CycleStartTime"].isNull())
+			strategiesObject.cycleStartTime = std::stoi(valueStrategiesStrategy["CycleStartTime"].asString());
+		if(!valueStrategiesStrategy["Type"].isNull())
+			strategiesObject.type = std::stoi(valueStrategiesStrategy["Type"].asString());
+		if(!valueStrategiesStrategy["Name"].isNull())
+			strategiesObject.name = valueStrategiesStrategy["Name"].asString();
+		if(!valueStrategiesStrategy["RiskCount"].isNull())
+			strategiesObject.riskCount = std::stoi(valueStrategiesStrategy["RiskCount"].asString());
+		if(!valueStrategiesStrategy["EcsCount"].isNull())
+			strategiesObject.ecsCount = std::stoi(valueStrategiesStrategy["EcsCount"].asString());
+		if(!valueStrategiesStrategy["ExecStatus"].isNull())
+			strategiesObject.execStatus = std::stoi(valueStrategiesStrategy["ExecStatus"].asString());
+		if(!valueStrategiesStrategy["ProcessRate"].isNull())
+			strategiesObject.processRate = std::stoi(valueStrategiesStrategy["ProcessRate"].asString());
+		if(!valueStrategiesStrategy["PassRate"].isNull())
+			strategiesObject.passRate = std::stoi(valueStrategiesStrategy["PassRate"].asString());
+		auto allConfigTargetsNode = allStrategiesNode["ConfigTargets"]["ConfigTarget"];
+		for (auto allStrategiesNodeConfigTargetsConfigTarget : allConfigTargetsNode)
 		{
 			Strategy::ConfigTarget configTargetsObject;
-			if(!value["Flag"].isNull())
-				configTargetsObject.flag = value["Flag"].asString();
-			if(!value["TargetType"].isNull())
-				configTargetsObject.targetType = value["TargetType"].asString();
-			if(!value["Target"].isNull())
-				configTargetsObject.target = value["Target"].asString();
+			if(!allStrategiesNodeConfigTargetsConfigTarget["Flag"].isNull())
+				configTargetsObject.flag = allStrategiesNodeConfigTargetsConfigTarget["Flag"].asString();
+			if(!allStrategiesNodeConfigTargetsConfigTarget["TargetType"].isNull())
+				configTargetsObject.targetType = allStrategiesNodeConfigTargetsConfigTarget["TargetType"].asString();
+			if(!allStrategiesNodeConfigTargetsConfigTarget["Target"].isNull())
+				configTargetsObject.target = allStrategiesNodeConfigTargetsConfigTarget["Target"].asString();
 			strategiesObject.configTargets.push_back(configTargetsObject);
 		}
 		strategies_.push_back(strategiesObject);

+ 18 - 18
aegis/src/model/DescribeSuspEventDetailResult.cc

@@ -39,30 +39,30 @@ void DescribeSuspEventDetailResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allDetails = value["Details"]["QuaraFile"];
-	for (auto value : allDetails)
+	auto allDetailsNode = value["Details"]["QuaraFile"];
+	for (auto valueDetailsQuaraFile : allDetailsNode)
 	{
 		QuaraFile detailsObject;
-		if(!value["Name"].isNull())
-			detailsObject.name = value["Name"].asString();
-		if(!value["Type"].isNull())
-			detailsObject.type = value["Type"].asString();
-		if(!value["InfoType"].isNull())
-			detailsObject.infoType = value["InfoType"].asString();
-		if(!value["Value"].isNull())
-			detailsObject.value = value["Value"].asString();
+		if(!valueDetailsQuaraFile["Name"].isNull())
+			detailsObject.name = valueDetailsQuaraFile["Name"].asString();
+		if(!valueDetailsQuaraFile["Type"].isNull())
+			detailsObject.type = valueDetailsQuaraFile["Type"].asString();
+		if(!valueDetailsQuaraFile["InfoType"].isNull())
+			detailsObject.infoType = valueDetailsQuaraFile["InfoType"].asString();
+		if(!valueDetailsQuaraFile["Value"].isNull())
+			detailsObject.value = valueDetailsQuaraFile["Value"].asString();
 		details_.push_back(detailsObject);
 	}
-	auto allEventNotes = value["EventNotes"]["EventNote"];
-	for (auto value : allEventNotes)
+	auto allEventNotesNode = value["EventNotes"]["EventNote"];
+	for (auto valueEventNotesEventNote : allEventNotesNode)
 	{
 		EventNote eventNotesObject;
-		if(!value["NoteTime"].isNull())
-			eventNotesObject.noteTime = value["NoteTime"].asString();
-		if(!value["Note"].isNull())
-			eventNotesObject.note = value["Note"].asString();
-		if(!value["NoteId"].isNull())
-			eventNotesObject.noteId = std::stol(value["NoteId"].asString());
+		if(!valueEventNotesEventNote["NoteTime"].isNull())
+			eventNotesObject.noteTime = valueEventNotesEventNote["NoteTime"].asString();
+		if(!valueEventNotesEventNote["Note"].isNull())
+			eventNotesObject.note = valueEventNotesEventNote["Note"].asString();
+		if(!valueEventNotesEventNote["NoteId"].isNull())
+			eventNotesObject.noteId = std::stol(valueEventNotesEventNote["NoteId"].asString());
 		eventNotes_.push_back(eventNotesObject);
 	}
 	if(!value["LastTime"].isNull())

+ 26 - 26
aegis/src/model/DescribeSuspEventQuaraFilesResult.cc

@@ -39,34 +39,34 @@ void DescribeSuspEventQuaraFilesResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allQuaraFiles = value["QuaraFiles"]["QuaraFile"];
-	for (auto value : allQuaraFiles)
+	auto allQuaraFilesNode = value["QuaraFiles"]["QuaraFile"];
+	for (auto valueQuaraFilesQuaraFile : allQuaraFilesNode)
 	{
 		QuaraFile quaraFilesObject;
-		if(!value["Path"].isNull())
-			quaraFilesObject.path = value["Path"].asString();
-		if(!value["EventName"].isNull())
-			quaraFilesObject.eventName = value["EventName"].asString();
-		if(!value["Id"].isNull())
-			quaraFilesObject.id = std::stoi(value["Id"].asString());
-		if(!value["EventType"].isNull())
-			quaraFilesObject.eventType = value["EventType"].asString();
-		if(!value["Tag"].isNull())
-			quaraFilesObject.tag = value["Tag"].asString();
-		if(!value["Uuid"].isNull())
-			quaraFilesObject.uuid = value["Uuid"].asString();
-		if(!value["InstanceName"].isNull())
-			quaraFilesObject.instanceName = value["InstanceName"].asString();
-		if(!value["InternetIp"].isNull())
-			quaraFilesObject.internetIp = value["InternetIp"].asString();
-		if(!value["Ip"].isNull())
-			quaraFilesObject.ip = value["Ip"].asString();
-		if(!value["Status"].isNull())
-			quaraFilesObject.status = value["Status"].asString();
-		if(!value["Md5"].isNull())
-			quaraFilesObject.md5 = value["Md5"].asString();
-		if(!value["ModifyTime"].isNull())
-			quaraFilesObject.modifyTime = value["ModifyTime"].asString();
+		if(!valueQuaraFilesQuaraFile["Path"].isNull())
+			quaraFilesObject.path = valueQuaraFilesQuaraFile["Path"].asString();
+		if(!valueQuaraFilesQuaraFile["EventName"].isNull())
+			quaraFilesObject.eventName = valueQuaraFilesQuaraFile["EventName"].asString();
+		if(!valueQuaraFilesQuaraFile["Id"].isNull())
+			quaraFilesObject.id = std::stoi(valueQuaraFilesQuaraFile["Id"].asString());
+		if(!valueQuaraFilesQuaraFile["EventType"].isNull())
+			quaraFilesObject.eventType = valueQuaraFilesQuaraFile["EventType"].asString();
+		if(!valueQuaraFilesQuaraFile["Tag"].isNull())
+			quaraFilesObject.tag = valueQuaraFilesQuaraFile["Tag"].asString();
+		if(!valueQuaraFilesQuaraFile["Uuid"].isNull())
+			quaraFilesObject.uuid = valueQuaraFilesQuaraFile["Uuid"].asString();
+		if(!valueQuaraFilesQuaraFile["InstanceName"].isNull())
+			quaraFilesObject.instanceName = valueQuaraFilesQuaraFile["InstanceName"].asString();
+		if(!valueQuaraFilesQuaraFile["InternetIp"].isNull())
+			quaraFilesObject.internetIp = valueQuaraFilesQuaraFile["InternetIp"].asString();
+		if(!valueQuaraFilesQuaraFile["Ip"].isNull())
+			quaraFilesObject.ip = valueQuaraFilesQuaraFile["Ip"].asString();
+		if(!valueQuaraFilesQuaraFile["Status"].isNull())
+			quaraFilesObject.status = valueQuaraFilesQuaraFile["Status"].asString();
+		if(!valueQuaraFilesQuaraFile["Md5"].isNull())
+			quaraFilesObject.md5 = valueQuaraFilesQuaraFile["Md5"].asString();
+		if(!valueQuaraFilesQuaraFile["ModifyTime"].isNull())
+			quaraFilesObject.modifyTime = valueQuaraFilesQuaraFile["ModifyTime"].asString();
 		quaraFiles_.push_back(quaraFilesObject);
 	}
 	if(!value["Count"].isNull())

+ 6 - 6
aegis/src/model/DescribeSuspEventTypesResult.cc

@@ -39,14 +39,14 @@ void DescribeSuspEventTypesResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allEventTypes = value["EventTypes"]["Data"];
-	for (auto value : allEventTypes)
+	auto allEventTypesNode = value["EventTypes"]["Data"];
+	for (auto valueEventTypesData : allEventTypesNode)
 	{
 		Data eventTypesObject;
-		if(!value["AliseEventType"].isNull())
-			eventTypesObject.aliseEventType = value["AliseEventType"].asString();
-		if(!value["EventType"].isNull())
-			eventTypesObject.eventType = value["EventType"].asString();
+		if(!valueEventTypesData["AliseEventType"].isNull())
+			eventTypesObject.aliseEventType = valueEventTypesData["AliseEventType"].asString();
+		if(!valueEventTypesData["EventType"].isNull())
+			eventTypesObject.eventType = valueEventTypesData["EventType"].asString();
 		eventTypes_.push_back(eventTypesObject);
 	}
 	if(!value["TotalCount"].isNull())

+ 11 - 0
aegis/src/model/DescribeSuspEventsRequest.cc

@@ -146,3 +146,14 @@ void DescribeSuspEventsRequest::setParentEventTypes(const std::string& parentEve
 	setCoreParameter("ParentEventTypes", parentEventTypes);
 }
 
+std::string DescribeSuspEventsRequest::getStatus()const
+{
+	return status_;
+}
+
+void DescribeSuspEventsRequest::setStatus(const std::string& status)
+{
+	status_ = status;
+	setCoreParameter("Status", status);
+}
+

+ 42 - 40
aegis/src/model/DescribeSuspEventsResult.cc

@@ -39,48 +39,50 @@ void DescribeSuspEventsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allSuspEvents = value["SuspEvents"]["WarningSummary"];
-	for (auto value : allSuspEvents)
+	auto allSuspEventsNode = value["SuspEvents"]["WarningSummary"];
+	for (auto valueSuspEventsWarningSummary : allSuspEventsNode)
 	{
 		WarningSummary suspEventsObject;
-		if(!value["LastTime"].isNull())
-			suspEventsObject.lastTime = value["LastTime"].asString();
-		if(!value["OccurrenceTime"].isNull())
-			suspEventsObject.occurrenceTime = value["OccurrenceTime"].asString();
-		if(!value["Id"].isNull())
-			suspEventsObject.id = std::stol(value["Id"].asString());
-		if(!value["InstanceName"].isNull())
-			suspEventsObject.instanceName = value["InstanceName"].asString();
-		if(!value["InternetIp"].isNull())
-			suspEventsObject.internetIp = value["InternetIp"].asString();
-		if(!value["IntranetIp"].isNull())
-			suspEventsObject.intranetIp = value["IntranetIp"].asString();
-		if(!value["Uuid"].isNull())
-			suspEventsObject.uuid = value["Uuid"].asString();
-		if(!value["Name"].isNull())
-			suspEventsObject.name = value["Name"].asString();
-		if(!value["EventSubType"].isNull())
-			suspEventsObject.eventSubType = value["EventSubType"].asString();
-		if(!value["Level"].isNull())
-			suspEventsObject.level = value["Level"].asString();
-		if(!value["EventStatus"].isNull())
-			suspEventsObject.eventStatus = std::stoi(value["EventStatus"].asString());
-		if(!value["Desc"].isNull())
-			suspEventsObject.desc = value["Desc"].asString();
-		if(!value["OperateMsg"].isNull())
-			suspEventsObject.operateMsg = value["OperateMsg"].asString();
-		if(!value["DataSource"].isNull())
-			suspEventsObject.dataSource = value["DataSource"].asString();
-		if(!value["CanBeDealOnLine"].isNull())
-			suspEventsObject.canBeDealOnLine = value["CanBeDealOnLine"].asString() == "true";
-		if(!value["SaleVersion"].isNull())
-			suspEventsObject.saleVersion = value["SaleVersion"].asString();
-		if(!value["AlarmEventType"].isNull())
-			suspEventsObject.alarmEventType = value["AlarmEventType"].asString();
-		if(!value["AlarmEventName"].isNull())
-			suspEventsObject.alarmEventName = value["AlarmEventName"].asString();
-		if(!value["AlarmUniqueInfo"].isNull())
-			suspEventsObject.alarmUniqueInfo = value["AlarmUniqueInfo"].asString();
+		if(!valueSuspEventsWarningSummary["LastTime"].isNull())
+			suspEventsObject.lastTime = valueSuspEventsWarningSummary["LastTime"].asString();
+		if(!valueSuspEventsWarningSummary["OccurrenceTime"].isNull())
+			suspEventsObject.occurrenceTime = valueSuspEventsWarningSummary["OccurrenceTime"].asString();
+		if(!valueSuspEventsWarningSummary["Id"].isNull())
+			suspEventsObject.id = std::stol(valueSuspEventsWarningSummary["Id"].asString());
+		if(!valueSuspEventsWarningSummary["UniqueInfo"].isNull())
+			suspEventsObject.uniqueInfo = valueSuspEventsWarningSummary["UniqueInfo"].asString();
+		if(!valueSuspEventsWarningSummary["InstanceName"].isNull())
+			suspEventsObject.instanceName = valueSuspEventsWarningSummary["InstanceName"].asString();
+		if(!valueSuspEventsWarningSummary["InternetIp"].isNull())
+			suspEventsObject.internetIp = valueSuspEventsWarningSummary["InternetIp"].asString();
+		if(!valueSuspEventsWarningSummary["IntranetIp"].isNull())
+			suspEventsObject.intranetIp = valueSuspEventsWarningSummary["IntranetIp"].asString();
+		if(!valueSuspEventsWarningSummary["Uuid"].isNull())
+			suspEventsObject.uuid = valueSuspEventsWarningSummary["Uuid"].asString();
+		if(!valueSuspEventsWarningSummary["Name"].isNull())
+			suspEventsObject.name = valueSuspEventsWarningSummary["Name"].asString();
+		if(!valueSuspEventsWarningSummary["EventSubType"].isNull())
+			suspEventsObject.eventSubType = valueSuspEventsWarningSummary["EventSubType"].asString();
+		if(!valueSuspEventsWarningSummary["Level"].isNull())
+			suspEventsObject.level = valueSuspEventsWarningSummary["Level"].asString();
+		if(!valueSuspEventsWarningSummary["EventStatus"].isNull())
+			suspEventsObject.eventStatus = std::stoi(valueSuspEventsWarningSummary["EventStatus"].asString());
+		if(!valueSuspEventsWarningSummary["Desc"].isNull())
+			suspEventsObject.desc = valueSuspEventsWarningSummary["Desc"].asString();
+		if(!valueSuspEventsWarningSummary["OperateMsg"].isNull())
+			suspEventsObject.operateMsg = valueSuspEventsWarningSummary["OperateMsg"].asString();
+		if(!valueSuspEventsWarningSummary["DataSource"].isNull())
+			suspEventsObject.dataSource = valueSuspEventsWarningSummary["DataSource"].asString();
+		if(!valueSuspEventsWarningSummary["CanBeDealOnLine"].isNull())
+			suspEventsObject.canBeDealOnLine = valueSuspEventsWarningSummary["CanBeDealOnLine"].asString() == "true";
+		if(!valueSuspEventsWarningSummary["SaleVersion"].isNull())
+			suspEventsObject.saleVersion = valueSuspEventsWarningSummary["SaleVersion"].asString();
+		if(!valueSuspEventsWarningSummary["AlarmEventType"].isNull())
+			suspEventsObject.alarmEventType = valueSuspEventsWarningSummary["AlarmEventType"].asString();
+		if(!valueSuspEventsWarningSummary["AlarmEventName"].isNull())
+			suspEventsObject.alarmEventName = valueSuspEventsWarningSummary["AlarmEventName"].asString();
+		if(!valueSuspEventsWarningSummary["AlarmUniqueInfo"].isNull())
+			suspEventsObject.alarmUniqueInfo = valueSuspEventsWarningSummary["AlarmUniqueInfo"].asString();
 		suspEvents_.push_back(suspEventsObject);
 	}
 	if(!value["Count"].isNull())

+ 42 - 42
aegis/src/model/DescribeSuspiciousEventsResult.cc

@@ -39,52 +39,52 @@ void DescribeSuspiciousEventsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allLogList = value["LogList"]["LogListItem"];
-	for (auto value : allLogList)
+	auto allLogListNode = value["LogList"]["LogListItem"];
+	for (auto valueLogListLogListItem : allLogListNode)
 	{
 		LogListItem logListObject;
-		if(!value["AliasEventType"].isNull())
-			logListObject.aliasEventType = value["AliasEventType"].asString();
-		if(!value["LastTime"].isNull())
-			logListObject.lastTime = std::stol(value["LastTime"].asString());
-		if(!value["Level"].isNull())
-			logListObject.level = value["Level"].asString();
-		if(!value["InstanceName"].isNull())
-			logListObject.instanceName = value["InstanceName"].asString();
-		if(!value["GroupId"].isNull())
-			logListObject.groupId = std::stol(value["GroupId"].asString());
-		if(!value["Ip"].isNull())
-			logListObject.ip = value["Ip"].asString();
-		if(!value["EventType"].isNull())
-			logListObject.eventType = value["EventType"].asString();
-		if(!value["Uuid"].isNull())
-			logListObject.uuid = value["Uuid"].asString();
-		if(!value["FirstTime"].isNull())
-			logListObject.firstTime = std::stol(value["FirstTime"].asString());
-		if(!value["InstanceId"].isNull())
-			logListObject.instanceId = value["InstanceId"].asString();
-		if(!value["Tag"].isNull())
-			logListObject.tag = value["Tag"].asString();
-		if(!value["AliasEventName"].isNull())
-			logListObject.aliasEventName = value["AliasEventName"].asString();
-		if(!value["OsVersion"].isNull())
-			logListObject.osVersion = value["OsVersion"].asString();
-		if(!value["ClientIp"].isNull())
-			logListObject.clientIp = value["ClientIp"].asString();
-		if(!value["EventName"].isNull())
-			logListObject.eventName = value["EventName"].asString();
-		auto allDetailList = value["DetailList"]["DetailListItem"];
-		for (auto value : allDetailList)
+		if(!valueLogListLogListItem["AliasEventType"].isNull())
+			logListObject.aliasEventType = valueLogListLogListItem["AliasEventType"].asString();
+		if(!valueLogListLogListItem["LastTime"].isNull())
+			logListObject.lastTime = std::stol(valueLogListLogListItem["LastTime"].asString());
+		if(!valueLogListLogListItem["Level"].isNull())
+			logListObject.level = valueLogListLogListItem["Level"].asString();
+		if(!valueLogListLogListItem["InstanceName"].isNull())
+			logListObject.instanceName = valueLogListLogListItem["InstanceName"].asString();
+		if(!valueLogListLogListItem["GroupId"].isNull())
+			logListObject.groupId = std::stol(valueLogListLogListItem["GroupId"].asString());
+		if(!valueLogListLogListItem["Ip"].isNull())
+			logListObject.ip = valueLogListLogListItem["Ip"].asString();
+		if(!valueLogListLogListItem["EventType"].isNull())
+			logListObject.eventType = valueLogListLogListItem["EventType"].asString();
+		if(!valueLogListLogListItem["Uuid"].isNull())
+			logListObject.uuid = valueLogListLogListItem["Uuid"].asString();
+		if(!valueLogListLogListItem["FirstTime"].isNull())
+			logListObject.firstTime = std::stol(valueLogListLogListItem["FirstTime"].asString());
+		if(!valueLogListLogListItem["InstanceId"].isNull())
+			logListObject.instanceId = valueLogListLogListItem["InstanceId"].asString();
+		if(!valueLogListLogListItem["Tag"].isNull())
+			logListObject.tag = valueLogListLogListItem["Tag"].asString();
+		if(!valueLogListLogListItem["AliasEventName"].isNull())
+			logListObject.aliasEventName = valueLogListLogListItem["AliasEventName"].asString();
+		if(!valueLogListLogListItem["OsVersion"].isNull())
+			logListObject.osVersion = valueLogListLogListItem["OsVersion"].asString();
+		if(!valueLogListLogListItem["ClientIp"].isNull())
+			logListObject.clientIp = valueLogListLogListItem["ClientIp"].asString();
+		if(!valueLogListLogListItem["EventName"].isNull())
+			logListObject.eventName = valueLogListLogListItem["EventName"].asString();
+		auto allDetailListNode = allLogListNode["DetailList"]["DetailListItem"];
+		for (auto allLogListNodeDetailListDetailListItem : allDetailListNode)
 		{
 			LogListItem::DetailListItem detailListObject;
-			if(!value["Name"].isNull())
-				detailListObject.name = value["Name"].asString();
-			if(!value["Type"].isNull())
-				detailListObject.type = value["Type"].asString();
-			if(!value["Value"].isNull())
-				detailListObject.value = value["Value"].asString();
-			if(!value["InfoType"].isNull())
-				detailListObject.infoType = value["InfoType"].asString();
+			if(!allLogListNodeDetailListDetailListItem["Name"].isNull())
+				detailListObject.name = allLogListNodeDetailListDetailListItem["Name"].asString();
+			if(!allLogListNodeDetailListDetailListItem["Type"].isNull())
+				detailListObject.type = allLogListNodeDetailListDetailListItem["Type"].asString();
+			if(!allLogListNodeDetailListDetailListItem["Value"].isNull())
+				detailListObject.value = allLogListNodeDetailListDetailListItem["Value"].asString();
+			if(!allLogListNodeDetailListDetailListItem["InfoType"].isNull())
+				detailListObject.infoType = allLogListNodeDetailListDetailListItem["InfoType"].asString();
 			logListObject.detailList.push_back(detailListObject);
 		}
 		logList_.push_back(logListObject);

+ 8 - 8
aegis/src/model/DescribeTargetConfigResult.cc

@@ -39,16 +39,16 @@ void DescribeTargetConfigResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allTargetConfigs = value["TargetConfigs"]["TargetConfig"];
-	for (auto value : allTargetConfigs)
+	auto allTargetConfigsNode = value["TargetConfigs"]["TargetConfig"];
+	for (auto valueTargetConfigsTargetConfig : allTargetConfigsNode)
 	{
 		TargetConfig targetConfigsObject;
-		if(!value["Type"].isNull())
-			targetConfigsObject.type = value["Type"].asString();
-		if(!value["Config"].isNull())
-			targetConfigsObject.config = value["Config"].asString();
-		if(!value["OverAllConfig"].isNull())
-			targetConfigsObject.overAllConfig = value["OverAllConfig"].asString();
+		if(!valueTargetConfigsTargetConfig["Type"].isNull())
+			targetConfigsObject.type = valueTargetConfigsTargetConfig["Type"].asString();
+		if(!valueTargetConfigsTargetConfig["Config"].isNull())
+			targetConfigsObject.config = valueTargetConfigsTargetConfig["Config"].asString();
+		if(!valueTargetConfigsTargetConfig["OverAllConfig"].isNull())
+			targetConfigsObject.overAllConfig = valueTargetConfigsTargetConfig["OverAllConfig"].asString();
 		targetConfigs_.push_back(targetConfigsObject);
 	}
 	if(!value["TotalCount"].isNull())

+ 8 - 8
aegis/src/model/DescribeTargetResult.cc

@@ -39,16 +39,16 @@ void DescribeTargetResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allTargets = value["Targets"]["Target"];
-	for (auto value : allTargets)
+	auto allTargetsNode = value["Targets"]["Target"];
+	for (auto valueTargetsTarget : allTargetsNode)
 	{
 		Target targetsObject;
-		if(!value["TargetType"].isNull())
-			targetsObject.targetType = value["TargetType"].asString();
-		if(!value["Target"].isNull())
-			targetsObject.target = value["Target"].asString();
-		if(!value["Flag"].isNull())
-			targetsObject.flag = value["Flag"].asString();
+		if(!valueTargetsTarget["TargetType"].isNull())
+			targetsObject.targetType = valueTargetsTarget["TargetType"].asString();
+		if(!valueTargetsTarget["Target"].isNull())
+			targetsObject.target = valueTargetsTarget["Target"].asString();
+		if(!valueTargetsTarget["Flag"].isNull())
+			targetsObject.flag = valueTargetsTarget["Flag"].asString();
 		targets_.push_back(targetsObject);
 	}
 	if(!value["TotalCount"].isNull())

+ 14 - 14
aegis/src/model/DescribeTopRiskyAssetsResult.cc

@@ -39,24 +39,24 @@ void DescribeTopRiskyAssetsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allTopRiskyAssets = value["TopRiskyAssets"]["TopRiskyAsset"];
-	for (auto value : allTopRiskyAssets)
+	auto allTopRiskyAssetsNode = value["TopRiskyAssets"]["TopRiskyAsset"];
+	for (auto valueTopRiskyAssetsTopRiskyAsset : allTopRiskyAssetsNode)
 	{
 		TopRiskyAsset topRiskyAssetsObject;
-		if(!value["Type"].isNull())
-			topRiskyAssetsObject.type = value["Type"].asString();
-		auto allAssetInfos = value["AssetInfos"]["AssetInfo"];
-		for (auto value : allAssetInfos)
+		if(!valueTopRiskyAssetsTopRiskyAsset["Type"].isNull())
+			topRiskyAssetsObject.type = valueTopRiskyAssetsTopRiskyAsset["Type"].asString();
+		auto allAssetInfosNode = allTopRiskyAssetsNode["AssetInfos"]["AssetInfo"];
+		for (auto allTopRiskyAssetsNodeAssetInfosAssetInfo : allAssetInfosNode)
 		{
 			TopRiskyAsset::AssetInfo assetInfosObject;
-			if(!value["Uuid"].isNull())
-				assetInfosObject.uuid = value["Uuid"].asString();
-			if(!value["Ip"].isNull())
-				assetInfosObject.ip = value["Ip"].asString();
-			if(!value["InstanceName"].isNull())
-				assetInfosObject.instanceName = value["InstanceName"].asString();
-			if(!value["Count"].isNull())
-				assetInfosObject.count = value["Count"].asString();
+			if(!allTopRiskyAssetsNodeAssetInfosAssetInfo["Uuid"].isNull())
+				assetInfosObject.uuid = allTopRiskyAssetsNodeAssetInfosAssetInfo["Uuid"].asString();
+			if(!allTopRiskyAssetsNodeAssetInfosAssetInfo["Ip"].isNull())
+				assetInfosObject.ip = allTopRiskyAssetsNodeAssetInfosAssetInfo["Ip"].asString();
+			if(!allTopRiskyAssetsNodeAssetInfosAssetInfo["InstanceName"].isNull())
+				assetInfosObject.instanceName = allTopRiskyAssetsNodeAssetInfosAssetInfo["InstanceName"].asString();
+			if(!allTopRiskyAssetsNodeAssetInfosAssetInfo["Count"].isNull())
+				assetInfosObject.count = allTopRiskyAssetsNodeAssetInfosAssetInfo["Count"].asString();
 			topRiskyAssetsObject.assetInfos.push_back(assetInfosObject);
 		}
 		topRiskyAssets_.push_back(topRiskyAssetsObject);

+ 68 - 68
aegis/src/model/DescribeTraceInfoDetailResult.cc

@@ -40,92 +40,92 @@ void DescribeTraceInfoDetailResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto traceInfoDetailNode = value["TraceInfoDetail"];
-	auto allEdgeList = value["EdgeList"]["Edge"];
-	for (auto value : allEdgeList)
+	auto allEdgeListNode = traceInfoDetailNode["EdgeList"]["Edge"];
+	for (auto traceInfoDetailNodeEdgeListEdge : allEdgeListNode)
 	{
 		TraceInfoDetail::Edge edgeObject;
-		if(!value["EndId"].isNull())
-			edgeObject.endId = value["EndId"].asString();
-		if(!value["StartId"].isNull())
-			edgeObject.startId = value["StartId"].asString();
-		if(!value["Count"].isNull())
-			edgeObject.count = std::stoi(value["Count"].asString());
-		if(!value["Time"].isNull())
-			edgeObject.time = value["Time"].asString();
-		if(!value["Type"].isNull())
-			edgeObject.type = value["Type"].asString();
+		if(!traceInfoDetailNodeEdgeListEdge["EndId"].isNull())
+			edgeObject.endId = traceInfoDetailNodeEdgeListEdge["EndId"].asString();
+		if(!traceInfoDetailNodeEdgeListEdge["StartId"].isNull())
+			edgeObject.startId = traceInfoDetailNodeEdgeListEdge["StartId"].asString();
+		if(!traceInfoDetailNodeEdgeListEdge["Count"].isNull())
+			edgeObject.count = std::stoi(traceInfoDetailNodeEdgeListEdge["Count"].asString());
+		if(!traceInfoDetailNodeEdgeListEdge["Time"].isNull())
+			edgeObject.time = traceInfoDetailNodeEdgeListEdge["Time"].asString();
+		if(!traceInfoDetailNodeEdgeListEdge["Type"].isNull())
+			edgeObject.type = traceInfoDetailNodeEdgeListEdge["Type"].asString();
 		traceInfoDetail_.edgeList.push_back(edgeObject);
 	}
-	auto allVertexList = value["VertexList"]["Vertex"];
-	for (auto value : allVertexList)
+	auto allVertexListNode = traceInfoDetailNode["VertexList"]["Vertex"];
+	for (auto traceInfoDetailNodeVertexListVertex : allVertexListNode)
 	{
 		TraceInfoDetail::Vertex vertexObject;
-		if(!value["Name"].isNull())
-			vertexObject.name = value["Name"].asString();
-		if(!value["Count"].isNull())
-			vertexObject.count = std::stoi(value["Count"].asString());
-		if(!value["Id"].isNull())
-			vertexObject.id = value["Id"].asString();
-		if(!value["Time"].isNull())
-			vertexObject.time = value["Time"].asString();
-		if(!value["Type"].isNull())
-			vertexObject.type = value["Type"].asString();
-		auto allNeighborList = value["NeighborList"]["Neighbor"];
-		for (auto value : allNeighborList)
+		if(!traceInfoDetailNodeVertexListVertex["Name"].isNull())
+			vertexObject.name = traceInfoDetailNodeVertexListVertex["Name"].asString();
+		if(!traceInfoDetailNodeVertexListVertex["Count"].isNull())
+			vertexObject.count = std::stoi(traceInfoDetailNodeVertexListVertex["Count"].asString());
+		if(!traceInfoDetailNodeVertexListVertex["Id"].isNull())
+			vertexObject.id = traceInfoDetailNodeVertexListVertex["Id"].asString();
+		if(!traceInfoDetailNodeVertexListVertex["Time"].isNull())
+			vertexObject.time = traceInfoDetailNodeVertexListVertex["Time"].asString();
+		if(!traceInfoDetailNodeVertexListVertex["Type"].isNull())
+			vertexObject.type = traceInfoDetailNodeVertexListVertex["Type"].asString();
+		auto allNeighborListNode = allVertexListNode["NeighborList"]["Neighbor"];
+		for (auto allVertexListNodeNeighborListNeighbor : allNeighborListNode)
 		{
 			TraceInfoDetail::Vertex::Neighbor neighborListObject;
-			if(!value["HasMore"].isNull())
-				neighborListObject.hasMore = value["HasMore"].asString() == "true";
-			if(!value["Count"].isNull())
-				neighborListObject.count = std::stoi(value["Count"].asString());
-			if(!value["Type"].isNull())
-				neighborListObject.type = value["Type"].asString();
+			if(!allVertexListNodeNeighborListNeighbor["HasMore"].isNull())
+				neighborListObject.hasMore = allVertexListNodeNeighborListNeighbor["HasMore"].asString() == "true";
+			if(!allVertexListNodeNeighborListNeighbor["Count"].isNull())
+				neighborListObject.count = std::stoi(allVertexListNodeNeighborListNeighbor["Count"].asString());
+			if(!allVertexListNodeNeighborListNeighbor["Type"].isNull())
+				neighborListObject.type = allVertexListNodeNeighborListNeighbor["Type"].asString();
 			vertexObject.neighborList.push_back(neighborListObject);
 		}
 		traceInfoDetail_.vertexList.push_back(vertexObject);
 	}
-	auto allEntityTypeList = value["EntityTypeList"]["EntityType"];
-	for (auto value : allEntityTypeList)
+	auto allEntityTypeListNode = traceInfoDetailNode["EntityTypeList"]["EntityType"];
+	for (auto traceInfoDetailNodeEntityTypeListEntityType : allEntityTypeListNode)
 	{
 		TraceInfoDetail::EntityType entityTypeObject;
-		if(!value["DisplayTemplate"].isNull())
-			entityTypeObject.displayTemplate = value["DisplayTemplate"].asString();
-		if(!value["GmtModified"].isNull())
-			entityTypeObject.gmtModified = std::stol(value["GmtModified"].asString());
-		if(!value["DisplayIcon"].isNull())
-			entityTypeObject.displayIcon = value["DisplayIcon"].asString();
-		if(!value["Offset"].isNull())
-			entityTypeObject.offset = std::stoi(value["Offset"].asString());
-		if(!value["DbId"].isNull())
-			entityTypeObject.dbId = std::stoi(value["DbId"].asString());
-		if(!value["Name"].isNull())
-			entityTypeObject.name = value["Name"].asString();
-		if(!value["Namespace"].isNull())
-			entityTypeObject._namespace = value["Namespace"].asString();
-		if(!value["Limit"].isNull())
-			entityTypeObject.limit = std::stoi(value["Limit"].asString());
-		if(!value["Id"].isNull())
-			entityTypeObject.id = value["Id"].asString();
-		if(!value["DisplayColor"].isNull())
-			entityTypeObject.displayColor = value["DisplayColor"].asString();
-		if(!value["GmtCreate"].isNull())
-			entityTypeObject.gmtCreate = std::stol(value["GmtCreate"].asString());
+		if(!traceInfoDetailNodeEntityTypeListEntityType["DisplayTemplate"].isNull())
+			entityTypeObject.displayTemplate = traceInfoDetailNodeEntityTypeListEntityType["DisplayTemplate"].asString();
+		if(!traceInfoDetailNodeEntityTypeListEntityType["GmtModified"].isNull())
+			entityTypeObject.gmtModified = std::stol(traceInfoDetailNodeEntityTypeListEntityType["GmtModified"].asString());
+		if(!traceInfoDetailNodeEntityTypeListEntityType["DisplayIcon"].isNull())
+			entityTypeObject.displayIcon = traceInfoDetailNodeEntityTypeListEntityType["DisplayIcon"].asString();
+		if(!traceInfoDetailNodeEntityTypeListEntityType["Offset"].isNull())
+			entityTypeObject.offset = std::stoi(traceInfoDetailNodeEntityTypeListEntityType["Offset"].asString());
+		if(!traceInfoDetailNodeEntityTypeListEntityType["DbId"].isNull())
+			entityTypeObject.dbId = std::stoi(traceInfoDetailNodeEntityTypeListEntityType["DbId"].asString());
+		if(!traceInfoDetailNodeEntityTypeListEntityType["Name"].isNull())
+			entityTypeObject.name = traceInfoDetailNodeEntityTypeListEntityType["Name"].asString();
+		if(!traceInfoDetailNodeEntityTypeListEntityType["Namespace"].isNull())
+			entityTypeObject._namespace = traceInfoDetailNodeEntityTypeListEntityType["Namespace"].asString();
+		if(!traceInfoDetailNodeEntityTypeListEntityType["Limit"].isNull())
+			entityTypeObject.limit = std::stoi(traceInfoDetailNodeEntityTypeListEntityType["Limit"].asString());
+		if(!traceInfoDetailNodeEntityTypeListEntityType["Id"].isNull())
+			entityTypeObject.id = traceInfoDetailNodeEntityTypeListEntityType["Id"].asString();
+		if(!traceInfoDetailNodeEntityTypeListEntityType["DisplayColor"].isNull())
+			entityTypeObject.displayColor = traceInfoDetailNodeEntityTypeListEntityType["DisplayColor"].asString();
+		if(!traceInfoDetailNodeEntityTypeListEntityType["GmtCreate"].isNull())
+			entityTypeObject.gmtCreate = std::stol(traceInfoDetailNodeEntityTypeListEntityType["GmtCreate"].asString());
 		traceInfoDetail_.entityTypeList.push_back(entityTypeObject);
 	}
-	auto allRelationTypeList = value["RelationTypeList"]["RelationType"];
-	for (auto value : allRelationTypeList)
+	auto allRelationTypeListNode = traceInfoDetailNode["RelationTypeList"]["RelationType"];
+	for (auto traceInfoDetailNodeRelationTypeListRelationType : allRelationTypeListNode)
 	{
 		TraceInfoDetail::RelationType relationTypeObject;
-		if(!value["RelationTypeId"].isNull())
-			relationTypeObject.relationTypeId = value["RelationTypeId"].asString();
-		if(!value["Name"].isNull())
-			relationTypeObject.name = value["Name"].asString();
-		if(!value["Directed"].isNull())
-			relationTypeObject.directed = std::stoi(value["Directed"].asString());
-		if(!value["DisplayColor"].isNull())
-			relationTypeObject.displayColor = value["DisplayColor"].asString();
-		if(!value["ShowType"].isNull())
-			relationTypeObject.showType = value["ShowType"].asString();
+		if(!traceInfoDetailNodeRelationTypeListRelationType["RelationTypeId"].isNull())
+			relationTypeObject.relationTypeId = traceInfoDetailNodeRelationTypeListRelationType["RelationTypeId"].asString();
+		if(!traceInfoDetailNodeRelationTypeListRelationType["Name"].isNull())
+			relationTypeObject.name = traceInfoDetailNodeRelationTypeListRelationType["Name"].asString();
+		if(!traceInfoDetailNodeRelationTypeListRelationType["Directed"].isNull())
+			relationTypeObject.directed = std::stoi(traceInfoDetailNodeRelationTypeListRelationType["Directed"].asString());
+		if(!traceInfoDetailNodeRelationTypeListRelationType["DisplayColor"].isNull())
+			relationTypeObject.displayColor = traceInfoDetailNodeRelationTypeListRelationType["DisplayColor"].asString();
+		if(!traceInfoDetailNodeRelationTypeListRelationType["ShowType"].isNull())
+			relationTypeObject.showType = traceInfoDetailNodeRelationTypeListRelationType["ShowType"].asString();
 		traceInfoDetail_.relationTypeList.push_back(relationTypeObject);
 	}
 	if(!value["Success"].isNull())

+ 16 - 16
aegis/src/model/DescribeTraceInfoNodeListResult.cc

@@ -40,28 +40,28 @@ void DescribeTraceInfoNodeListResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto nodeListInfoNode = value["NodeListInfo"];
-	auto allEdgeList = value["EdgeList"]["Edge"];
-	for (auto value : allEdgeList)
+	auto allEdgeListNode = nodeListInfoNode["EdgeList"]["Edge"];
+	for (auto nodeListInfoNodeEdgeListEdge : allEdgeListNode)
 	{
 		NodeListInfo::Edge edgeObject;
-		if(!value["EndId"].isNull())
-			edgeObject.endId = value["EndId"].asString();
-		if(!value["StartId"].isNull())
-			edgeObject.startId = value["StartId"].asString();
-		if(!value["Time"].isNull())
-			edgeObject.time = value["Time"].asString();
+		if(!nodeListInfoNodeEdgeListEdge["EndId"].isNull())
+			edgeObject.endId = nodeListInfoNodeEdgeListEdge["EndId"].asString();
+		if(!nodeListInfoNodeEdgeListEdge["StartId"].isNull())
+			edgeObject.startId = nodeListInfoNodeEdgeListEdge["StartId"].asString();
+		if(!nodeListInfoNodeEdgeListEdge["Time"].isNull())
+			edgeObject.time = nodeListInfoNodeEdgeListEdge["Time"].asString();
 		nodeListInfo_.edgeList.push_back(edgeObject);
 	}
-	auto allVertexList = value["VertexList"]["Vertex"];
-	for (auto value : allVertexList)
+	auto allVertexListNode = nodeListInfoNode["VertexList"]["Vertex"];
+	for (auto nodeListInfoNodeVertexListVertex : allVertexListNode)
 	{
 		NodeListInfo::Vertex vertexObject;
-		if(!value["Name"].isNull())
-			vertexObject.name = value["Name"].asString();
-		if(!value["Id"].isNull())
-			vertexObject.id = value["Id"].asString();
-		if(!value["Time"].isNull())
-			vertexObject.time = value["Time"].asString();
+		if(!nodeListInfoNodeVertexListVertex["Name"].isNull())
+			vertexObject.name = nodeListInfoNodeVertexListVertex["Name"].asString();
+		if(!nodeListInfoNodeVertexListVertex["Id"].isNull())
+			vertexObject.id = nodeListInfoNodeVertexListVertex["Id"].asString();
+		if(!nodeListInfoNodeVertexListVertex["Time"].isNull())
+			vertexObject.time = nodeListInfoNodeVertexListVertex["Time"].asString();
 		auto allNeighborList = value["NeighborList"]["StringItem"];
 		for (auto value : allNeighborList)
 			vertexObject.neighborList.push_back(value.asString());

+ 6 - 6
aegis/src/model/DescribeTraceInfoNodeResult.cc

@@ -44,14 +44,14 @@ void DescribeTraceInfoNodeResult::parse(const std::string &payload)
 		node_.name = nodeNode["Name"].asString();
 	if(!nodeNode["Type"].isNull())
 		node_.type = nodeNode["Type"].asString();
-	auto allPropertyList = value["PropertyList"]["Property"];
-	for (auto value : allPropertyList)
+	auto allPropertyListNode = nodeNode["PropertyList"]["Property"];
+	for (auto nodeNodePropertyListProperty : allPropertyListNode)
 	{
 		Node::Property propertyObject;
-		if(!value["Name"].isNull())
-			propertyObject.name = value["Name"].asString();
-		if(!value["Value"].isNull())
-			propertyObject.value = value["Value"].asString();
+		if(!nodeNodePropertyListProperty["Name"].isNull())
+			propertyObject.name = nodeNodePropertyListProperty["Name"].asString();
+		if(!nodeNodePropertyListProperty["Value"].isNull())
+			propertyObject.value = nodeNodePropertyListProperty["Value"].asString();
 		node_.propertyList.push_back(propertyObject);
 	}
 

+ 8 - 8
aegis/src/model/DescribeVulConfigResult.cc

@@ -39,16 +39,16 @@ void DescribeVulConfigResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allTargetConfigs = value["TargetConfigs"]["TargetConfig"];
-	for (auto value : allTargetConfigs)
+	auto allTargetConfigsNode = value["TargetConfigs"]["TargetConfig"];
+	for (auto valueTargetConfigsTargetConfig : allTargetConfigsNode)
 	{
 		TargetConfig targetConfigsObject;
-		if(!value["Type"].isNull())
-			targetConfigsObject.type = value["Type"].asString();
-		if(!value["Config"].isNull())
-			targetConfigsObject.config = value["Config"].asString();
-		if(!value["OverAllConfig"].isNull())
-			targetConfigsObject.overAllConfig = value["OverAllConfig"].asString();
+		if(!valueTargetConfigsTargetConfig["Type"].isNull())
+			targetConfigsObject.type = valueTargetConfigsTargetConfig["Type"].asString();
+		if(!valueTargetConfigsTargetConfig["Config"].isNull())
+			targetConfigsObject.config = valueTargetConfigsTargetConfig["Config"].asString();
+		if(!valueTargetConfigsTargetConfig["OverAllConfig"].isNull())
+			targetConfigsObject.overAllConfig = valueTargetConfigsTargetConfig["OverAllConfig"].asString();
 		targetConfigs_.push_back(targetConfigsObject);
 	}
 	if(!value["TotalCount"].isNull())

+ 48 - 48
aegis/src/model/DescribeVulDetailsResult.cc

@@ -39,58 +39,58 @@ void DescribeVulDetailsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allCves = value["Cves"]["Cve"];
-	for (auto value : allCves)
+	auto allCvesNode = value["Cves"]["Cve"];
+	for (auto valueCvesCve : allCvesNode)
 	{
 		Cve cvesObject;
-		if(!value["CveId"].isNull())
-			cvesObject.cveId = value["CveId"].asString();
-		if(!value["CnvdId"].isNull())
-			cvesObject.cnvdId = value["CnvdId"].asString();
-		if(!value["OtherId"].isNull())
-			cvesObject.otherId = value["OtherId"].asString();
-		if(!value["Title"].isNull())
-			cvesObject.title = value["Title"].asString();
-		if(!value["CvssScore"].isNull())
-			cvesObject.cvssScore = value["CvssScore"].asString();
-		if(!value["CvssVector"].isNull())
-			cvesObject.cvssVector = value["CvssVector"].asString();
-		if(!value["ReleaseTime"].isNull())
-			cvesObject.releaseTime = std::stol(value["ReleaseTime"].asString());
-		if(!value["Complexity"].isNull())
-			cvesObject.complexity = value["Complexity"].asString();
-		if(!value["Poc"].isNull())
-			cvesObject.poc = value["Poc"].asString();
-		if(!value["PocCreateTime"].isNull())
-			cvesObject.pocCreateTime = std::stol(value["PocCreateTime"].asString());
-		if(!value["PocDisclosureTime"].isNull())
-			cvesObject.pocDisclosureTime = std::stol(value["PocDisclosureTime"].asString());
-		if(!value["Summary"].isNull())
-			cvesObject.summary = value["Summary"].asString();
-		if(!value["Solution"].isNull())
-			cvesObject.solution = value["Solution"].asString();
-		if(!value["Content"].isNull())
-			cvesObject.content = value["Content"].asString();
-		if(!value["Vendor"].isNull())
-			cvesObject.vendor = value["Vendor"].asString();
-		if(!value["Product"].isNull())
-			cvesObject.product = value["Product"].asString();
-		if(!value["VulLevel"].isNull())
-			cvesObject.vulLevel = value["VulLevel"].asString();
-		if(!value["Reference"].isNull())
-			cvesObject.reference = value["Reference"].asString();
-		if(!value["Classify"].isNull())
-			cvesObject.classify = value["Classify"].asString();
-		auto allClassifys = value["Classifys"]["Classify"];
-		for (auto value : allClassifys)
+		if(!valueCvesCve["CveId"].isNull())
+			cvesObject.cveId = valueCvesCve["CveId"].asString();
+		if(!valueCvesCve["CnvdId"].isNull())
+			cvesObject.cnvdId = valueCvesCve["CnvdId"].asString();
+		if(!valueCvesCve["OtherId"].isNull())
+			cvesObject.otherId = valueCvesCve["OtherId"].asString();
+		if(!valueCvesCve["Title"].isNull())
+			cvesObject.title = valueCvesCve["Title"].asString();
+		if(!valueCvesCve["CvssScore"].isNull())
+			cvesObject.cvssScore = valueCvesCve["CvssScore"].asString();
+		if(!valueCvesCve["CvssVector"].isNull())
+			cvesObject.cvssVector = valueCvesCve["CvssVector"].asString();
+		if(!valueCvesCve["ReleaseTime"].isNull())
+			cvesObject.releaseTime = std::stol(valueCvesCve["ReleaseTime"].asString());
+		if(!valueCvesCve["Complexity"].isNull())
+			cvesObject.complexity = valueCvesCve["Complexity"].asString();
+		if(!valueCvesCve["Poc"].isNull())
+			cvesObject.poc = valueCvesCve["Poc"].asString();
+		if(!valueCvesCve["PocCreateTime"].isNull())
+			cvesObject.pocCreateTime = std::stol(valueCvesCve["PocCreateTime"].asString());
+		if(!valueCvesCve["PocDisclosureTime"].isNull())
+			cvesObject.pocDisclosureTime = std::stol(valueCvesCve["PocDisclosureTime"].asString());
+		if(!valueCvesCve["Summary"].isNull())
+			cvesObject.summary = valueCvesCve["Summary"].asString();
+		if(!valueCvesCve["Solution"].isNull())
+			cvesObject.solution = valueCvesCve["Solution"].asString();
+		if(!valueCvesCve["Content"].isNull())
+			cvesObject.content = valueCvesCve["Content"].asString();
+		if(!valueCvesCve["Vendor"].isNull())
+			cvesObject.vendor = valueCvesCve["Vendor"].asString();
+		if(!valueCvesCve["Product"].isNull())
+			cvesObject.product = valueCvesCve["Product"].asString();
+		if(!valueCvesCve["VulLevel"].isNull())
+			cvesObject.vulLevel = valueCvesCve["VulLevel"].asString();
+		if(!valueCvesCve["Reference"].isNull())
+			cvesObject.reference = valueCvesCve["Reference"].asString();
+		if(!valueCvesCve["Classify"].isNull())
+			cvesObject.classify = valueCvesCve["Classify"].asString();
+		auto allClassifysNode = allCvesNode["Classifys"]["Classify"];
+		for (auto allCvesNodeClassifysClassify : allClassifysNode)
 		{
 			Cve::Classify classifysObject;
-			if(!value["Classify"].isNull())
-				classifysObject.classify = value["Classify"].asString();
-			if(!value["Description"].isNull())
-				classifysObject.description = value["Description"].asString();
-			if(!value["DemoVideoUrl"].isNull())
-				classifysObject.demoVideoUrl = value["DemoVideoUrl"].asString();
+			if(!allCvesNodeClassifysClassify["Classify"].isNull())
+				classifysObject.classify = allCvesNodeClassifysClassify["Classify"].asString();
+			if(!allCvesNodeClassifysClassify["Description"].isNull())
+				classifysObject.description = allCvesNodeClassifysClassify["Description"].asString();
+			if(!allCvesNodeClassifysClassify["DemoVideoUrl"].isNull())
+				classifysObject.demoVideoUrl = allCvesNodeClassifysClassify["DemoVideoUrl"].asString();
 			cvesObject.classifys.push_back(classifysObject);
 		}
 		cves_.push_back(cvesObject);

+ 32 - 32
aegis/src/model/DescribeVulLevelStatisticsResult.cc

@@ -39,40 +39,40 @@ void DescribeVulLevelStatisticsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allLevelStatistics = value["LevelStatistics"]["LevelStatistic"];
-	for (auto value : allLevelStatistics)
+	auto allLevelStatisticsNode = value["LevelStatistics"]["LevelStatistic"];
+	for (auto valueLevelStatisticsLevelStatistic : allLevelStatisticsNode)
 	{
 		LevelStatistic levelStatisticsObject;
-		if(!value["Level"].isNull())
-			levelStatisticsObject.level = value["Level"].asString();
-		if(!value["CveNum"].isNull())
-			levelStatisticsObject.cveNum = std::stoi(value["CveNum"].asString());
-		if(!value["EmgNum"].isNull())
-			levelStatisticsObject.emgNum = std::stoi(value["EmgNum"].asString());
-		if(!value["SysNum"].isNull())
-			levelStatisticsObject.sysNum = std::stoi(value["SysNum"].asString());
-		if(!value["CmsNum"].isNull())
-			levelStatisticsObject.cmsNum = std::stoi(value["CmsNum"].asString());
-		if(!value["AppNum"].isNull())
-			levelStatisticsObject.appNum = std::stoi(value["AppNum"].asString());
-		if(!value["CmsDealedTotalNum"].isNull())
-			levelStatisticsObject.cmsDealedTotalNum = std::stoi(value["CmsDealedTotalNum"].asString());
-		if(!value["VulDealedTotalNum"].isNull())
-			levelStatisticsObject.vulDealedTotalNum = std::stoi(value["VulDealedTotalNum"].asString());
-		if(!value["VulAsapSum"].isNull())
-			levelStatisticsObject.vulAsapSum = std::stoi(value["VulAsapSum"].asString());
-		if(!value["VulLaterSum"].isNull())
-			levelStatisticsObject.vulLaterSum = std::stoi(value["VulLaterSum"].asString());
-		if(!value["VulNntfSum"].isNull())
-			levelStatisticsObject.vulNntfSum = std::stoi(value["VulNntfSum"].asString());
-		if(!value["VulSeriousTotal"].isNull())
-			levelStatisticsObject.vulSeriousTotal = std::stoi(value["VulSeriousTotal"].asString());
-		if(!value["VulHighTotal"].isNull())
-			levelStatisticsObject.vulHighTotal = std::stoi(value["VulHighTotal"].asString());
-		if(!value["VulMediumTotal"].isNull())
-			levelStatisticsObject.vulMediumTotal = std::stoi(value["VulMediumTotal"].asString());
-		if(!value["VulLowTotal"].isNull())
-			levelStatisticsObject.vulLowTotal = std::stoi(value["VulLowTotal"].asString());
+		if(!valueLevelStatisticsLevelStatistic["Level"].isNull())
+			levelStatisticsObject.level = valueLevelStatisticsLevelStatistic["Level"].asString();
+		if(!valueLevelStatisticsLevelStatistic["CveNum"].isNull())
+			levelStatisticsObject.cveNum = std::stoi(valueLevelStatisticsLevelStatistic["CveNum"].asString());
+		if(!valueLevelStatisticsLevelStatistic["EmgNum"].isNull())
+			levelStatisticsObject.emgNum = std::stoi(valueLevelStatisticsLevelStatistic["EmgNum"].asString());
+		if(!valueLevelStatisticsLevelStatistic["SysNum"].isNull())
+			levelStatisticsObject.sysNum = std::stoi(valueLevelStatisticsLevelStatistic["SysNum"].asString());
+		if(!valueLevelStatisticsLevelStatistic["CmsNum"].isNull())
+			levelStatisticsObject.cmsNum = std::stoi(valueLevelStatisticsLevelStatistic["CmsNum"].asString());
+		if(!valueLevelStatisticsLevelStatistic["AppNum"].isNull())
+			levelStatisticsObject.appNum = std::stoi(valueLevelStatisticsLevelStatistic["AppNum"].asString());
+		if(!valueLevelStatisticsLevelStatistic["CmsDealedTotalNum"].isNull())
+			levelStatisticsObject.cmsDealedTotalNum = std::stoi(valueLevelStatisticsLevelStatistic["CmsDealedTotalNum"].asString());
+		if(!valueLevelStatisticsLevelStatistic["VulDealedTotalNum"].isNull())
+			levelStatisticsObject.vulDealedTotalNum = std::stoi(valueLevelStatisticsLevelStatistic["VulDealedTotalNum"].asString());
+		if(!valueLevelStatisticsLevelStatistic["VulAsapSum"].isNull())
+			levelStatisticsObject.vulAsapSum = std::stoi(valueLevelStatisticsLevelStatistic["VulAsapSum"].asString());
+		if(!valueLevelStatisticsLevelStatistic["VulLaterSum"].isNull())
+			levelStatisticsObject.vulLaterSum = std::stoi(valueLevelStatisticsLevelStatistic["VulLaterSum"].asString());
+		if(!valueLevelStatisticsLevelStatistic["VulNntfSum"].isNull())
+			levelStatisticsObject.vulNntfSum = std::stoi(valueLevelStatisticsLevelStatistic["VulNntfSum"].asString());
+		if(!valueLevelStatisticsLevelStatistic["VulSeriousTotal"].isNull())
+			levelStatisticsObject.vulSeriousTotal = std::stoi(valueLevelStatisticsLevelStatistic["VulSeriousTotal"].asString());
+		if(!valueLevelStatisticsLevelStatistic["VulHighTotal"].isNull())
+			levelStatisticsObject.vulHighTotal = std::stoi(valueLevelStatisticsLevelStatistic["VulHighTotal"].asString());
+		if(!valueLevelStatisticsLevelStatistic["VulMediumTotal"].isNull())
+			levelStatisticsObject.vulMediumTotal = std::stoi(valueLevelStatisticsLevelStatistic["VulMediumTotal"].asString());
+		if(!valueLevelStatisticsLevelStatistic["VulLowTotal"].isNull())
+			levelStatisticsObject.vulLowTotal = std::stoi(valueLevelStatisticsLevelStatistic["VulLowTotal"].asString());
 		levelStatistics_.push_back(levelStatisticsObject);
 	}
 	if(!value["TotalCount"].isNull())

+ 92 - 92
aegis/src/model/DescribeVulListResult.cc

@@ -39,70 +39,70 @@ void DescribeVulListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allVulRecords = value["VulRecords"]["VulRecord"];
-	for (auto value : allVulRecords)
+	auto allVulRecordsNode = value["VulRecords"]["VulRecord"];
+	for (auto valueVulRecordsVulRecord : allVulRecordsNode)
 	{
 		VulRecord vulRecordsObject;
-		if(!value["PrimaryId"].isNull())
-			vulRecordsObject.primaryId = std::stol(value["PrimaryId"].asString());
-		if(!value["Uuid"].isNull())
-			vulRecordsObject.uuid = value["Uuid"].asString();
-		if(!value["Name"].isNull())
-			vulRecordsObject.name = value["Name"].asString();
-		if(!value["Tag"].isNull())
-			vulRecordsObject.tag = value["Tag"].asString();
-		if(!value["AliasName"].isNull())
-			vulRecordsObject.aliasName = value["AliasName"].asString();
-		if(!value["RecordId"].isNull())
-			vulRecordsObject.recordId = std::stol(value["RecordId"].asString());
-		if(!value["Type"].isNull())
-			vulRecordsObject.type = value["Type"].asString();
-		if(!value["Level"].isNull())
-			vulRecordsObject.level = value["Level"].asString();
-		if(!value["Product"].isNull())
-			vulRecordsObject.product = value["Product"].asString();
-		if(!value["FirstTs"].isNull())
-			vulRecordsObject.firstTs = std::stol(value["FirstTs"].asString());
-		if(!value["LastTs"].isNull())
-			vulRecordsObject.lastTs = std::stol(value["LastTs"].asString());
-		if(!value["RepairTs"].isNull())
-			vulRecordsObject.repairTs = std::stol(value["RepairTs"].asString());
-		if(!value["Status"].isNull())
-			vulRecordsObject.status = std::stoi(value["Status"].asString());
-		if(!value["Progress"].isNull())
-			vulRecordsObject.progress = std::stoi(value["Progress"].asString());
-		if(!value["Related"].isNull())
-			vulRecordsObject.related = value["Related"].asString();
-		if(!value["ResultCode"].isNull())
-			vulRecordsObject.resultCode = value["ResultCode"].asString();
-		if(!value["ResultMessage"].isNull())
-			vulRecordsObject.resultMessage = value["ResultMessage"].asString();
-		if(!value["ModifyTs"].isNull())
-			vulRecordsObject.modifyTs = std::stol(value["ModifyTs"].asString());
-		if(!value["Necessity"].isNull())
-			vulRecordsObject.necessity = value["Necessity"].asString();
-		if(!value["GroupId"].isNull())
-			vulRecordsObject.groupId = std::stoi(value["GroupId"].asString());
-		if(!value["InstanceId"].isNull())
-			vulRecordsObject.instanceId = value["InstanceId"].asString();
-		if(!value["InstanceName"].isNull())
-			vulRecordsObject.instanceName = value["InstanceName"].asString();
-		if(!value["InternetIp"].isNull())
-			vulRecordsObject.internetIp = value["InternetIp"].asString();
-		if(!value["IntranetIp"].isNull())
-			vulRecordsObject.intranetIp = value["IntranetIp"].asString();
-		if(!value["Ip"].isNull())
-			vulRecordsObject.ip = value["Ip"].asString();
-		if(!value["Online"].isNull())
-			vulRecordsObject.online = value["Online"].asString() == "true";
-		if(!value["RegionId"].isNull())
-			vulRecordsObject.regionId = value["RegionId"].asString();
-		if(!value["OsVersion"].isNull())
-			vulRecordsObject.osVersion = value["OsVersion"].asString();
-		if(!value["NeedReboot"].isNull())
-			vulRecordsObject.needReboot = value["NeedReboot"].asString();
-		if(!value["CanFix"].isNull())
-			vulRecordsObject.canFix = value["CanFix"].asString();
+		if(!valueVulRecordsVulRecord["PrimaryId"].isNull())
+			vulRecordsObject.primaryId = std::stol(valueVulRecordsVulRecord["PrimaryId"].asString());
+		if(!valueVulRecordsVulRecord["Uuid"].isNull())
+			vulRecordsObject.uuid = valueVulRecordsVulRecord["Uuid"].asString();
+		if(!valueVulRecordsVulRecord["Name"].isNull())
+			vulRecordsObject.name = valueVulRecordsVulRecord["Name"].asString();
+		if(!valueVulRecordsVulRecord["Tag"].isNull())
+			vulRecordsObject.tag = valueVulRecordsVulRecord["Tag"].asString();
+		if(!valueVulRecordsVulRecord["AliasName"].isNull())
+			vulRecordsObject.aliasName = valueVulRecordsVulRecord["AliasName"].asString();
+		if(!valueVulRecordsVulRecord["RecordId"].isNull())
+			vulRecordsObject.recordId = std::stol(valueVulRecordsVulRecord["RecordId"].asString());
+		if(!valueVulRecordsVulRecord["Type"].isNull())
+			vulRecordsObject.type = valueVulRecordsVulRecord["Type"].asString();
+		if(!valueVulRecordsVulRecord["Level"].isNull())
+			vulRecordsObject.level = valueVulRecordsVulRecord["Level"].asString();
+		if(!valueVulRecordsVulRecord["Product"].isNull())
+			vulRecordsObject.product = valueVulRecordsVulRecord["Product"].asString();
+		if(!valueVulRecordsVulRecord["FirstTs"].isNull())
+			vulRecordsObject.firstTs = std::stol(valueVulRecordsVulRecord["FirstTs"].asString());
+		if(!valueVulRecordsVulRecord["LastTs"].isNull())
+			vulRecordsObject.lastTs = std::stol(valueVulRecordsVulRecord["LastTs"].asString());
+		if(!valueVulRecordsVulRecord["RepairTs"].isNull())
+			vulRecordsObject.repairTs = std::stol(valueVulRecordsVulRecord["RepairTs"].asString());
+		if(!valueVulRecordsVulRecord["Status"].isNull())
+			vulRecordsObject.status = std::stoi(valueVulRecordsVulRecord["Status"].asString());
+		if(!valueVulRecordsVulRecord["Progress"].isNull())
+			vulRecordsObject.progress = std::stoi(valueVulRecordsVulRecord["Progress"].asString());
+		if(!valueVulRecordsVulRecord["Related"].isNull())
+			vulRecordsObject.related = valueVulRecordsVulRecord["Related"].asString();
+		if(!valueVulRecordsVulRecord["ResultCode"].isNull())
+			vulRecordsObject.resultCode = valueVulRecordsVulRecord["ResultCode"].asString();
+		if(!valueVulRecordsVulRecord["ResultMessage"].isNull())
+			vulRecordsObject.resultMessage = valueVulRecordsVulRecord["ResultMessage"].asString();
+		if(!valueVulRecordsVulRecord["ModifyTs"].isNull())
+			vulRecordsObject.modifyTs = std::stol(valueVulRecordsVulRecord["ModifyTs"].asString());
+		if(!valueVulRecordsVulRecord["Necessity"].isNull())
+			vulRecordsObject.necessity = valueVulRecordsVulRecord["Necessity"].asString();
+		if(!valueVulRecordsVulRecord["GroupId"].isNull())
+			vulRecordsObject.groupId = std::stoi(valueVulRecordsVulRecord["GroupId"].asString());
+		if(!valueVulRecordsVulRecord["InstanceId"].isNull())
+			vulRecordsObject.instanceId = valueVulRecordsVulRecord["InstanceId"].asString();
+		if(!valueVulRecordsVulRecord["InstanceName"].isNull())
+			vulRecordsObject.instanceName = valueVulRecordsVulRecord["InstanceName"].asString();
+		if(!valueVulRecordsVulRecord["InternetIp"].isNull())
+			vulRecordsObject.internetIp = valueVulRecordsVulRecord["InternetIp"].asString();
+		if(!valueVulRecordsVulRecord["IntranetIp"].isNull())
+			vulRecordsObject.intranetIp = valueVulRecordsVulRecord["IntranetIp"].asString();
+		if(!valueVulRecordsVulRecord["Ip"].isNull())
+			vulRecordsObject.ip = valueVulRecordsVulRecord["Ip"].asString();
+		if(!valueVulRecordsVulRecord["Online"].isNull())
+			vulRecordsObject.online = valueVulRecordsVulRecord["Online"].asString() == "true";
+		if(!valueVulRecordsVulRecord["RegionId"].isNull())
+			vulRecordsObject.regionId = valueVulRecordsVulRecord["RegionId"].asString();
+		if(!valueVulRecordsVulRecord["OsVersion"].isNull())
+			vulRecordsObject.osVersion = valueVulRecordsVulRecord["OsVersion"].asString();
+		if(!valueVulRecordsVulRecord["NeedReboot"].isNull())
+			vulRecordsObject.needReboot = valueVulRecordsVulRecord["NeedReboot"].asString();
+		if(!valueVulRecordsVulRecord["CanFix"].isNull())
+			vulRecordsObject.canFix = valueVulRecordsVulRecord["CanFix"].asString();
 		auto extendContentJsonNode = value["ExtendContentJson"];
 		if(!extendContentJsonNode["Os"].isNull())
 			vulRecordsObject.extendContentJson.os = extendContentJsonNode["Os"].asString();
@@ -150,22 +150,22 @@ void DescribeVulListResult::parse(const std::string &payload)
 			vulRecordsObject.extendContentJson.reference = extendContentJsonNode["Reference"].asString();
 		if(!extendContentJsonNode["Proof"].isNull())
 			vulRecordsObject.extendContentJson.proof = extendContentJsonNode["Proof"].asString();
-		auto allRpmEntityList = value["RpmEntityList"]["RpmEntity"];
-		for (auto value : allRpmEntityList)
+		auto allRpmEntityListNode = extendContentJsonNode["RpmEntityList"]["RpmEntity"];
+		for (auto extendContentJsonNodeRpmEntityListRpmEntity : allRpmEntityListNode)
 		{
 			VulRecord::ExtendContentJson::RpmEntity rpmEntityObject;
-			if(!value["FullVersion"].isNull())
-				rpmEntityObject.fullVersion = value["FullVersion"].asString();
-			if(!value["MatchDetail"].isNull())
-				rpmEntityObject.matchDetail = value["MatchDetail"].asString();
-			if(!value["Name"].isNull())
-				rpmEntityObject.name = value["Name"].asString();
-			if(!value["Path"].isNull())
-				rpmEntityObject.path = value["Path"].asString();
-			if(!value["UpdateCmd"].isNull())
-				rpmEntityObject.updateCmd = value["UpdateCmd"].asString();
-			if(!value["Version"].isNull())
-				rpmEntityObject.version = value["Version"].asString();
+			if(!extendContentJsonNodeRpmEntityListRpmEntity["FullVersion"].isNull())
+				rpmEntityObject.fullVersion = extendContentJsonNodeRpmEntityListRpmEntity["FullVersion"].asString();
+			if(!extendContentJsonNodeRpmEntityListRpmEntity["MatchDetail"].isNull())
+				rpmEntityObject.matchDetail = extendContentJsonNodeRpmEntityListRpmEntity["MatchDetail"].asString();
+			if(!extendContentJsonNodeRpmEntityListRpmEntity["Name"].isNull())
+				rpmEntityObject.name = extendContentJsonNodeRpmEntityListRpmEntity["Name"].asString();
+			if(!extendContentJsonNodeRpmEntityListRpmEntity["Path"].isNull())
+				rpmEntityObject.path = extendContentJsonNodeRpmEntityListRpmEntity["Path"].asString();
+			if(!extendContentJsonNodeRpmEntityListRpmEntity["UpdateCmd"].isNull())
+				rpmEntityObject.updateCmd = extendContentJsonNodeRpmEntityListRpmEntity["UpdateCmd"].asString();
+			if(!extendContentJsonNodeRpmEntityListRpmEntity["Version"].isNull())
+				rpmEntityObject.version = extendContentJsonNodeRpmEntityListRpmEntity["Version"].asString();
 			vulRecordsObject.extendContentJson.rpmEntityList.push_back(rpmEntityObject);
 		}
 		auto necessityNode = extendContentJsonNode["Necessity"];
@@ -190,26 +190,26 @@ void DescribeVulListResult::parse(const std::string &payload)
 			vulRecordsObject.processInfo.gmtLastTs = std::stol(processInfoNode["GmtLastTs"].asString());
 		if(!processInfoNode["TotalCount"].isNull())
 			vulRecordsObject.processInfo.totalCount = std::stoi(processInfoNode["TotalCount"].asString());
-		auto allProcessList = value["ProcessList"]["Process"];
-		for (auto value : allProcessList)
+		auto allProcessListNode = processInfoNode["ProcessList"]["Process"];
+		for (auto processInfoNodeProcessListProcess : allProcessListNode)
 		{
 			VulRecord::ProcessInfo::Process processObject;
-			if(!value["Rpm"].isNull())
-				processObject.rpm = value["Rpm"].asString();
-			if(!value["Pname"].isNull())
-				processObject.pname = value["Pname"].asString();
-			if(!value["Pid"].isNull())
-				processObject.pid = value["Pid"].asString();
-			auto allSubProcessList = value["SubProcessList"]["SubProcess"];
-			for (auto value : allSubProcessList)
+			if(!processInfoNodeProcessListProcess["Rpm"].isNull())
+				processObject.rpm = processInfoNodeProcessListProcess["Rpm"].asString();
+			if(!processInfoNodeProcessListProcess["Pname"].isNull())
+				processObject.pname = processInfoNodeProcessListProcess["Pname"].asString();
+			if(!processInfoNodeProcessListProcess["Pid"].isNull())
+				processObject.pid = processInfoNodeProcessListProcess["Pid"].asString();
+			auto allSubProcessListNode = allProcessListNode["SubProcessList"]["SubProcess"];
+			for (auto allProcessListNodeSubProcessListSubProcess : allSubProcessListNode)
 			{
 				VulRecord::ProcessInfo::Process::SubProcess subProcessListObject;
-				if(!value["Rpm"].isNull())
-					subProcessListObject.rpm = value["Rpm"].asString();
-				if(!value["Pname"].isNull())
-					subProcessListObject.pname = value["Pname"].asString();
-				if(!value["Pid"].isNull())
-					subProcessListObject.pid = value["Pid"].asString();
+				if(!allProcessListNodeSubProcessListSubProcess["Rpm"].isNull())
+					subProcessListObject.rpm = allProcessListNodeSubProcessListSubProcess["Rpm"].asString();
+				if(!allProcessListNodeSubProcessListSubProcess["Pname"].isNull())
+					subProcessListObject.pname = allProcessListNodeSubProcessListSubProcess["Pname"].asString();
+				if(!allProcessListNodeSubProcessListSubProcess["Pid"].isNull())
+					subProcessListObject.pid = allProcessListNodeSubProcessListSubProcess["Pid"].asString();
 				processObject.subProcessList.push_back(subProcessListObject);
 			}
 			vulRecordsObject.processInfo.processList.push_back(processObject);

+ 30 - 30
aegis/src/model/DescribeVulMachineListResult.cc

@@ -39,38 +39,38 @@ void DescribeVulMachineListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allMachineStatistics = value["MachineStatistics"]["MachineStatistic"];
-	for (auto value : allMachineStatistics)
+	auto allMachineStatisticsNode = value["MachineStatistics"]["MachineStatistic"];
+	for (auto valueMachineStatisticsMachineStatistic : allMachineStatisticsNode)
 	{
 		MachineStatistic machineStatisticsObject;
-		if(!value["Uuid"].isNull())
-			machineStatisticsObject.uuid = value["Uuid"].asString();
-		if(!value["CveNum"].isNull())
-			machineStatisticsObject.cveNum = std::stoi(value["CveNum"].asString());
-		if(!value["EmgNum"].isNull())
-			machineStatisticsObject.emgNum = std::stoi(value["EmgNum"].asString());
-		if(!value["SysNum"].isNull())
-			machineStatisticsObject.sysNum = std::stoi(value["SysNum"].asString());
-		if(!value["CmsNum"].isNull())
-			machineStatisticsObject.cmsNum = std::stoi(value["CmsNum"].asString());
-		if(!value["CmsDealedTotalNum"].isNull())
-			machineStatisticsObject.cmsDealedTotalNum = std::stoi(value["CmsDealedTotalNum"].asString());
-		if(!value["VulDealedTotalNum"].isNull())
-			machineStatisticsObject.vulDealedTotalNum = std::stoi(value["VulDealedTotalNum"].asString());
-		if(!value["VulAsapSum"].isNull())
-			machineStatisticsObject.vulAsapSum = std::stoi(value["VulAsapSum"].asString());
-		if(!value["VulLaterSum"].isNull())
-			machineStatisticsObject.vulLaterSum = std::stoi(value["VulLaterSum"].asString());
-		if(!value["VulNntfSum"].isNull())
-			machineStatisticsObject.vulNntfSum = std::stoi(value["VulNntfSum"].asString());
-		if(!value["VulSeriousTotal"].isNull())
-			machineStatisticsObject.vulSeriousTotal = std::stoi(value["VulSeriousTotal"].asString());
-		if(!value["VulHighTotal"].isNull())
-			machineStatisticsObject.vulHighTotal = std::stoi(value["VulHighTotal"].asString());
-		if(!value["VulMediumTotal"].isNull())
-			machineStatisticsObject.vulMediumTotal = std::stoi(value["VulMediumTotal"].asString());
-		if(!value["VulLowTotal"].isNull())
-			machineStatisticsObject.vulLowTotal = std::stoi(value["VulLowTotal"].asString());
+		if(!valueMachineStatisticsMachineStatistic["Uuid"].isNull())
+			machineStatisticsObject.uuid = valueMachineStatisticsMachineStatistic["Uuid"].asString();
+		if(!valueMachineStatisticsMachineStatistic["CveNum"].isNull())
+			machineStatisticsObject.cveNum = std::stoi(valueMachineStatisticsMachineStatistic["CveNum"].asString());
+		if(!valueMachineStatisticsMachineStatistic["EmgNum"].isNull())
+			machineStatisticsObject.emgNum = std::stoi(valueMachineStatisticsMachineStatistic["EmgNum"].asString());
+		if(!valueMachineStatisticsMachineStatistic["SysNum"].isNull())
+			machineStatisticsObject.sysNum = std::stoi(valueMachineStatisticsMachineStatistic["SysNum"].asString());
+		if(!valueMachineStatisticsMachineStatistic["CmsNum"].isNull())
+			machineStatisticsObject.cmsNum = std::stoi(valueMachineStatisticsMachineStatistic["CmsNum"].asString());
+		if(!valueMachineStatisticsMachineStatistic["CmsDealedTotalNum"].isNull())
+			machineStatisticsObject.cmsDealedTotalNum = std::stoi(valueMachineStatisticsMachineStatistic["CmsDealedTotalNum"].asString());
+		if(!valueMachineStatisticsMachineStatistic["VulDealedTotalNum"].isNull())
+			machineStatisticsObject.vulDealedTotalNum = std::stoi(valueMachineStatisticsMachineStatistic["VulDealedTotalNum"].asString());
+		if(!valueMachineStatisticsMachineStatistic["VulAsapSum"].isNull())
+			machineStatisticsObject.vulAsapSum = std::stoi(valueMachineStatisticsMachineStatistic["VulAsapSum"].asString());
+		if(!valueMachineStatisticsMachineStatistic["VulLaterSum"].isNull())
+			machineStatisticsObject.vulLaterSum = std::stoi(valueMachineStatisticsMachineStatistic["VulLaterSum"].asString());
+		if(!valueMachineStatisticsMachineStatistic["VulNntfSum"].isNull())
+			machineStatisticsObject.vulNntfSum = std::stoi(valueMachineStatisticsMachineStatistic["VulNntfSum"].asString());
+		if(!valueMachineStatisticsMachineStatistic["VulSeriousTotal"].isNull())
+			machineStatisticsObject.vulSeriousTotal = std::stoi(valueMachineStatisticsMachineStatistic["VulSeriousTotal"].asString());
+		if(!valueMachineStatisticsMachineStatistic["VulHighTotal"].isNull())
+			machineStatisticsObject.vulHighTotal = std::stoi(valueMachineStatisticsMachineStatistic["VulHighTotal"].asString());
+		if(!valueMachineStatisticsMachineStatistic["VulMediumTotal"].isNull())
+			machineStatisticsObject.vulMediumTotal = std::stoi(valueMachineStatisticsMachineStatistic["VulMediumTotal"].asString());
+		if(!valueMachineStatisticsMachineStatistic["VulLowTotal"].isNull())
+			machineStatisticsObject.vulLowTotal = std::stoi(valueMachineStatisticsMachineStatistic["VulLowTotal"].asString());
 		machineStatistics_.push_back(machineStatisticsObject);
 	}
 	if(!value["TotalCount"].isNull())

+ 12 - 12
aegis/src/model/DescribeVulRelatedProcessResult.cc

@@ -39,20 +39,20 @@ void DescribeVulRelatedProcessResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allProcessList = value["ProcessList"]["Process"];
-	for (auto value : allProcessList)
+	auto allProcessListNode = value["ProcessList"]["Process"];
+	for (auto valueProcessListProcess : allProcessListNode)
 	{
 		Process processListObject;
-		if(!value["Uuid"].isNull())
-			processListObject.uuid = value["Uuid"].asString();
-		if(!value["Rpm"].isNull())
-			processListObject.rpm = value["Rpm"].asString();
-		if(!value["Pname"].isNull())
-			processListObject.pname = value["Pname"].asString();
-		if(!value["Pid"].isNull())
-			processListObject.pid = value["Pid"].asString();
-		if(!value["Ppid"].isNull())
-			processListObject.ppid = value["Ppid"].asString();
+		if(!valueProcessListProcess["Uuid"].isNull())
+			processListObject.uuid = valueProcessListProcess["Uuid"].asString();
+		if(!valueProcessListProcess["Rpm"].isNull())
+			processListObject.rpm = valueProcessListProcess["Rpm"].asString();
+		if(!valueProcessListProcess["Pname"].isNull())
+			processListObject.pname = valueProcessListProcess["Pname"].asString();
+		if(!valueProcessListProcess["Pid"].isNull())
+			processListObject.pid = valueProcessListProcess["Pid"].asString();
+		if(!valueProcessListProcess["Ppid"].isNull())
+			processListObject.ppid = valueProcessListProcess["Ppid"].asString();
 		processList_.push_back(processListObject);
 	}
 	if(!value["GmtLastTs"].isNull())

+ 16 - 16
aegis/src/model/DescribeVulTargetStatisticsResult.cc

@@ -39,26 +39,26 @@ void DescribeVulTargetStatisticsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allTargetStats = value["TargetStats"]["TargetStat"];
-	for (auto value : allTargetStats)
+	auto allTargetStatsNode = value["TargetStats"]["TargetStat"];
+	for (auto valueTargetStatsTargetStat : allTargetStatsNode)
 	{
 		TargetStat targetStatsObject;
-		if(!value["VulType"].isNull())
-			targetStatsObject.vulType = value["VulType"].asString();
-		if(!value["UuidCount"].isNull())
-			targetStatsObject.uuidCount = value["UuidCount"].asString();
-		if(!value["TotalCount"].isNull())
-			targetStatsObject.totalCount = value["TotalCount"].asString();
-		auto allTargets = value["Targets"]["Target"];
-		for (auto value : allTargets)
+		if(!valueTargetStatsTargetStat["VulType"].isNull())
+			targetStatsObject.vulType = valueTargetStatsTargetStat["VulType"].asString();
+		if(!valueTargetStatsTargetStat["UuidCount"].isNull())
+			targetStatsObject.uuidCount = valueTargetStatsTargetStat["UuidCount"].asString();
+		if(!valueTargetStatsTargetStat["TotalCount"].isNull())
+			targetStatsObject.totalCount = valueTargetStatsTargetStat["TotalCount"].asString();
+		auto allTargetsNode = allTargetStatsNode["Targets"]["Target"];
+		for (auto allTargetStatsNodeTargetsTarget : allTargetsNode)
 		{
 			TargetStat::Target targetsObject;
-			if(!value["Target"].isNull())
-				targetsObject.target = value["Target"].asString();
-			if(!value["TargetType"].isNull())
-				targetsObject.targetType = value["TargetType"].asString();
-			if(!value["Flag"].isNull())
-				targetsObject.flag = value["Flag"].asString();
+			if(!allTargetStatsNodeTargetsTarget["Target"].isNull())
+				targetsObject.target = allTargetStatsNodeTargetsTarget["Target"].asString();
+			if(!allTargetStatsNodeTargetsTarget["TargetType"].isNull())
+				targetsObject.targetType = allTargetStatsNodeTargetsTarget["TargetType"].asString();
+			if(!allTargetStatsNodeTargetsTarget["Flag"].isNull())
+				targetsObject.flag = allTargetStatsNodeTargetsTarget["Flag"].asString();
 			targetStatsObject.targets.push_back(targetsObject);
 		}
 		targetStats_.push_back(targetStatsObject);

+ 10 - 10
aegis/src/model/DescribeVulWhitelistResult.cc

@@ -39,18 +39,18 @@ void DescribeVulWhitelistResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allVulWhitelists = value["VulWhitelists"]["VulWhitelist"];
-	for (auto value : allVulWhitelists)
+	auto allVulWhitelistsNode = value["VulWhitelists"]["VulWhitelist"];
+	for (auto valueVulWhitelistsVulWhitelist : allVulWhitelistsNode)
 	{
 		VulWhitelist vulWhitelistsObject;
-		if(!value["Name"].isNull())
-			vulWhitelistsObject.name = value["Name"].asString();
-		if(!value["Type"].isNull())
-			vulWhitelistsObject.type = value["Type"].asString();
-		if(!value["AliasName"].isNull())
-			vulWhitelistsObject.aliasName = value["AliasName"].asString();
-		if(!value["Reason"].isNull())
-			vulWhitelistsObject.reason = value["Reason"].asString();
+		if(!valueVulWhitelistsVulWhitelist["Name"].isNull())
+			vulWhitelistsObject.name = valueVulWhitelistsVulWhitelist["Name"].asString();
+		if(!valueVulWhitelistsVulWhitelist["Type"].isNull())
+			vulWhitelistsObject.type = valueVulWhitelistsVulWhitelist["Type"].asString();
+		if(!valueVulWhitelistsVulWhitelist["AliasName"].isNull())
+			vulWhitelistsObject.aliasName = valueVulWhitelistsVulWhitelist["AliasName"].asString();
+		if(!valueVulWhitelistsVulWhitelist["Reason"].isNull())
+			vulWhitelistsObject.reason = valueVulWhitelistsVulWhitelist["Reason"].asString();
 		vulWhitelists_.push_back(vulWhitelistsObject);
 	}
 	if(!value["PageSize"].isNull())

+ 20 - 20
aegis/src/model/DescribeWarningMachinesResult.cc

@@ -39,28 +39,28 @@ void DescribeWarningMachinesResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allWarningMachines = value["WarningMachines"]["WarningMachine"];
-	for (auto value : allWarningMachines)
+	auto allWarningMachinesNode = value["WarningMachines"]["WarningMachine"];
+	for (auto valueWarningMachinesWarningMachine : allWarningMachinesNode)
 	{
 		WarningMachine warningMachinesObject;
-		if(!value["Uuid"].isNull())
-			warningMachinesObject.uuid = value["Uuid"].asString();
-		if(!value["MachineName"].isNull())
-			warningMachinesObject.machineName = value["MachineName"].asString();
-		if(!value["InternetIp"].isNull())
-			warningMachinesObject.internetIp = value["InternetIp"].asString();
-		if(!value["IntranetIp"].isNull())
-			warningMachinesObject.intranetIp = value["IntranetIp"].asString();
-		if(!value["PassCount"].isNull())
-			warningMachinesObject.passCount = std::stoi(value["PassCount"].asString());
-		if(!value["HighWarningCount"].isNull())
-			warningMachinesObject.highWarningCount = std::stoi(value["HighWarningCount"].asString());
-		if(!value["MediumWarningCount"].isNull())
-			warningMachinesObject.mediumWarningCount = std::stoi(value["MediumWarningCount"].asString());
-		if(!value["LowWarningCount"].isNull())
-			warningMachinesObject.lowWarningCount = std::stoi(value["LowWarningCount"].asString());
-		if(!value["Status"].isNull())
-			warningMachinesObject.status = std::stoi(value["Status"].asString());
+		if(!valueWarningMachinesWarningMachine["Uuid"].isNull())
+			warningMachinesObject.uuid = valueWarningMachinesWarningMachine["Uuid"].asString();
+		if(!valueWarningMachinesWarningMachine["MachineName"].isNull())
+			warningMachinesObject.machineName = valueWarningMachinesWarningMachine["MachineName"].asString();
+		if(!valueWarningMachinesWarningMachine["InternetIp"].isNull())
+			warningMachinesObject.internetIp = valueWarningMachinesWarningMachine["InternetIp"].asString();
+		if(!valueWarningMachinesWarningMachine["IntranetIp"].isNull())
+			warningMachinesObject.intranetIp = valueWarningMachinesWarningMachine["IntranetIp"].asString();
+		if(!valueWarningMachinesWarningMachine["PassCount"].isNull())
+			warningMachinesObject.passCount = std::stoi(valueWarningMachinesWarningMachine["PassCount"].asString());
+		if(!valueWarningMachinesWarningMachine["HighWarningCount"].isNull())
+			warningMachinesObject.highWarningCount = std::stoi(valueWarningMachinesWarningMachine["HighWarningCount"].asString());
+		if(!valueWarningMachinesWarningMachine["MediumWarningCount"].isNull())
+			warningMachinesObject.mediumWarningCount = std::stoi(valueWarningMachinesWarningMachine["MediumWarningCount"].asString());
+		if(!valueWarningMachinesWarningMachine["LowWarningCount"].isNull())
+			warningMachinesObject.lowWarningCount = std::stoi(valueWarningMachinesWarningMachine["LowWarningCount"].asString());
+		if(!valueWarningMachinesWarningMachine["Status"].isNull())
+			warningMachinesObject.status = std::stoi(valueWarningMachinesWarningMachine["Status"].asString());
 		warningMachines_.push_back(warningMachinesObject);
 	}
 	if(!value["Count"].isNull())

+ 34 - 34
aegis/src/model/DescribeWarningResult.cc

@@ -39,46 +39,46 @@ void DescribeWarningResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allWarnings = value["Warnings"]["Warning"];
-	for (auto value : allWarnings)
+	auto allWarningsNode = value["Warnings"]["Warning"];
+	for (auto valueWarningsWarning : allWarningsNode)
 	{
 		Warning warningsObject;
-		if(!value["RiskWarningId"].isNull())
-			warningsObject.riskWarningId = std::stol(value["RiskWarningId"].asString());
-		if(!value["RiskName"].isNull())
-			warningsObject.riskName = value["RiskName"].asString();
-		if(!value["Uuid"].isNull())
-			warningsObject.uuid = value["Uuid"].asString();
-		if(!value["RirstFoundTime"].isNull())
-			warningsObject.rirstFoundTime = value["RirstFoundTime"].asString();
-		if(!value["LastFoundTime"].isNull())
-			warningsObject.lastFoundTime = value["LastFoundTime"].asString();
-		if(!value["Level"].isNull())
-			warningsObject.level = value["Level"].asString();
-		if(!value["TypeName"].isNull())
-			warningsObject.typeName = value["TypeName"].asString();
-		if(!value["SubTypeName"].isNull())
-			warningsObject.subTypeName = value["SubTypeName"].asString();
-		if(!value["TypeAlias"].isNull())
-			warningsObject.typeAlias = value["TypeAlias"].asString();
-		if(!value["SubTypeAlias"].isNull())
-			warningsObject.subTypeAlias = value["SubTypeAlias"].asString();
-		if(!value["Status"].isNull())
-			warningsObject.status = std::stoi(value["Status"].asString());
-		auto allDetails = value["Details"]["Detail"];
-		for (auto value : allDetails)
+		if(!valueWarningsWarning["RiskWarningId"].isNull())
+			warningsObject.riskWarningId = std::stol(valueWarningsWarning["RiskWarningId"].asString());
+		if(!valueWarningsWarning["RiskName"].isNull())
+			warningsObject.riskName = valueWarningsWarning["RiskName"].asString();
+		if(!valueWarningsWarning["Uuid"].isNull())
+			warningsObject.uuid = valueWarningsWarning["Uuid"].asString();
+		if(!valueWarningsWarning["RirstFoundTime"].isNull())
+			warningsObject.rirstFoundTime = valueWarningsWarning["RirstFoundTime"].asString();
+		if(!valueWarningsWarning["LastFoundTime"].isNull())
+			warningsObject.lastFoundTime = valueWarningsWarning["LastFoundTime"].asString();
+		if(!valueWarningsWarning["Level"].isNull())
+			warningsObject.level = valueWarningsWarning["Level"].asString();
+		if(!valueWarningsWarning["TypeName"].isNull())
+			warningsObject.typeName = valueWarningsWarning["TypeName"].asString();
+		if(!valueWarningsWarning["SubTypeName"].isNull())
+			warningsObject.subTypeName = valueWarningsWarning["SubTypeName"].asString();
+		if(!valueWarningsWarning["TypeAlias"].isNull())
+			warningsObject.typeAlias = valueWarningsWarning["TypeAlias"].asString();
+		if(!valueWarningsWarning["SubTypeAlias"].isNull())
+			warningsObject.subTypeAlias = valueWarningsWarning["SubTypeAlias"].asString();
+		if(!valueWarningsWarning["Status"].isNull())
+			warningsObject.status = std::stoi(valueWarningsWarning["Status"].asString());
+		auto allDetailsNode = allWarningsNode["Details"]["Detail"];
+		for (auto allWarningsNodeDetailsDetail : allDetailsNode)
 		{
 			Warning::Detail detailsObject;
-			auto allDetailItems = value["DetailItems"]["DetailItem"];
-			for (auto value : allDetailItems)
+			auto allDetailItemsNode = allDetailsNode["DetailItems"]["DetailItem"];
+			for (auto allDetailsNodeDetailItemsDetailItem : allDetailItemsNode)
 			{
 				Warning::Detail::DetailItem detailItemsObject;
-				if(!value["name"].isNull())
-					detailItemsObject.name = value["name"].asString();
-				if(!value["value"].isNull())
-					detailItemsObject.value = value["value"].asString();
-				if(!value["type"].isNull())
-					detailItemsObject.type = value["type"].asString();
+				if(!allDetailsNodeDetailItemsDetailItem["name"].isNull())
+					detailItemsObject.name = allDetailsNodeDetailItemsDetailItem["name"].asString();
+				if(!allDetailsNodeDetailItemsDetailItem["value"].isNull())
+					detailItemsObject.value = allDetailsNodeDetailItemsDetailItem["value"].asString();
+				if(!allDetailsNodeDetailItemsDetailItem["type"].isNull())
+					detailItemsObject.type = allDetailsNodeDetailItemsDetailItem["type"].asString();
 				detailsObject.detailItems.push_back(detailItemsObject);
 			}
 			warningsObject.details.push_back(detailsObject);

+ 24 - 24
aegis/src/model/DescribeWebLockBindListResult.cc

@@ -39,32 +39,32 @@ void DescribeWebLockBindListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allBindList = value["BindList"]["Bind"];
-	for (auto value : allBindList)
+	auto allBindListNode = value["BindList"]["Bind"];
+	for (auto valueBindListBind : allBindListNode)
 	{
 		Bind bindListObject;
-		if(!value["Uuid"].isNull())
-			bindListObject.uuid = value["Uuid"].asString();
-		if(!value["InstanceName"].isNull())
-			bindListObject.instanceName = value["InstanceName"].asString();
-		if(!value["InternetIp"].isNull())
-			bindListObject.internetIp = value["InternetIp"].asString();
-		if(!value["IntranetIp"].isNull())
-			bindListObject.intranetIp = value["IntranetIp"].asString();
-		if(!value["Os"].isNull())
-			bindListObject.os = value["Os"].asString();
-		if(!value["DirCount"].isNull())
-			bindListObject.dirCount = value["DirCount"].asString();
-		if(!value["ServiceStatus"].isNull())
-			bindListObject.serviceStatus = value["ServiceStatus"].asString();
-		if(!value["ServiceCode"].isNull())
-			bindListObject.serviceCode = value["ServiceCode"].asString();
-		if(!value["ServiceDetail"].isNull())
-			bindListObject.serviceDetail = value["ServiceDetail"].asString();
-		if(!value["Status"].isNull())
-			bindListObject.status = value["Status"].asString();
-		if(!value["Percent"].isNull())
-			bindListObject.percent = std::stoi(value["Percent"].asString());
+		if(!valueBindListBind["Uuid"].isNull())
+			bindListObject.uuid = valueBindListBind["Uuid"].asString();
+		if(!valueBindListBind["InstanceName"].isNull())
+			bindListObject.instanceName = valueBindListBind["InstanceName"].asString();
+		if(!valueBindListBind["InternetIp"].isNull())
+			bindListObject.internetIp = valueBindListBind["InternetIp"].asString();
+		if(!valueBindListBind["IntranetIp"].isNull())
+			bindListObject.intranetIp = valueBindListBind["IntranetIp"].asString();
+		if(!valueBindListBind["Os"].isNull())
+			bindListObject.os = valueBindListBind["Os"].asString();
+		if(!valueBindListBind["DirCount"].isNull())
+			bindListObject.dirCount = valueBindListBind["DirCount"].asString();
+		if(!valueBindListBind["ServiceStatus"].isNull())
+			bindListObject.serviceStatus = valueBindListBind["ServiceStatus"].asString();
+		if(!valueBindListBind["ServiceCode"].isNull())
+			bindListObject.serviceCode = valueBindListBind["ServiceCode"].asString();
+		if(!valueBindListBind["ServiceDetail"].isNull())
+			bindListObject.serviceDetail = valueBindListBind["ServiceDetail"].asString();
+		if(!valueBindListBind["Status"].isNull())
+			bindListObject.status = valueBindListBind["Status"].asString();
+		if(!valueBindListBind["Percent"].isNull())
+			bindListObject.percent = std::stoi(valueBindListBind["Percent"].asString());
 		bindList_.push_back(bindListObject);
 	}
 	if(!value["PageSize"].isNull())

+ 20 - 20
aegis/src/model/DescribeWebLockConfigListResult.cc

@@ -39,28 +39,28 @@ void DescribeWebLockConfigListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allConfigList = value["ConfigList"]["ConfigInfo"];
-	for (auto value : allConfigList)
+	auto allConfigListNode = value["ConfigList"]["ConfigInfo"];
+	for (auto valueConfigListConfigInfo : allConfigListNode)
 	{
 		ConfigInfo configListObject;
-		if(!value["Id"].isNull())
-			configListObject.id = value["Id"].asString();
-		if(!value["Uuid"].isNull())
-			configListObject.uuid = value["Uuid"].asString();
-		if(!value["Dir"].isNull())
-			configListObject.dir = value["Dir"].asString();
-		if(!value["ExclusiveDir"].isNull())
-			configListObject.exclusiveDir = value["ExclusiveDir"].asString();
-		if(!value["ExclusiveFileType"].isNull())
-			configListObject.exclusiveFileType = value["ExclusiveFileType"].asString();
-		if(!value["LocalBackupDir"].isNull())
-			configListObject.localBackupDir = value["LocalBackupDir"].asString();
-		if(!value["Mode"].isNull())
-			configListObject.mode = value["Mode"].asString();
-		if(!value["InclusiveFileType"].isNull())
-			configListObject.inclusiveFileType = value["InclusiveFileType"].asString();
-		if(!value["ExclusiveFile"].isNull())
-			configListObject.exclusiveFile = value["ExclusiveFile"].asString();
+		if(!valueConfigListConfigInfo["Id"].isNull())
+			configListObject.id = valueConfigListConfigInfo["Id"].asString();
+		if(!valueConfigListConfigInfo["Uuid"].isNull())
+			configListObject.uuid = valueConfigListConfigInfo["Uuid"].asString();
+		if(!valueConfigListConfigInfo["Dir"].isNull())
+			configListObject.dir = valueConfigListConfigInfo["Dir"].asString();
+		if(!valueConfigListConfigInfo["ExclusiveDir"].isNull())
+			configListObject.exclusiveDir = valueConfigListConfigInfo["ExclusiveDir"].asString();
+		if(!valueConfigListConfigInfo["ExclusiveFileType"].isNull())
+			configListObject.exclusiveFileType = valueConfigListConfigInfo["ExclusiveFileType"].asString();
+		if(!valueConfigListConfigInfo["LocalBackupDir"].isNull())
+			configListObject.localBackupDir = valueConfigListConfigInfo["LocalBackupDir"].asString();
+		if(!valueConfigListConfigInfo["Mode"].isNull())
+			configListObject.mode = valueConfigListConfigInfo["Mode"].asString();
+		if(!valueConfigListConfigInfo["InclusiveFileType"].isNull())
+			configListObject.inclusiveFileType = valueConfigListConfigInfo["InclusiveFileType"].asString();
+		if(!valueConfigListConfigInfo["ExclusiveFile"].isNull())
+			configListObject.exclusiveFile = valueConfigListConfigInfo["ExclusiveFile"].asString();
 		configList_.push_back(configListObject);
 	}
 	if(!value["TotalCount"].isNull())

+ 28 - 28
aegis/src/model/DescribeWebLockEventsResult.cc

@@ -39,36 +39,36 @@ void DescribeWebLockEventsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allEventList = value["EventList"]["EventInfo"];
-	for (auto value : allEventList)
+	auto allEventListNode = value["EventList"]["EventInfo"];
+	for (auto valueEventListEventInfo : allEventListNode)
 	{
 		EventInfo eventListObject;
-		if(!value["Id"].isNull())
-			eventListObject.id = std::stol(value["Id"].asString());
-		if(!value["Uuid"].isNull())
-			eventListObject.uuid = value["Uuid"].asString();
-		if(!value["Ip"].isNull())
-			eventListObject.ip = value["Ip"].asString();
-		if(!value["InternetIp"].isNull())
-			eventListObject.internetIp = value["InternetIp"].asString();
-		if(!value["IntranetIp"].isNull())
-			eventListObject.intranetIp = value["IntranetIp"].asString();
-		if(!value["InstanceName"].isNull())
-			eventListObject.instanceName = value["InstanceName"].asString();
-		if(!value["EventType"].isNull())
-			eventListObject.eventType = value["EventType"].asString();
-		if(!value["EventName"].isNull())
-			eventListObject.eventName = value["EventName"].asString();
-		if(!value["Level"].isNull())
-			eventListObject.level = value["Level"].asString();
-		if(!value["Status"].isNull())
-			eventListObject.status = value["Status"].asString();
-		if(!value["GmtEvent"].isNull())
-			eventListObject.gmtEvent = std::stol(value["GmtEvent"].asString());
-		if(!value["Path"].isNull())
-			eventListObject.path = value["Path"].asString();
-		if(!value["Solution"].isNull())
-			eventListObject.solution = value["Solution"].asString();
+		if(!valueEventListEventInfo["Id"].isNull())
+			eventListObject.id = std::stol(valueEventListEventInfo["Id"].asString());
+		if(!valueEventListEventInfo["Uuid"].isNull())
+			eventListObject.uuid = valueEventListEventInfo["Uuid"].asString();
+		if(!valueEventListEventInfo["Ip"].isNull())
+			eventListObject.ip = valueEventListEventInfo["Ip"].asString();
+		if(!valueEventListEventInfo["InternetIp"].isNull())
+			eventListObject.internetIp = valueEventListEventInfo["InternetIp"].asString();
+		if(!valueEventListEventInfo["IntranetIp"].isNull())
+			eventListObject.intranetIp = valueEventListEventInfo["IntranetIp"].asString();
+		if(!valueEventListEventInfo["InstanceName"].isNull())
+			eventListObject.instanceName = valueEventListEventInfo["InstanceName"].asString();
+		if(!valueEventListEventInfo["EventType"].isNull())
+			eventListObject.eventType = valueEventListEventInfo["EventType"].asString();
+		if(!valueEventListEventInfo["EventName"].isNull())
+			eventListObject.eventName = valueEventListEventInfo["EventName"].asString();
+		if(!valueEventListEventInfo["Level"].isNull())
+			eventListObject.level = valueEventListEventInfo["Level"].asString();
+		if(!valueEventListEventInfo["Status"].isNull())
+			eventListObject.status = valueEventListEventInfo["Status"].asString();
+		if(!valueEventListEventInfo["GmtEvent"].isNull())
+			eventListObject.gmtEvent = std::stol(valueEventListEventInfo["GmtEvent"].asString());
+		if(!valueEventListEventInfo["Path"].isNull())
+			eventListObject.path = valueEventListEventInfo["Path"].asString();
+		if(!valueEventListEventInfo["Solution"].isNull())
+			eventListObject.solution = valueEventListEventInfo["Solution"].asString();
 		eventList_.push_back(eventListObject);
 	}
 	if(!value["CurrentPage"].isNull())

+ 14 - 14
aegis/src/model/DescribeWebLockMachineListResult.cc

@@ -39,22 +39,22 @@ void DescribeWebLockMachineListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allMachineList = value["MachineList"]["MachineInfo"];
-	for (auto value : allMachineList)
+	auto allMachineListNode = value["MachineList"]["MachineInfo"];
+	for (auto valueMachineListMachineInfo : allMachineListNode)
 	{
 		MachineInfo machineListObject;
-		if(!value["Uuid"].isNull())
-			machineListObject.uuid = value["Uuid"].asString();
-		if(!value["InternetIp"].isNull())
-			machineListObject.internetIp = value["InternetIp"].asString();
-		if(!value["IntranetIp"].isNull())
-			machineListObject.intranetIp = value["IntranetIp"].asString();
-		if(!value["InstanceId"].isNull())
-			machineListObject.instanceId = value["InstanceId"].asString();
-		if(!value["InstanceName"].isNull())
-			machineListObject.instanceName = value["InstanceName"].asString();
-		if(!value["Status"].isNull())
-			machineListObject.status = value["Status"].asString();
+		if(!valueMachineListMachineInfo["Uuid"].isNull())
+			machineListObject.uuid = valueMachineListMachineInfo["Uuid"].asString();
+		if(!valueMachineListMachineInfo["InternetIp"].isNull())
+			machineListObject.internetIp = valueMachineListMachineInfo["InternetIp"].asString();
+		if(!valueMachineListMachineInfo["IntranetIp"].isNull())
+			machineListObject.intranetIp = valueMachineListMachineInfo["IntranetIp"].asString();
+		if(!valueMachineListMachineInfo["InstanceId"].isNull())
+			machineListObject.instanceId = valueMachineListMachineInfo["InstanceId"].asString();
+		if(!valueMachineListMachineInfo["InstanceName"].isNull())
+			machineListObject.instanceName = valueMachineListMachineInfo["InstanceName"].asString();
+		if(!valueMachineListMachineInfo["Status"].isNull())
+			machineListObject.status = valueMachineListMachineInfo["Status"].asString();
 		machineList_.push_back(machineListObject);
 	}
 	if(!value["TotalCount"].isNull())

+ 24 - 24
aegis/src/model/DescribeWebshellListResult.cc

@@ -39,32 +39,32 @@ void DescribeWebshellListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allWebshells = value["Webshells"]["Data"];
-	for (auto value : allWebshells)
+	auto allWebshellsNode = value["Webshells"]["Data"];
+	for (auto valueWebshellsData : allWebshellsNode)
 	{
 		Data webshellsObject;
-		if(!value["FoundTime"].isNull())
-			webshellsObject.foundTime = value["FoundTime"].asString();
-		if(!value["TrojanType"].isNull())
-			webshellsObject.trojanType = value["TrojanType"].asString();
-		if(!value["TrojanSize"].isNull())
-			webshellsObject.trojanSize = std::stoi(value["TrojanSize"].asString());
-		if(!value["FirstFoundTime"].isNull())
-			webshellsObject.firstFoundTime = value["FirstFoundTime"].asString();
-		if(!value["Domain"].isNull())
-			webshellsObject.domain = value["Domain"].asString();
-		if(!value["DownloadUrl"].isNull())
-			webshellsObject.downloadUrl = value["DownloadUrl"].asString();
-		if(!value["TrojanPath"].isNull())
-			webshellsObject.trojanPath = value["TrojanPath"].asString();
-		if(!value["Uuid"].isNull())
-			webshellsObject.uuid = value["Uuid"].asString();
-		if(!value["MachineName"].isNull())
-			webshellsObject.machineName = value["MachineName"].asString();
-		if(!value["Status"].isNull())
-			webshellsObject.status = std::stoi(value["Status"].asString());
-		if(!value["MachineIp"].isNull())
-			webshellsObject.machineIp = value["MachineIp"].asString();
+		if(!valueWebshellsData["FoundTime"].isNull())
+			webshellsObject.foundTime = valueWebshellsData["FoundTime"].asString();
+		if(!valueWebshellsData["TrojanType"].isNull())
+			webshellsObject.trojanType = valueWebshellsData["TrojanType"].asString();
+		if(!valueWebshellsData["TrojanSize"].isNull())
+			webshellsObject.trojanSize = std::stoi(valueWebshellsData["TrojanSize"].asString());
+		if(!valueWebshellsData["FirstFoundTime"].isNull())
+			webshellsObject.firstFoundTime = valueWebshellsData["FirstFoundTime"].asString();
+		if(!valueWebshellsData["Domain"].isNull())
+			webshellsObject.domain = valueWebshellsData["Domain"].asString();
+		if(!valueWebshellsData["DownloadUrl"].isNull())
+			webshellsObject.downloadUrl = valueWebshellsData["DownloadUrl"].asString();
+		if(!valueWebshellsData["TrojanPath"].isNull())
+			webshellsObject.trojanPath = valueWebshellsData["TrojanPath"].asString();
+		if(!valueWebshellsData["Uuid"].isNull())
+			webshellsObject.uuid = valueWebshellsData["Uuid"].asString();
+		if(!valueWebshellsData["MachineName"].isNull())
+			webshellsObject.machineName = valueWebshellsData["MachineName"].asString();
+		if(!valueWebshellsData["Status"].isNull())
+			webshellsObject.status = std::stoi(valueWebshellsData["Status"].asString());
+		if(!valueWebshellsData["MachineIp"].isNull())
+			webshellsObject.machineIp = valueWebshellsData["MachineIp"].asString();
 		webshells_.push_back(webshellsObject);
 	}
 	if(!value["Success"].isNull())

+ 30 - 30
aegis/src/model/DescribeWebshellResult.cc

@@ -39,38 +39,38 @@ void DescribeWebshellResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allWebshellList = value["WebshellList"]["WebshellListItem"];
-	for (auto value : allWebshellList)
+	auto allWebshellListNode = value["WebshellList"]["WebshellListItem"];
+	for (auto valueWebshellListWebshellListItem : allWebshellListNode)
 	{
 		WebshellListItem webshellListObject;
-		if(!value["Os"].isNull())
-			webshellListObject.os = value["Os"].asString();
-		if(!value["InstanceName"].isNull())
-			webshellListObject.instanceName = value["InstanceName"].asString();
-		if(!value["GroupId"].isNull())
-			webshellListObject.groupId = std::stol(value["GroupId"].asString());
-		if(!value["Ip"].isNull())
-			webshellListObject.ip = value["Ip"].asString();
-		if(!value["Uuid"].isNull())
-			webshellListObject.uuid = value["Uuid"].asString();
-		if(!value["FoundTime"].isNull())
-			webshellListObject.foundTime = value["FoundTime"].asString();
-		if(!value["InstanceId"].isNull())
-			webshellListObject.instanceId = value["InstanceId"].asString();
-		if(!value["TrojanType"].isNull())
-			webshellListObject.trojanType = value["TrojanType"].asString();
-		if(!value["FirstFoundTime"].isNull())
-			webshellListObject.firstFoundTime = value["FirstFoundTime"].asString();
-		if(!value["TrojanSize"].isNull())
-			webshellListObject.trojanSize = std::stol(value["TrojanSize"].asString());
-		if(!value["Domain"].isNull())
-			webshellListObject.domain = value["Domain"].asString();
-		if(!value["TrojanPath"].isNull())
-			webshellListObject.trojanPath = value["TrojanPath"].asString();
-		if(!value["Region"].isNull())
-			webshellListObject.region = value["Region"].asString();
-		if(!value["Status"].isNull())
-			webshellListObject.status = std::stoi(value["Status"].asString());
+		if(!valueWebshellListWebshellListItem["Os"].isNull())
+			webshellListObject.os = valueWebshellListWebshellListItem["Os"].asString();
+		if(!valueWebshellListWebshellListItem["InstanceName"].isNull())
+			webshellListObject.instanceName = valueWebshellListWebshellListItem["InstanceName"].asString();
+		if(!valueWebshellListWebshellListItem["GroupId"].isNull())
+			webshellListObject.groupId = std::stol(valueWebshellListWebshellListItem["GroupId"].asString());
+		if(!valueWebshellListWebshellListItem["Ip"].isNull())
+			webshellListObject.ip = valueWebshellListWebshellListItem["Ip"].asString();
+		if(!valueWebshellListWebshellListItem["Uuid"].isNull())
+			webshellListObject.uuid = valueWebshellListWebshellListItem["Uuid"].asString();
+		if(!valueWebshellListWebshellListItem["FoundTime"].isNull())
+			webshellListObject.foundTime = valueWebshellListWebshellListItem["FoundTime"].asString();
+		if(!valueWebshellListWebshellListItem["InstanceId"].isNull())
+			webshellListObject.instanceId = valueWebshellListWebshellListItem["InstanceId"].asString();
+		if(!valueWebshellListWebshellListItem["TrojanType"].isNull())
+			webshellListObject.trojanType = valueWebshellListWebshellListItem["TrojanType"].asString();
+		if(!valueWebshellListWebshellListItem["FirstFoundTime"].isNull())
+			webshellListObject.firstFoundTime = valueWebshellListWebshellListItem["FirstFoundTime"].asString();
+		if(!valueWebshellListWebshellListItem["TrojanSize"].isNull())
+			webshellListObject.trojanSize = std::stol(valueWebshellListWebshellListItem["TrojanSize"].asString());
+		if(!valueWebshellListWebshellListItem["Domain"].isNull())
+			webshellListObject.domain = valueWebshellListWebshellListItem["Domain"].asString();
+		if(!valueWebshellListWebshellListItem["TrojanPath"].isNull())
+			webshellListObject.trojanPath = valueWebshellListWebshellListItem["TrojanPath"].asString();
+		if(!valueWebshellListWebshellListItem["Region"].isNull())
+			webshellListObject.region = valueWebshellListWebshellListItem["Region"].asString();
+		if(!valueWebshellListWebshellListItem["Status"].isNull())
+			webshellListObject.status = std::stoi(valueWebshellListWebshellListItem["Status"].asString());
 		webshellList_.push_back(webshellListObject);
 	}
 

+ 16 - 16
aegis/src/model/DescribeWhiteListAssetResult.cc

@@ -39,24 +39,24 @@ void DescribeWhiteListAssetResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allAssets = value["Assets"]["Asset"];
-	for (auto value : allAssets)
+	auto allAssetsNode = value["Assets"]["Asset"];
+	for (auto valueAssetsAsset : allAssetsNode)
 	{
 		Asset assetsObject;
-		if(!value["Id"].isNull())
-			assetsObject.id = std::stol(value["Id"].asString());
-		if(!value["Uuid"].isNull())
-			assetsObject.uuid = value["Uuid"].asString();
-		if(!value["GroupId"].isNull())
-			assetsObject.groupId = std::stol(value["GroupId"].asString());
-		if(!value["MachineName"].isNull())
-			assetsObject.machineName = value["MachineName"].asString();
-		if(!value["MachineIp"].isNull())
-			assetsObject.machineIp = value["MachineIp"].asString();
-		if(!value["Selected"].isNull())
-			assetsObject.selected = std::stoi(value["Selected"].asString());
-		if(!value["AllowSelected"].isNull())
-			assetsObject.allowSelected = std::stoi(value["AllowSelected"].asString());
+		if(!valueAssetsAsset["Id"].isNull())
+			assetsObject.id = std::stol(valueAssetsAsset["Id"].asString());
+		if(!valueAssetsAsset["Uuid"].isNull())
+			assetsObject.uuid = valueAssetsAsset["Uuid"].asString();
+		if(!valueAssetsAsset["GroupId"].isNull())
+			assetsObject.groupId = std::stol(valueAssetsAsset["GroupId"].asString());
+		if(!valueAssetsAsset["MachineName"].isNull())
+			assetsObject.machineName = valueAssetsAsset["MachineName"].asString();
+		if(!valueAssetsAsset["MachineIp"].isNull())
+			assetsObject.machineIp = valueAssetsAsset["MachineIp"].asString();
+		if(!valueAssetsAsset["Selected"].isNull())
+			assetsObject.selected = std::stoi(valueAssetsAsset["Selected"].asString());
+		if(!valueAssetsAsset["AllowSelected"].isNull())
+			assetsObject.allowSelected = std::stoi(valueAssetsAsset["AllowSelected"].asString());
 		assets_.push_back(assetsObject);
 	}
 

+ 18 - 18
aegis/src/model/DescribeWhiteListEffectiveAssetsResult.cc

@@ -39,26 +39,26 @@ void DescribeWhiteListEffectiveAssetsResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allAssets = value["Assets"]["Asset"];
-	for (auto value : allAssets)
+	auto allAssetsNode = value["Assets"]["Asset"];
+	for (auto valueAssetsAsset : allAssetsNode)
 	{
 		Asset assetsObject;
-		if(!value["Uuid"].isNull())
-			assetsObject.uuid = value["Uuid"].asString();
-		if(!value["MachineName"].isNull())
-			assetsObject.machineName = value["MachineName"].asString();
-		if(!value["InternetIp"].isNull())
-			assetsObject.internetIp = value["InternetIp"].asString();
-		if(!value["IntranetIp"].isNull())
-			assetsObject.intranetIp = value["IntranetIp"].asString();
-		if(!value["StrategyId"].isNull())
-			assetsObject.strategyId = std::stol(value["StrategyId"].asString());
-		if(!value["StrategyName"].isNull())
-			assetsObject.strategyName = value["StrategyName"].asString();
-		if(!value["SuspiciousEventCount"].isNull())
-			assetsObject.suspiciousEventCount = std::stoi(value["SuspiciousEventCount"].asString());
-		if(!value["ProcessMethod"].isNull())
-			assetsObject.processMethod = std::stoi(value["ProcessMethod"].asString());
+		if(!valueAssetsAsset["Uuid"].isNull())
+			assetsObject.uuid = valueAssetsAsset["Uuid"].asString();
+		if(!valueAssetsAsset["MachineName"].isNull())
+			assetsObject.machineName = valueAssetsAsset["MachineName"].asString();
+		if(!valueAssetsAsset["InternetIp"].isNull())
+			assetsObject.internetIp = valueAssetsAsset["InternetIp"].asString();
+		if(!valueAssetsAsset["IntranetIp"].isNull())
+			assetsObject.intranetIp = valueAssetsAsset["IntranetIp"].asString();
+		if(!valueAssetsAsset["StrategyId"].isNull())
+			assetsObject.strategyId = std::stol(valueAssetsAsset["StrategyId"].asString());
+		if(!valueAssetsAsset["StrategyName"].isNull())
+			assetsObject.strategyName = valueAssetsAsset["StrategyName"].asString();
+		if(!valueAssetsAsset["SuspiciousEventCount"].isNull())
+			assetsObject.suspiciousEventCount = std::stoi(valueAssetsAsset["SuspiciousEventCount"].asString());
+		if(!valueAssetsAsset["ProcessMethod"].isNull())
+			assetsObject.processMethod = std::stoi(valueAssetsAsset["ProcessMethod"].asString());
 		assets_.push_back(assetsObject);
 	}
 	if(!value["Count"].isNull())

+ 18 - 18
aegis/src/model/DescribeWhiteListProcessResult.cc

@@ -39,26 +39,26 @@ void DescribeWhiteListProcessResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allProcesses = value["Processes"]["Process"];
-	for (auto value : allProcesses)
+	auto allProcessesNode = value["Processes"]["Process"];
+	for (auto valueProcessesProcess : allProcessesNode)
 	{
 		Process processesObject;
-		if(!value["Id"].isNull())
-			processesObject.id = std::stol(value["Id"].asString());
-		if(!value["ProcessId"].isNull())
-			processesObject.processId = std::stoi(value["ProcessId"].asString());
-		if(!value["ProcessName"].isNull())
-			processesObject.processName = value["ProcessName"].asString();
-		if(!value["FilePath"].isNull())
-			processesObject.filePath = value["FilePath"].asString();
-		if(!value["Md5"].isNull())
-			processesObject.md5 = value["Md5"].asString();
-		if(!value["Level"].isNull())
-			processesObject.level = std::stoi(value["Level"].asString());
-		if(!value["ProcessType"].isNull())
-			processesObject.processType = std::stoi(value["ProcessType"].asString());
-		if(!value["Status"].isNull())
-			processesObject.status = std::stoi(value["Status"].asString());
+		if(!valueProcessesProcess["Id"].isNull())
+			processesObject.id = std::stol(valueProcessesProcess["Id"].asString());
+		if(!valueProcessesProcess["ProcessId"].isNull())
+			processesObject.processId = std::stoi(valueProcessesProcess["ProcessId"].asString());
+		if(!valueProcessesProcess["ProcessName"].isNull())
+			processesObject.processName = valueProcessesProcess["ProcessName"].asString();
+		if(!valueProcessesProcess["FilePath"].isNull())
+			processesObject.filePath = valueProcessesProcess["FilePath"].asString();
+		if(!valueProcessesProcess["Md5"].isNull())
+			processesObject.md5 = valueProcessesProcess["Md5"].asString();
+		if(!valueProcessesProcess["Level"].isNull())
+			processesObject.level = std::stoi(valueProcessesProcess["Level"].asString());
+		if(!valueProcessesProcess["ProcessType"].isNull())
+			processesObject.processType = std::stoi(valueProcessesProcess["ProcessType"].asString());
+		if(!valueProcessesProcess["Status"].isNull())
+			processesObject.status = std::stoi(valueProcessesProcess["Status"].asString());
 		processes_.push_back(processesObject);
 	}
 	if(!value["Count"].isNull())

+ 10 - 10
aegis/src/model/DescribeWhiteListStrategyListResult.cc

@@ -39,18 +39,18 @@ void DescribeWhiteListStrategyListResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allStrategies = value["Strategies"]["Strategy"];
-	for (auto value : allStrategies)
+	auto allStrategiesNode = value["Strategies"]["Strategy"];
+	for (auto valueStrategiesStrategy : allStrategiesNode)
 	{
 		Strategy strategiesObject;
-		if(!value["StrategyId"].isNull())
-			strategiesObject.strategyId = std::stol(value["StrategyId"].asString());
-		if(!value["StrategyName"].isNull())
-			strategiesObject.strategyName = value["StrategyName"].asString();
-		if(!value["StudyTime"].isNull())
-			strategiesObject.studyTime = std::stoi(value["StudyTime"].asString());
-		if(!value["Status"].isNull())
-			strategiesObject.status = std::stoi(value["Status"].asString());
+		if(!valueStrategiesStrategy["StrategyId"].isNull())
+			strategiesObject.strategyId = std::stol(valueStrategiesStrategy["StrategyId"].asString());
+		if(!valueStrategiesStrategy["StrategyName"].isNull())
+			strategiesObject.strategyName = valueStrategiesStrategy["StrategyName"].asString();
+		if(!valueStrategiesStrategy["StudyTime"].isNull())
+			strategiesObject.studyTime = std::stoi(valueStrategiesStrategy["StudyTime"].asString());
+		if(!valueStrategiesStrategy["Status"].isNull())
+			strategiesObject.status = std::stoi(valueStrategiesStrategy["Status"].asString());
 		strategies_.push_back(strategiesObject);
 	}
 

+ 20 - 20
aegis/src/model/DescribeWhiteListStrategyStatisticsResult.cc

@@ -39,28 +39,28 @@ void DescribeWhiteListStrategyStatisticsResult::parse(const std::string &payload
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allStrategies = value["Strategies"]["Strategy"];
-	for (auto value : allStrategies)
+	auto allStrategiesNode = value["Strategies"]["Strategy"];
+	for (auto valueStrategiesStrategy : allStrategiesNode)
 	{
 		Strategy strategiesObject;
-		if(!value["StrategyId"].isNull())
-			strategiesObject.strategyId = std::stol(value["StrategyId"].asString());
-		if(!value["StrategyName"].isNull())
-			strategiesObject.strategyName = value["StrategyName"].asString();
-		if(!value["StudyTime"].isNull())
-			strategiesObject.studyTime = std::stoi(value["StudyTime"].asString());
-		if(!value["AssetCount"].isNull())
-			strategiesObject.assetCount = std::stoi(value["AssetCount"].asString());
-		if(!value["Status"].isNull())
-			strategiesObject.status = std::stoi(value["Status"].asString());
-		if(!value["TrustProcCount"].isNull())
-			strategiesObject.trustProcCount = std::stoi(value["TrustProcCount"].asString());
-		if(!value["SuspiciousProcCount"].isNull())
-			strategiesObject.suspiciousProcCount = std::stoi(value["SuspiciousProcCount"].asString());
-		if(!value["VirusProcCount"].isNull())
-			strategiesObject.virusProcCount = std::stoi(value["VirusProcCount"].asString());
-		if(!value["Progress"].isNull())
-			strategiesObject.progress = std::stoi(value["Progress"].asString());
+		if(!valueStrategiesStrategy["StrategyId"].isNull())
+			strategiesObject.strategyId = std::stol(valueStrategiesStrategy["StrategyId"].asString());
+		if(!valueStrategiesStrategy["StrategyName"].isNull())
+			strategiesObject.strategyName = valueStrategiesStrategy["StrategyName"].asString();
+		if(!valueStrategiesStrategy["StudyTime"].isNull())
+			strategiesObject.studyTime = std::stoi(valueStrategiesStrategy["StudyTime"].asString());
+		if(!valueStrategiesStrategy["AssetCount"].isNull())
+			strategiesObject.assetCount = std::stoi(valueStrategiesStrategy["AssetCount"].asString());
+		if(!valueStrategiesStrategy["Status"].isNull())
+			strategiesObject.status = std::stoi(valueStrategiesStrategy["Status"].asString());
+		if(!valueStrategiesStrategy["TrustProcCount"].isNull())
+			strategiesObject.trustProcCount = std::stoi(valueStrategiesStrategy["TrustProcCount"].asString());
+		if(!valueStrategiesStrategy["SuspiciousProcCount"].isNull())
+			strategiesObject.suspiciousProcCount = std::stoi(valueStrategiesStrategy["SuspiciousProcCount"].asString());
+		if(!valueStrategiesStrategy["VirusProcCount"].isNull())
+			strategiesObject.virusProcCount = std::stoi(valueStrategiesStrategy["VirusProcCount"].asString());
+		if(!valueStrategiesStrategy["Progress"].isNull())
+			strategiesObject.progress = std::stoi(valueStrategiesStrategy["Progress"].asString());
 		strategies_.push_back(strategiesObject);
 	}
 	if(!value["Count"].isNull())

+ 20 - 20
aegis/src/model/DescribesummaryResult.cc

@@ -39,28 +39,28 @@ void DescribesummaryResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allWarningSummarys = value["WarningSummarys"]["WarningSummary"];
-	for (auto value : allWarningSummarys)
+	auto allWarningSummarysNode = value["WarningSummarys"]["WarningSummary"];
+	for (auto valueWarningSummarysWarningSummary : allWarningSummarysNode)
 	{
 		WarningSummary warningSummarysObject;
-		if(!value["RiskId"].isNull())
-			warningSummarysObject.riskId = std::stol(value["RiskId"].asString());
-		if(!value["RiskName"].isNull())
-			warningSummarysObject.riskName = value["RiskName"].asString();
-		if(!value["Level"].isNull())
-			warningSummarysObject.level = value["Level"].asString();
-		if(!value["TypeAlias"].isNull())
-			warningSummarysObject.typeAlias = value["TypeAlias"].asString();
-		if(!value["SubTypeAlias"].isNull())
-			warningSummarysObject.subTypeAlias = value["SubTypeAlias"].asString();
-		if(!value["LastFoundTime"].isNull())
-			warningSummarysObject.lastFoundTime = value["LastFoundTime"].asString();
-		if(!value["PendingCount"].isNull())
-			warningSummarysObject.pendingCount = std::stoi(value["PendingCount"].asString());
-		if(!value["TotalCount"].isNull())
-			warningSummarysObject.totalCount = std::stoi(value["TotalCount"].asString());
-		if(!value["RiskDetail"].isNull())
-			warningSummarysObject.riskDetail = value["RiskDetail"].asString();
+		if(!valueWarningSummarysWarningSummary["RiskId"].isNull())
+			warningSummarysObject.riskId = std::stol(valueWarningSummarysWarningSummary["RiskId"].asString());
+		if(!valueWarningSummarysWarningSummary["RiskName"].isNull())
+			warningSummarysObject.riskName = valueWarningSummarysWarningSummary["RiskName"].asString();
+		if(!valueWarningSummarysWarningSummary["Level"].isNull())
+			warningSummarysObject.level = valueWarningSummarysWarningSummary["Level"].asString();
+		if(!valueWarningSummarysWarningSummary["TypeAlias"].isNull())
+			warningSummarysObject.typeAlias = valueWarningSummarysWarningSummary["TypeAlias"].asString();
+		if(!valueWarningSummarysWarningSummary["SubTypeAlias"].isNull())
+			warningSummarysObject.subTypeAlias = valueWarningSummarysWarningSummary["SubTypeAlias"].asString();
+		if(!valueWarningSummarysWarningSummary["LastFoundTime"].isNull())
+			warningSummarysObject.lastFoundTime = valueWarningSummarysWarningSummary["LastFoundTime"].asString();
+		if(!valueWarningSummarysWarningSummary["PendingCount"].isNull())
+			warningSummarysObject.pendingCount = std::stoi(valueWarningSummarysWarningSummary["PendingCount"].asString());
+		if(!valueWarningSummarysWarningSummary["TotalCount"].isNull())
+			warningSummarysObject.totalCount = std::stoi(valueWarningSummarysWarningSummary["TotalCount"].asString());
+		if(!valueWarningSummarysWarningSummary["RiskDetail"].isNull())
+			warningSummarysObject.riskDetail = valueWarningSummarysWarningSummary["RiskDetail"].asString();
 		warningSummarys_.push_back(warningSummarysObject);
 	}
 	if(!value["Count"].isNull())

+ 12 - 12
aegis/src/model/DownloadLogResult.cc

@@ -39,20 +39,20 @@ void DownloadLogResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allStackTrace = value["StackTrace"]["StackTraceItem"];
-	for (auto value : allStackTrace)
+	auto allStackTraceNode = value["StackTrace"]["StackTraceItem"];
+	for (auto valueStackTraceStackTraceItem : allStackTraceNode)
 	{
 		StackTraceItem stackTraceObject;
-		if(!value["FileName"].isNull())
-			stackTraceObject.fileName = value["FileName"].asString();
-		if(!value["NativeMethod"].isNull())
-			stackTraceObject.nativeMethod = value["NativeMethod"].asString() == "true";
-		if(!value["MethodName"].isNull())
-			stackTraceObject.methodName = value["MethodName"].asString();
-		if(!value["ClassName"].isNull())
-			stackTraceObject.className = value["ClassName"].asString();
-		if(!value["LineNumber"].isNull())
-			stackTraceObject.lineNumber = std::stoi(value["LineNumber"].asString());
+		if(!valueStackTraceStackTraceItem["FileName"].isNull())
+			stackTraceObject.fileName = valueStackTraceStackTraceItem["FileName"].asString();
+		if(!valueStackTraceStackTraceItem["NativeMethod"].isNull())
+			stackTraceObject.nativeMethod = valueStackTraceStackTraceItem["NativeMethod"].asString() == "true";
+		if(!valueStackTraceStackTraceItem["MethodName"].isNull())
+			stackTraceObject.methodName = valueStackTraceStackTraceItem["MethodName"].asString();
+		if(!valueStackTraceStackTraceItem["ClassName"].isNull())
+			stackTraceObject.className = valueStackTraceStackTraceItem["ClassName"].asString();
+		if(!valueStackTraceStackTraceItem["LineNumber"].isNull())
+			stackTraceObject.lineNumber = std::stoi(valueStackTraceStackTraceItem["LineNumber"].asString());
 		stackTrace_.push_back(stackTraceObject);
 	}
 	auto allSuppressed = value["Suppressed"]["StringItem"];

+ 24 - 24
aegis/src/model/GetEntityListResult.cc

@@ -40,32 +40,32 @@ void GetEntityListResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
-	auto allList = value["List"]["Entity"];
-	for (auto value : allList)
+	auto allListNode = dataNode["List"]["Entity"];
+	for (auto dataNodeListEntity : allListNode)
 	{
 		Data::Entity entityObject;
-		if(!value["Uuid"].isNull())
-			entityObject.uuid = value["Uuid"].asString();
-		if(!value["GroupId"].isNull())
-			entityObject.groupId = std::stol(value["GroupId"].asString());
-		if(!value["Ip"].isNull())
-			entityObject.ip = value["Ip"].asString();
-		if(!value["InstanceName"].isNull())
-			entityObject.instanceName = value["InstanceName"].asString();
-		if(!value["InstanceId"].isNull())
-			entityObject.instanceId = value["InstanceId"].asString();
-		if(!value["Region"].isNull())
-			entityObject.region = value["Region"].asString();
-		if(!value["Os"].isNull())
-			entityObject.os = value["Os"].asString();
-		if(!value["Flag"].isNull())
-			entityObject.flag = value["Flag"].asString();
-		if(!value["BuyVersion"].isNull())
-			entityObject.buyVersion = value["BuyVersion"].asString();
-		if(!value["AegisOnline"].isNull())
-			entityObject.aegisOnline = value["AegisOnline"].asString() == "true";
-		if(!value["aegisVersion"].isNull())
-			entityObject.aegisVersion = value["aegisVersion"].asString();
+		if(!dataNodeListEntity["Uuid"].isNull())
+			entityObject.uuid = dataNodeListEntity["Uuid"].asString();
+		if(!dataNodeListEntity["GroupId"].isNull())
+			entityObject.groupId = std::stol(dataNodeListEntity["GroupId"].asString());
+		if(!dataNodeListEntity["Ip"].isNull())
+			entityObject.ip = dataNodeListEntity["Ip"].asString();
+		if(!dataNodeListEntity["InstanceName"].isNull())
+			entityObject.instanceName = dataNodeListEntity["InstanceName"].asString();
+		if(!dataNodeListEntity["InstanceId"].isNull())
+			entityObject.instanceId = dataNodeListEntity["InstanceId"].asString();
+		if(!dataNodeListEntity["Region"].isNull())
+			entityObject.region = dataNodeListEntity["Region"].asString();
+		if(!dataNodeListEntity["Os"].isNull())
+			entityObject.os = dataNodeListEntity["Os"].asString();
+		if(!dataNodeListEntity["Flag"].isNull())
+			entityObject.flag = dataNodeListEntity["Flag"].asString();
+		if(!dataNodeListEntity["BuyVersion"].isNull())
+			entityObject.buyVersion = dataNodeListEntity["BuyVersion"].asString();
+		if(!dataNodeListEntity["AegisOnline"].isNull())
+			entityObject.aegisOnline = dataNodeListEntity["AegisOnline"].asString() == "true";
+		if(!dataNodeListEntity["aegisVersion"].isNull())
+			entityObject.aegisVersion = dataNodeListEntity["aegisVersion"].asString();
 		data_.list.push_back(entityObject);
 	}
 	auto pageInfoNode = dataNode["PageInfo"];

+ 14 - 14
aegis/src/model/GetStatisticsByUuidResult.cc

@@ -39,22 +39,22 @@ void GetStatisticsByUuidResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allData = value["Data"]["Entity"];
-	for (auto value : allData)
+	auto allDataNode = value["Data"]["Entity"];
+	for (auto valueDataEntity : allDataNode)
 	{
 		Entity dataObject;
-		if(!value["Uuid"].isNull())
-			dataObject.uuid = value["Uuid"].asString();
-		if(!value["Account"].isNull())
-			dataObject.account = std::stoi(value["Account"].asString());
-		if(!value["Health"].isNull())
-			dataObject.health = std::stoi(value["Health"].asString());
-		if(!value["Patch"].isNull())
-			dataObject.patch = std::stoi(value["Patch"].asString());
-		if(!value["Trojan"].isNull())
-			dataObject.trojan = std::stoi(value["Trojan"].asString());
-		if(!value["Online"].isNull())
-			dataObject.online = value["Online"].asString() == "true";
+		if(!valueDataEntity["Uuid"].isNull())
+			dataObject.uuid = valueDataEntity["Uuid"].asString();
+		if(!valueDataEntity["Account"].isNull())
+			dataObject.account = std::stoi(valueDataEntity["Account"].asString());
+		if(!valueDataEntity["Health"].isNull())
+			dataObject.health = std::stoi(valueDataEntity["Health"].asString());
+		if(!valueDataEntity["Patch"].isNull())
+			dataObject.patch = std::stoi(valueDataEntity["Patch"].asString());
+		if(!valueDataEntity["Trojan"].isNull())
+			dataObject.trojan = std::stoi(valueDataEntity["Trojan"].asString());
+		if(!valueDataEntity["Online"].isNull())
+			dataObject.online = valueDataEntity["Online"].asString() == "true";
 		data_.push_back(dataObject);
 	}
 	if(!value["requestId"].isNull())

+ 8 - 8
aegis/src/model/OperateAgentClientInstallResult.cc

@@ -39,16 +39,16 @@ void OperateAgentClientInstallResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allAegisCelintInstallResposeList = value["AegisCelintInstallResposeList"]["AegisCelintInstallRespose"];
-	for (auto value : allAegisCelintInstallResposeList)
+	auto allAegisCelintInstallResposeListNode = value["AegisCelintInstallResposeList"]["AegisCelintInstallRespose"];
+	for (auto valueAegisCelintInstallResposeListAegisCelintInstallRespose : allAegisCelintInstallResposeListNode)
 	{
 		AegisCelintInstallRespose aegisCelintInstallResposeListObject;
-		if(!value["InstanceId"].isNull())
-			aegisCelintInstallResposeListObject.instanceId = value["InstanceId"].asString();
-		if(!value["RecordId"].isNull())
-			aegisCelintInstallResposeListObject.recordId = std::stol(value["RecordId"].asString());
-		if(!value["Uuid"].isNull())
-			aegisCelintInstallResposeListObject.uuid = value["Uuid"].asString();
+		if(!valueAegisCelintInstallResposeListAegisCelintInstallRespose["InstanceId"].isNull())
+			aegisCelintInstallResposeListObject.instanceId = valueAegisCelintInstallResposeListAegisCelintInstallRespose["InstanceId"].asString();
+		if(!valueAegisCelintInstallResposeListAegisCelintInstallRespose["RecordId"].isNull())
+			aegisCelintInstallResposeListObject.recordId = std::stol(valueAegisCelintInstallResposeListAegisCelintInstallRespose["RecordId"].asString());
+		if(!valueAegisCelintInstallResposeListAegisCelintInstallRespose["Uuid"].isNull())
+			aegisCelintInstallResposeListObject.uuid = valueAegisCelintInstallResposeListAegisCelintInstallRespose["Uuid"].asString();
 		aegisCelintInstallResposeList_.push_back(aegisCelintInstallResposeListObject);
 	}
 

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff