Skip to content

根据优化建议修改 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jul 19, 2022
Merged

根据优化建议修改 #6

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c1c4b3b
去除dependabot；去除多余gradle wrapper
lianup Jul 13, 2022
5ef46a7
Merge branch 'wechatpay-apiv3:main' into main
lianup Jul 14, 2022
429fbfd
忽略buildSrc/.gradle/*
lianup Jul 14, 2022
69ea386
设置GsonUtil中的gson为单例
lianup Jul 14, 2022
82b253c
1.对query param编码
lianup Jul 15, 2022
b3706fd
增加 throws Exception
lianup Jul 15, 2022
ba8e273
增加downloadCertificate(apiv3Key)接口
lianup Jul 15, 2022
a38169b
简化方法名称
lianup Jul 15, 2022
c67b3fc
增加屏蔽规则
lianup Jul 15, 2022
b383762
1.抽取encodeParam方法
lianup Jul 18, 2022
16d37b2
修正代码缺陷
lianup Jul 18, 2022
5eb5c44
1.修正.gitignore
lianup Jul 19, 2022
d94c7e3
修改encodeParam()为urlEncode()
lianup Jul 19, 2022
f6f78f7
抽象UrlEncoder类
lianup Jul 19, 2022
55637d8
更新.gitignore
lianup Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion core/src/main/java/com/wechat/pay/java/core/RSAConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,11 @@ public RSAConfig build() {
requireNonNull(privateKey);
requireNonNull(merchantSerialNumber);
requireNonNull(merchantId);
requireNonNull(wechatPayCertificates);
if (wechatPayCertificates == null || wechatPayCertificates.size() == 0) {
throw new IllegalArgumentException(
"Build RSAConfig, wechatPayCertificates is empty.Please "
+ "call wechatPayCertificates() or wechatPayCertificatesFromPath() method.");
}
X509Certificate latestCertificate = null;
// 获取最近可用的微信支付平台证书
for (X509Certificate x509Certificate : wechatPayCertificates) {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/wechat/pay/java/core/exception/ServiceException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class ServiceException extends WechatPayException {
public ServiceException(HttpRequest httpRequest, int httpStatusCode, String responseBody) {
super(
String.format(
"Wrong HttpStatusCode[%d]\nhttResponseBody[%.1024s]\tHttpRequest[%s]",
"Wrong HttpStatusCode[%d]%nhttResponseBody[%.1024s]\tHttpRequest[%s]",
httpStatusCode, responseBody, httpRequest));
this.httpRequest = httpRequest;
this.httpStatusCode = httpStatusCode;
Expand Down
4 changes: 3 additions & 1 deletion core/src/main/java/com/wechat/pay/java/core/util/IOUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ public static String toString(InputStream inputStream) throws IOException {
* @throws IOException 读取字节失败、关闭流失败等
*/
public static String loadStringFromPath(String path) throws IOException {
return toString(Files.newInputStream(Paths.get(path)));
try (InputStream inputStream = Files.newInputStream(Paths.get(path))) {
return toString(inputStream);
}
}
}
3 changes: 2 additions & 1 deletion core/src/main/java/com/wechat/pay/java/core/util/PemUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.security.KeyFactory;
import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
Expand Down Expand Up @@ -112,7 +113,7 @@ public static X509Certificate loadX509FromPath(String certificatePath) {
public static X509Certificate loadX509FromString(String certificateString) {
X509Certificate certificate = null;
try (ByteArrayInputStream inputStream =
new ByteArrayInputStream(certificateString.getBytes())) {
new ByteArrayInputStream(certificateString.getBytes(StandardCharsets.UTF_8))) {
certificate = loadX509FromStream(inputStream);
} catch (IOException e) {
logger.warn("Get certificate from certificate string,inputStream close failed.", e);
Expand Down