From 482e4a101b4a10d7d9841cd4b4fabb4dc2b2486b Mon Sep 17 00:00:00 2001 From: flystar32 Date: Tue, 12 Mar 2019 15:32:39 +0800 Subject: [PATCH 1/2] add management.endpoints.web.base-path to metadata --- .../cloud/alibaba/nacos/registry/NacosRegistration.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java index 587cc475..141e7f7a 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java @@ -40,6 +40,7 @@ public class NacosRegistration implements Registration, ServiceInstance { public static final String MANAGEMENT_PORT = "management.port"; public static final String MANAGEMENT_CONTEXT_PATH = "management.context-path"; public static final String MANAGEMENT_ADDRESS = "management.address"; + public static final String MANAGEMENT_ENDPOINT_BASE_PATH = "management.endpoints.web.base-path"; private NacosDiscoveryProperties nacosDiscoveryProperties; @@ -54,10 +55,16 @@ public class NacosRegistration implements Registration, ServiceInstance { @PostConstruct public void init() { + Map metadata = nacosDiscoveryProperties.getMetadata(); Environment env = context.getEnvironment(); + + String endpointBasePath = env.getProperty(MANAGEMENT_ENDPOINT_BASE_PATH); + if (StringUtils.isEmpty(endpointBasePath)) { + metadata.put(MANAGEMENT_ENDPOINT_BASE_PATH, endpointBasePath); + } + Integer managementPort = ManagementServerPortUtils.getPort(context); if (null != managementPort) { - Map metadata = nacosDiscoveryProperties.getMetadata(); metadata.put(MANAGEMENT_PORT, managementPort.toString()); String contextPath = env .getProperty("management.server.servlet.context-path"); From 6e846f662fb725cd52abb57ca3949d3448ca6cdc Mon Sep 17 00:00:00 2001 From: flystar32 Date: Tue, 12 Mar 2019 15:59:45 +0800 Subject: [PATCH 2/2] fix condition with --- .../cloud/alibaba/nacos/registry/NacosRegistration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java index 141e7f7a..68d8c995 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java @@ -59,7 +59,7 @@ public class NacosRegistration implements Registration, ServiceInstance { Environment env = context.getEnvironment(); String endpointBasePath = env.getProperty(MANAGEMENT_ENDPOINT_BASE_PATH); - if (StringUtils.isEmpty(endpointBasePath)) { + if (!StringUtils.isEmpty(endpointBasePath)) { metadata.put(MANAGEMENT_ENDPOINT_BASE_PATH, endpointBasePath); }