Skip to content

Commit 3c28850

Browse files
committed
支付宝证书
1 parent 4be7061 commit 3c28850

4 files changed

Lines changed: 17 additions & 9 deletions

File tree

pay-java-ali/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
<artifactId>pay-java-common</artifactId>
2020
</dependency>
2121
<!-- /pay-java -->
22-
22+
<dependency>
23+
<groupId>org.bouncycastle</groupId>
24+
<artifactId>bcprov-jdk15on</artifactId>
25+
<version>1.59</version>
26+
</dependency>
2327
</dependencies>
2428

2529

pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayConfigStorage.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
* <p>
1717
* email egzosn@gmail.com
1818
* date 2016-5-18 14:09:01
19-
*
20-
*
21-
* 以下证书签名相关触发前提是 {@link BasePayConfigStorage#isCertSign}等于true的情况。不然走的就是普通的方式
19+
* </p>
20+
* 以下证书签名相关触发前提是 {@link BasePayConfigStorage#isCertSign}等于true的情况。不然走的就是普通的方式
2221
*/
2322
public class AliPayConfigStorage extends BasePayConfigStorage {
2423

@@ -146,7 +145,7 @@ public void setCertEnvironment(CertEnvironment certEnvironment) {
146145
* 初始化证书信息
147146
*/
148147
public void loadCertEnvironment() {
149-
if (!isCertSign() || null == this.certEnvironment){
148+
if (!isCertSign() || null != this.certEnvironment) {
150149
return;
151150
}
152151
try (InputStream merchantCertStream = certStoreType.getInputStream(merchantCert);

pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public AliPayService setPayConfigStorage(AliPayConfigStorage payConfigStorage) {
9090

9191
public AliPayService(AliPayConfigStorage payConfigStorage, HttpConfigStorage configStorage) {
9292
super(payConfigStorage, configStorage);
93-
93+
payConfigStorage.loadCertEnvironment();
9494
}
9595

9696
public AliPayService(AliPayConfigStorage payConfigStorage) {
@@ -161,7 +161,7 @@ private String getKeyPublic(Map<String, Object> params) {
161161
* @param respMap 响应Map
162162
* @return 支付宝公钥证书序列号
163163
*/
164-
public String getAliPayCertSN(java.util.Map<String, Object> respMap) {
164+
public String getAliPayCertSN(Map<String, Object> respMap) {
165165
return (String) respMap.get(AliPayConst.ALIPAY_CERT_SN_FIELD);
166166
}
167167

@@ -233,7 +233,7 @@ private Map<String, Object> getOrder(PayOrder order) {
233233

234234
Map<String, Object> bizContent = new TreeMap<>();
235235
bizContent.put("body", order.getBody());
236-
bizContent.put("seller_id", payConfigStorage.getSeller());
236+
setParameters(bizContent, "seller_id", payConfigStorage.getSeller());
237237
bizContent.put("subject", order.getSubject());
238238
bizContent.put("out_trade_no", order.getOutTradeNo());
239239
bizContent.put("total_amount", Util.conversionAmount(order.getPrice()).toString());

pay-java-ali/src/main/java/com/egzosn/pay/ali/utils/AntCertificationUtil.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.security.NoSuchAlgorithmException;
1111
import java.security.Principal;
1212
import java.security.PublicKey;
13+
import java.security.Security;
1314
import java.security.cert.Certificate;
1415
import java.security.cert.CertificateException;
1516
import java.security.cert.CertificateExpiredException;
@@ -25,6 +26,7 @@
2526

2627
import org.apache.commons.logging.Log;
2728
import org.apache.commons.logging.LogFactory;
29+
import org.bouncycastle.jce.provider.BouncyCastleProvider;
2830

2931
import com.egzosn.pay.common.bean.result.PayException;
3032
import com.egzosn.pay.common.exception.PayErrorException;
@@ -43,7 +45,10 @@
4345
*/
4446
public class AntCertificationUtil {
4547
private static final Log LOGGER = LogFactory.getLog(AntCertificationUtil.class);
46-
48+
static {
49+
Security.removeProvider("SunEC");
50+
Security.addProvider(new BouncyCastleProvider());
51+
}
4752
/**
4853
* 验证证书是否可信
4954
*

0 commit comments

Comments
 (0)