fix signature encoding charset error

samurai00 · samurai00 · commit 963a2e016f8a · 2016-04-09T00:54:43.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.6
+* 修正：  
+签名内容编码问题
+
 ## 2.1.5
 * 修改：  
 补充 RedEnvelope、Transfer 缺少字段
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ maven 远程仓库
 <dependency>
     <groupId>Pingplusplus</groupId>
     <artifactId>pingpp-java</artifactId>
-    <version>2.1.5</version>
+    <version>2.1.6</version>
     <type>jar</type>
 </dependency>
 ```
@@ -52,7 +52,7 @@ repositories {
 
 安装 Ping++ SDK
 ```
-compile 'Pingplusplus:pingpp-java:2.1.5'
+compile 'Pingplusplus:pingpp-java:2.1.6'
 ```
 
 ### 初始化
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1.5
+2.1.6
diff --git a/libs/pingpp-java-2.1.6.jar b/libs/pingpp-java-2.1.6.jar
diff --git a/src/com/pingplusplus/Pingpp.java b/src/com/pingplusplus/Pingpp.java
@@ -11,7 +11,7 @@ public abstract class Pingpp {
     /**
      * version
      */
-    public static final String VERSION = "2.1.5";
+    public static final String VERSION = "2.1.6";
     /**
      * api key
      */
diff --git a/src/com/pingplusplus/net/APIResource.java b/src/com/pingplusplus/net/APIResource.java
@@ -588,7 +588,7 @@ private static String generateSign(String data)
             byte[] keyBytes = new byte[inputStream.available()];
             inputStream.read(keyBytes);
             inputStream.close();
-            String keyString = new String(keyBytes, "UTF-8");
+            String keyString = new String(keyBytes, CHARSET);
             Pingpp.privateKey = keyString.replaceAll("(-+BEGIN (RSA )?PRIVATE KEY-+\\r?\\n|-+END (RSA )?PRIVATE KEY-+\\r?\\n?)", "");
         }
 
@@ -619,7 +619,7 @@ private static String generateSign(String data)
 
             Signature signature = Signature.getInstance("SHA256withRSA");
             signature.initSign(privateKey);
-            signature.update(data.getBytes());
+            signature.update(data.getBytes(CHARSET));
             byte[] signBytes = signature.sign();
 
             return Base64.encodeBase64String(signBytes).replaceAll("\n|\r", "");
diff --git a/src/com/pingplusplus/util/WxpubOAuth.java b/src/com/pingplusplus/util/WxpubOAuth.java
@@ -23,6 +23,12 @@
  * 详细内容可参考http://mp.weixin.qq.com/wiki/17/c0f37d5704f0b64713d5d2c37b468d75.html
  */
 public class WxpubOAuth {
+
+    /**
+     * URLEncoder charset
+     */
+    public static final String CHARSET = "UTF-8";
+
     /**
      * 获取微信公众号授权用户唯一标识
      *
@@ -91,7 +97,7 @@ private static String httpBuildQuery(Map<String, String> queryString) throws Uns
             if (sb.length() > 0) {
                 sb.append('&');
             }
-            sb.append(URLEncoder.encode(e.getKey(), "UTF-8")).append('=').append(URLEncoder.encode(e.getValue(), "UTF-8"));
+            sb.append(URLEncoder.encode(e.getKey(), CHARSET)).append('=').append(URLEncoder.encode(e.getValue(), CHARSET));
         }
 
         return sb.toString();
@@ -184,7 +190,7 @@ public static String getSignature(String charge, String jsapiTicket, String url)
         try {
             MessageDigest crypt = MessageDigest.getInstance("SHA-1");
             crypt.reset();
-            crypt.update(string1.getBytes("UTF-8"));
+            crypt.update(string1.getBytes(CHARSET));
             signature = byteToHex(crypt.digest());
         } catch (NoSuchAlgorithmException e) {
             e.printStackTrace();
