兼容两种微信公众号接入方式

samurai00 · samurai00 · commit 319dc314faf1 · 2016-03-03T15:47:44.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.1.3
+* 兼容两种微信公众号接入方式
+
 ## 2.1.2
 * 补全确实字段  
 * 修正 Event 解析  
diff --git a/libs/pingpp-java-2.1.3.jar b/libs/pingpp-java-2.1.3.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.2";
+    public static final String VERSION = "2.1.3";
     /**
      * api key
      */
diff --git a/src/com/pingplusplus/net/ChargeDeserializer.java b/src/com/pingplusplus/net/ChargeDeserializer.java
@@ -30,15 +30,16 @@ public Charge deserialize(JsonElement jsonElement, Type type, JsonDeserializatio
                 Long timeStamp = wx.get("timeStamp").getAsLong();
                 wx.addProperty("timeStamp", "" + timeStamp);
             } else if (null != credentialJson.getAsJsonObject("wx_pub")) {
-                JsonObject wx = credentialJson.getAsJsonObject("wx_pub");
-                Long timeStamp = wx.get("timeStamp").getAsLong();
-                wx.addProperty("timeStamp", "" + timeStamp);
+                JsonObject wxPub = credentialJson.getAsJsonObject("wx_pub");
+                if (null == wxPub.get("signed_data") && wxPub.get("timeStamp") != null) {
+                    Long timeStamp = wxPub.get("timeStamp").getAsLong();
+                    wxPub.addProperty("timeStamp", "" + timeStamp);
+                }
             } else if (null != credentialJson.getAsJsonObject("bfb")) {
                 JsonObject bfb = credentialJson.getAsJsonObject("bfb");
                 Long total_amount = bfb.get("total_amount").getAsLong();
                 bfb.addProperty("total_amount", total_amount + "");
             }
-
         }
 
         Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).
