lxm_library_java/WxJava
1
0
Fork 0
mirror of synced 2025-12-15 11:41:42 +08:00
Code Issues Projects Releases Wiki Activity

🎨 #3757 【微信支付】修复当只设置 privateCertString 或 PrivateCertContent 时 certSerialNo 没有被正确生成的问题

Browse Source
This commit is contained in:
kongkong
2025-11-12 13:41:52 +08:00
committed by GitHub
parent d4186c49c1
commit b94106fd57
2 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
View File

@@ -341,7 +341,7 @@ public class WxPayConfig {
certificate = (X509Certificate) objects[1];
this.certSerialNo = certificate.getSerialNumber().toString(16).toUpperCase();
}
if (certificate == null && StringUtils.isBlank(this.getCertSerialNo()) && StringUtils.isNotBlank(this.getPrivateCertPath())) {
if (certificate == null && StringUtils.isBlank(this.getCertSerialNo()) && (StringUtils.isNotBlank(this.getPrivateCertPath()) || StringUtils.isNotBlank(this.getPrivateCertString())) || this.getPrivateCertContent() != null) {
try (InputStream certInputStream = this.loadConfigInputStream(this.getPrivateCertString(), this.getPrivateCertPath(),
this.privateCertContent, "privateCertPath")) {
certificate = PemUtils.loadCertificate(certInputStream);
@@ -349,7 +349,7 @@ public class WxPayConfig {
this.certSerialNo = certificate.getSerialNumber().toString(16).toUpperCase();
}
if (this.getPublicKeyString() != null || this.getPublicKeyPath() != null || this.publicKeyContent != null) {
if (StringUtils.isNotBlank(this.getPublicKeyString()) || StringUtils.isNotBlank(this.getPublicKeyPath()) || this.publicKeyContent != null) {
if (StringUtils.isBlank(this.getPublicKeyId())) {
throw new WxPayException("请确保和publicKeyId配套使用");
}

41
weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
View File

@@ -33,6 +33,7 @@ import org.testng.annotations.Test;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Calendar;
@@ -976,4 +977,44 @@ public class BaseWxPayServiceImplTest {
WxPayUnifiedOrderV3Result.JsapiResult result = payService.createPartnerOrderV3(TradeTypeEnum.JSAPI, request);
System.out.println(result);
}
@Test
public void test_certSerialNoExtractedFromPrivateCertContentOrPrivateCertString() throws Exception {
WxPayConfig wxPayConfig = new WxPayConfig();
//服务商的参数
wxPayConfig.setMchId("xxx");
wxPayConfig.setAppId("xxx");
wxPayConfig.setApiV3Key("xxx");
wxPayConfig.setPrivateKeyContent("xxx".getBytes(StandardCharsets.UTF_8));
wxPayConfig.setPrivateCertContent("xxx".getBytes(StandardCharsets.UTF_8)
);
wxPayConfig.setPublicKeyId("xxx");
wxPayConfig.setPublicKeyContent("xxx".getBytes(StandardCharsets.UTF_8));
//创建支付服务
WxPayService wxPayService = new WxPayServiceImpl();
wxPayService.setConfig(wxPayConfig);
String outTradeNo = RandomUtils.getRandomStr();
String notifyUrl = "https://api.qq.com/";
System.out.println("outTradeNo = " + outTradeNo);
WxPayUnifiedOrderV3Request request = new WxPayUnifiedOrderV3Request();
request.setOutTradeNo(outTradeNo);
request.setNotifyUrl(notifyUrl);
request.setDescription("test");
WxPayUnifiedOrderV3Request.Payer payer = new WxPayUnifiedOrderV3Request.Payer();
payer.setOpenid("xxx");
request.setPayer(payer);
//构建金额信息
WxPayUnifiedOrderV3Request.Amount amount = new WxPayUnifiedOrderV3Request.Amount();
//设置币种信息
amount.setCurrency(WxPayConstants.CurrencyType.CNY);
//设置金额
amount.setTotal(BaseWxPayRequest.yuan2Fen(BigDecimal.ONE));
request.setAmount(amount);
wxPayService.createOrderV3(TradeTypeEnum.JSAPI, request);
}
}