From 6ce3772c86995d2db4f8db273aa077f539ec0cb5 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Mon, 21 Mar 2022 14:45:44 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chanjar/weixin/common/util/fs/FileUtils.java | 2 +- .../wxpay/service/impl/BaseWxPayServiceImpl.java | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java index d60f5cedd..65bc48da1 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java @@ -43,7 +43,7 @@ public class FileUtils { * @param ext 扩展名 */ public static File createTmpFile(InputStream inputStream, String name, String ext) throws IOException { - return createTmpFile(inputStream, name, ext, Files.createTempDirectory("weixin-java-tools-temp").toFile()); + return createTmpFile(inputStream, name, ext, Files.createTempDirectory("wxjava-temp").toFile()); } /** diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java index 47b898720..128a7362d 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java @@ -147,10 +147,14 @@ public abstract class BaseWxPayServiceImpl implements WxPayService { } @Override - public PartnerTransferService getPartnerTransferService(){return partnerTransferService;} + public PartnerTransferService getPartnerTransferService() { + return partnerTransferService; + } @Override - public PayrollService getPayrollService(){return payrollService;} + public PayrollService getPayrollService() { + return payrollService; + } @Override public WxPayConfig getConfig() { @@ -358,8 +362,9 @@ public abstract class BaseWxPayServiceImpl implements WxPayService { /** * 校验通知签名 + * * @param header 通知头信息 - * @param data 通知数据 + * @param data 通知数据 * @return true:校验通过 false:校验不通过 */ private boolean verifyNotifySign(SignatureHeader header, String data) { @@ -700,6 +705,10 @@ public abstract class BaseWxPayServiceImpl implements WxPayService { if (StringUtils.isBlank(request.getMchid())) { request.setMchid(this.getConfig().getMchId()); } + if (StringUtils.isBlank(request.getNotifyUrl())) { + request.setNotifyUrl(this.getConfig().getNotifyUrl()); + } + String url = this.getPayBaseUrl() + tradeType.getPartnerUrl(); String response = this.postV3(url, GSON.toJson(request)); return GSON.fromJson(response, WxPayUnifiedOrderV3Result.class);