非法参数的异常统一使用WxPayException

binarywang · binarywang · commit e886ba09f6e6 · 2017-09-03T00:00:58.000+08:00
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java
@@ -122,7 +122,7 @@ protected void checkFields() throws WxPayException {
   /**
    * 检查约束情况
    */
-  protected abstract void checkConstraints();
+  protected abstract void checkConstraints() throws WxPayException;
 
   public String getAppid() {
     return this.appid;
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadBillRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadBillRequest.java
@@ -1,5 +1,6 @@
 package com.github.binarywang.wxpay.bean.request;
 
+import com.github.binarywang.wxpay.exception.WxPayException;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import me.chanjar.weixin.common.annotation.Required;
 import org.apache.commons.lang3.ArrayUtils;
@@ -128,13 +129,13 @@ public void setTarType(String tarType) {
   }
 
   @Override
-  protected void checkConstraints() {
+  protected void checkConstraints() throws WxPayException {
     if (StringUtils.isNotBlank(this.getTarType()) && !"GZIP".equals(this.getTarType())) {
-      throw new IllegalArgumentException("tar_type值如果存在，只能为GZIP");
+      throw new WxPayException("tar_type值如果存在，只能为GZIP");
     }
 
     if (!ArrayUtils.contains(BILL_TYPE, this.getBillType())) {
-      throw new IllegalArgumentException(String.format("bill_tpye目前必须为%s其中之一,实际值：%s",
+      throw new WxPayException(String.format("bill_tpye目前必须为%s其中之一,实际值：%s",
         Arrays.toString(BILL_TYPE), this.getBillType()));
     }
   }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderQueryRequest.java
@@ -1,5 +1,6 @@
 package com.github.binarywang.wxpay.bean.request;
 
+import com.github.binarywang.wxpay.exception.WxPayException;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.StringUtils;
 
@@ -64,10 +65,10 @@ public void setOutTradeNo(String outTradeNo) {
   }
 
   @Override
-  protected void checkConstraints() {
+  protected void checkConstraints() throws WxPayException {
     if ((StringUtils.isBlank(transactionId) && StringUtils.isBlank(outTradeNo)) ||
       (StringUtils.isNotBlank(transactionId) && StringUtils.isNotBlank(outTradeNo))) {
-      throw new IllegalArgumentException("transaction_id 和 out_trade_no 不能同时存在或同时为空，必须二选一");
+      throw new WxPayException("transaction_id 和 out_trade_no 不能同时存在或同时为空，必须二选一");
     }
   }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderReverseRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderReverseRequest.java
@@ -1,5 +1,6 @@
 package com.github.binarywang.wxpay.bean.request;
 
+import com.github.binarywang.wxpay.exception.WxPayException;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.StringUtils;
 
@@ -91,9 +92,9 @@ public void setSignType(String signType) {
   }
 
   @Override
-  protected void checkConstraints() {
+  protected void checkConstraints() throws WxPayException {
     if (StringUtils.isBlank(transactionId) && StringUtils.isBlank(outTradeNo)) {
-      throw new IllegalArgumentException("transaction_id 和 out_trade_no不能同时为空！");
+      throw new WxPayException("transaction_id 和 out_trade_no不能同时为空！");
     }
   }
 
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundQueryRequest.java
@@ -1,5 +1,6 @@
 package com.github.binarywang.wxpay.bean.request;
 
+import com.github.binarywang.wxpay.exception.WxPayException;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.StringUtils;
 
@@ -135,12 +136,12 @@ public void setRefundId(String refundId) {
   }
 
   @Override
-  protected void checkConstraints() {
+  protected void checkConstraints() throws WxPayException {
     if ((StringUtils.isBlank(transactionId) && StringUtils.isBlank(outTradeNo)
       && StringUtils.isBlank(outRefundNo) && StringUtils.isBlank(refundId)) ||
       (StringUtils.isNotBlank(transactionId) && StringUtils.isNotBlank(outTradeNo)
         && StringUtils.isNotBlank(outRefundNo) && StringUtils.isNotBlank(refundId))) {
-      throw new IllegalArgumentException("transaction_id，out_trade_no，out_refund_no，refund_id 必须四选一");
+      throw new WxPayException("transaction_id，out_trade_no，out_refund_no，refund_id 必须四选一");
     }
 
   }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java
@@ -271,16 +271,16 @@ public void checkAndSign(WxPayConfig config) throws WxPayException {
   }
 
   @Override
-  protected void checkConstraints() {
+  protected void checkConstraints() throws WxPayException {
     if (StringUtils.isNotBlank(this.getRefundAccount())) {
       if (!ArrayUtils.contains(REFUND_ACCOUNT, this.getRefundAccount())) {
-        throw new IllegalArgumentException(String.format("refund_account目前必须为%s其中之一,实际值：%s",
+        throw new WxPayException(String.format("refund_account目前必须为%s其中之一,实际值：%s",
           Arrays.toString(REFUND_ACCOUNT), this.getRefundAccount()));
       }
     }
 
     if (StringUtils.isBlank(this.getOutTradeNo()) && StringUtils.isBlank(this.getTransactionId())) {
-      throw new IllegalArgumentException("transaction_id 和 out_trade_no 不能同时为空，必须提供一个");
+      throw new WxPayException("transaction_id 和 out_trade_no 不能同时为空，必须提供一个");
     }
   }
 
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
@@ -500,18 +500,18 @@ public void setSceneInfo(String sceneInfo) {
   }
 
   @Override
-  protected void checkConstraints() {
+  protected void checkConstraints() throws WxPayException {
 //    if (!ArrayUtils.contains(TRADE_TYPES, this.getTradeType())) {
-//      throw new IllegalArgumentException(String.format("trade_type目前必须为%s其中之一,实际值：%s",
+//      throw new WxPayException(String.format("trade_type目前必须为%s其中之一,实际值：%s",
 //        Arrays.toString(TRADE_TYPES), this.getTradeType()));
 //    }
 
     if ("JSAPI".equals(this.getTradeType()) && this.getOpenid() == null) {
-      throw new IllegalArgumentException("当 trade_type是'JSAPI'时未指定openid");
+      throw new WxPayException("当 trade_type是'JSAPI'时未指定openid");
     }
 
     if ("NATIVE".equals(this.getTradeType()) && this.getProductId() == null) {
-      throw new IllegalArgumentException("当 trade_type是'NATIVE'时未指定product_id");
+      throw new WxPayException("当 trade_type是'NATIVE'时未指定product_id");
     }
   }
 
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResult.java
@@ -316,8 +316,8 @@ public void checkResult(WxPayServiceAbstractImpl wxPayService) throws WxPayExcep
     }
 
     //校验结果是否成功
-    if (!"SUCCESS".equalsIgnoreCase(getReturnCode())
-      || !"SUCCESS".equalsIgnoreCase(getResultCode())) {
+    if (!StringUtils.equalsAny(StringUtils.trimToEmpty(getReturnCode()).toUpperCase(), "SUCCESS", "")
+      || !StringUtils.equalsAny(StringUtils.trimToEmpty(getResultCode()).toUpperCase(), "SUCCESS", "")) {
       StringBuilder errorMsg = new StringBuilder();
       if (getReturnCode() != null) {
         errorMsg.append("返回代码：").append(getReturnCode());
@@ -335,8 +335,7 @@ public void checkResult(WxPayServiceAbstractImpl wxPayService) throws WxPayExcep
         errorMsg.append("，错误详情：").append(getErrCodeDes());
       }
 
-      this.getLogger().error("\n结果业务代码异常，返回結果：{},\n{}",
-        map, errorMsg.toString());
+      this.getLogger().error("\n结果业务代码异常，返回結果：{},\n{}", map, errorMsg.toString());
       throw WxPayException.from(this);
     }
   }
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
@@ -160,11 +160,11 @@ public void setUseSandboxEnv(boolean useSandboxEnv) {
 
   public SSLContext initSSLContext() throws WxPayException {
     if (StringUtils.isBlank(mchId)) {
-      throw new IllegalArgumentException("请确保商户号mchId已设置");
+      throw new WxPayException("请确保商户号mchId已设置");
     }
 
     if (StringUtils.isBlank(this.keyPath)) {
-      throw new IllegalArgumentException("请确保证书文件地址keyPath已配置");
+      throw new WxPayException("请确保证书文件地址keyPath已配置");
     }
 
     InputStream inputStream;
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
@@ -161,7 +161,7 @@ public WxPayOrderQueryResult queryOrder(String transactionId, String outTradeNo)
   @Override
   public WxPayOrderCloseResult closeOrder(String outTradeNo) throws WxPayException {
     if (StringUtils.isBlank(outTradeNo)) {
-      throw new IllegalArgumentException("out_trade_no不能为空");
+      throw new WxPayException("out_trade_no不能为空");
     }
 
     WxPayOrderCloseRequest request = new WxPayOrderCloseRequest();
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
@@ -139,7 +139,7 @@ public void testUnifiedOrder() throws WxPayException {
       .unifiedOrder(WxPayUnifiedOrderRequest.newBuilder()
         .body("我去")
         .totalFee(1)
-        .spbillCreateIp("111111")
+        .spbillCreateIp("11.1.11.1")
         .notifyURL("111111")
         .tradeType("JSAPI")
         .openid(((XmlWxPayConfig) this.payService.getConfig()).getOpenid())

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.github.binarywang.wxpay.bean.request;`
`2`	`2`
	`3`	`+import com.github.binarywang.wxpay.exception.WxPayException;`
`3`	`4`	`import com.thoughtworks.xstream.annotations.XStreamAlias;`
`4`	`5`	`import me.chanjar.weixin.common.annotation.Required;`
`5`	`6`	`import org.apache.commons.lang3.ArrayUtils;`
`@@ -128,13 +129,13 @@ public void setTarType(String tarType) {`
`128`	`129`	`}`
`129`	`130`
`130`	`131`	`@Override`
`131`		`- protected void checkConstraints() {`
	`132`	`+ protected void checkConstraints() throws WxPayException {`
`132`	`133`	`if (StringUtils.isNotBlank(this.getTarType()) && !"GZIP".equals(this.getTarType())) {`
`133`		`- throw new IllegalArgumentException("tar_type值如果存在，只能为GZIP");`
	`134`	`+ throw new WxPayException("tar_type值如果存在，只能为GZIP");`
`134`	`135`	`}`
`135`	`136`
`136`	`137`	`if (!ArrayUtils.contains(BILL_TYPE, this.getBillType())) {`
`137`		`- throw new IllegalArgumentException(String.format("bill_tpye目前必须为%s其中之一,实际值：%s",`
	`138`	`+ throw new WxPayException(String.format("bill_tpye目前必须为%s其中之一,实际值：%s",`
`138`	`139`	`Arrays.toString(BILL_TYPE), this.getBillType()));`
`139`	`140`	`}`
`140`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -271,16 +271,16 @@ public void checkAndSign(WxPayConfig config) throws WxPayException {`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`@Override`
`274`		`- protected void checkConstraints() {`
	`274`	`+ protected void checkConstraints() throws WxPayException {`
`275`	`275`	`if (StringUtils.isNotBlank(this.getRefundAccount())) {`
`276`	`276`	`if (!ArrayUtils.contains(REFUND_ACCOUNT, this.getRefundAccount())) {`
`277`		`- throw new IllegalArgumentException(String.format("refund_account目前必须为%s其中之一,实际值：%s",`
	`277`	`+ throw new WxPayException(String.format("refund_account目前必须为%s其中之一,实际值：%s",`
`278`	`278`	`Arrays.toString(REFUND_ACCOUNT), this.getRefundAccount()));`
`279`	`279`	`}`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`if (StringUtils.isBlank(this.getOutTradeNo()) && StringUtils.isBlank(this.getTransactionId())) {`
`283`		`- throw new IllegalArgumentException("transaction_id 和 out_trade_no 不能同时为空，必须提供一个");`
	`283`	`+ throw new WxPayException("transaction_id 和 out_trade_no 不能同时为空，必须提供一个");`
`284`	`284`	`}`
`285`	`285`	`}`
`286`	`286`
Original file line number	Diff line number	Diff line change
`@@ -500,18 +500,18 @@ public void setSceneInfo(String sceneInfo) {`
`500`	`500`	`}`
`501`	`501`
`502`	`502`	`@Override`
`503`		`- protected void checkConstraints() {`
	`503`	`+ protected void checkConstraints() throws WxPayException {`
`504`	`504`	`// if (!ArrayUtils.contains(TRADE_TYPES, this.getTradeType())) {`
`505`		`-// throw new IllegalArgumentException(String.format("trade_type目前必须为%s其中之一,实际值：%s",`
	`505`	`+// throw new WxPayException(String.format("trade_type目前必须为%s其中之一,实际值：%s",`
`506`	`506`	`// Arrays.toString(TRADE_TYPES), this.getTradeType()));`
`507`	`507`	`// }`
`508`	`508`
`509`	`509`	`if ("JSAPI".equals(this.getTradeType()) && this.getOpenid() == null) {`
`510`		`- throw new IllegalArgumentException("当 trade_type是'JSAPI'时未指定openid");`
	`510`	`+ throw new WxPayException("当 trade_type是'JSAPI'时未指定openid");`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`if ("NATIVE".equals(this.getTradeType()) && this.getProductId() == null) {`
`514`		`- throw new IllegalArgumentException("当 trade_type是'NATIVE'时未指定product_id");`
	`514`	`+ throw new WxPayException("当 trade_type是'NATIVE'时未指定product_id");`
`515`	`515`	`}`
`516`	`516`	`}`
`517`	`517`
Original file line number	Diff line number	Diff line change
`@@ -316,8 +316,8 @@ public void checkResult(WxPayServiceAbstractImpl wxPayService) throws WxPayExcep`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`//校验结果是否成功`
`319`		`- if (!"SUCCESS".equalsIgnoreCase(getReturnCode())`
`320`		`- \|\| !"SUCCESS".equalsIgnoreCase(getResultCode())) {`
	`319`	`+ if (!StringUtils.equalsAny(StringUtils.trimToEmpty(getReturnCode()).toUpperCase(), "SUCCESS", "")`
	`320`	`+ \|\| !StringUtils.equalsAny(StringUtils.trimToEmpty(getResultCode()).toUpperCase(), "SUCCESS", "")) {`
`321`	`321`	`StringBuilder errorMsg = new StringBuilder();`
`322`	`322`	`if (getReturnCode() != null) {`
`323`	`323`	`errorMsg.append("返回代码：").append(getReturnCode());`
`@@ -335,8 +335,7 @@ public void checkResult(WxPayServiceAbstractImpl wxPayService) throws WxPayExcep`
`335`	`335`	`errorMsg.append("，错误详情：").append(getErrCodeDes());`
`336`	`336`	`}`
`337`	`337`
`338`		`- this.getLogger().error("\n结果业务代码异常，返回結果：{},\n{}",`
`339`		`- map, errorMsg.toString());`
	`338`	`+ this.getLogger().error("\n结果业务代码异常，返回結果：{},\n{}", map, errorMsg.toString());`
`340`	`339`	`throw WxPayException.from(this);`
`341`	`340`	`}`
`342`	`341`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,11 +160,11 @@ public void setUseSandboxEnv(boolean useSandboxEnv) {`
`160`	`160`
`161`	`161`	`public SSLContext initSSLContext() throws WxPayException {`
`162`	`162`	`if (StringUtils.isBlank(mchId)) {`
`163`		`- throw new IllegalArgumentException("请确保商户号mchId已设置");`
	`163`	`+ throw new WxPayException("请确保商户号mchId已设置");`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`if (StringUtils.isBlank(this.keyPath)) {`
`167`		`- throw new IllegalArgumentException("请确保证书文件地址keyPath已配置");`
	`167`	`+ throw new WxPayException("请确保证书文件地址keyPath已配置");`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`InputStream inputStream;`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public WxPayOrderQueryResult queryOrder(String transactionId, String outTradeNo)`
`161`	`161`	`@Override`
`162`	`162`	`public WxPayOrderCloseResult closeOrder(String outTradeNo) throws WxPayException {`
`163`	`163`	`if (StringUtils.isBlank(outTradeNo)) {`
`164`		`- throw new IllegalArgumentException("out_trade_no不能为空");`
	`164`	`+ throw new WxPayException("out_trade_no不能为空");`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`WxPayOrderCloseRequest request = new WxPayOrderCloseRequest();`