closes #162, fixes #138. Add spring-cloud-alicloud-schedulerX module, and fix ACM starter rely on actuator.

spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/AliCloudContextAutoConfiguration.java

@@ -16,14 +16,24 @@
 
 package org.springframework.cloud.alicloud.context;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.commons.util.InetUtils;
+import org.springframework.cloud.commons.util.InetUtilsProperties;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * @author xiaolongzuo
  */
 @Configuration
-@EnableConfigurationProperties(AliCloudProperties.class)
+@EnableConfigurationProperties({ AliCloudProperties.class, InetUtilsProperties.class })
 public class AliCloudContextAutoConfiguration {
 
+	@Bean
+	@ConditionalOnMissingBean
+	public InetUtils inetUtils(InetUtilsProperties inetUtilsProperties) {
+		return new InetUtils(inetUtilsProperties);
+	}
+
 }

spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsContextAutoConfiguration.java

@@ -18,12 +18,8 @@ package org.springframework.cloud.alicloud.context.ans;
 
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.commons.util.InetUtilsProperties;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
@@ -31,14 +27,8 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 @ConditionalOnClass(name = "org.springframework.cloud.alicloud.ans.AnsAutoConfiguration")
-@EnableConfigurationProperties({ AnsProperties.class, InetUtilsProperties.class })
+@EnableConfigurationProperties(AnsProperties.class)
 @ImportAutoConfiguration(EdasContextAutoConfiguration.class)
 public class AnsContextAutoConfiguration {
 
-	@Bean
-	@ConditionalOnMissingBean
-	public InetUtils inetUtils(InetUtilsProperties inetUtilsProperties) {
-		return new InetUtils(inetUtilsProperties);
-	}
-
 }

spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosParameterInitListener.java

@@ -1,12 +1,13 @@
 package org.springframework.cloud.alicloud.context.nacos;
 
-import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
-import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
 import org.springframework.context.ApplicationListener;
 
