diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java index 9878264..c65b521 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java @@ -34,7 +34,7 @@ import java.util.Map; * @author felord.cn * @since 1.0.0.RELEASE */ -@Configuration +@Configuration(proxyBeanMethods = false) @Conditional(WechatPayConfiguredCondition.class) @EnableConfigurationProperties(WechatPayProperties.class) public class WechatPayConfiguration { diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguredCondition.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguredCondition.java index bb624a8..cea7905 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguredCondition.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguredCondition.java @@ -24,6 +24,7 @@ import org.springframework.boot.autoconfigure.condition.SpringBootCondition; import org.springframework.boot.context.properties.bind.Bindable; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.context.annotation.ConditionContext; +import org.springframework.core.annotation.Order; import org.springframework.core.env.Environment; import org.springframework.core.type.AnnotatedTypeMetadata; @@ -37,6 +38,7 @@ import java.util.stream.Collectors; * @author felord.cn * @since 1.0.3.RELEASE */ +@Order public class WechatPayConfiguredCondition extends SpringBootCondition { /** @@ -57,7 +59,8 @@ public class WechatPayConfiguredCondition extends SpringBootCondition { } private Map getV3(Environment environment) { - return Binder.get(environment).bind("wechat.pay.v3", STRING_WECHAT_V3_MAP) + return Binder.get(environment) + .bind("wechat.pay.v3", STRING_WECHAT_V3_MAP) .orElse(Collections.emptyMap()); } diff --git a/pom.xml b/pom.xml index 9f656a7..2d7d489 100644 --- a/pom.xml +++ b/pom.xml @@ -132,62 +132,82 @@ + + + + org.apache.maven.plugins + maven-source-plugin + 3.1.0 + + + package + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.2.0 + + private + true + UTF-8 + UTF-8 + UTF-8 + + + + compile + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + verify + + sign + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + sonatype-nexus-staging + https://oss.sonatype.org/ + + + + org.apache.maven.plugins maven-source-plugin - 3.1.0 - - - package - - jar-no-fork - - - org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 - - private - true - UTF-8 - UTF-8 - UTF-8 - - - - compile - - jar - - - org.apache.maven.plugins maven-gpg-plugin - 1.6 - - - verify - - sign - - - org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 - true - - sonatype-nexus-staging - https://oss.sonatype.org/ -