From fc41db58416929a969a513e64af78d207477cd2f Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Fri, 7 Jan 2022 22:39:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E9=A1=B9=E7=9B=AE=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E6=B1=A0=E5=AE=9E=E4=BE=8B=E7=BC=93=E5=AD=98=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=B2=BE=E7=A1=AE=E6=B8=85=E7=90=86.=20(#66)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/hippo4j/starter/config/DiscoveryConfig.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DiscoveryConfig.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DiscoveryConfig.java index 1092b013..c997a861 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DiscoveryConfig.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DiscoveryConfig.java @@ -6,6 +6,7 @@ import cn.hippo4j.starter.core.DiscoveryClient; import cn.hippo4j.starter.remote.HttpAgent; import cn.hippo4j.starter.toolkit.IdentifyUtil; import cn.hippo4j.starter.toolkit.inet.InetUtils; +import cn.hutool.core.text.StrBuilder; import lombok.AllArgsConstructor; import lombok.SneakyThrows; import org.springframework.context.annotation.Bean; @@ -13,6 +14,8 @@ import org.springframework.core.env.ConfigurableEnvironment; import java.net.InetAddress; +import static cn.hippo4j.common.constant.Constants.GROUP_KEY_DELIMITER; +import static cn.hippo4j.starter.config.DynamicThreadPoolAutoConfiguration.CLIENT_IDENTIFICATION_VALUE; import static cn.hippo4j.starter.toolkit.CloudCommonIdUtil.getDefaultInstanceId; import static cn.hippo4j.starter.toolkit.CloudCommonIdUtil.getIpApplicationName; @@ -36,19 +39,24 @@ public class DiscoveryConfig { public InstanceInfo instanceConfig() { String namespace = properties.getNamespace(); String itemId = properties.getItemId(); + String port = environment.getProperty("server.port"); String applicationName = environment.getProperty("spring.application.name"); InstanceInfo instanceInfo = new InstanceInfo(); - instanceInfo.setInstanceId(getDefaultInstanceId(environment, hippo4JInetUtils)) + String instanceId = getDefaultInstanceId(environment, hippo4JInetUtils); + instanceId = StrBuilder.create().append(instanceId).append(":").append(CLIENT_IDENTIFICATION_VALUE).toString(); + + instanceInfo.setInstanceId(instanceId) .setIpApplicationName(getIpApplicationName(environment, hippo4JInetUtils)) .setHostName(InetAddress.getLocalHost().getHostAddress()) - .setGroupKey(itemId + "+" + namespace) + .setGroupKey(itemId + GROUP_KEY_DELIMITER + namespace) .setAppName(applicationName) + .setPort(port) .setClientBasePath(environment.getProperty("server.servlet.context-path")) .setGroupKey(ContentUtil.getGroupKey(itemId, namespace)); String callBackUrl = new StringBuilder().append(instanceInfo.getHostName()).append(":") - .append(environment.getProperty("server.port")).append(instanceInfo.getClientBasePath()) + .append(port).append(instanceInfo.getClientBasePath()) .toString(); instanceInfo.setCallBackUrl(callBackUrl);