mirror of
https://gitee.com/mirrors/Spring-Cloud-Alibaba.git
synced 2021-06-26 13:25:11 +08:00
Merge pull request #180 from xiaolongzuo/master
Update SchedulerX endpoint.
This commit is contained in:
commit
78d10a866c
@ -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<String, Object> invoke() {
|
||||
Map<String, Object> scxEndpoint = new HashMap<>();
|
||||
LOGGER.info("SCX endpoint invoke, scxProperties is {}", scxProperties);
|
||||
scxEndpoint.put("namespace", edasProperties == null ? "" : edasProperties.getNamespace());
|
||||
scxEndpoint.put("scxProperties", scxProperties);
|
||||
return scxEndpoint;
|
||||
}
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user