Merge branch 'develop'

Author: chanjarster

.travis.yml

@@ -0,0 +1,13 @@
+language: java
+jdk:
+  - oraclejdk7
+
+script: "mvn clean install -Dmaven.test.skip=true"
+
+branches:
+  only:
+    - develop
+
+notifications:
+  email:
+    - [email protected]

README.md

@@ -1,4 +1,8 @@
 weixin-java-tools
+
+[![Build Status](https://travis-ci.org/chanjarster/weixin-java-tools.svg?branch=develop)](https://travis-ci.org/chanjarster/weixin-java-tools)
+![Maven Central](https://img.shields.io/maven-central/v/me.chanjar/weixin-java-parent.svg)
+
 ===========
 
 微信公众号、企业号Java SDK。

pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>

weixin-java-common/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>me.chanjar</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/WxErrorExceptionHandler.java renamed to weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxErrorExceptionHandler.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.common.util;
+package me.chanjar.weixin.common.api;
 
 import me.chanjar.weixin.common.exception.WxErrorException;
 

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/WxMessageDuplicateChecker.java renamed to weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxMessageDuplicateChecker.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.common.util;
+package me.chanjar.weixin.common.api;
 
 /**
  * <pre>

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/WxMessageInMemoryDuplicateChecker.java renamed to weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxMessageInMemoryDuplicateChecker.java

@@ -1,4 +1,4 @@
-package me.chanjar.weixin.common.util;
+package me.chanjar.weixin.common.api;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxAccessToken.java

@@ -2,7 +2,9 @@
 
 import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 
-public class WxAccessToken {
+import java.io.Serializable;
+
+public class WxAccessToken implements Serializable {
 
   private String accessToken;
 

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpJsapiSignature.java renamed to weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java

@@ -1,9 +1,11 @@
-package me.chanjar.weixin.mp.bean.result;
+package me.chanjar.weixin.common.bean;
+
+import java.io.Serializable;
 
 /**
  * jspai signature
  */
-public class WxMpJsapiSignature {
+public class WxJsapiSignature implements Serializable {
 
   private String noncestr;
 

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java

@@ -2,6 +2,7 @@
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -12,7 +13,7 @@
  * @author Daniel Qian
  *
  */
-public class WxMenu {
+public class WxMenu implements Serializable {
 
   private List<WxMenuButton> buttons = new ArrayList<WxMenuButton>();