1
0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00

fix get active profiles

This commit is contained in:
flystar32 2018-10-29 23:17:51 +08:00
parent 45e4ec3a84
commit 7323880c01

View File

@ -67,16 +67,11 @@ public class AcmContextBootstrapConfiguration {
AcmIntegrationProperties acmIntegrationProperties = new AcmIntegrationProperties(); AcmIntegrationProperties acmIntegrationProperties = new AcmIntegrationProperties();
String applicationName = environment.getProperty("spring.application.name"); String applicationName = environment.getProperty("spring.application.name");
String applicationGroup = environment.getProperty("spring.application.group"); String applicationGroup = environment.getProperty("spring.application.group");
String activeProfiles = environment.getProperty(ACTIVE_PROFILES_PROPERTY_NAME);
Assert.isTrue(!StringUtils.isEmpty(applicationName), Assert.isTrue(!StringUtils.isEmpty(applicationName),
"'spring.application.name' must be configured.."); "'spring.application.name' must be configured..");
acmIntegrationProperties.setApplicationName(applicationName); acmIntegrationProperties.setApplicationName(applicationName);
acmIntegrationProperties.setApplicationGroup(applicationGroup); acmIntegrationProperties.setApplicationGroup(applicationGroup);
if (StringUtils.hasText(activeProfiles)) { acmIntegrationProperties.setActiveProfiles(environment.getActiveProfiles());
acmIntegrationProperties
.setActiveProfiles(StringUtils.commaDelimitedListToStringArray(
StringUtils.trimAllWhitespace(activeProfiles)));
}
acmIntegrationProperties.setAcmProperties(acmProperties); acmIntegrationProperties.setAcmProperties(acmProperties);
return acmIntegrationProperties; return acmIntegrationProperties;
} }