Commit 266f45e3 by QIANGLU

Merge branch 'dev'

parents 0d2cf649 cecbbe32
...@@ -23,7 +23,7 @@ public class ApolloContextInitializer implements ApplicationContextInitializer<C ...@@ -23,7 +23,7 @@ public class ApolloContextInitializer implements ApplicationContextInitializer<C
String appId = environment.getProperty("spring.application.name"); String appId = environment.getProperty("spring.application.name");
String cacheDir = environment.getProperty("apollo.cacheDir" , "/data/cacheDir"); String cacheDir = environment.getProperty("apollo.cacheDir" , "/data/cacheDir");
String namespaces = environment.getProperty("apollo.bootstrap.namespaces" , "application,jg.pub_logs"); String namespaces = environment.getProperty("apollo.bootstrap.namespaces" , "application,arch.pub_logs");
if (!StringUtils.isEmpty(appId)) { if (!StringUtils.isEmpty(appId)) {
System.setProperty("app.id" , appId); System.setProperty("app.id" , appId);
System.setProperty("apollo.cacheDir" , cacheDir); System.setProperty("apollo.cacheDir" , cacheDir);
......
...@@ -14,11 +14,11 @@ import org.springframework.boot.logging.LoggingSystem; ...@@ -14,11 +14,11 @@ import org.springframework.boot.logging.LoggingSystem;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import javax.annotation.PostConstruct;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Set; import java.util.Set;
/** /**
* 用于提供动态日志切换
* @author qianglu * @author qianglu
*/ */
@Configuration @Configuration
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment