lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-04-05 08:37:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 #3443 【微信支付】初始化V3请求时取消对私钥的加密

Browse Source
This commit is contained in:
Ader1y 栈烟 2024-12-18 11:37:37 +08:00 committed by Binary Wang
parent 47471a6c0b
commit 8891b68e79
4 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,6 @@ import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
import java.util.Base64;
import java.util.Optional;
import javax.net.ssl.SSLContext;
import lombok.Data;
@ -295,10 +294,6 @@ public class WxPayConfig {
}
try {
if (merchantPrivateKey == null) {
if (StringUtils.isNotBlank(this.getPrivateKeyString())) {
this.setPrivateKeyString(Base64.getEncoder().encodeToString(this.getPrivateKeyString().getBytes()));
}
try (InputStream keyInputStream = this.loadConfigInputStream(this.getPrivateKeyString(), this.getPrivateKeyPath(),
this.privateKeyContent, "privateKeyPath")) {
merchantPrivateKey = PemUtils.loadPrivateKey(keyInputStream);

9
weixin-java-pay/src/test/java/com/github/binarywang/wxpay/config/CustomizedWxPayConfigTest.java
View File

@ -1,5 +1,9 @@
package com.github.binarywang.wxpay.config;
import static org.testng.Assert.assertEquals;
import com.github.binarywang.wxpay.bean.result.WxPayOrderQueryV3Result;
import com.github.binarywang.wxpay.constant.WxPayErrorCode;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.binarywang.wxpay.service.WxPayService;
import com.github.binarywang.wxpay.testbase.CustomizedApiTestModule;
@ -30,10 +34,9 @@ public class CustomizedWxPayConfigTest {
public void testCustomizerV3HttpClient() {
try {
wxPayService.queryOrderV3("a", null);
WxPayOrderQueryV3Result result = wxPayService.queryOrderV3("a", null);
} catch (WxPayException e) {
// ignore
e.printStackTrace();
assertEquals(e.getErrCode(), WxPayErrorCode.RefundQuery.PARAM_ERROR);
}
}
}

24
weixin-java-pay/src/test/java/com/github/binarywang/wxpay/config/WxPayConfigTest.java
View File

@ -1,16 +1,7 @@
package com.github.binarywang.wxpay.config;
import com.github.binarywang.wxpay.exception.WxPayException;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.pqc.jcajce.provider.util.KeyUtil;
import org.testng.annotations.Test;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.SecureRandom;
import java.security.Security;
import java.util.Base64;
/**
* <pre>
* Created by BinaryWang on 2017/6/18.
@ -54,19 +45,4 @@ public class WxPayConfigTest {
payConfig.initSSLContext();
}
@Test
public void testInitApiV3HttpClient() throws Exception {
Security.addProvider(new BouncyCastleProvider());
KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA","BC");
keyPairGenerator.initialize(2048,new SecureRandom());
KeyPair keyPair = keyPairGenerator.genKeyPair();
byte[] encoded = keyPair.getPrivate().getEncoded();
// 模拟用户配置
String privateKeyString = Base64.getEncoder().encodeToString(encoded);
payConfig.setPrivateKeyString(privateKeyString);
payConfig.setApiV3Key("Test");
payConfig.initApiV3HttpClient();
}
}

20
weixin-java-pay/src/test/java/com/github/binarywang/wxpay/testbase/CustomizedApiTestModule.java
View File

@ -6,15 +6,14 @@ import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
import com.google.inject.Binder;
import com.google.inject.Module;
import com.thoughtworks.xstream.XStream;
import java.io.*;
import java.nio.charset.StandardCharsets;
import me.chanjar.weixin.common.error.WxRuntimeException;
import me.chanjar.weixin.common.util.xml.XStreamInitializer;
import org.apache.http.HttpRequestInterceptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
/**
* The type Api test module.
*/
@ -39,7 +38,22 @@ public class CustomizedApiTestModule implements Module {
config.setHttpClientBuilderCustomizer((builder) -> {
builder.addInterceptorLast((HttpRequestInterceptor) (r, c) -> System.out.println("--------> HttpRequestInterceptor ..."));
});
try (FileInputStream fis = new FileInputStream(config.getPrivateKeyPath());
InputStreamReader isr = new InputStreamReader(fis, StandardCharsets.UTF_8);
BufferedReader reader = new BufferedReader(isr)) {
StringBuilder stringBuilder = new StringBuilder();
String line;
while ((line = reader.readLine()) != null) {
stringBuilder.append(line);
stringBuilder.append(System.lineSeparator());
}
String fileContent = stringBuilder.toString();
config.setPrivateKeyString(fileContent);
System.out.println(fileContent);
}
WxPayService wxService = new WxPayServiceImpl();
wxService.setConfig(config);