From cbf652d8d8fbebf75b5a5379580921c273f1465b Mon Sep 17 00:00:00 2001
From: xiafang <xiafang>
Date: Thu, 3 Dec 2020 18:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/felord/payment/wechat/WechatPayConfiguration.java | 1 -
 .../java/cn/felord/payment/wechat/WechatPayProperties.java    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

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 e66918b..0ba4275 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
@@ -14,7 +14,6 @@ import java.util.Map;
  * The type Wechat pay configuration.
  */
 @Configuration
-@ConditionalOnProperty(prefix = "wechat.pay", name = "v3.app-id")
 @EnableConfigurationProperties(WechatPayProperties.class)
 public class WechatPayConfiguration {
     private static final String CERT_ALIAS = "Tenpay Certificate";
diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java
index 82658e7..d31488c 100644
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java
@@ -4,6 +4,7 @@ import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -15,8 +16,7 @@ public class WechatPayProperties {
     /**
      * wechat pay V3 properties
      */
-    @NestedConfigurationProperty
-    private Map<String,V3> v3;
+    private Map<String,V3> v3 =new HashMap<>();
 
     /**
      * wechat pay v3 properties.