open-source/payment-spring-boot
1
0
Fork 0
mirror of https://github.com/dromara/payment-spring-boot.git synced 2026-03-14 05:43:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Spring Boot upgrade to 2.3.4

Browse Source
This commit is contained in:
xiafang
2020-10-29 12:52:37 +08:00
parent 568f463f2f
commit 8e9c553326
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/EnableWechatPay.java
View File

@@ -2,10 +2,15 @@ package com.enongm.dianji.payment.autoconfigure;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import java.lang.annotation.*;
/** /**
* @author Dax * @author Dax
* @since 9:49 * @since 9:49
*/ */
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Import(WechatPayConfiguration.class) @Import(WechatPayConfiguration.class)
public @interface EnableWechatPay { public @interface EnableWechatPay {
} }

3
payment-spring-boot-autoconfigure/src/main/java/com/enongm/dianji/payment/autoconfigure/WechatPayConfiguration.java
View File

@@ -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.v2.WechatPayV2Service;
import com.enongm.dianji.payment.wechat.v3.SignatureProvider; import com.enongm.dianji.payment.wechat.v3.SignatureProvider;
import com.enongm.dianji.payment.wechat.v3.model.WechatMetaBean; 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.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@@ -15,7 +14,6 @@ import org.springframework.context.annotation.Configuration;
* The type Wechat pay configuration. * The type Wechat pay configuration.
*/ */
@Configuration @Configuration
@ConditionalOnProperty(prefix = "wechat.pay",havingValue = "v3")
@EnableConfigurationProperties(WechatPayProperties.class) @EnableConfigurationProperties(WechatPayProperties.class)
public class WechatPayConfiguration { public class WechatPayConfiguration {
private static final String CERT_ALIAS = "Tenpay Certificate"; private static final String CERT_ALIAS = "Tenpay Certificate";
@@ -56,6 +54,7 @@ public class WechatPayConfiguration {
*/ */
@Bean @Bean
public WechatPayV2Service wechatPayV2Service(WechatPayProperties wechatPayProperties) { public WechatPayV2Service wechatPayV2Service(WechatPayProperties wechatPayProperties) {
System.out.println("wechatPayProperties = " + wechatPayProperties);
return new WechatPayV2Service(wechatPayProperties); return new WechatPayV2Service(wechatPayProperties);
} }

2
pom.xml
View File

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