diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/EnvUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/EnvUtils.java index ef8121ec56f2460889daaea34f4f870344f31e23..d9065e23369150567422e179f0430e3adf7f378e 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/EnvUtils.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/EnvUtils.java @@ -58,6 +58,11 @@ public class EnvUtils { return profiles[0]; } + public static boolean runningOnCloudPlatform() { + Environment environment = SpringUtil.getBean(Environment.class); + return runningOnCloudPlatform(environment); + } + public static boolean runningOnCloudPlatform(Environment environment) { CloudPlatform cloudPlatform = CloudPlatform.getActive(environment); return cloudPlatform != null && cloudPlatform != CloudPlatform.NONE; diff --git a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ApolloConfigurationInitializerEnvironmentPostProcessor.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ApolloConfigurationInitializerEnvironmentPostProcessor.java index a1641b23bb176acf6e3602ee1681323e8a21b0ce..58c8e29a67bf851a0fcbd1ad3e71e6e56582049c 100644 --- a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ApolloConfigurationInitializerEnvironmentPostProcessor.java +++ b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ApolloConfigurationInitializerEnvironmentPostProcessor.java @@ -137,11 +137,7 @@ public class ApolloConfigurationInitializerEnvironmentPostProcessor extends Logg * @see #getApolloMetaServerUrl(org.springframework.core.env.ConfigurableEnvironment, String) */ private String getEnv(ConfigurableEnvironment environment) { - String profile = EnvUtils.getProfile(environment); - if (profile == null) { - profile = EnvUtils.DEVELOPMENT; - } - return profile; + return EnvUtils.getProfile(environment); } /** @@ -151,13 +147,11 @@ public class ApolloConfigurationInitializerEnvironmentPostProcessor extends Logg */ @SuppressWarnings("JavadocReference") private String getAppId(ConfigurableEnvironment environment) { - String appId; if (environment.containsProperty(APP_ID)) { - appId = environment.getRequiredProperty(APP_ID); + return environment.getRequiredProperty(APP_ID); } else { - appId = ApplicationName.get(environment); + return ApplicationName.get(environment); } - return appId; } } \ No newline at end of file diff --git a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurablePropertiesLoader.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurablePropertiesLoader.java index ed4830924af09cab4408fc46fe2c56881b1e0d00..239ed14024f96b7616a6fea96ca6913e46357f25 100644 --- a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurablePropertiesLoader.java +++ b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/ConfigurablePropertiesLoader.java @@ -2,7 +2,7 @@ package com.schbrain.framework.autoconfigure.apollo; import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.ConfigService; -import com.schbrain.common.util.properties.OrderedMapPropertySource; +import com.schbrain.framework.autoconfigure.apollo.config.OrderedMapPropertySource; import com.schbrain.common.util.support.ConfigurableProperties; import com.schbrain.framework.autoconfigure.apollo.event.ConfigLoadedEvent; import com.schbrain.framework.autoconfigure.apollo.event.listener.ConfigLoadedEventListener; diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/properties/OrderedMapPropertySource.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/config/OrderedMapPropertySource.java similarity index 91% rename from commons/common-util/src/main/java/com/schbrain/common/util/properties/OrderedMapPropertySource.java rename to starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/config/OrderedMapPropertySource.java index b72cdb41224498594e9a0cf49ae0e0e2310421aa..b73a70676bc1ce2b26226245fd70f6aafacd595c 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/properties/OrderedMapPropertySource.java +++ b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/config/OrderedMapPropertySource.java @@ -1,4 +1,4 @@ -package com.schbrain.common.util.properties; +package com.schbrain.framework.autoconfigure.apollo.config; import org.springframework.core.env.MapPropertySource; diff --git a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/ConfigLoadedEvent.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/ConfigLoadedEvent.java index 673d2d82492f221cbfad43e27ded1e7dbc3dab22..fe3ef4da9e5a19a1b44443fed56ee01f6f82f633 100644 --- a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/ConfigLoadedEvent.java +++ b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/ConfigLoadedEvent.java @@ -1,7 +1,7 @@ package com.schbrain.framework.autoconfigure.apollo.event; -import com.schbrain.common.util.properties.OrderedMapPropertySource; import com.schbrain.common.util.support.ConfigurableProperties; +import com.schbrain.framework.autoconfigure.apollo.config.OrderedMapPropertySource; import lombok.Getter; import org.springframework.boot.ConfigurableBootstrapContext; import org.springframework.boot.SpringApplication; @@ -38,8 +38,9 @@ public class ConfigLoadedEvent extends ApplicationEvent { this.bootstrapContext = bootstrapContext; } - public ConfigurableProperties getConfigurableProperties() { - return (ConfigurableProperties) getSource(); + @Override + public ConfigurableProperties getSource() { + return (ConfigurableProperties) super.getSource(); } } \ No newline at end of file diff --git a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/GenericConfigLoadedEventListener.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/GenericConfigLoadedEventListener.java index 440a32c2c8b161c03b6458f1f55b4c0c7f65fb5d..c403c1bc60ba65ded747f1888967abda910ea2d5 100644 --- a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/GenericConfigLoadedEventListener.java +++ b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/GenericConfigLoadedEventListener.java @@ -23,9 +23,9 @@ public abstract class GenericConfigLoadedEventListener { - private LoggerConfigurationInitializer initializer; + private LoggerConfigurationInitializer loggerInitializer; @Override public void initialize(ConfigurableApplicationContext applicationContext) { - initializer.init(); + loggerInitializer.init(); } @Override protected void onConfigLoaded(ConfigLoadedEvent event, LoggerProperties properties) { - ConfigurableEnvironment environment = event.getEnvironment(); HostInfo hostInfo = InetUtils.findFirstNonLoopBackHostInfo(); Map hostInfoProperties = buildHostInfoProperties(hostInfo); event.getPropertySource().addProperties(hostInfoProperties); - configLoggingFileLocation(environment, properties.getLogConfigNamespace()); - this.initializer = new LoggerConfigurationInitializer(environment, properties, hostInfo); + configLoggingFileLocation(event.getEnvironment(), properties.getLogConfigNamespace()); + this.loggerInitializer = new LoggerConfigurationInitializer(event.getEnvironment(), properties, hostInfo); } /**