fix alibaba#69 default spring.dubbo.appname=${spring.application.name}

phlsb · Mar 7, 2018 · 3bdc07d · 3bdc07d
1 parent b01306f
commit 3bdc07d
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/com/alibaba/dubbo/spring/boot/DubboAutoConfiguration.java b/src/main/java/com/alibaba/dubbo/spring/boot/DubboAutoConfiguration.java
@@ -8,6 +8,7 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
 
 import com.alibaba.dubbo.config.ApplicationConfig;
 import com.alibaba.dubbo.config.MonitorConfig;
@@ -30,9 +31,13 @@ public class DubboAutoConfiguration {
 
  @Bean
  @ConditionalOnMissingBean
- public ApplicationConfig dubboApplicationConfig() {
+ public ApplicationConfig dubboApplicationConfig(Environment environment) {
+ String appname = this.properties.getAppname();
+ if (appname == null) {
+ appname = environment.getProperty("spring.application.name");
+ }
  ApplicationConfig appConfig = new ApplicationConfig();
- appConfig.setName(this.properties.getAppname());
+ appConfig.setName(appname);
  return appConfig;
  }