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

refactor: 证书逻辑优化

Browse Source
This commit is contained in:
felord.cn
2021-02-05 09:38:25 +08:00
parent 3000c9cfac
commit 92104e67ec
4 changed files with 97 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java
View File

@@ -29,6 +29,7 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.springframework.core.io.Resource;
import org.springframework.http.HttpHeaders;
import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity;
import org.springframework.util.Assert;
@@ -155,6 +156,25 @@ public abstract class AbstractApi {
}
}
/**
* 构建Post请求对象.
*
* @param uri the uri
* @param params the params
* @param httpHeaders the http headers
* @return request entity
*/
protected RequestEntity<?> Post(URI uri, Object params, HttpHeaders httpHeaders) {
try {
return RequestEntity.post(uri)
.header("Pay-TenantId", tenantId)
.headers(httpHeaders)
.body(mapper.writeValueAsString(params));
} catch (JsonProcessingException e) {
throw new PayException("wechat app pay json failed");
}
}
/**
* 构建Get请求对象.
*
@@ -165,7 +185,18 @@ public abstract class AbstractApi {
return RequestEntity.get(uri).header("Pay-TenantId", tenantId)
.build();
}
/**
* 构建Get请求对象.
*
* @param uri the uri
* @return the request entity
*/
protected RequestEntity<?> Get(URI uri, HttpHeaders httpHeaders) {
return RequestEntity.get(uri)
.header("Pay-TenantId", tenantId)
.headers(httpHeaders)
.build();
}
/**
* 对账单内容下载，非流文件。

22
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/SignatureProvider.java
View File

@@ -37,7 +37,6 @@ import org.springframework.web.client.RestOperations;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponents;
import org.springframework.web.util.UriComponentsBuilder;
import sun.security.x509.X509CertImpl;
import javax.crypto.Cipher;
import javax.crypto.NoSuchPaddingException;
@@ -46,11 +45,16 @@ import javax.crypto.spec.SecretKeySpec;
import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets;
import java.security.*;
import java.security.cert.*;
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
@@ -219,7 +223,7 @@ public class SignatureProvider {
ArrayNode certificates = bodyObjectNode.withArray("data");
if (certificates.isArray() && certificates.size() > 0) {
CERTIFICATE_MAP.clear();
final CertificateFactory certificateFactory = CertificateFactory.getInstance("X509");
final CertificateFactory certificateFactory = CertificateFactory.getInstance("X509",BC_PROVIDER);
certificates.forEach(objectNode -> {
JsonNode encryptCertificate = objectNode.get("encrypt_certificate");
String associatedData = encryptCertificate.get("associated_data").asText();
@@ -275,6 +279,7 @@ public class SignatureProvider {
* 对请求敏感字段进行加密
*
* @param message the message
* @param certificate the certificate
* @return encrypt message
* @since 1.0.6.RELEASE
*/
@@ -292,12 +297,15 @@ public class SignatureProvider {
}
}
public X509CertImpl getCertificate(){
public X509WechatCertificateInfo getCertificate(){
for (String serial : CERTIFICATE_MAP.keySet()) {
X509CertImpl x509Cert = (X509CertImpl) CERTIFICATE_MAP.get(serial);
X509Certificate x509Cert = (X509Certificate) CERTIFICATE_MAP.get(serial);
try {
x509Cert.checkValidity();
return x509Cert;
X509WechatCertificateInfo x509WechatCertificateInfo = new X509WechatCertificateInfo();
x509WechatCertificateInfo.setWechatPaySerial(serial);
x509WechatCertificateInfo.setX509Certificate(x509Cert);
return x509WechatCertificateInfo;
} catch (Exception e) {
log.warn("the wechat certificate is invalid , {}", e.getMessage());
// Async?

16
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatBatchTransferApi.java
View File

@@ -24,6 +24,7 @@ import cn.felord.payment.wechat.v3.model.batchtransfer.QueryBatchTransferDetailP
import cn.felord.payment.wechat.v3.model.batchtransfer.QueryBatchTransferParams;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.springframework.core.io.Resource;
import org.springframework.http.HttpHeaders;
import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity;
import org.springframework.util.Assert;
@@ -31,9 +32,9 @@ import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
import org.springframework.web.util.UriComponentsBuilder;
import sun.security.x509.X509CertImpl;
import java.net.URI;
import java.security.cert.X509Certificate;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -76,15 +77,16 @@ public class WechatBatchTransferApi extends AbstractApi {
List<CreateBatchTransferParams.TransferDetailListItem> transferDetailList = createBatchTransferParams.getTransferDetailList();
SignatureProvider signatureProvider = this.client().signatureProvider();
final X509CertImpl certificate = signatureProvider.getCertificate();
final X509WechatCertificateInfo certificate = signatureProvider.getCertificate();
List<CreateBatchTransferParams.TransferDetailListItem> encrypted = transferDetailList.stream()
.peek(transferDetailListItem -> {
String userName = transferDetailListItem.getUserName();
String encryptedUserName = signatureProvider.encryptRequestMessage(userName, certificate);
X509Certificate x509Certificate = certificate.getX509Certificate();
String encryptedUserName = signatureProvider.encryptRequestMessage(userName, x509Certificate);
transferDetailListItem.setUserName(encryptedUserName);
String userIdCard = transferDetailListItem.getUserIdCard();
if (StringUtils.hasText(userIdCard)) {
String encryptedUserIdCard = signatureProvider.encryptRequestMessage(userIdCard, certificate);
String encryptedUserIdCard = signatureProvider.encryptRequestMessage(userIdCard, x509Certificate);
transferDetailListItem.setUserIdCard(encryptedUserIdCard);
}
}).collect(Collectors.toList());
@@ -93,7 +95,9 @@ public class WechatBatchTransferApi extends AbstractApi {
URI uri = UriComponentsBuilder.fromHttpUrl(type.uri(WeChatServer.CHINA))
.build()
.toUri();
return Post(uri, createBatchTransferParams);
HttpHeaders httpHeaders = new HttpHeaders();
httpHeaders.add("Wechatpay-Serial", certificate.getWechatPaySerial());
return Post(uri, createBatchTransferParams, httpHeaders);
}
/**
@@ -249,7 +253,7 @@ public class WechatBatchTransferApi extends AbstractApi {
.consumer(wechatResponseEntity::convert)
.request();
String downloadUrl = wechatResponseEntity.getBody().get("download_url").asText();
Assert.hasText(downloadUrl,"download url has no text");
Assert.hasText(downloadUrl, "download url has no text");
return this.billResource(downloadUrl);
}
}

40
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/X509WechatCertificateInfo.java Normal file
View File

@@ -0,0 +1,40 @@
/*
* Copyright 2019-2021 felord.cn
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
* Website:
* https://felord.cn
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.felord.payment.wechat.v3;
import lombok.Data;
import java.security.cert.X509Certificate;
/**
* 微信X509证书
*
* @author felord.cn
* @since 1.0.6.RELEASE
*/
@Data
public class X509WechatCertificateInfo {
/**
* wechatPaySerial
*/
private String wechatPaySerial;
/**
* X509Certificate
*/
private X509Certificate x509Certificate;
}