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 +}