diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index f4e3661..df4fe00 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -12,7 +12,7 @@ on:
push:
branches: [ 'dev-1.x' ]
pull_request:
- branches: [ 'release-1.x' ]
+ branches: [ 'dev-1.x' , 'release-1.x' ]
jobs:
build:
diff --git a/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/EnableFeignAutoRefresh.java b/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/EnableFeignAutoRefresh.java
index 6418883..1587b12 100644
--- a/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/EnableFeignAutoRefresh.java
+++ b/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/EnableFeignAutoRefresh.java
@@ -9,12 +9,19 @@
import java.lang.annotation.Target;
/**
+ * Enable Feign Auto Refresh
+ *
* @author 韩超
+ * @author Mercy
+ * @see FeignClientAutoRefreshAutoConfiguration
* @since 0.0.1
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
@Documented
-@Import(FeignClientAutoRefreshConfiguration.class)
+@Import(FeignClientAutoRefreshAutoConfiguration.class)
public @interface EnableFeignAutoRefresh {
+
+ class Marker {
+ }
}
diff --git a/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/FeignClientAutoRefreshConfiguration.java b/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/FeignClientAutoRefreshAutoConfiguration.java
similarity index 77%
rename from microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/FeignClientAutoRefreshConfiguration.java
rename to microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/FeignClientAutoRefreshAutoConfiguration.java
index 2da3e20..93c5e36 100644
--- a/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/FeignClientAutoRefreshConfiguration.java
+++ b/microsphere-spring-cloud-openfeign/src/main/java/io/microsphere/spring/cloud/openfeign/autoconfigure/FeignClientAutoRefreshAutoConfiguration.java
@@ -5,22 +5,29 @@
import io.microsphere.spring.cloud.openfeign.components.NoOpRequestInterceptor;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration;
import org.springframework.cloud.openfeign.FeignBuilderCustomizer;
import org.springframework.cloud.openfeign.FeignClientProperties;
import org.springframework.context.annotation.Bean;
/**
+ * The Auto-Configuration class for {@link EnableFeignAutoRefresh}
+ *
* @author 韩超
+ * @author Mercy
+ * @see EnableFeignAutoRefresh
* @since 0.0.1
*/
+@ConditionalOnBean(EnableFeignAutoRefresh.Marker.class)
@AutoConfigureAfter(ConfigurationPropertiesRebinderAutoConfiguration.class)
-public class FeignClientAutoRefreshConfiguration {
-
+public class FeignClientAutoRefreshAutoConfiguration {
@Bean
public FeignBuilderCustomizer addDefaultRequestInterceptorCustomizer() {
- return builder -> {builder.requestInterceptor(NoOpRequestInterceptor.INSTANCE);};
+ return builder -> {
+ builder.requestInterceptor(NoOpRequestInterceptor.INSTANCE);
+ };
}
@Bean
diff --git a/microsphere-spring-cloud-openfeign/src/main/resources/META-INF/spring.factories b/microsphere-spring-cloud-openfeign/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..896056c
--- /dev/null
+++ b/microsphere-spring-cloud-openfeign/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+io.microsphere.spring.cloud.openfeign.autoconfigure.FeignClientAutoRefreshAutoConfiguration
\ No newline at end of file