From 5594c8852d4070c4796600166ea9875df53b7a71 Mon Sep 17 00:00:00 2001
From: Kane Zhu <kane.mx@gmail.com>
Date: Tue, 1 Dec 2015 11:18:39 +0800
Subject: [PATCH 01/12] Fix the bug that fails to query order due to sign
 error.

---
 .../weixin/mp/api/WxMpServiceImpl.java        |  68 +--
 .../weixin/mp/bean/result/WxMpPayResult.java  | 440 ++++++++++--------
 2 files changed, 275 insertions(+), 233 deletions(-)

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
index 232dc198d7..65c59c637e 100644
--- 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
@@ -892,44 +892,44 @@ public Map<String, String> getJSSDKPayInfo(Map<String, String> parameters) {
 
   @Override
   public WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo) {
-      String nonce_str = System.currentTimeMillis() + "";
+    String nonce_str = System.currentTimeMillis() + "";
 
-      SortedMap<String, String> packageParams = new TreeMap<String, String>();
-      packageParams.put("appid", wxMpConfigStorage.getAppId());
-      packageParams.put("mch_id", wxMpConfigStorage.getPartnerId());
+    SortedMap<String, String> packageParams = new TreeMap<String, String>();
+    packageParams.put("appid", wxMpConfigStorage.getAppId());
+    packageParams.put("mch_id", wxMpConfigStorage.getPartnerId());
+    if (transactionId != null && !"".equals(transactionId.trim()))
       packageParams.put("transaction_id", transactionId);
+    else if (outTradeNo != null && !"".equals(outTradeNo.trim()))
       packageParams.put("out_trade_no", outTradeNo);
-      packageParams.put("nonce_str", nonce_str);
-
-      String sign = WxCryptUtil.createSign(packageParams, wxMpConfigStorage.getPartnerKey());
-      String xml = "<xml>" +
-              "<appid>" + wxMpConfigStorage.getAppId() + "</appid>" +
-              "<mch_id>" + wxMpConfigStorage.getPartnerId() + "</mch_id>" +
-              "<transaction_id>" + transactionId + "</transaction_id>" +
-              "<out_trade_no>" + outTradeNo + "</out_trade_no>" +
-              "<nonce_str>" + nonce_str + "</nonce_str>" +
-              "<sign>" + sign + "</sign>" +
-              "</xml>";
-
-      HttpPost httpPost = new HttpPost("https://api.mch.weixin.qq.com/pay/orderquery");
-      if (httpProxy != null) {
-        RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build();
-        httpPost.setConfig(config);
-      }
+    else
+      throw new IllegalArgumentException("Either 'transactionId' or 'outTradeNo' must be given.");
+    packageParams.put("nonce_str", nonce_str);
+    packageParams.put("sign", WxCryptUtil.createSign(packageParams, wxMpConfigStorage.getPartnerKey()));
 
-      StringEntity entity = new StringEntity(xml, Consts.UTF_8);
-      httpPost.setEntity(entity);
-      try {
-        CloseableHttpResponse response = httpClient.execute(httpPost);
-        String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-        XStream xstream = XStreamInitializer.getInstance();
-        xstream.alias("xml", WxMpPayResult.class);
-        WxMpPayResult wxMpPayResult = (WxMpPayResult) xstream.fromXML(responseContent);
-        return wxMpPayResult;
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
-      return new WxMpPayResult();
+    StringBuilder request = new StringBuilder("<xml>");
+    for (Entry<String, String> para : packageParams.entrySet()) {
+      request.append(String.format("<%s>%s</%s>", para.getKey(), para.getValue(), para.getKey()));
+    }
+    request.append("</xml>");
+
+    HttpPost httpPost = new HttpPost("https://api.mch.weixin.qq.com/pay/orderquery");
+    if (httpProxy != null) {
+      RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build();
+      httpPost.setConfig(config);
+    }
+
+    StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8);
+    httpPost.setEntity(entity);
+    try {
+      CloseableHttpResponse response = httpClient.execute(httpPost);
+      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+      XStream xstream = XStreamInitializer.getInstance();
+      xstream.alias("xml", WxMpPayResult.class);
+      WxMpPayResult wxMpPayResult = (WxMpPayResult) xstream.fromXML(responseContent);
+      return wxMpPayResult;
+    } catch (IOException e) {
+      throw new RuntimeException("Failed to query order due to IO exception.", e);
+    }
   }
 
   @Override
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java
index 7fd850fb07..3c7887296a 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java
@@ -13,203 +13,245 @@
  * @author ukid
  */
 public class WxMpPayResult implements Serializable {
-    private String return_code;
-    private String return_msg;
-    private String appid;
-    private String mch_id;
-    private String nonce_str;
-    private String sign;
-    private String result_code;
-    private String err_code;
-    private String err_code_des;
-    private String trade_state;
-    private String device_info;
-    private String openid;
-    private String is_subscribe;
-    private String trade_type;
-    private String bank_type;
-    private String total_fee;
-    private String coupon_fee;
-    private String fee_type;
-    private String transaction_id;
-    private String out_trade_no;
-    private String attach;
-    private String time_end;
-
-    public String getReturn_code() {
-        return return_code;
-    }
-
-    public String getReturn_msg() {
-        return return_msg;
-    }
-
-    public String getAppid() {
-        return appid;
-    }
-
-    public String getMch_id() {
-        return mch_id;
-    }
-
-    public String getNonce_str() {
-        return nonce_str;
-    }
-
-    public String getSign() {
-        return sign;
-    }
-
-    public String getResult_code() {
-        return result_code;
-    }
-
-    public String getErr_code() {
-        return err_code;
-    }
-
-    public String getErr_code_des() {
-        return err_code_des;
-    }
-
-    public String getTrade_state() {
-        return trade_state;
-    }
-
-    public String getDevice_info() {
-        return device_info;
-    }
-
-    public String getOpenid() {
-        return openid;
-    }
-
-    public String getIs_subscribe() {
-        return is_subscribe;
-    }
-
-    public String getTrade_type() {
-        return trade_type;
-    }
-
-    public String getBank_type() {
-        return bank_type;
-    }
-
-    public String getTotal_fee() {
-        return total_fee;
-    }
-
-    public String getCoupon_fee() {
-        return coupon_fee;
-    }
-
-    public String getFee_type() {
-        return fee_type;
-    }
-
-    public String getTransaction_id() {
-        return transaction_id;
-    }
-
-    public String getOut_trade_no() {
-        return out_trade_no;
-    }
-
-    public String getAttach() {
-        return attach;
-    }
-
-    public String getTime_end() {
-        return time_end;
-    }
-
-    public void setReturn_code(String return_code) {
-        this.return_code = return_code;
-    }
-
-    public void setReturn_msg(String return_msg) {
-        this.return_msg = return_msg;
-    }
-
-    public void setAppid(String appid) {
-        this.appid = appid;
-    }
-
-    public void setMch_id(String mch_id) {
-        this.mch_id = mch_id;
-    }
-
-    public void setNonce_str(String nonce_str) {
-        this.nonce_str = nonce_str;
-    }
-
-    public void setSign(String sign) {
-        this.sign = sign;
-    }
-
-    public void setResult_code(String result_code) {
-        this.result_code = result_code;
-    }
-
-    public void setErr_code(String err_code) {
-        this.err_code = err_code;
-    }
-
-    public void setErr_code_des(String err_code_des) {
-        this.err_code_des = err_code_des;
-    }
-
-    public void setTrade_state(String trade_state) {
-        this.trade_state = trade_state;
-    }
-
-    public void setDevice_info(String device_info) {
-        this.device_info = device_info;
-    }
-
-    public void setOpenid(String openid) {
-        this.openid = openid;
-    }
-
-    public void setIs_subscribe(String is_subscribe) {
-        this.is_subscribe = is_subscribe;
-    }
-
-    public void setTrade_type(String trade_type) {
-        this.trade_type = trade_type;
-    }
-
-    public void setBank_type(String bank_type) {
-        this.bank_type = bank_type;
-    }
-
-    public void setTotal_fee(String total_fee) {
-        this.total_fee = total_fee;
-    }
-
-    public void setCoupon_fee(String coupon_fee) {
-        this.coupon_fee = coupon_fee;
-    }
-
-    public void setFee_type(String fee_type) {
-        this.fee_type = fee_type;
-    }
-
-    public void setTransaction_id(String transaction_id) {
-        this.transaction_id = transaction_id;
-    }
-
-    public void setOut_trade_no(String out_trade_no) {
-        this.out_trade_no = out_trade_no;
-    }
-
-    public void setAttach(String attach) {
-        this.attach = attach;
-    }
-
-    public void setTime_end(String time_end) {
-        this.time_end = time_end;
-    }
-
+  /**
+   * 
+   */
+  private static final long serialVersionUID = -570934170727777190L;
+  
+  private String return_code;
+  private String return_msg;
+  private String appid;
+  private String mch_id;
+  private String nonce_str;
+  private String sign;
+  private String result_code;
+  private String err_code;
+  private String err_code_des;
+  private String trade_state;
+  private String trade_state_desc;
+  private String device_info;
+  private String openid;
+  private String is_subscribe;
+  private String trade_type;
+  private String bank_type;
+  private String total_fee;
+  private String coupon_fee;
+  private String fee_type;
+  private String transaction_id;
+  private String out_trade_no;
+  private String attach;
+  private String time_end;
+
+  public String getReturn_code() {
+    return return_code;
+  }
+
+  public String getReturn_msg() {
+    return return_msg;
+  }
+
+  public String getAppid() {
+    return appid;
+  }
+
+  public String getMch_id() {
+    return mch_id;
+  }
+
+  public String getNonce_str() {
+    return nonce_str;
+  }
+
+  public String getSign() {
+    return sign;
+  }
+
+  public String getResult_code() {
+    return result_code;
+  }
+
+  public String getErr_code() {
+    return err_code;
+  }
+
+  public String getErr_code_des() {
+    return err_code_des;
+  }
+
+  public String getTrade_state() {
+    return trade_state;
+  }
+
+  public String getDevice_info() {
+    return device_info;
+  }
+
+  public String getOpenid() {
+    return openid;
+  }
+
+  public String getIs_subscribe() {
+    return is_subscribe;
+  }
+
+  public String getTrade_type() {
+    return trade_type;
+  }
+
+  public String getBank_type() {
+    return bank_type;
+  }
+
+  public String getTotal_fee() {
+    return total_fee;
+  }
+
+  public String getCoupon_fee() {
+    return coupon_fee;
+  }
+
+  public String getFee_type() {
+    return fee_type;
+  }
+
+  public String getTransaction_id() {
+    return transaction_id;
+  }
+
+  public String getOut_trade_no() {
+    return out_trade_no;
+  }
+
+  public String getAttach() {
+    return attach;
+  }
+
+  public String getTime_end() {
+    return time_end;
+  }
+
+  public void setReturn_code(String return_code) {
+    this.return_code = return_code;
+  }
+
+  public void setReturn_msg(String return_msg) {
+    this.return_msg = return_msg;
+  }
+
+  public void setAppid(String appid) {
+    this.appid = appid;
+  }
+
+  public void setMch_id(String mch_id) {
+    this.mch_id = mch_id;
+  }
+
+  public void setNonce_str(String nonce_str) {
+    this.nonce_str = nonce_str;
+  }
+
+  public void setSign(String sign) {
+    this.sign = sign;
+  }
+
+  public void setResult_code(String result_code) {
+    this.result_code = result_code;
+  }
+
+  public void setErr_code(String err_code) {
+    this.err_code = err_code;
+  }
+
+  public void setErr_code_des(String err_code_des) {
+    this.err_code_des = err_code_des;
+  }
+
+  public void setTrade_state(String trade_state) {
+    this.trade_state = trade_state;
+  }
+
+  public void setDevice_info(String device_info) {
+    this.device_info = device_info;
+  }
+
+  public void setOpenid(String openid) {
+    this.openid = openid;
+  }
+
+  public void setIs_subscribe(String is_subscribe) {
+    this.is_subscribe = is_subscribe;
+  }
+
+  public void setTrade_type(String trade_type) {
+    this.trade_type = trade_type;
+  }
+
+  public void setBank_type(String bank_type) {
+    this.bank_type = bank_type;
+  }
+
+  public void setTotal_fee(String total_fee) {
+    this.total_fee = total_fee;
+  }
+
+  public void setCoupon_fee(String coupon_fee) {
+    this.coupon_fee = coupon_fee;
+  }
+
+  public void setFee_type(String fee_type) {
+    this.fee_type = fee_type;
+  }
+
+  public void setTransaction_id(String transaction_id) {
+    this.transaction_id = transaction_id;
+  }
+
+  public void setOut_trade_no(String out_trade_no) {
+    this.out_trade_no = out_trade_no;
+  }
+
+  public void setAttach(String attach) {
+    this.attach = attach;
+  }
+
+  public void setTime_end(String time_end) {
+    this.time_end = time_end;
+  }
+
+  public String getTrade_state_desc() {
+    return trade_state_desc;
+  }
+
+  public void setTrade_state_desc(String trade_state_desc) {
+    this.trade_state_desc = trade_state_desc;
+  }
+
+  @Override
+  public String toString() {
+    return "WxMpPayResult{" +
+        "return_code=" + return_code +
+        ", return_msg='" + return_msg + '\'' +
+        ", appid='" + appid + '\'' +
+        ", mch_id='" + mch_id + '\'' +
+        ", nonce_str='" + nonce_str + '\'' +
+        ", sign='" + sign + '\'' +
+        ", result_code='" + result_code + '\'' +
+        ", err_code='" + err_code + '\'' +
+        ", err_code_des='" + err_code_des + '\'' +
+        ", trade_state=" + trade_state +
+        ", trade_state_desc=" + trade_state_desc +
+        ", device_info='" + device_info + '\'' +
+        ", openid='" + openid + '\'' +
+        ", is_subscribe='" + is_subscribe + '\'' +
+        ", trade_type='" + trade_type + '\'' +
+        ", bank_type='" + bank_type + '\'' +
+        ", total_fee='" + total_fee + '\'' +
+        ", coupon_fee='" + coupon_fee + '\'' +
+        ", fee_type='" + fee_type + '\'' +
+        ", transaction_id='" + transaction_id + '\'' +
+        ", out_trade_no='" + out_trade_no + '\'' +
+        ", attach='" + attach + '\'' +
+        ", time_end='" + time_end + '\'' +
+        '}';
+  }
 }

