简化方法名称

binarywang · binarywang · commit 424337a7a786 · 2017-05-03T17:45:37.000+08:00
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
@@ -129,7 +129,7 @@ public SSLContext getSslContext() {
    * 微信支付是否使用仿真测试环境
    * 默认不使用
    */
-  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
@@ -45,7 +45,7 @@ public void setConfig(WxPayConfig config) {
   }
 
   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
@@ -2,13 +2,6 @@
 
 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 void setOpenid(String openid) {
   }
 
   @Override
-  public boolean useSandboxForWxPay() {
+  public boolean useSandbox() {
     //沙箱环境不成熟，有问题无法使用，暂时屏蔽掉
-    // return true;
+//     return true;
     return false;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public SSLContext getSslContext() {`
`129`	`129`	`* 微信支付是否使用仿真测试环境`
`130`	`130`	`* 默认不使用`
`131`	`131`	`*/`
`132`		`- public boolean useSandboxForWxPay() {`
	`132`	`+ public boolean useSandbox() {`
`133`	`133`	`return false;`
`134`	`134`	`}`
`135`	`135`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public void setConfig(WxPayConfig config) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`private String getPayBaseUrl() {`
`48`		`- if (this.getConfig().useSandboxForWxPay()) {`
	`48`	`+ if (this.getConfig().useSandbox()) {`
`49`	`49`	`return PAY_BASE_URL + "/sandboxnew";`
`50`	`50`	`}`
`51`	`51`