diff --git a/arex-schedule-web-api/pom.xml b/arex-schedule-web-api/pom.xml
index c3d2e1d5..5107a955 100644
--- a/arex-schedule-web-api/pom.xml
+++ b/arex-schedule-web-api/pom.xml
@@ -139,7 +139,7 @@
arex-schedule-parent
com.arextest
- 2.0.2
+ 2.0.3
@@ -337,5 +337,5 @@
- 2.0.2
+ 2.0.3
\ No newline at end of file
diff --git a/arex-schedule-web-api/src/main/java/com/arextest/schedule/model/ReplayPlan.java b/arex-schedule-web-api/src/main/java/com/arextest/schedule/model/ReplayPlan.java
index c615de4c..dd80440c 100644
--- a/arex-schedule-web-api/src/main/java/com/arextest/schedule/model/ReplayPlan.java
+++ b/arex-schedule-web-api/src/main/java/com/arextest/schedule/model/ReplayPlan.java
@@ -122,6 +122,5 @@ public void enqueueBizLog(BizLog log) {
public void buildActionItemMap() {
this.getReplayActionItemList().forEach(
replayActionItem -> this.actionItemMap.put(replayActionItem.getId(), replayActionItem));
- LOGGER.info("buildActionItemMap, planId:{}, keySet:{}", getId(), actionItemMap.keySet());
}
}
\ No newline at end of file
diff --git a/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/PlanConsumePrepareService.java b/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/PlanConsumePrepareService.java
index 93ea49df..3be0cb42 100644
--- a/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/PlanConsumePrepareService.java
+++ b/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/PlanConsumePrepareService.java
@@ -325,7 +325,7 @@ public void updateFailedActionAndCase(ReplayPlan replayPlan,
replayPlan.setReplayActionItemList(failedActionList);
doResumeOperationDescriptor(replayPlan);
-
+ setHost(replayPlan);
// filter actionItem by appId and fill exclusionOperationConfig
List excludedActionIds = replayActionItemPreprocessService.filterActionItem(
replayPlan.getReplayActionItemList(), replayPlan.getAppId());
@@ -387,6 +387,24 @@ public void updateFailedActionAndCase(ReplayPlan replayPlan,
removeErrorMsgTask, updateReportTask, deletePlanItemStatisticsTask, deleteRunDetailsTask).join();
}
+ private void setHost(ReplayPlan replayPlan) {
+ if (replayPlan == null || CollectionUtils.isEmpty(replayPlan.getReplayActionItemList()) ||
+ replayPlan.getReplayActionItemList().get(0) == null || CollectionUtils.isEmpty(
+ replayPlan.getReplayActionItemList().get(0).getTargetInstance())) {
+ return;
+ }
+
+ List targetInstance = replayPlan.getReplayActionItemList().get(0).getTargetInstance();
+ String targetHost = targetInstance.stream().map(ServiceInstance::getIp).distinct().collect(Collectors.joining(","));
+ replayPlan.setTargetHost(targetHost);
+ List serviceInstances = replayPlan.getReplayActionItemList().get(0).getSourceInstance();
+ if (CollectionUtils.isNotEmpty(serviceInstances)) {
+ String sourceHost = serviceInstances.stream().map(ServiceInstance::getIp).distinct()
+ .collect(Collectors.joining(","));
+ replayPlan.setSourceHost(sourceHost);
+ }
+ }
+
public void doResumeOperationDescriptor(ReplayPlan replayPlan) {
PlanContext planContext = planContextCreator.createByAppId(replayPlan.getAppId());
AppServiceOperationDescriptor operationDescriptor;
diff --git a/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/ReplayReportService.java b/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/ReplayReportService.java
index f9a63d55..fc1d4e2e 100644
--- a/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/ReplayReportService.java
+++ b/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/ReplayReportService.java
@@ -259,6 +259,8 @@ public void updateReportInfo(ReplayPlan replayPlan) {
UpdateReportInfoRequestType requestType = new UpdateReportInfoRequestType();
requestType.setPlanId(replayPlan.getId());
requestType.setTotalCaseCount(replayPlan.getCaseTotalCount());
+ requestType.setTargetHost(replayPlan.getTargetHost());
+ requestType.setSourceHost(replayPlan.getSourceHost());
List actionItemList = replayPlan.getReplayActionItemList();
if (CollectionUtils.isNotEmpty(actionItemList)) {
List updateReportInfoList = new ArrayList<>(actionItemList.size());
diff --git a/pom.xml b/pom.xml
index 2a6493c4..f0a1f6ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -306,7 +306,7 @@
**/mapping/**
1.3.4
- 0.6.5.2
+ 0.6.5.7
1.0.1
@@ -317,5 +317,5 @@
https://github.com/arextest/arex-replay-schedule
https://github.com/arextest/arex-replay-schedule
- 2.0.2
+ 2.0.3
\ No newline at end of file