From 8e9c55332654db5976d6dfc10ba75960a55ef692 Mon Sep 17 00:00:00 2001
From: xiafang <xiafang>
Date: Thu, 29 Oct 2020 12:52:37 +0800
Subject: [PATCH] Spring Boot upgrade to 2.3.4

---
 .../enongm/dianji/payment/autoconfigure/EnableWechatPay.java | 5 +++++
 .../dianji/payment/autoconfigure/WechatPayConfiguration.java | 3 +--
 pom.xml                                                      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

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 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring-boot.version>2.1.14.RELEASE</spring-boot.version>
+        <spring-boot.version>2.3.4.RELEASE</spring-boot.version>
         <aliy-pay-sdk.version>4.10.167.ALL</aliy-pay-sdk.version>
         <oss-starter.version>1.0.0.RELEASE</oss-starter.version>
         <lombok.verison>1.18.12</lombok.verison>