event 解析修正

samurai00 · samurai00 · commit 34fe113545c8 · 2017-12-08T18:16:32.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # ChangeLog
 
+## 2.3.0 (2017-12-08)
+#### 修正
+- Event 解析修正
+
 ## 2.3.0 (2017-12-01)
 #### 更改
 - 合并账户系统相关接口
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ maven 远程仓库
 <dependency>
     <groupId>Pingplusplus</groupId>
     <artifactId>pingpp-java</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1</version>
     <type>jar</type>
 </dependency>
 ```
@@ -52,7 +52,7 @@ repositories {
 
 安装 Ping++ SDK
 ```
-compile 'Pingplusplus:pingpp-java:2.3.0'
+compile 'Pingplusplus:pingpp-java:2.3.1'
 ```
 
 ### 初始化
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.3.0
+2.3.1
diff --git a/example/libs/commons-codec-1.10.jar b/example/libs/commons-codec-1.10.jar
diff --git a/example/libs/gson-2.6.2.jar b/example/libs/gson-2.6.2.jar
diff --git a/example/libs/pingpp-java-2.2.5.jar b/example/libs/pingpp-java-2.2.5.jar
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>Pingplusplus</groupId>
   <artifactId>pingpp-java</artifactId>
-  <version>2.3.0</version>
+  <version>2.3.1</version>
   <name>pingpp-java</name>
   <url>https://github.com/PingPlusPlus/pingpp-java</url>
   <properties>
diff --git a/src/main/java/com/pingplusplus/Pingpp.java b/src/main/java/com/pingplusplus/Pingpp.java
@@ -11,7 +11,7 @@ public abstract class Pingpp {
     /**
      * version
      */
-    public static final String VERSION = "2.3.0";
+    public static final String VERSION = "2.3.1";
     /**
      * api key
      */
diff --git a/src/main/java/com/pingplusplus/PingppAccount.java b/src/main/java/com/pingplusplus/PingppAccount.java
@@ -4,5 +4,5 @@
  * Created by Afon on 2016/12/22.
  */
 public abstract class PingppAccount extends Pingpp {
-    public static final String VERSION = "1.2.3";
+    public static final String VERSION = "1.2.4"; // 之后不再更新此版本号
 }
diff --git a/src/main/java/com/pingplusplus/serializer/AccountEventDataDeserializer.java b/src/main/java/com/pingplusplus/serializer/AccountEventDataDeserializer.java
@@ -35,17 +35,22 @@ public class AccountEventDataDeserializer extends EventDataDeserializer {
 
         objectMap.put("order", Order.class);
         objectMap.put("order_refund", OrderRefund.class);
+        objectMap.put("user", User.class);
+        objectMap.put("settle_account", SettleAccount.class);
         objectMap.put("withdrawal", Withdrawal.class);
         objectMap.put("batch_withdrawal", BatchWithdrawal.class);
+        objectMap.put("balance_bonus", BalanceBonus.class);
+        objectMap.put("balance_transfer", BalanceTransfer.class);
+        objectMap.put("recharge", Recharge.class);
+        objectMap.put("balance_transaction", BalanceTransaction.class);
+
         objectMap.put("coupon", Coupon.class);
         objectMap.put("coupon_template", CouponTemplate.class);
-        objectMap.put("balance_transaction", BalanceTransaction.class);
-        objectMap.put("user", User.class);
 
         objectMap.put("royalty", Royalty.class);
         objectMap.put("royalty_settlement", RoyaltySettlement.class);
         objectMap.put("royalty_transaction", RoyaltyTransaction.class);
-        objectMap.put("settle_account", SettleAccount.class);
+
         objectMap.put("sub_app", SubApp.class);
         objectMap.put("channel", Channel.class);
     }
diff --git a/src/test/java/com/pingplusplus/PingppAccountTest.java b/src/test/java/com/pingplusplus/PingppAccountTest.java
@@ -17,7 +17,7 @@ public class PingppAccountTest extends PingppAccountTestBase {
     }
 
     @Test public void testVerifyVersions() {
-        assertEquals("Pingpp.VERSION should match", "2.3.0", Pingpp.VERSION);
-        assertEquals("PingppAccount.VERSION should match", "1.2.3", PingppAccount.VERSION);
+        assertEquals("Pingpp.VERSION should match", "2.3.1", Pingpp.VERSION);
+        assertEquals("PingppAccount.VERSION should match", "1.2.4", PingppAccount.VERSION);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@`
`4`	`4`	`* Created by Afon on 2016/12/22.`
`5`	`5`	`*/`
`6`	`6`	`public abstract class PingppAccount extends Pingpp {`
`7`		`- public static final String VERSION = "1.2.3";`
	`7`	`+ public static final String VERSION = "1.2.4"; // 之后不再更新此版本号`
`8`	`8`	`}`