Merge pull request chanjarster#218 from ukid/develop

票据验证方法
enli2222 · Oct 23, 2015 · b5f0ee7 · b5f0ee7
2 parents 9363a67 + 123e5ef
commit b5f0ee7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java
@@ -248,7 +248,6 @@ public static String createSign(Map<String, String> packageParams, String signKe
             }
         }
         toSign.append("key=" + signKey);
-        System.out.println(toSign.toString());
         String sign = DigestUtils.md5Hex(toSign.toString())
                 .toUpperCase();
         return sign;

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
@@ -11,7 +11,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -738,4 +737,15 @@ public interface WxMpService {
      * @return
      */
     WxMpPayCallback getJSSDKCallbackData(String xmlData);
+
+    /**
+     * <pre>
+     * 计算Map键值对是否和签名相符,
+     * 按照字段名的 ASCII 码从小到大排序(字典序)后,使用 URL 键值对的 格式(即 key1=value1&key2=value2...)拼接成字符串
+     * </pre>
+     * @param kvm
+     * @param signature
+     * @return
+     */
+    public boolean checkJSSDKCallbackDataSignature(Map<String, String> kvm, String signature);
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java
@@ -5,8 +5,6 @@
 import java.io.InputStream;
 import java.io.StringReader;
 import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -76,7 +74,6 @@
 import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.http.Consts;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
@@ -937,5 +934,8 @@ public WxMpPayCallback getJSSDKCallbackData(String xmlData) {
     return new WxMpPayCallback();
   }
 
-
+  @Override
+  public boolean checkJSSDKCallbackDataSignature(Map<String, String> kvm, String signature) {
+	  return signature.equals(WxCryptUtil.createSign(kvm, wxMpConfigStorage.getPartnerKey()));
+  }
 }