From 6085adb7c74cbc3cb7fe3658bbf0abd014c7a0d4 Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Thu, 29 Jun 2023 16:05:24 +0800
Subject: [PATCH] Update cors configuration

---
 .../schbrain/common/web/DefaultCorsConfiguration.java    | 4 ++--
 .../apollo/event/listener/ConfigLoadedEventListener.java | 9 +++++++--
 .../event/listener/GenericConfigLoadedEventListener.java | 9 +--------
 3 files changed, 10 insertions(+), 12 deletions(-)

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 5ee2e6a..9ba5e1f 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 0cba2aa..12dd0a3 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<ConfigLoadedEvent>, Ordered {
+public interface ConfigLoadedEventListener extends ApplicationListener<ConfigLoadedEvent>, ApplicationContextInitializer<ConfigurableApplicationContext>, 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 2f3b752..440a32c 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<T extends ConfigurableProperties> implements ConfigLoadedEventListener, ApplicationContextInitializer<ConfigurableApplicationContext> {
+public abstract class GenericConfigLoadedEventListener<T extends ConfigurableProperties> implements ConfigLoadedEventListener {
 
     protected final ResolvableType propertiesType;
 
@@ -31,11 +29,6 @@ public abstract class GenericConfigLoadedEventListener<T extends ConfigurablePro
         }
     }
 
-    @Override
-    public void initialize(ConfigurableApplicationContext applicationContext) {
-
-    }
-
     protected abstract void onConfigLoaded(ConfigLoadedEvent event, T configurableProperties);
 
 }
\ No newline at end of file
-- 
GitLab