Skip to content

Commit be46c3c

Browse files
committed
when instance has port, then replace it.
1 parent 1429ee5 commit be46c3c

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,7 @@
8282
import org.springframework.web.multipart.MultipartFile;
8383

8484
import java.time.LocalDateTime;
85-
import java.util.ArrayList;
86-
import java.util.HashMap;
87-
import java.util.HashSet;
88-
import java.util.List;
89-
import java.util.Map;
90-
import java.util.Objects;
91-
import java.util.Optional;
92-
import java.util.Set;
85+
import java.util.*;
9386
import java.util.stream.Collectors;
9487

9588
/**
@@ -397,7 +390,10 @@ public void modifyMonitor(Monitor monitor, List<Param> params, String collector,
397390
String portWithMark = (Objects.isNull(portParam) || !StringUtils.hasText(portParam.getParamValue()))
398391
? ""
399392
: SignConstants.DOUBLE_MARK + portParam.getParamValue();
400-
if (Objects.nonNull(instance) && !IpDomainUtil.isHasPortWithMark(instance)) {
393+
if (IpDomainUtil.isHasPortWithMark(instance)){
394+
instance = Arrays.stream(instance.split(":")).findFirst().orElse("");
395+
}
396+
if (Objects.nonNull(instance)) {
401397
instance = instance + portWithMark;
402398
}
403399

0 commit comments

Comments
 (0)