+import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
+import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
+
 public class NacosParameterInitListener
 		implements ApplicationListener<ApplicationEnvironmentPreparedEvent> {
 	private static final Logger log = LoggerFactory
@@ -20,7 +21,7 @@ public class NacosParameterInitListener
 
 	private void preparedNacosConfiguration() {
 		EdasChangeOrderConfiguration edasChangeOrderConfiguration = EdasChangeOrderConfigurationFactory
-				.buildEdasChangeOrderConfiguration();
+				.getEdasChangeOrderConfiguration();
 		log.info("Initialize Nacos Parameter from edas change order,is edas managed {}.",
 				edasChangeOrderConfiguration.isEdasManaged());
 		if (!edasChangeOrderConfiguration.isEdasManaged()) {

spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/oss/OssContextAutoConfiguration.java

@@ -51,9 +51,9 @@ public class OssContextAutoConfiguration {
 			Assert.isTrue(!StringUtils.isEmpty(ossProperties.getEndpoint()),
 					"Oss endpoint can't be empty.");
 			Assert.isTrue(!StringUtils.isEmpty(aliCloudProperties.getAccessKey()),
-					"Access key can't be empty.");
+					"${spring.cloud.alicloud.access-key} can't be empty.");
 			Assert.isTrue(!StringUtils.isEmpty(aliCloudProperties.getSecretKey()),
-					"Secret key can't be empty.");
+					"${spring.cloud.alicloud.secret-key} can't be empty.");
 			return new OSSClientBuilder().build(ossProperties.getEndpoint(),
 					aliCloudProperties.getAccessKey(), aliCloudProperties.getSecretKey(),
 					ossProperties.getConfig());

spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/scx/ScxContextAutoConfiguration.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.alicloud.context.scx;
+
+import javax.annotation.PostConstruct;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.alicloud.context.AliCloudProperties;
+import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
+import org.springframework.cloud.alicloud.context.edas.EdasProperties;
+import org.springframework.context.annotation.Configuration;
+
+import com.alibaba.cloud.context.edas.AliCloudEdasSdk;
+import com.alibaba.cloud.context.scx.AliCloudScxInitializer;
+import com.alibaba.dts.common.exception.InitException;
+
+/**
+ * @author xiaolongzuo
+ */
+@Configuration
+@ConditionalOnClass(name = "org.springframework.cloud.alicloud.scx.ScxAutoConfiguration")
+@EnableConfigurationProperties(ScxProperties.class)
+@ImportAutoConfiguration(EdasContextAutoConfiguration.class)
+public class ScxContextAutoConfiguration {
+
+	private static final Logger log = LoggerFactory
+			.getLogger(ScxContextAutoConfiguration.class);
+
+	@Autowired
+	private AliCloudProperties aliCloudProperties;
+
+	@Autowired
+	private EdasProperties edasProperties;
+
+	@Autowired
+	private ScxProperties scxProperties;
+
+	@Autowired
+	private AliCloudEdasSdk aliCloudEdasSdk;
+
+	@PostConstruct
+	public void initAcmProperties() {
+		try {
+			AliCloudScxInitializer.initialize(aliCloudProperties, edasProperties,
+					scxProperties, aliCloudEdasSdk);
+		}
+		catch (InitException e) {
+			log.error("Init SchedulerX failed.", e);
+			throw new RuntimeException(e);
+		}
+	}
+}

spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/scx/ScxProperties.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.alicloud.context.scx;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import com.alibaba.cloud.context.scx.ScxConfiguration;
+
+/**
+ * @author xiaolongzuo
+ */
+@ConfigurationProperties("spring.cloud.alicloud.scx")
+public class ScxProperties implements ScxConfiguration {
+
+	private String groupId;
+
+	private String domainName;
+
+	@Override
+	public String getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
+
+	@Override
+	public String getDomainName() {
+		return domainName;
+	}
+
+	public void setDomainName(String domainName) {
+		this.domainName = domainName;
+	}
+
+}

spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/statistics/StatisticsTaskStarter.java

@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.alicloud.context.statistics;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.cloud.alicloud.context.acm.AcmContextBootstrapConfiguration;
+import org.springframework.cloud.alicloud.context.acm.AcmProperties;
+import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
+import org.springframework.cloud.alicloud.context.ans.AnsProperties;
+import org.springframework.cloud.alicloud.context.edas.EdasProperties;
+import org.springframework.cloud.alicloud.context.oss.OssContextAutoConfiguration;
+import org.springframework.cloud.alicloud.context.oss.OssProperties;
+import org.springframework.cloud.alicloud.context.scx.ScxContextAutoConfiguration;
+import org.springframework.cloud.alicloud.context.scx.ScxProperties;
+import org.springframework.context.annotation.Configuration;
+
+import com.alibaba.cloud.context.AliCloudServerMode;
+import com.alibaba.cloud.context.edas.AliCloudEdasSdk;
+import com.alibaba.cloud.context.statistics.StatisticsTask;
+
+/**
+ * @author xiaolongzuo
+ */
+@Configuration
+@AutoConfigureAfter({ ScxContextAutoConfiguration.class,
+		OssContextAutoConfiguration.class, AnsContextAutoConfiguration.class,
+		AcmContextBootstrapConfiguration.class })
+public class StatisticsTaskStarter implements InitializingBean {
+
+	@Autowired(required = false)
+	private AliCloudEdasSdk aliCloudEdasSdk;
+
+	@Autowired(required = false)
+	private EdasProperties edasProperties;
+
+	@Autowired(required = false)
+	private ScxProperties scxProperties;
+
+	@Autowired(required = false)
+	private OssProperties ossProperties;
+
+	@Autowired(required = false)
+	private AnsProperties ansProperties;
+
+	@Autowired(required = false)
+	private AcmProperties acmProperties;
+
+	@Autowired(required = false)
+	private ScxContextAutoConfiguration scxContextAutoConfiguration;
+
+	@Autowired(required = false)
+	private OssContextAutoConfiguration ossContextAutoConfiguration;
+
+	@Autowired(required = false)
+	private AnsContextAutoConfiguration ansContextAutoConfiguration;
+
+	@Autowired(required = false)
+	private AcmContextBootstrapConfiguration acmContextBootstrapConfiguration;
+
+	@Override
+	public void afterPropertiesSet() {
+		StatisticsTask statisticsTask = new StatisticsTask(aliCloudEdasSdk,
+				edasProperties, getComponents());
+		statisticsTask.start();
+	}
+
+	private List<String> getComponents() {
+		List<String> components = new ArrayList<>();
+		if (scxContextAutoConfiguration != null && scxProperties != null) {
+			components.add("SC-SCX");
+		}
+		if (ossContextAutoConfiguration != null && ossProperties != null) {
+			components.add("SC-OSS");
+		}
+		boolean edasEnabled = edasProperties != null && edasProperties.isEnabled();
+		boolean ansEnableEdas = edasEnabled || (ansProperties != null
+				&& ansProperties.getServerMode() == AliCloudServerMode.EDAS);
+		if (ansContextAutoConfiguration != null && ansEnableEdas) {
+			components.add("SC-ANS");
+		}
+		boolean acmEnableEdas = edasEnabled || (acmProperties != null
+				&& acmProperties.getServerMode() == AliCloudServerMode.EDAS);
+		if (acmContextBootstrapConfiguration != null && acmEnableEdas) {
+			components.add("SC-ACM");
+		}
+		return components;
+	}
+
+}

spring-cloud-alicloud-context/src/main/resources/META-INF/spring.factories

@@ -4,7 +4,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration,\
   org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration,\
   org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration,\
-  org.springframework.cloud.alicloud.context.oss.OssContextAutoConfiguration
+  org.springframework.cloud.alicloud.context.oss.OssContextAutoConfiguration,\
+  org.springframework.cloud.alicloud.context.scx.ScxContextAutoConfiguration,\
+  org.springframework.cloud.alicloud.context.statistics.StatisticsTaskStarter
 org.springframework.context.ApplicationListener=\
-  org.springframework.cloud.alicloud.context.ans.AnsContextApplicationListener,\
-  org.springframework.cloud.alicloud.context.nacos.NacosParameterInitListener
+  org.springframework.cloud.alicloud.context.ans.AnsContextApplicationListener

spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/AliCloudSpringApplicationTests.java

@@ -33,7 +33,9 @@ import org.springframework.test.context.junit4.SpringRunner;
 		"spring.application.name=myapp",
 		"spring.cloud.alicloud.edas.application.name=myapp",
 		"spring.cloud.alicloud.access-key=ak", "spring.cloud.alicloud.secret-key=sk",
-		"spring.cloud.alicloud.oss.endpoint=test" }, webEnvironment = RANDOM_PORT)
+		"spring.cloud.alicloud.oss.endpoint=test",
+		"spring.cloud.alicloud.scx.group-id=1-2-3-4",
+		"spring.cloud.alicloud.edas.namespace=cn-test" }, webEnvironment = RANDOM_PORT)
 @DirtiesContext
 public class AliCloudSpringApplicationTests {
 

spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/scx/ScxAutoConfigurationTests.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.alicloud.context.scx;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.cloud.alicloud.context.edas.EdasProperties;
+import org.springframework.cloud.alicloud.context.oss.OssProperties;
+
+import com.aliyun.oss.OSS;
+
+/**
+ * {@link OSS} {@link OssProperties} Test
+ *
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ */
+public class ScxAutoConfigurationTests {
+
+	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+			.withConfiguration(AutoConfigurations.of(ScxContextAutoConfiguration.class))
+			.withPropertyValues("spring.cloud.alicloud.scx.group-id=1-2-3-4")
+			.withPropertyValues("spring.cloud.alicloud.edas.namespace=cn-test");
+
+	@Test
+	public void testSxcProperties() {
+		this.contextRunner.run(context -> {
+			assertThat(context.getBeansOfType(ScxProperties.class).size() == 1).isTrue();
+			EdasProperties edasProperties = context.getBean(EdasProperties.class);
+			ScxProperties scxProperties = context.getBean(ScxProperties.class);
+			assertThat(scxProperties.getGroupId()).isEqualTo("1-2-3-4");
+			assertThat(edasProperties.getNamespace()).isEqualTo("cn-test");
+			assertThat(scxProperties.getDomainName()).isNull();
+		});
+	}
+
+}

spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/scx/ScxAutoConfiguration.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.alicloud.scx;
+
+/**
+ * @author xiaolongzuo
+ */
+public class ScxAutoConfiguration {
+}