From 424337a7a7861639c48595a7fd67979691672909 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Wed, 3 May 2017 17:45:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E6=96=B9=E6=B3=95=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../github/binarywang/wxpay/config/WxPayConfig.java | 2 +- .../wxpay/service/impl/WxPayServiceImpl.java | 2 +- .../binarywang/wxpay/testbase/XmlWxPayConfig.java | 11 ++--------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java index c03b2482..895a827a 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java @@ -129,7 +129,7 @@ public class WxPayConfig { * 微信支付是否使用仿真测试环境 * 默认不使用 */ - public boolean useSandboxForWxPay() { + public boolean useSandbox() { return false; } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java index ed6e2c82..c15a3ab6 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java @@ -45,7 +45,7 @@ public class WxPayServiceImpl implements WxPayService { } private String getPayBaseUrl() { - if (this.getConfig().useSandboxForWxPay()) { + if (this.getConfig().useSandbox()) { return PAY_BASE_URL + "/sandboxnew"; } diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/testbase/XmlWxPayConfig.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/testbase/XmlWxPayConfig.java index a10f36f3..d029590a 100644 --- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/testbase/XmlWxPayConfig.java +++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/testbase/XmlWxPayConfig.java @@ -2,13 +2,6 @@ package com.github.binarywang.wxpay.testbase; import com.github.binarywang.wxpay.config.WxPayConfig; import com.thoughtworks.xstream.annotations.XStreamAlias; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.http.ssl.SSLContexts; - -import javax.net.ssl.SSLContext; -import java.io.File; -import java.io.FileInputStream; -import java.security.KeyStore; @XStreamAlias("xml") public class XmlWxPayConfig extends WxPayConfig { @@ -23,9 +16,9 @@ public class XmlWxPayConfig extends WxPayConfig { } @Override - public boolean useSandboxForWxPay() { + public boolean useSandbox() { //沙箱环境不成熟,有问题无法使用,暂时屏蔽掉 - // return true; +// return true; return false; } }