binarywang · binarywang · Jul 26, 2016 · Jun 30, 2016 · Jul 4, 2016 · Jul 4, 2016
diff --git a/pom.xml b/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>1.3.5</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
@@ -39,7 +39,6 @@
     <module>weixin-java-common</module>
     <module>weixin-java-cp</module>
     <module>weixin-java-mp</module>
-    <module>spring-demo</module>
   </modules>
 
   <properties>
@@ -50,6 +49,13 @@
     <slf4j.version>1.7.10</slf4j.version>
     <logback.version>1.1.2</logback.version>
     <jodd-http.version>3.6.7</jodd-http.version>
+    <jackson.version>2.8.0</jackson.version>
+    <gson.version>2.7</gson.version>
+    <commons-lang3.version>3.4</commons-lang3.version>
+    <commons-io.version>2.5</commons-io.version>
+    <commons-codec.version>1.10</commons-codec.version>
+    <jetty.version>9.3.0.M0</jetty.version>
+    <jetty-new.version>9.3.10.v20160621</jetty-new.version>
   </properties>
 
   <dependencies>
@@ -82,20 +88,30 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.2.2</version>
+      <version>${gson.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.9</version>
+      <version>${commons-codec.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.4</version>
+      <version>${commons-io.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>${commons-lang3.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${jackson.version}</version>
     </dependency>
   </dependencies>
-
+  
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -125,13 +141,13 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>
-        <version>9.3.0.M0</version>
+        <version>${jetty.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-servlet</artifactId>
-        <version>9.3.0.M0</version>
+        <version>${jetty.version}</version>
         <scope>test</scope>
       </dependency>
     </dependencies>
@@ -149,16 +165,16 @@
   </distributionManagement>
 
   <profiles>
-	  <profile>
-	    <id>doclint-java8-disable</id>
-	    <activation>
-	      <jdk>[1.8,)</jdk>
-	    </activation>
-	    <properties>
-	      <javadoc.opts>-Xdoclint:none</javadoc.opts>
-	    </properties>
-	  </profile>
-	  
+    <profile>
+      <id>doclint-java8-disable</id>
+      <activation>
+        <jdk>[1.8,)</jdk>
+      </activation>
+      <properties>
+        <javadoc.opts>-Xdoclint:none</javadoc.opts>
+      </properties>
+    </profile>
+
     <profile>
       <id>release</id>
       <build>
@@ -220,6 +236,9 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.17</version>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/spring-demo/pom.xml b/spring-demo/pom.xml
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>1.3.5</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java
@@ -11,6 +11,7 @@ public class WxConsts {
   public static final String XML_MSG_TEXT = "text";
   public static final String XML_MSG_IMAGE = "image";
   public static final String XML_MSG_VOICE = "voice";
+  public static final String XML_MSG_SHORTVIDEO = "shortvideo";
   public static final String XML_MSG_VIDEO = "video";
   public static final String XML_MSG_NEWS = "news";
   public static final String XML_MSG_MUSIC = "music";
@@ -20,7 +21,7 @@ public class WxConsts {
   public static final String XML_TRANSFER_CUSTOMER_SERVICE = "transfer_customer_service";
 
   ///////////////////////
-  // 主动发送消息的消息类型
+  // 主动发送消息(即客服消息)的消息类型
   ///////////////////////
   public static final String CUSTOM_MSG_TEXT = "text";
   public static final String CUSTOM_MSG_IMAGE = "image";
@@ -103,6 +104,10 @@ public class WxConsts {
   public static final String EVT_USER_ENTER_SESSION_FROM_CARD = "user_enter_session_from_card";
   public static final String EVT_CARD_SKU_REMIND = "card_sku_remind"; // 库存报警
 
+  public static final String EVT_KF_CREATE_SESSION = "kf_create_session"; // 客服接入会话
+  public static final String EVT_KF_CLOSE_SESSION = "kf_close_session"; // 客服关闭会话
+  public static final String EVT_KF_SWITCH_SESSION = "kf_switch_session"; // 客服转接会话
+
   ///////////////////////
   // 上传多媒体文件的类型
   ///////////////////////
@@ -133,13 +138,17 @@ public class WxConsts {
   /** 扫码推事件且弹出“消息接收中”提示框 */
   public static final String BUTTON_SCANCODE_WAITMSG = "scancode_waitmsg";
   /** 弹出系统拍照发图 */
-  public static final String PIC_SYSPHOTO = "pic_sysphoto";
+  public static final String BUTTON_PIC_SYSPHOTO = "pic_sysphoto";
   /** 弹出拍照或者相册发图 */
-  public static final String PIC_PHOTO_OR_ALBUM = "pic_photo_or_album";
+  public static final String BUTTON_PIC_PHOTO_OR_ALBUM = "pic_photo_or_album";
   /** 弹出微信相册发图器 */
-  public static final String PIC_WEIXIN = "pic_weixin";
+  public static final String BUTTON_PIC_WEIXIN = "pic_weixin";
   /** 弹出地理位置选择器 */
-  public static final String LOCATION_SELECT = "location_select";
+  public static final String BUTTON_LOCATION_SELECT = "location_select";
+  /** 下发消息（除文本消息） */
+  public static final String BUTTON_MEDIA_ID = "media_id";
+  /** 跳转图文消息URL */
+  public static final String BUTTON_VIEW_LIMITED = "view_limited";
 
   ///////////////////////
   // oauth2网页授权的scope

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java
@@ -1,14 +1,14 @@
 package me.chanjar.weixin.common.bean;
 
-import me.chanjar.weixin.common.util.json.WxGsonBuilder;
-import org.apache.commons.codec.Charsets;
-
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
+import me.chanjar.weixin.common.util.json.WxGsonBuilder;
+
 /**
  * 企业号菜单
  * @author Daniel Qian
@@ -45,8 +45,6 @@ public String toJson() {
   /**
    * 要用 http://mp.weixin.qq.com/wiki/16/ff9b7b85220e1396ffa16794a9d95adc.html 格式来反序列化
    * 相比 http://mp.weixin.qq.com/wiki/13/43de8269be54a0a6f64413e4dfa94f39.html 的格式，外层多套了一个menu
-   * @param json
-   * @return
    */
   public static WxMenu fromJson(String json) {
     return WxGsonBuilder.create().fromJson(json, WxMenu.class);
@@ -55,11 +53,9 @@ public static WxMenu fromJson(String json) {
   /**
    * 要用 http://mp.weixin.qq.com/wiki/16/ff9b7b85220e1396ffa16794a9d95adc.html 格式来反序列化
    * 相比 http://mp.weixin.qq.com/wiki/13/43de8269be54a0a6f64413e4dfa94f39.html 的格式，外层多套了一个menu
-   * @param is
-   * @return
    */
   public static WxMenu fromJson(InputStream is) {
-    return WxGsonBuilder.create().fromJson(new InputStreamReader(is, Charsets.UTF_8), WxMenu.class);
+    return WxGsonBuilder.create().fromJson(new InputStreamReader(is, StandardCharsets.UTF_8), WxMenu.class);
   }
 
   @Override
@@ -195,7 +191,7 @@ public void setLanguage(String language) {
       this.language = language;
     }
 
-      @Override
+    @Override
     public String toString() {
       return "matchrule:{" +
           "tag_id='" + tagId + '\'' +

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/WxSessionManager.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/WxSessionManager.java
@@ -4,16 +4,11 @@ public interface WxSessionManager {
 
   /**
    * 获取某个sessionId对应的session,如果sessionId没有对应的session，则新建一个并返回。
-   * @param sessionId
-   * @return
    */
   public WxSession getSession(String sessionId);
 
   /**
    * 获取某个sessionId对应的session,如果sessionId没有对应的session，若create为true则新建一个，否则返回null。
-   * @param sessionId
-   * @param create
-   * @return
    */
   public WxSession getSession(String sessionId, boolean create);
 

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/SHA1.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/SHA1.java
@@ -12,9 +12,6 @@ public class SHA1 {
 
   /**
    * 串接arr参数，生成sha1 digest
-   *
-   * @param arr
-   * @return
    */
   public static String gen(String... arr) throws NoSuchAlgorithmException {
     Arrays.sort(arr);
@@ -27,9 +24,6 @@ public static String gen(String... arr) throws NoSuchAlgorithmException {
 
   /**
    * 用&串接arr参数，生成sha1 digest
-   *
-   * @param arr
-   * @return
    */
   public static String genWithAmple(String... arr) throws NoSuchAlgorithmException {
     Arrays.sort(arr);