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

Fix SchedulerX cycle ref error.

Browse Source
This commit is contained in:
chenzhu.zxl
2019-01-17 16:52:03 +08:00
parent 2a39bca22f
commit 2de5362f4d
4 changed files with 51 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,27 +16,19 @@
package org.springframework.cloud.alicloud.context.scx;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
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.AliCloudProperties;
import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
import org.springframework.cloud.alicloud.context.edas.EdasProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import com.alibaba.cloud.context.edas.AliCloudEdasSdk;
import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
import com.alibaba.dts.common.exception.InitException;
import com.alibaba.cloud.context.scx.AliCloudScxInitializer;
import com.alibaba.edas.schedulerx.SchedulerXClient;
import com.aliyuncs.edas.model.v20170801.GetSecureTokenResponse;
/**
* @author xiaolongzuo
@@ -45,77 +37,15 @@ import com.aliyuncs.edas.model.v20170801.GetSecureTokenResponse;
@ConditionalOnClass(name = "org.springframework.cloud.alicloud.scx.ScxAutoConfiguration")
@EnableConfigurationProperties(ScxProperties.class)
@ImportAutoConfiguration(EdasContextAutoConfiguration.class)
public class ScxContextAutoConfiguration implements InitializingBean {
public class ScxContextAutoConfiguration {
private static final Logger log = LoggerFactory
.getLogger(ScxContextAutoConfiguration.class);
private static final String TEST_REGION = "cn-test";
private static final String DEFAULT_KEY = "123456";
@Autowired
private SchedulerXClient schedulerXClient;
@Bean
@Bean(initMethod = "init")
@ConditionalOnMissingBean
public SchedulerXClient schedulerXClient(AliCloudProperties aliCloudProperties,
EdasProperties edasProperties, ScxProperties scxProperties,
AliCloudEdasSdk aliCloudEdasSdk) {
Assert.isTrue(!StringUtils.isEmpty(scxProperties.getGroupId()),
"${spring.cloud.alicloud.scx.group-id} can't be null.");
SchedulerXClient schedulerXClient = new SchedulerXClient();
schedulerXClient.setGroupId(scxProperties.getGroupId());
EdasChangeOrderConfiguration edasChangeOrderConfiguration = EdasChangeOrderConfigurationFactory
.getEdasChangeOrderConfiguration();
if (edasChangeOrderConfiguration.isEdasManaged()) {
if (edasChangeOrderConfiguration.getRegionId() != null) {
schedulerXClient
.setRegionName(edasChangeOrderConfiguration.getRegionId());
}
else {
Assert.isTrue(!StringUtils.isEmpty(edasProperties.getNamespace()),
"${spring.cloud.alicloud.edas.namespace} can't be null.");
schedulerXClient.setRegionName(edasProperties.getRegionId());
}
schedulerXClient.setDomainName(scxProperties.getDomainName());
schedulerXClient
.setAccessKey(edasChangeOrderConfiguration.getDauthAccessKey());
schedulerXClient
.setSecretKey(edasChangeOrderConfiguration.getDauthSecretKey());
}
else if (TEST_REGION.equals(edasProperties.getNamespace())) {
Assert.isTrue(!StringUtils.isEmpty(edasProperties.getNamespace()),
"${spring.cloud.alicloud.edas.namespace} can't be null.");
schedulerXClient.setRegionName(edasProperties.getNamespace());
schedulerXClient.setAccessKey(DEFAULT_KEY);
schedulerXClient.setSecretKey(DEFAULT_KEY);
}
else {
Assert.isTrue(!StringUtils.isEmpty(edasProperties.getNamespace()),
"${spring.cloud.alicloud.edas.namespace} can't be null.");
Assert.isTrue(!StringUtils.isEmpty(aliCloudProperties.getAccessKey()),
"${spring.cloud.alicloud.access-key} can't be empty.");
Assert.isTrue(!StringUtils.isEmpty(aliCloudProperties.getSecretKey()),
"${spring.cloud.alicloud.secret-key} can't be empty.");
GetSecureTokenResponse.SecureToken secureToken = aliCloudEdasSdk
.getSecureToken(edasProperties.getNamespace());
schedulerXClient.setRegionName(edasProperties.getRegionId());
schedulerXClient.setDomainName(scxProperties.getDomainName());
schedulerXClient.setAccessKey(secureToken.getAccessKey());
schedulerXClient.setSecretKey(secureToken.getSecretKey());
}
return schedulerXClient;
EdasProperties edasProperties, ScxProperties scxProperties,
AliCloudEdasSdk aliCloudEdasSdk) {
return AliCloudScxInitializer.initialize(aliCloudProperties, edasProperties,
scxProperties, aliCloudEdasSdk);
}
@Override
public void afterPropertiesSet() {
try {
schedulerXClient.init();
}
catch (InitException e) {
log.error("Init SchedulerX failed.", e);
throw new RuntimeException(e);
}
}
}