From 0388c8d9dcd878a08ef0a5eeb01be6d4896839ac Mon Sep 17 00:00:00 2001
From: Daniel Qian <chanjarster@gmail.com>
Date: Sat, 5 Dec 2015 15:37:25 +0800
Subject: [PATCH 02/12] upgrade to 1.3.3-SNAPSHOT

---
 pom.xml                    | 2 +-
 weixin-java-common/pom.xml | 2 +-
 weixin-java-cp/pom.xml     | 2 +-
 weixin-java-mp/pom.xml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1f66829597..ac274f748c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>1.3.2</version>
+  <version>1.3.3-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 510b49703b..24438e070c 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>me.chanjar</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index f193ecc55c..5dc93ea745 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.chanjar</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 57655e0bb5..8bc462f8d7 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.chanjar</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <artifactId>weixin-java-mp</artifactId>
     <name>WeiXin Java Tools - MP</name>

From 15d6b79319b2fea7982815404cc33eac83785c5f Mon Sep 17 00:00:00 2001
From: Liu Kai <liukai@tinkers.com.cn>
Date: Fri, 18 Dec 2015 12:11:11 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=8F=B7=E7=9A=84?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E4=B8=AD=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?safe=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根据微信企业号官方文档（
http://qydev.weixin.qq.com/wiki/index.php?title=%E6%B6%88%E6%81%AF%E7%B1%BB%E5%9E%8B%E5%8F%8A%E6%95%B0%E6%8D%AE%E6%A0%BC%E5%BC%8F
），发送消息接口的数据格式中需要加入safe字段。并且经过实际验证，官方文档上“safe为非必须项”的表述有误，safe应为必须项，即如果参数中没有写safe字段而调用发送消息接口的话，微信服务器会正常返回，但touser却收不到任何消息。

