From d4fae5adbef6fb080f70e6ef5b5656188598408c Mon Sep 17 00:00:00 2001 From: egan Date: Sun, 13 Jan 2019 14:47:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=96=E7=A0=81=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/egzosn/pay/common/api/BasePayService.java | 3 ++- .../src/main/java/com/egzosn/pay/common/bean/PayOrder.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java index f9d1873..a455d4c 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java @@ -6,6 +6,7 @@ import com.egzosn.pay.common.exception.PayErrorException; import com.egzosn.pay.common.http.HttpConfigStorage; import com.egzosn.pay.common.http.HttpRequestTemplate; import com.egzosn.pay.common.util.sign.SignUtils; +import com.egzosn.pay.common.util.str.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -139,7 +140,7 @@ public abstract class BasePayService implements Pay for (int i = 0,len = values.length; i < len; i++) { valueStr += (i == len - 1) ? values[i] : values[i] + ","; } - if (!valueStr.matches("\\w+")){ + if (StringUtils.isNotEmpty(payConfigStorage.getInputCharset()) && !valueStr.matches("\\w+")){ try { if(valueStr.equals(new String(valueStr.getBytes("iso8859-1"), "iso8859-1"))){ valueStr=new String(valueStr.getBytes("iso8859-1"), payConfigStorage.getInputCharset()); diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java index 30928ad..753054d 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java @@ -61,7 +61,8 @@ public class PayOrder { private String wapName; /** - * 微信会员唯一标识 + * 用户唯一标识 + * 微信含 sub_openid 字段 */ private String openid; /**