From 372d13223b0c7a5e2f52a4a078927d085e8fbbc9 Mon Sep 17 00:00:00 2001 From: Fang Date: Mon, 13 Jun 2022 09:44:45 +0800 Subject: [PATCH] README.md --- README.md | 20 +++++++++++++++++-- .../wechat/v2/WechatAllocationApi.java | 4 ++-- .../payment/wechat/v2/model/BaseModel.java | 12 +++++++---- .../payment/wechat/v3/WechatPayCallback.java | 4 ++-- 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 84486b9..248e535 100644 --- a/README.md +++ b/README.md @@ -29,9 +29,25 @@ 更多参考[changelog](https://notfound403.github.io/payment-spring-boot/#/changelog) ## 核心API结构 -![](https://asset.felord.cn/blog/20210112211759.png) +![](https://asset.felord.cn/blog/20220613092244.png) -> 随着版本迭代会增加 +- `WechatPartnerProfitsharingApi` 微信支付服务商V3分账 +- `WechatPayCallback` 微信支付V3回调通知工具封装 +- `WechatAllocationApi` 微信支付V2分账（未来会移除） +- `WechatMarketingFavorApi` 微信支付代金券V3 +- `WechatCombinePayApi` 微信支付合单支付V3 +- `WechatPayScoreApi` 微信支付分V3 +- `WechatPayRedpackApi` 微信支付V2现金红包 +- `WechatDiscountCardApi` 微信支付V3先享卡 +- `WechatProfitsharingApi` 微信支付直连商户V3分账 +- `WechatPartnerPayApi` 微信支付服务商模式V3普通支付 +- `WechatMarketingBusiFavorApi` 微信支付V3商家券 +- `WechatPayTransfersApi` 微信支付V2企业付款到零钱，目前不包括到银行卡 +- `WechatDirectPayApi` 微信支付直连模式V3普通支付 +- `WechatPayScoreParkingApi` 微信支付分V3停车服务 +- `WechatBatchTransferApi` 微信支付V3批量转账到零钱 + +> 随着版本迭代功能会增加。 ## 开源协议 **Apache 2.0** diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/WechatAllocationApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/WechatAllocationApi.java index ddb2ac1..74928ce 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/WechatAllocationApi.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/WechatAllocationApi.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -47,7 +47,7 @@ public class WechatAllocationApi { private static final ObjectMapper MAPPER = new ObjectMapper(); static { - MAPPER.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE) + MAPPER.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE) .setSerializationInclusion(JsonInclude.Include.NON_NULL) .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) .configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true) diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/BaseModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/BaseModel.java index a2d7771..ca0fcc8 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/BaseModel.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/BaseModel.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import lombok.Getter; import lombok.SneakyThrows; @@ -54,7 +54,11 @@ import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.security.*; +import java.security.KeyManagementException; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.UnrecoverableKeyException; import java.security.cert.CertificateException; import java.util.TreeMap; import java.util.stream.Collectors; @@ -75,11 +79,11 @@ public abstract class BaseModel { // 忽略null XML_MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL) // 属性使用 驼峰首字母小写 - .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE); + .setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE); OBJECT_MAPPER // .configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true) .setSerializationInclusion(JsonInclude.Include.NON_NULL) - .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE); + .setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE); } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayCallback.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayCallback.java index 571de37..7355446 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayCallback.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayCallback.java @@ -41,7 +41,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -78,7 +78,7 @@ public class WechatPayCallback { private final String tenantId; static { - MAPPER.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE) + MAPPER.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE) .setSerializationInclusion(JsonInclude.Include.NON_NULL) .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) .configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true)