From 75c65eda527b0aee2255b005dce572fee90921c8 Mon Sep 17 00:00:00 2001 From: liaozan <378024053@qq.com> Date: Thu, 6 Jul 2023 22:55:43 +0800 Subject: [PATCH] Polish --- .../main/java/com/schbrain/common/util/EnvUtils.java | 5 +++++ ...igurationInitializerEnvironmentPostProcessor.java | 12 +++--------- .../apollo/ConfigurablePropertiesLoader.java | 2 +- .../apollo/config}/OrderedMapPropertySource.java | 2 +- .../apollo/event/ConfigLoadedEvent.java | 7 ++++--- .../listener/GenericConfigLoadedEventListener.java | 4 ++-- .../autoconfigure/apollo/util/ConfigUtils.java | 2 +- .../initializer/DubboValidationInitializer.java | 2 +- .../listener/DubboConfigLoadedEventListener.java | 2 +- .../logger/LoggerConfigurationInitializer.java | 3 --- .../listener/LoggerConfigLoadedEventListener.java | 9 ++++----- 11 files changed, 23 insertions(+), 27 deletions(-) rename {commons/common-util/src/main/java/com/schbrain/common/util/properties => starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/config}/OrderedMapPropertySource.java (91%) 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 ef8121e..d9065e2 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 a1641b2..58c8e29 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 ed48309..239ed14 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 b72cdb4..b73a706 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 673d2d8..fe3ef4d 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 440a32c..c403c1b 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); } /** -- GitLab