Przeglądaj źródła

#1059 微信支付证书地址参数keyPath支持使用网络地址

master
Binary Wang 5 lat temu
rodzic
commit
60ebb54958
2 zmienionych plików z 23 dodań i 16 usunięć
  1. +15
    -10
      weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
  2. +8
    -6
      weixin-java-pay/src/test/java/com/github/binarywang/wxpay/config/WxPayConfigTest.java

+ 15
- 10
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java Wyświetl plik

@@ -1,19 +1,15 @@
package com.github.binarywang.wxpay.config;

import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.security.KeyStore;
import javax.net.ssl.SSLContext;

import com.github.binarywang.wxpay.exception.WxPayException;
import lombok.Data;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.ssl.SSLContexts;

import com.github.binarywang.wxpay.exception.WxPayException;
import lombok.Data;
import javax.net.ssl.SSLContext;
import java.io.*;
import java.net.URL;
import java.security.KeyStore;

/**
* 微信支付配置
@@ -131,6 +127,15 @@ public class WxPayConfig {
if (inputStream == null) {
throw new WxPayException(fileNotFoundMsg);
}
} else if (this.getKeyPath().startsWith("http://") || this.getKeyPath().startsWith("https://")) {
try {
inputStream = new URL(this.keyPath).openStream();
if (inputStream == null) {
throw new WxPayException(fileNotFoundMsg);
}
} catch (IOException e) {
throw new WxPayException(fileNotFoundMsg, e);
}
} else {
try {
File file = new File(this.getKeyPath());


+ 8
- 6
weixin-java-pay/src/test/java/com/github/binarywang/wxpay/config/WxPayConfigTest.java Wyświetl plik

@@ -14,16 +14,18 @@ import static org.testng.Assert.*;
public class WxPayConfigTest {
private WxPayConfig payConfig = new WxPayConfig();

/**
* Test init ssl context.
*
* @throws Exception the exception
*/
@Test
public void testInitSSLContext() throws Exception {
public void testInitSSLContext_classpath() throws Exception {
payConfig.setMchId("123");
payConfig.setKeyPath("classpath:/abc.p12");
payConfig.initSSLContext();
}

@Test
public void testInitSSLContext_http() throws Exception {
payConfig.setMchId("123");
payConfig.setKeyPath("https://www.baidu.com");
payConfig.initSSLContext();
}

}

Ładowanie…
Anuluj
Zapisz