From 7bb3a1270d27479c777fd40727cdbee63d54d069 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Fri, 22 Sep 2017 10:58:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=86=99=E9=83=A8=E5=88=86=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8StringUtils.equalsAny=E6=96=B9=E6=B3=95=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E9=81=BF=E5=85=8D=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AFjar=E5=8C=85=E5=86=B2=E7=AA=81=E5=BC=95=E8=B5=B7?=
 =?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E9=BA=BB=E7=83=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wxpay/bean/result/WxPayBaseResult.java      | 7 +++++--
 .../java/com/github/binarywang/wxpay/util/SignUtils.java   | 5 ++---
 2 files changed, 7 insertions(+), 5 deletions(-)

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
index 63db0e73b..6607b7698 100644
--- 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
@@ -4,6 +4,7 @@ import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.impl.WxPayServiceAbstractImpl;
 import com.github.binarywang.wxpay.util.SignUtils;
 import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
@@ -25,6 +26,7 @@ import javax.xml.xpath.XPathFactory;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -222,9 +224,10 @@ public abstract class WxPayBaseResult {
       throw new WxPayException("参数格式校验错误！");
     }
 
+    List<String> successStrings = Lists.newArrayList("SUCCESS", "");
     //校验结果是否成功
-    if (!StringUtils.equalsAny(StringUtils.trimToEmpty(getReturnCode()).toUpperCase(), "SUCCESS", "")
-      || !StringUtils.equalsAny(StringUtils.trimToEmpty(getResultCode()).toUpperCase(), "SUCCESS", "")) {
+    if (!successStrings.contains(StringUtils.trimToEmpty(getReturnCode()).toUpperCase())
+      || !successStrings.contains(StringUtils.trimToEmpty(getResultCode()).toUpperCase())) {
       StringBuilder errorMsg = new StringBuilder();
       if (getReturnCode() != null) {
         errorMsg.append("返回代码：").append(getReturnCode());
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/util/SignUtils.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/util/SignUtils.java
index b13175a72..6bff4d7a3 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/util/SignUtils.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/util/SignUtils.java
@@ -1,10 +1,10 @@
 package com.github.binarywang.wxpay.util;
 
 import com.github.binarywang.wxpay.constant.WxPayConstants.SignType;
+import com.google.common.collect.Lists;
 import me.chanjar.weixin.common.util.BeanUtils;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.StringUtils;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
@@ -56,8 +56,7 @@ public class SignUtils {
     StringBuilder toSign = new StringBuilder();
     for (String key : sortedMap.keySet()) {
       String value = params.get(key);
-      if (StringUtils.isNotEmpty(value)
-        && !StringUtils.equalsAny(key, "sign", "key", "sign_type")) {
+      if (!Lists.newArrayList("sign", "key", "sign_type").contains(key)) {
         toSign.append(key).append("=").append(value).append("&");
       }
     }