From 9b76b88fffafee3f6cf571f1826f6d445a1ffbc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=B9=E5=AD=90?= Date: Sun, 25 Dec 2022 14:33:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BD=BF=E7=94=A8AlipayConfi?= =?UTF-8?q?g=20=E5=88=9D=E5=A7=8B=E5=8C=96MsgClient=E5=AF=86=E9=92=A5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/alipay/api/msg/AlipayMsgClient.java | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/v2/src/main/java/com/alipay/api/msg/AlipayMsgClient.java b/v2/src/main/java/com/alipay/api/msg/AlipayMsgClient.java index b22e7aba6b7f..138b797fa07d 100644 --- a/v2/src/main/java/com/alipay/api/msg/AlipayMsgClient.java +++ b/v2/src/main/java/com/alipay/api/msg/AlipayMsgClient.java @@ -4,6 +4,7 @@ package com.alipay.api.msg; import com.alipay.api.AlipayApiException; +import com.alipay.api.AlipayConfig; import com.alipay.api.AlipayConstants; import com.alipay.api.AlipayRequest; import com.alipay.api.internal.util.AlipayLogger; @@ -362,6 +363,33 @@ public void setSecurityConfig(String signType, String appPrivateKey, String alip this.appPrivateKey = appPrivateKey; this.alipayPublicKey = alipayPublicKey; } + + public void setSecurityConfig(AlipayConfig alipayConfig){ + this.signType = alipayConfig.getSignType(); + this.charset = alipayConfig.getCharset(); + this.appPrivateKey = alipayConfig.getPrivateKey(); + if(!StringUtils.isEmpty(alipayConfig.getAppCertPath())){ + this.appCertSN = AntCertificationUtil.getCertSN(AntCertificationUtil.getCertFromPath(alipayConfig.getAppCertPath())); + }else if(!StringUtils.isEmpty(alipayConfig.getAppCertContent())){ + this.appCertSN = AntCertificationUtil.getCertSN(AntCertificationUtil.getCertFromContent(alipayConfig.getAppCertContent())); + } + if(!StringUtils.isEmpty(alipayConfig.getAlipayPublicCertPath())){ + this.alipayPublicKey = AntCertificationUtil.getAlipayPublicKey(alipayConfig.getAlipayPublicCertPath()); + this.alipayCertSN = AntCertificationUtil.getCertSN(AntCertificationUtil.getCertFromPath(alipayConfig.getAlipayPublicCertPath())); + }else if(!StringUtils.isEmpty(alipayConfig.getAlipayPublicCertContent())){ + this.alipayPublicKey = alipayConfig.getAlipayPublicCertContent(); + this.alipayCertSN = AntCertificationUtil.getCertSN(AntCertificationUtil.getCertFromContent(alipayConfig.getAlipayPublicCertContent())); + }else{ + this.alipayPublicKey = alipayConfig.getAlipayPublicKey(); + } + if (!StringUtils.isEmpty(alipayConfig.getRootCertContent())){ + this.rootCertContent = alipayConfig.getRootCertContent(); + this.alipayRootCertSN = AntCertificationUtil.getRootCertSN(this.rootCertContent, signType); + }else if(!StringUtils.isEmpty(alipayConfig.getRootCertPath())){ + this.rootCertContent = readFileToString(alipayConfig.getRootCertPath()); + this.alipayRootCertSN = AntCertificationUtil.getRootCertSN(this.rootCertContent, signType); + } + } //设置证书参数 public void setSecurityCertConfig(String signType, String appPrivateKey, String certPath, String alipayPublicCertPath, @@ -585,4 +613,4 @@ void setZone(String zone) { this.zone = zone; } } -} \ No newline at end of file +}