diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/EnableWechatPay.java b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/EnableWechatPay.java
index 51a6108..a358227 100644
--- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/EnableWechatPay.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/EnableWechatPay.java
@@ -2,10 +2,15 @@ package com.enongm.dianji.payment.autoconfigure;
import org.springframework.context.annotation.Import;
+import java.lang.annotation.*;
+
/**
* @author Dax
* @since 9:49
*/
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Import(WechatPayConfiguration.class)
public @interface EnableWechatPay {
}
diff --git a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/WechatPayConfiguration.java b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/WechatPayConfiguration.java
index ecabe44..de428bd 100644
--- a/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/WechatPayConfiguration.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/WechatPayConfiguration.java
@@ -6,7 +6,6 @@ import com.enongm.dianji.payment.wechat.WechatPayV3Service;
import com.enongm.dianji.payment.wechat.v2.WechatPayV2Service;
import com.enongm.dianji.payment.wechat.v3.SignatureProvider;
import com.enongm.dianji.payment.wechat.v3.model.WechatMetaBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -15,7 +14,6 @@ import org.springframework.context.annotation.Configuration;
* The type Wechat pay configuration.
*/
@Configuration
-@ConditionalOnProperty(prefix = "wechat.pay",havingValue = "v3")
@EnableConfigurationProperties(WechatPayProperties.class)
public class WechatPayConfiguration {
private static final String CERT_ALIAS = "Tenpay Certificate";
@@ -56,6 +54,7 @@ public class WechatPayConfiguration {
*/
@Bean
public WechatPayV2Service wechatPayV2Service(WechatPayProperties wechatPayProperties) {
+ System.out.println("wechatPayProperties = " + wechatPayProperties);
return new WechatPayV2Service(wechatPayProperties);
}
diff --git a/pom.xml b/pom.xml
index 5941e7f..9067990 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
UTF-8
UTF-8
1.8
- 2.1.14.RELEASE
+ 2.3.4.RELEASE
4.10.167.ALL
1.0.0.RELEASE
1.18.12