Change-Id: Ifc894e6f6b03147f000b42f346d2bdccb11b0c64
Signed-off-by: Liu Kai <liukai@tinkers.com.cn>
---
 .../main/java/me/chanjar/weixin/common/api/WxConsts.java | 2 ++
 .../main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java | 9 +++++++++
 .../weixin/cp/bean/messagebuilder/BaseBuilder.java       | 9 +++++++++
 3 files changed, 20 insertions(+)

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
index 80d1663825..0455e6c2b8 100644
--- 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
@@ -30,6 +30,8 @@ public class WxConsts {
   public static final String CUSTOM_MSG_NEWS = "news";
   public static final String CUSTOM_MSG_FILE = "file";
   public static final String CUSTOM_MSG_TRANSFER_CUSTOMER_SERVICE = "transfer_customer_service";
+  public static final String CUSTOM_MSG_SAFE_NO = "0";
+  public static final String CUSTOM_MSG_SAFE_YES = "1";
   
   ///////////////////////
   // 群发消息的消息类型
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java
index ef64586931..8e69027a46 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java
@@ -26,6 +26,7 @@ public class WxCpMessage implements Serializable {
   private String description;
   private String musicUrl;
   private String hqMusicUrl;
+  private String safe;
   private List<WxArticle> articles = new ArrayList<WxArticle>();
   
   public String getToUser() {
@@ -63,6 +64,14 @@ public String getMsgType() {
     return msgType;
   }
   
+  public String getSafe() {
+    return safe;
+  }
+
+  public void setSafe(String safe) {
+    this.safe = safe;
+  }
+
   /**
    * <pre>
    * 请使用
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/BaseBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/BaseBuilder.java
index f52f274cfd..ee075baf78 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/BaseBuilder.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/BaseBuilder.java
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.cp.bean.messagebuilder;
 
+import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.cp.bean.WxCpMessage;
 
 public class BaseBuilder<T> {
@@ -8,6 +9,7 @@ public class BaseBuilder<T> {
   protected String toUser;
   protected String toParty;
   protected String toTag;
+  protected String safe;
 
   public T agentId(String agentId) {
     this.agentId = agentId;
@@ -29,6 +31,11 @@ public T toTag(String toTag) {
     return (T) this;
   }
 
+  public T safe(String safe) {
+    this.safe = safe;
+    return (T) this;
+  }
+
   public WxCpMessage build() {
     WxCpMessage m = new WxCpMessage();
     m.setAgentId(this.agentId);
@@ -36,6 +43,8 @@ public WxCpMessage build() {
     m.setToUser(this.toUser);
     m.setToParty(this.toParty);
     m.setToTag(this.toTag);
+    m.setSafe(
+      (this.safe == null || "".equals(this.safe))? WxConsts.CUSTOM_MSG_SAFE_NO: this.safe);
     return m;
   }
 

From 34fda26e020b2a812927bb8bc2c74d8b8f716c94 Mon Sep 17 00:00:00 2001
From: Tianmu <277297372@qq.com>
Date: Mon, 21 Dec 2015 16:00:18 +0800
Subject: [PATCH 04/12] add conditional menu method

---
 .../me/chanjar/weixin/common/bean/WxMenu.java | 85 ++++++++++++++++++-
 .../common/util/json/WxMenuGsonAdapter.java   | 10 ++-
 .../me/chanjar/weixin/mp/api/WxMpService.java | 22 +++++
 .../weixin/mp/api/WxMpServiceImpl.java        | 28 +++++-
 4 files changed, 138 insertions(+), 7 deletions(-)

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
index 8e40c113bf..5a1f4686a6 100644
--- 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
@@ -3,13 +3,13 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Serializable;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
-import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 import org.apache.commons.codec.Charsets;
 
+import me.chanjar.weixin.common.util.json.WxGsonBuilder;
+
 /**
  * 企业号菜单
  * @author Daniel Qian
@@ -19,6 +19,8 @@ public class WxMenu implements Serializable {
 
   private List<WxMenuButton> buttons = new ArrayList<WxMenuButton>();
 
+  private WxMenuRule matchrule;
+  
   public List<WxMenuButton> getButtons() {
     return buttons;
   }
@@ -27,6 +29,14 @@ public void setButtons(List<WxMenuButton> buttons) {
     this.buttons = buttons;
   }
   
+  public WxMenuRule getMatchrule() {
+  	return matchrule;
+  }
+  
+  public void setMatchrule(WxMenuRule matchrule) {
+  	this.matchrule = matchrule;
+  }
+  
   public String toJson() {
     return WxGsonBuilder.create().toJson(this);
   }
@@ -118,5 +128,74 @@ public String toString() {
           '}';
     }
   }
-
+  
+	public static class WxMenuRule {
+		private String groupId;
+		private String sex;
+		private String country;
+		private String province;
+		private String city;
+		private String clientPlatformType;
+		
+		public String getGroupId() {
+			return groupId;
+		}
+	
+		public void setGroupId(String groupId) {
+			this.groupId = groupId;
+		}
+	
+		public String getSex() {
+			return sex;
+		}
+	
+		public void setSex(String sex) {
+			this.sex = sex;
+		}
+	
+		public String getCountry() {
+			return country;
+		}
+	
+		public void setCountry(String country) {
+			this.country = country;
+		}
+	
+		public String getProvince() {
+			return province;
+		}
+	
+		public void setProvince(String province) {
+			this.province = province;
+		}
+	
+		public String getCity() {
+			return city;
+		}
+	
+		public void setCity(String city) {
+			this.city = city;
+		}
+	
+		public String getClientPlatformType() {
+			return clientPlatformType;
+		}
+	
+		public void setClientPlatformType(String clientPlatformType) {
+			this.clientPlatformType = clientPlatformType;
+		}
+	
+		@Override
+		public String toString() {
+			return "matchrule:{" +
+			  "group_id='" + groupId + '\'' +
+			  ", sex='" + sex + '\'' +
+			  ", country" + country + '\'' +
+			  ", province" + province + '\'' +
+			  ", city" + city + '\'' +
+			  ", client_platform_type" + clientPlatformType + '\'' +
+			  "}";
+		}
+	}
+	
 }
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java
index 6fc788d30c..4b1a720d36 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java
@@ -10,8 +10,7 @@
 
 import java.lang.reflect.Type;
 
-import me.chanjar.weixin.common.bean.WxMenu;
-
+import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -21,6 +20,8 @@
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 
+import me.chanjar.weixin.common.bean.WxMenu;
+
 /**
  * 
  * @author Daniel Qian
@@ -38,6 +39,11 @@ public JsonElement serialize(WxMenu menu, Type typeOfSrc, JsonSerializationConte
     }
     json.add("button", buttonArray);
     
+    if (menu.getMatchrule() != null) {
+    	Gson gson = new Gson();
+    	json.add("matchrule", gson.toJsonTree(menu.getMatchrule()));
+    }
+    
     return json;
   }
 
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
index 6dd96f58b3..e6ce30cff9 100644
--- 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
@@ -324,6 +324,8 @@ public interface WxMpService {
    * <pre>
    * 自定义菜单创建接口
    * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=自定义菜单创建接口
+   * 如果要创建个性化菜单，请设置matchrule属性
+   * 详情请见:http://mp.weixin.qq.com/wiki/0/c48ccd12b69ae023159b4bfaa7c39c20.html
    * </pre>
    * @param menu
    * @throws WxErrorException
@@ -339,6 +341,16 @@ public interface WxMpService {
    */
   public void menuDelete() throws WxErrorException;
 
+  /**
+   * <pre>
+   * 删除个性化菜单接口
+   * 详情请见: http://mp.weixin.qq.com/wiki/0/c48ccd12b69ae023159b4bfaa7c39c20.html
+   * </pre>
+   * @param menuid
+   * @throws WxErrorException
+   */
+  public void menuDelete(String menuid) throws WxErrorException;
+  
   /**
    * <pre>
    * 自定义菜单查询接口
@@ -348,6 +360,16 @@ public interface WxMpService {
    * @throws WxErrorException
    */
   public WxMenu menuGet() throws WxErrorException;
+  
+  /**
+   * <pre>
+   * 测试个性化菜单匹配结果
+   * 详情请见: http://mp.weixin.qq.com/wiki/0/c48ccd12b69ae023159b4bfaa7c39c20.html
+   * </pre>
+   * @param userid 可以是粉丝的OpenID，也可以是粉丝的微信号。
+   * @throws WxErrorException
+   */
+  public WxMenu menuTryMatch(String userid) throws WxErrorException;
 
   /**
    * <pre>
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
index 232dc198d7..a77b3c0818 100644
--- 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
@@ -230,14 +230,24 @@ public void customMessageSend(WxMpCustomMessage message) throws WxErrorException
   }
 
   public void menuCreate(WxMenu menu) throws WxErrorException {
-    String url = "https://api.weixin.qq.com/cgi-bin/menu/create";
-    execute(new SimplePostRequestExecutor(), url, menu.toJson());
+		if (menu.getMatchrule() != null) {
+			String url = "https://api.weixin.qq.com/cgi-bin/menu/addconditional";
+			execute(new SimplePostRequestExecutor(), url, menu.toJson());
+		} else {
+			String url = "https://api.weixin.qq.com/cgi-bin/menu/create";
+			execute(new SimplePostRequestExecutor(), url, menu.toJson());
+		}
   }
 
   public void menuDelete() throws WxErrorException {
     String url = "https://api.weixin.qq.com/cgi-bin/menu/delete";
     execute(new SimpleGetRequestExecutor(), url, null);
   }
+  
+  public void menuDelete(String menuid) throws WxErrorException {
+  	String url = "https://api.weixin.qq.com/cgi-bin/menu/delconditional";
+    execute(new SimpleGetRequestExecutor(), url, "menuid=" + menuid);
+  }
 
   public WxMenu menuGet() throws WxErrorException {
     String url = "https://api.weixin.qq.com/cgi-bin/menu/get";
@@ -252,6 +262,20 @@ public WxMenu menuGet() throws WxErrorException {
       throw e;
     }
   }
+  
+  public WxMenu menuTryMatch(String userid) throws WxErrorException {
+  	String url = "https://api.weixin.qq.com/cgi-bin/menu/trymatch";
+  	try {
+  		String resultContent = execute(new SimpleGetRequestExecutor(), url, "user_id=" + userid);
+  		return WxMenu.fromJson(resultContent);
+  	} catch (WxErrorException e) {
+      // 46003 不存在的菜单数据     46002 不存在的菜单版本
+      if (e.getError().getErrorCode() == 46003 || e.getError().getErrorCode() == 46002) {
+        return null;
+      }
+      throw e;
+    }
+  }
 
   public WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputStream inputStream) throws WxErrorException, IOException {
     return mediaUpload(mediaType, FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), fileType));

From f585385e6e3479552213dd3fe8fd54089e5e962e Mon Sep 17 00:00:00 2001
From: tianmu <shituo123@gmail.com>
Date: Mon, 21 Dec 2015 16:13:03 +0800
Subject: [PATCH 05/12] change tab space

change tab space
---
 .../src/main/java/me/chanjar/weixin/common/bean/WxMenu.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 5a1f4686a6..a192570664 100644
--- 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
@@ -197,5 +197,5 @@ public String toString() {
 			  "}";
 		}
 	}
-	
+
 }

From 924d3c254ff325866d357c1418f365421df01753 Mon Sep 17 00:00:00 2001
From: tianmu <shituo123@gmail.com>
Date: Mon, 21 Dec 2015 16:14:48 +0800
Subject: [PATCH 06/12] Update WxMenu.java

---
 .../src/main/java/me/chanjar/weixin/common/bean/WxMenu.java      | 1 -
 1 file changed, 1 deletion(-)

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
index a192570664..b847820f29 100644
--- 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
@@ -197,5 +197,4 @@ public String toString() {
 			  "}";
 		}
 	}
-
 }

From f8207ef65f49fc005a28598c98af7384d31fc1b2 Mon Sep 17 00:00:00 2001
From: tianmu <shituo123@gmail.com>
Date: Mon, 21 Dec 2015 19:33:32 +0800
Subject: [PATCH 07/12] change tab space

change tab space 2 times
---
 .../me/chanjar/weixin/common/bean/WxMenu.java | 113 +++++++++---------
 1 file changed, 57 insertions(+), 56 deletions(-)

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
index b847820f29..ab475b7f59 100644
--- 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
@@ -129,72 +129,73 @@ public String toString() {
     }
   }
   
-	public static class WxMenuRule {
-		private String groupId;
-		private String sex;
-		private String country;
-		private String province;
-		private String city;
-		private String clientPlatformType;
-		
-		public String getGroupId() {
-			return groupId;
-		}
+  public static class WxMenuRule {
+    private String groupId;
+    private String sex;
+    private String country;
+    private String province;
+    private String city;
+    private String clientPlatformType;
+    
+    public String getGroupId() {
+      return groupId;
+    }
 	
-		public void setGroupId(String groupId) {
-			this.groupId = groupId;
-		}
+    public void setGroupId(String groupId) {
+      this.groupId = groupId;
+    }
 	
-		public String getSex() {
-			return sex;
-		}
+    public String getSex() {
+      return sex;
+    }
 	
-		public void setSex(String sex) {
-			this.sex = sex;
-		}
+    public void setSex(String sex) {
+      this.sex = sex;
+    }
 	
-		public String getCountry() {
-			return country;
-		}
+    public String getCountry() {
+      return country;
+    }
+	
+    public void setCountry(String country) {
+      this.country = country;
+    }
 	
-		public void setCountry(String country) {
-			this.country = country;
-		}
+    public String getProvince() {
+      return province;
+    }
 	
-		public String getProvince() {
-			return province;
-		}
+    public void setProvince(String province) {
+      this.province = province;
+    }
 	
-		public void setProvince(String province) {
-			this.province = province;
-		}
+    public String getCity() {
+      return city;
+    }
 	
-		public String getCity() {
-			return city;
-		}
+    public void setCity(String city) {
+      this.city = city;
+    }
 	
-		public void setCity(String city) {
-			this.city = city;
-		}
+    public String getClientPlatformType() {
+      return clientPlatformType;
+    }
 	
-		public String getClientPlatformType() {
-			return clientPlatformType;
-		}
+    public void setClientPlatformType(String clientPlatformType) {
+      this.clientPlatformType = clientPlatformType;
+    }
 	
-		public void setClientPlatformType(String clientPlatformType) {
-			this.clientPlatformType = clientPlatformType;
-		}
+    @Override
+    public String toString() {
+      return "matchrule:{" +
+          "group_id='" + groupId + '\'' +
+          ", sex='" + sex + '\'' +
+          ", country" + country + '\'' +
+          ", province" + province + '\'' +
+          ", city" + city + '\'' +
+          ", client_platform_type" + clientPlatformType + '\'' +
+          "}";
+    }
+  }
 	
-		@Override
-		public String toString() {
-			return "matchrule:{" +
-			  "group_id='" + groupId + '\'' +
-			  ", sex='" + sex + '\'' +
-			  ", country" + country + '\'' +
-			  ", province" + province + '\'' +
-			  ", city" + city + '\'' +
-			  ", client_platform_type" + clientPlatformType + '\'' +
-			  "}";
-		}
-	}
 }

From b2e1cca6c23bd99f9ba32f7b9cf5d122c2c3fce3 Mon Sep 17 00:00:00 2001
From: tianmu <shituo123@gmail.com>
Date: Mon, 21 Dec 2015 19:41:42 +0800
Subject: [PATCH 08/12] change tab space

change tab space 1 time
---
 .../weixin/mp/api/WxMpServiceImpl.java        | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

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
index a77b3c0818..0b3429f8b3 100644
--- 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
@@ -230,13 +230,13 @@ public void customMessageSend(WxMpCustomMessage message) throws WxErrorException
   }
 
   public void menuCreate(WxMenu menu) throws WxErrorException {
-		if (menu.getMatchrule() != null) {
-			String url = "https://api.weixin.qq.com/cgi-bin/menu/addconditional";
-			execute(new SimplePostRequestExecutor(), url, menu.toJson());
-		} else {
-			String url = "https://api.weixin.qq.com/cgi-bin/menu/create";
-			execute(new SimplePostRequestExecutor(), url, menu.toJson());
-		}
+    if (menu.getMatchrule() != null) {
+      String url = "https://api.weixin.qq.com/cgi-bin/menu/addconditional";
+      execute(new SimplePostRequestExecutor(), url, menu.toJson());
+    } else {
+      String url = "https://api.weixin.qq.com/cgi-bin/menu/create";
+      execute(new SimplePostRequestExecutor(), url, menu.toJson());
+    }
   }
 
   public void menuDelete() throws WxErrorException {
@@ -245,7 +245,7 @@ public void menuDelete() throws WxErrorException {
   }
   
   public void menuDelete(String menuid) throws WxErrorException {
-  	String url = "https://api.weixin.qq.com/cgi-bin/menu/delconditional";
+    String url = "https://api.weixin.qq.com/cgi-bin/menu/delconditional";
     execute(new SimpleGetRequestExecutor(), url, "menuid=" + menuid);
   }
 
@@ -264,11 +264,11 @@ public WxMenu menuGet() throws WxErrorException {
   }
   
   public WxMenu menuTryMatch(String userid) throws WxErrorException {
-  	String url = "https://api.weixin.qq.com/cgi-bin/menu/trymatch";
-  	try {
-  		String resultContent = execute(new SimpleGetRequestExecutor(), url, "user_id=" + userid);
-  		return WxMenu.fromJson(resultContent);
-  	} catch (WxErrorException e) {
+    String url = "https://api.weixin.qq.com/cgi-bin/menu/trymatch";
+    try {
+      String resultContent = execute(new SimpleGetRequestExecutor(), url, "user_id=" + userid);
+      return WxMenu.fromJson(resultContent);
+    } catch (WxErrorException e) {
       // 46003 不存在的菜单数据     46002 不存在的菜单版本
       if (e.getError().getErrorCode() == 46003 || e.getError().getErrorCode() == 46002) {
         return null;

From 8d87609c0b8ed38038cefb80a643e60919aa91f3 Mon Sep 17 00:00:00 2001
From: tianmu <shituo123@gmail.com>
Date: Mon, 21 Dec 2015 21:04:01 +0800
Subject: [PATCH 09/12] Update WxMenu.java

---
 .../src/main/java/me/chanjar/weixin/common/bean/WxMenu.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
index ab475b7f59..25bb2138f0 100644
--- 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
@@ -30,11 +30,11 @@ public void setButtons(List<WxMenuButton> buttons) {
   }
   
   public WxMenuRule getMatchrule() {
-  	return matchrule;
+    return matchrule;
   }
   
   public void setMatchrule(WxMenuRule matchrule) {
-  	this.matchrule = matchrule;
+    this.matchrule = matchrule;
   }
   
   public String toJson() {

From 6b522da55988d8d3283e3e834e4d6328de686ef9 Mon Sep 17 00:00:00 2001
From: Tianmu <277297372@qq.com>
Date: Tue, 22 Dec 2015 10:45:15 +0800
Subject: [PATCH 10/12] change name: matchrule to matchRule

---
 .../java/me/chanjar/weixin/common/bean/WxMenu.java     | 10 +++++-----
 .../weixin/common/util/json/WxMenuGsonAdapter.java     |  6 +++---
 .../java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

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
index 25bb2138f0..e20be680f3 100644
--- 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
@@ -19,7 +19,7 @@ public class WxMenu implements Serializable {
 
   private List<WxMenuButton> buttons = new ArrayList<WxMenuButton>();
 
-  private WxMenuRule matchrule;
+  private WxMenuRule matchRule;
   
   public List<WxMenuButton> getButtons() {
     return buttons;
@@ -29,12 +29,12 @@ public void setButtons(List<WxMenuButton> buttons) {
     this.buttons = buttons;
   }
   
-  public WxMenuRule getMatchrule() {
-    return matchrule;
+  public WxMenuRule getMatchRule() {
+    return matchRule;
   }
   
-  public void setMatchrule(WxMenuRule matchrule) {
-    this.matchrule = matchrule;
+  public void setMatchRule(WxMenuRule matchRule) {
+    this.matchRule = matchRule;
   }
   
   public String toJson() {
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java
index 4b1a720d36..cb3e8c69f7 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java
@@ -39,9 +39,9 @@ public JsonElement serialize(WxMenu menu, Type typeOfSrc, JsonSerializationConte
     }
     json.add("button", buttonArray);
     
-    if (menu.getMatchrule() != null) {
-    	Gson gson = new Gson();
-    	json.add("matchrule", gson.toJsonTree(menu.getMatchrule()));
+    if (menu.getMatchRule() != null) {
+      Gson gson = new Gson();
+      json.add("matchrule", gson.toJsonTree(menu.getMatchRule()));
     }
     
     return json;
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
index 0b3429f8b3..3ad9bf4c68 100644
--- 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
@@ -230,7 +230,7 @@ public void customMessageSend(WxMpCustomMessage message) throws WxErrorException
   }
 
   public void menuCreate(WxMenu menu) throws WxErrorException {
-    if (menu.getMatchrule() != null) {
+    if (menu.getMatchRule() != null) {
       String url = "https://api.weixin.qq.com/cgi-bin/menu/addconditional";
       execute(new SimplePostRequestExecutor(), url, menu.toJson());
     } else {

From ed84f511c713901b201b18c1ef6ba1ae8d946f24 Mon Sep 17 00:00:00 2001
From: SimonDolph <simon.dong.sea@hotmail.com>
Date: Thu, 24 Dec 2015 17:44:48 +0800
Subject: [PATCH 11/12] add unionid

---
 .../mp/bean/result/WxMpOAuth2AccessToken.java     | 15 +++++++++++++--
 .../util/json/WxMpOAuth2AccessTokenAdapter.java   | 14 +++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java
index 2d6696d456..6ac77c83ce 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java
@@ -1,9 +1,9 @@
 package me.chanjar.weixin.mp.bean.result;
 
-import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
-
 import java.io.Serializable;
 
+import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
+
 public class WxMpOAuth2AccessToken implements Serializable {
 
   private String accessToken;
@@ -16,6 +16,8 @@ public class WxMpOAuth2AccessToken implements Serializable {
 
   private String scope;
 
+  private String unionId;
+
   public String getRefreshToken() {
     return refreshToken;
   }
@@ -56,6 +58,14 @@ public void setExpiresIn(int expiresIn) {
     this.expiresIn = expiresIn;
   }
 
+  public String getUnionId() {
+    return unionId;
+  }
+
+  public void setUnionId(String unionId) {
+    this.unionId = unionId;
+  }
+
   public static WxMpOAuth2AccessToken fromJson(String json) {
     return WxMpGsonBuilder.create().fromJson(json, WxMpOAuth2AccessToken.class);
   }
@@ -68,6 +78,7 @@ public String toString() {
         ", refreshToken='" + refreshToken + '\'' +
         ", openId='" + openId + '\'' +
         ", scope='" + scope + '\'' +
+        ", unionId='" + unionId + '\'' +
         '}';
   }
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpOAuth2AccessTokenAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpOAuth2AccessTokenAdapter.java
index 6d73131a2d..753e22d17e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpOAuth2AccessTokenAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpOAuth2AccessTokenAdapter.java
@@ -1,11 +1,16 @@
 package me.chanjar.weixin.mp.util.json;
 
-import com.google.gson.*;
+import java.lang.reflect.Type;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+
 import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
 
-import java.lang.reflect.Type;
-
 public class WxMpOAuth2AccessTokenAdapter implements JsonDeserializer<WxMpOAuth2AccessToken> {
 
   public WxMpOAuth2AccessToken deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws
@@ -28,6 +33,9 @@ public WxMpOAuth2AccessToken deserialize(JsonElement json, Type typeOfT, JsonDes
     if (accessTokenJsonObject.get("scope") != null && !accessTokenJsonObject.get("scope").isJsonNull()) {
       accessToken.setScope(GsonHelper.getAsString(accessTokenJsonObject.get("scope")));
     }
+    if (accessTokenJsonObject.get("unionid") != null && !accessTokenJsonObject.get("unionid").isJsonNull()) {
+      accessToken.setUnionId(GsonHelper.getAsString(accessTokenJsonObject.get("unionid")));
+    }
     return accessToken;
   }
 

From 03406f128f1c88d2cce9e0905444b2d778e97bcb Mon Sep 17 00:00:00 2001
From: Daniel Qian <chanjarster@gmail.com>
Date: Fri, 25 Dec 2015 09:27:35 +0800
Subject: [PATCH 12/12] upgrade to 1.3.3

---
 README.md                  | 4 ++--
 pom.xml                    | 2 +-
 weixin-java-common/pom.xml | 2 +-
 weixin-java-cp/pom.xml     | 2 +-
 weixin-java-mp/pom.xml     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index a41c22e813..84ad680e1a 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ weixin-java-tools
 <dependency>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-mp</artifactId>
-  <version>1.3.2</version>
+  <version>1.3.3</version>
 </dependency>
 ```
 
@@ -33,7 +33,7 @@ weixin-java-tools
 <dependency>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-cp</artifactId>
-  <version>1.3.2</version>
+  <version>1.3.3</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index ac274f748c..fdf6010eee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>1.3.3-SNAPSHOT</version>
+  <version>1.3.3</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 24438e070c..c160ffe351 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>me.chanjar</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.3</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 5dc93ea745..3e0613bc4c 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.chanjar</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.3</version>
     </parent>
 
     <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 8bc462f8d7..651cda3ea5 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.chanjar</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.3</version>
     </parent>
     <artifactId>weixin-java-mp</artifactId>
     <name>WeiXin Java Tools - MP</name>