diff --git a/commons/web-common/src/main/java/com/schbrain/common/web/DefaultCorsConfiguration.java b/commons/web-common/src/main/java/com/schbrain/common/web/DefaultCorsConfiguration.java index 5ee2e6aa5fd79013873a80ed3be81e5ff6ae7bdf..9ba5e1f3694822ab70df10392b07e22f9f311991 100644 --- a/commons/web-common/src/main/java/com/schbrain/common/web/DefaultCorsConfiguration.java +++ b/commons/web-common/src/main/java/com/schbrain/common/web/DefaultCorsConfiguration.java @@ -30,7 +30,7 @@ public class DefaultCorsConfiguration { @Bean @ConditionalOnMissingBean - public CorsConfigurationSource defaultCorsConfigurationSource(CorsConfiguration corsConfiguration) { + public UrlBasedCorsConfigurationSource defaultCorsConfigurationSource(CorsConfiguration corsConfiguration) { UrlBasedCorsConfigurationSource configSource = new UrlBasedCorsConfigurationSource(); configSource.registerCorsConfiguration("/**", corsConfiguration); return configSource; @@ -38,7 +38,7 @@ public class DefaultCorsConfiguration { @Bean @ConditionalOnMissingBean - public CorsFilter defaultCorsFilter(CorsConfigurationSource corsConfigurationSource) { + public CorsFilter defaultCorsFilter(UrlBasedCorsConfigurationSource corsConfigurationSource) { return new CorsFilter(corsConfigurationSource); } diff --git a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/ConfigLoadedEventListener.java b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/ConfigLoadedEventListener.java index 0cba2aac491bd703e5bcfd4b1d4c2ee86687104c..12dd0a3cb385f297d900e94b9d23ef6a4755e81d 100644 --- a/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/ConfigLoadedEventListener.java +++ b/starters/apollo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/apollo/event/listener/ConfigLoadedEventListener.java @@ -1,18 +1,23 @@ package com.schbrain.framework.autoconfigure.apollo.event.listener; import com.schbrain.framework.autoconfigure.apollo.event.ConfigLoadedEvent; -import org.springframework.context.ApplicationListener; +import org.springframework.context.*; import org.springframework.core.Ordered; /** * @author liaozan * @since 2023-04-29 */ -public interface ConfigLoadedEventListener extends ApplicationListener, Ordered { +public interface ConfigLoadedEventListener extends ApplicationListener, ApplicationContextInitializer, Ordered { @Override default int getOrder() { return Ordered.LOWEST_PRECEDENCE; } + @Override + default void initialize(ConfigurableApplicationContext applicationContext) { + + } + } \ 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 2f3b752d28ac248084f032b64ffce45b53a0d88a..440a32c2c8b161c03b6458f1f55b4c0c7f65fb5d 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 @@ -3,8 +3,6 @@ package com.schbrain.framework.autoconfigure.apollo.event.listener; import com.schbrain.common.util.support.ConfigurableProperties; import com.schbrain.framework.autoconfigure.apollo.event.ConfigLoadedEvent; import org.apache.commons.logging.Log; -import org.springframework.context.ApplicationContextInitializer; -import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.ResolvableType; /** @@ -12,7 +10,7 @@ import org.springframework.core.ResolvableType; * @since 2023-04-28 */ @SuppressWarnings("unchecked") -public abstract class GenericConfigLoadedEventListener implements ConfigLoadedEventListener, ApplicationContextInitializer { +public abstract class GenericConfigLoadedEventListener implements ConfigLoadedEventListener { protected final ResolvableType propertiesType; @@ -31,11 +29,6 @@ public abstract class GenericConfigLoadedEventListener