From 3ff7198798786c9c7d9ffbf296c9d3af95964e44 Mon Sep 17 00:00:00 2001
From: "egzosn@gmail.com" <930928lI1>
Date: Sat, 30 Sep 2017 09:26:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 84ef648..2fa0bf6 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,8 @@ android 例子 [pay-java-android](http://git.oschina.net/egzosn/pay-java-android
 
 这里感谢[ouyangxiangshao](https://github.com/ouyangxiangshao),[ZhuangXiong](https://github.com/ZhuangXiong) 与[Actinian](http://git.oschina.net/Actinia517) 所提交的安卓例子或者分支
 
+也感谢各大友友同学帮忙进行接口测试
+
 非常欢迎和感谢对本项目发起Pull Request的同学，不过本项目基于git flow开发流程，因此在发起Pull Request的时候请选择develop分支。
 
 E-Mail：egzosn@gmail.com

From fdc1e4627f7fa9846fdebdbec6619b8cd41bcefb Mon Sep 17 00:00:00 2001
From: "egzosn@gmail.com" <930928lI1>
Date: Wed, 11 Oct 2017 17:09:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E4=B9=B1=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/egzosn/pay/ali/api/AliPayService.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java
index a09aed9..68c94bb 100644
--- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java
+++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java
@@ -17,6 +17,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import java.awt.image.BufferedImage;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -243,6 +244,17 @@ public class AliPayService extends BasePayService {
             for (int i = 0,len =  values.length; i < len; i++) {
                 valueStr += (i == len - 1) ?  values[i] : values[i] + ",";
             }
+            //乱码解决，这段代码在出现乱码时使用。如果mysign和sign不相等也可以使用这段代码转化
+            //valueStr = new String(valueStr.getBytes("ISO-8859-1"), "gbk");
+            if (!valueStr.matches("\\w+")){
+                try {
+                    if(valueStr.equals(new String(valueStr.getBytes("iso8859-1"), "iso8859-1"))){
+                        valueStr=new String(valueStr.getBytes("iso8859-1"), payConfigStorage.getInputCharset());
+                    }
+                } catch (UnsupportedEncodingException e) {
+                    e.printStackTrace();
+                }
+            }
             params.put(name, valueStr);
         }