From 4ae39c9ae213d6f18bb30e7cd7a55ffbaa5e9684 Mon Sep 17 00:00:00 2001 From: xiaolongzuo <150349407@qq.com> Date: Fri, 14 Dec 2018 14:08:22 +0800 Subject: [PATCH 1/2] Update SchedulerX endpoint. --- .../cloud/alicloud/scx/endpoint/ScxEndpoint.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpoint.java b/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpoint.java index 5b6936fa..d959cfb3 100644 --- a/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpoint.java +++ b/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpoint.java @@ -20,6 +20,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; +import org.springframework.cloud.alicloud.context.edas.EdasProperties; import org.springframework.cloud.alicloud.context.scx.ScxProperties; import java.util.HashMap; @@ -35,7 +36,10 @@ public class ScxEndpoint { private ScxProperties scxProperties; - public ScxEndpoint(ScxProperties scxProperties) { + private EdasProperties edasProperties; + + public ScxEndpoint(EdasProperties edasProperties, ScxProperties scxProperties) { + this.edasProperties = edasProperties; this.scxProperties = scxProperties; } @@ -46,6 +50,7 @@ public class ScxEndpoint { public Map invoke() { Map scxEndpoint = new HashMap<>(); LOGGER.info("SCX endpoint invoke, scxProperties is {}", scxProperties); + scxEndpoint.put("namespace", edasProperties == null ? "" : edasProperties.getNamespace()); scxEndpoint.put("scxProperties", scxProperties); return scxEndpoint; } From 28777fecd050a21c786a4c5c080d91b74b8a1cb1 Mon Sep 17 00:00:00 2001 From: xiaolongzuo <150349407@qq.com> Date: Fri, 14 Dec 2018 14:14:08 +0800 Subject: [PATCH 2/2] Update SchedulerX endpoint. --- .../alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java b/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java index 56253374..9ca280b5 100644 --- a/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java +++ b/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java @@ -19,6 +19,7 @@ package org.springframework.cloud.alicloud.scx.endpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.cloud.alicloud.context.edas.EdasProperties; import org.springframework.cloud.alicloud.context.scx.ScxProperties; import org.springframework.context.annotation.Bean; @@ -30,7 +31,7 @@ import org.springframework.context.annotation.Bean; public class ScxEndpointAutoConfiguration { @Bean - public ScxEndpoint scxEndpoint(ScxProperties scxProperties) { - return new ScxEndpoint(scxProperties); + public ScxEndpoint scxEndpoint(EdasProperties edasProperties, ScxProperties scxProperties) { + return new ScxEndpoint(edasProperties, scxProperties); } }