Skip to content
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

添加使用AlipayConfig 初始化MsgClient密钥信息 #57

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

添加使用AlipayConfig 初始化MsgClient密钥信息 #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 29 additions & 1 deletion v2/src/main/java/com/alipay/api/msg/AlipayMsgClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -585,4 +613,4 @@ void setZone(String zone) {
this.zone = zone;
}
}
}
}