Skip to content

Commit 7bb3a12

Browse files
committed
改写部分使用StringUtils.equalsAny方法的代码,避免客户端jar包冲突引起不必要的麻烦
1 parent 3e75064 commit 7bb3a12

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResult.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.github.binarywang.wxpay.service.impl.WxPayServiceAbstractImpl;
55
import com.github.binarywang.wxpay.util.SignUtils;
66
import com.google.common.base.Joiner;
7+
import com.google.common.collect.Lists;
78
import com.google.common.collect.Maps;
89
import com.thoughtworks.xstream.XStream;
910
import com.thoughtworks.xstream.annotations.XStreamAlias;
@@ -25,6 +26,7 @@
2526
import java.io.ByteArrayInputStream;
2627
import java.io.IOException;
2728
import java.math.BigDecimal;
29+
import java.util.List;
2830
import java.util.Map;
2931

3032
/**
@@ -222,9 +224,10 @@ public void checkResult(WxPayServiceAbstractImpl wxPayService) throws WxPayExcep
222224
throw new WxPayException("参数格式校验错误!");
223225
}
224226

227+
List<String> successStrings = Lists.newArrayList("SUCCESS", "");
225228
//校验结果是否成功
226-
if (!StringUtils.equalsAny(StringUtils.trimToEmpty(getReturnCode()).toUpperCase(), "SUCCESS", "")
227-
|| !StringUtils.equalsAny(StringUtils.trimToEmpty(getResultCode()).toUpperCase(), "SUCCESS", "")) {
229+
if (!successStrings.contains(StringUtils.trimToEmpty(getReturnCode()).toUpperCase())
230+
|| !successStrings.contains(StringUtils.trimToEmpty(getResultCode()).toUpperCase())) {
228231
StringBuilder errorMsg = new StringBuilder();
229232
if (getReturnCode() != null) {
230233
errorMsg.append("返回代码:").append(getReturnCode());

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/util/SignUtils.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.github.binarywang.wxpay.util;
22

33
import com.github.binarywang.wxpay.constant.WxPayConstants.SignType;
4+
import com.google.common.collect.Lists;
45
import me.chanjar.weixin.common.util.BeanUtils;
56
import org.apache.commons.codec.binary.Hex;
67
import org.apache.commons.codec.digest.DigestUtils;
7-
import org.apache.commons.lang3.StringUtils;
88

99
import javax.crypto.Mac;
1010
import javax.crypto.spec.SecretKeySpec;
@@ -56,8 +56,7 @@ public static String createSign(Map<String, String> params, String signKey, Stri
5656
StringBuilder toSign = new StringBuilder();
5757
for (String key : sortedMap.keySet()) {
5858
String value = params.get(key);
59-
if (StringUtils.isNotEmpty(value)
60-
&& !StringUtils.equalsAny(key, "sign", "key", "sign_type")) {
59+
if (!Lists.newArrayList("sign", "key", "sign_type").contains(key)) {
6160
toSign.append(key).append("=").append(value).append("&");
6261
}
6362
}

0 commit comments

Comments
 (0)