study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Merge pull request #180 from xiaolongzuo/master

Browse Source 
Update SchedulerX endpoint.
This commit is contained in:
Xiaolong Zuo 2018-12-14 14:24:59 +08:00 committed by GitHub
commit 78d10a866c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpoint.java
View File

@ -20,6 +20,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; 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 org.springframework.cloud.alicloud.context.scx.ScxProperties;
import java.util.HashMap; import java.util.HashMap;
@ -35,7 +36,10 @@ public class ScxEndpoint {
private ScxProperties scxProperties; private ScxProperties scxProperties;
public ScxEndpoint(ScxProperties scxProperties) { private EdasProperties edasProperties;
public ScxEndpoint(EdasProperties edasProperties, ScxProperties scxProperties) {
this.edasProperties = edasProperties;
this.scxProperties = scxProperties; this.scxProperties = scxProperties;
} }
@ -46,6 +50,7 @@ public class ScxEndpoint {
public Map<String, Object> invoke() { public Map<String, Object> invoke() {
Map<String, Object> scxEndpoint = new HashMap<>(); Map<String, Object> scxEndpoint = new HashMap<>();
LOGGER.info("SCX endpoint invoke, scxProperties is {}", scxProperties); LOGGER.info("SCX endpoint invoke, scxProperties is {}", scxProperties);
scxEndpoint.put("namespace", edasProperties == null ? "" : edasProperties.getNamespace());
scxEndpoint.put("scxProperties", scxProperties); scxEndpoint.put("scxProperties", scxProperties);
return scxEndpoint; return scxEndpoint;
} }

5
spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java
View File

@ -19,6 +19,7 @@ package org.springframework.cloud.alicloud.scx.endpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; 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.cloud.alicloud.context.scx.ScxProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@ -30,7 +31,7 @@ import org.springframework.context.annotation.Bean;
public class ScxEndpointAutoConfiguration { public class ScxEndpointAutoConfiguration {
@Bean @Bean
public ScxEndpoint scxEndpoint(ScxProperties scxProperties) { public ScxEndpoint scxEndpoint(EdasProperties edasProperties, ScxProperties scxProperties) {
return new ScxEndpoint(scxProperties); return new ScxEndpoint(edasProperties, scxProperties);
} }
} }