diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/config/AliPayConfigService.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/config/AliPayConfigService.java index 9d607d8cb..db5220ec6 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/config/AliPayConfigService.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/config/AliPayConfigService.java @@ -96,6 +96,24 @@ public class AliPayConfigService { channelConfigManager.updateById(channelConfig); } + /** + * 获取异步通知地址 + */ + public String getNotifyUrl() { + var mchAppInfo = PaymentContextLocal.get().getMchAppInfo(); + var platformInfo = platformConfigService.getConfig(); + return StrUtil.format("{}/unipay/callback/{}/alipay",platformInfo.getGatewayServiceUrl(), mchAppInfo.getAppId()); + } + + /** + * 获取同步通知地址 + */ + public String getReturnUrl() { + MchAppLocal mchAppInfo = PaymentContextLocal.get().getMchAppInfo(); + var platformInfo = platformConfigService.getConfig(); + return StrUtil.format("{}/unipay/return/{}/{}/alipay",platformInfo.getGatewayServiceUrl(), mchAppInfo.getAppId()); + } + /** * 获取支付宝支付配置 */ @@ -124,24 +142,6 @@ public class AliPayConfigService { return this.getAlipayClient(aliPayConfig); } - /** - * 获取异步通知地址 - */ - public String getNotifyUrl() { - var mchAppInfo = PaymentContextLocal.get().getMchAppInfo(); - var platformInfo = platformConfigService.getConfig(); - return StrUtil.format("{}/unipay/callback/{}/alipay",platformInfo.getGatewayServiceUrl(), mchAppInfo.getAppId()); - } - - /** - * 获取同步通知地址 - */ - public String getReturnUrl() { - MchAppLocal mchAppInfo = PaymentContextLocal.get().getMchAppInfo(); - var platformInfo = platformConfigService.getConfig(); - return StrUtil.format("{}/unipay/return/{}/{}/alipay",platformInfo.getGatewayServiceUrl(), mchAppInfo.getAppId()); - } - /** * 获取支付宝SDK的配置 */ diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/extra/AliPayAuthService.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/extra/AliPayAuthService.java index 65411bb0c..7da5b8d00 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/extra/AliPayAuthService.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/extra/AliPayAuthService.java @@ -43,7 +43,7 @@ public class AliPayAuthService { return new AuthUrlResult(); } else { PlatformConfig platformConfig = platformsConfigService.getConfig(); - AliPayConfig aliPayConfig = aliPayConfigService.getAliPayConfig(); + AliPayConfig aliPayConfig = aliPayConfigService.getAndCheckConfig(); String queryCode = RandomUtil.randomString(10); // 授权地址 diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/pay/AliPayService.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/pay/AliPayService.java index 6e29767ef..f3a4b4e19 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/pay/AliPayService.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/pay/AliPayService.java @@ -47,8 +47,7 @@ public class AliPayService { * 支付前检查支付方式是否可用 */ public void validation(PayParam payParam) { - AliPayConfig alipayConfig = aliPayConfigService.getAliPayConfig(); - + AliPayConfig alipayConfig = aliPayConfigService.getAndCheckConfig(); // 验证订单金额是否超限 if(BigDecimalUtil.isGreaterThan(payParam.getAmount(), alipayConfig.getLimitAmount())){ throw new AmountExceedLimitException("支付宝支付金额超过限额"); diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/transfer/AliPayTransferService.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/transfer/AliPayTransferService.java index e154e97ed..ca6def28f 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/transfer/AliPayTransferService.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/service/transfer/AliPayTransferService.java @@ -103,7 +103,7 @@ public class AliPayTransferService { } /** - * + * 转换收款人类型 */ public String getIdentityType(TransferPayeeTypeEnum payeeType){ switch (payeeType){ diff --git a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCloseStrategy.java b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCloseStrategy.java index 27b8cc27f..f467c0be1 100644 --- a/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCloseStrategy.java +++ b/daxpay-single-channel/daxpay-single-alipay/src/main/java/org/dromara/daxpay/channel/alipay/strategy/AliPayCloseStrategy.java @@ -35,7 +35,7 @@ public class AliPayCloseStrategy extends AbsPayCloseStrategy { */ @Override public void doBeforeCloseHandler() { - this.alipayConfig = alipayConfigService.getAliPayConfig(); + this.alipayConfig = alipayConfigService.getAndCheckConfig(); } /** diff --git a/daxpay-single/daxpay-single-unisdk/src/main/java/org/dromara/daxpay/unisdk/common/http/ClientHttpRequest.java b/daxpay-single/daxpay-single-unisdk/src/main/java/org/dromara/daxpay/unisdk/common/http/ClientHttpRequest.java index 19320f857..89bf9a584 100644 --- a/daxpay-single/daxpay-single-unisdk/src/main/java/org/dromara/daxpay/unisdk/common/http/ClientHttpRequest.java +++ b/daxpay-single/daxpay-single-unisdk/src/main/java/org/dromara/daxpay/unisdk/common/http/ClientHttpRequest.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; import lombok.Setter; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.http.*; import org.apache.http.client.HttpResponseException; @@ -308,6 +309,7 @@ public class ClientHttpRequest extends HttpEntityEnclosingRequestBase impleme * @return 对应的响应对象 * @throws IOException 响应类型文本转换时抛出异常 */ + @SneakyThrows private T toBean(HttpEntity entity, String[] contentType) throws IOException { @@ -330,7 +332,7 @@ public class ClientHttpRequest extends HttpEntityEnclosingRequestBase impleme if (responseType == OutputStream.class){ t= new ByteArrayOutputStream(); }else { - t = (OutputStream) responseType.newInstance(); + t = (OutputStream) responseType.getDeclaredConstructor().newInstance(); } entity.writeTo( t); return (T) t;