From ae50576bf7de64de9b49954326468740e8ce0680 Mon Sep 17 00:00:00 2001 From: fxdfxq Date: Fri, 25 Mar 2016 18:24:19 +0800 Subject: [PATCH 01/33] Update WxMpService.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加NATIVE扫码支付类型, 1.将原来的getJSSDKPayInfo(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, String notifyUrl)方法拆分为两个方法:1)拼装NATIVE发起支付请求需要的参数的方法 Map getNativePayInfo(String productId, String outTradeNo, double amt, String body, String ip, String notifyUrl); 2) 拼装JSAPI发起支付请求需要的参数方法 Map getJsapiPayInfo(String openId, String outTradeNo, double amt, String body, String ip, String notifyUrl); 2.修改getJSSDKPayInfo(Map parameters)方式为getPayInfo(Map parameters),适用上面两个方法调用。 --- .../me/chanjar/weixin/mp/api/WxMpService.java | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) 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 af574c1b..4cf708f4 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 @@ -721,31 +721,49 @@ public interface WxMpService { WxMpPrepayIdResult getPrepayId(Map parameters); /** - * 该接口调用“统一下单”接口,并拼装JSSDK发起支付请求需要的参数 + * 该接口调用“统一下单”接口,并拼装发起支付请求需要的参数 * 详见http://mp.weixin.qq.com/wiki/7/aaa137b55fb2e0456bf8dd9148dd613f.html#.E5.8F.91.E8.B5.B7.E4.B8.80.E4.B8.AA.E5.BE.AE.E4.BF.A1.E6.94.AF.E4.BB.98.E8.AF.B7.E6.B1.82 * @param parameters * the required or optional parameters * @return * @throws WxErrorException */ - Map getJSSDKPayInfo(Map parameters) throws WxErrorException; + Map getPayInfo(Map parameters) throws WxErrorException; /** - * 该接口调用“统一下单”接口,并拼装JSSDK发起支付请求需要的参数 + * 该接口调用“统一下单”接口,并拼装NATIVE发起支付请求需要的参数 * 详见http://mp.weixin.qq.com/wiki/7/aaa137b55fb2e0456bf8dd9148dd613f.html#.E5.8F.91.E8.B5.B7.E4.B8.80.E4.B8.AA.E5.BE.AE.E4.BF.A1.E6.94.AF.E4.BB.98.E8.AF.B7.E6.B1.82 + * tradeType 交易类型 NATIVE (其他交易类型JSAPI,APP,WAP) + * @param productId 商户商品ID + * @param outTradeNo 商户端对应订单号 + * @param amt 金额(单位元) + * @param body 商品描述 + * @param ip 发起支付的客户端IP + * @param notifyUrl 通知地址 + * @return + * @throws WxErrorException + * @deprecated Use me.chanjar.weixin.mp.api.WxMpService.getPayInfo(Map) instead + */ + @Deprecated + Map getNativePayInfo(String productId, String outTradeNo, double amt, String body, String ip, String notifyUrl) throws WxErrorException; + + /** + * 该接口调用“统一下单”接口,并拼装JSAPI发起支付请求需要的参数 + * 详见http://mp.weixin.qq.com/wiki/7/aaa137b55fb2e0456bf8dd9148dd613f.html#.E5.8F.91.E8.B5.B7.E4.B8.80.E4.B8.AA.E5.BE.AE.E4.BF.A1.E6.94.AF.E4.BB.98.E8.AF.B7.E6.B1.82 + * tradeType 交易类型 JSAPI(其他交易类型NATIVE,APP,WAP) * @param openId 支付人openId * @param outTradeNo 商户端对应订单号 * @param amt 金额(单位元) * @param body 商品描述 - * @param tradeType 交易类型 JSAPI,NATIVE,APP,WAP * @param ip 发起支付的客户端IP * @param notifyUrl 通知地址 * @return * @throws WxErrorException - * @deprecated Use me.chanjar.weixin.mp.api.WxMpService.getJSSDKPayInfo(Map) instead + * @deprecated Use me.chanjar.weixin.mp.api.WxMpService.getPayInfo(Map) instead */ @Deprecated - Map getJSSDKPayInfo(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, String notifyUrl) throws WxErrorException; + Map getJsapiPayInfo(String openId, String outTradeNo, double amt, String body, String ip, String notifyUrl) throws WxErrorException; + /** * 该接口提供所有微信支付订单的查询,当支付通知处理异常戒丢失的情冴,商户可以通过该接口查询订单支付状态。 From ccdbef3963d0d12b6807e2d4251ab1f4af737ed1 Mon Sep 17 00:00:00 2001 From: fxdfxq Date: Fri, 25 Mar 2016 18:38:36 +0800 Subject: [PATCH 02/33] Update WxMpServiceImpl.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.对应WxMpService类修改getJSSDKPayInfo(Map parameters)方法为getPayInfo(Map parameters)方法 2.增加,1)扫码支付参数拼装方法:getNativePayInfo(String productId,String outTradeNo, double amt, String body,String ip, String callbackUrl) 2)原来的公众号支付参数拼装方法:getJsapiPayInfo(String openId,String outTradeNo, double amt, String body,String ip, String callbackUrl) 3.在getPayInfo(Map parameters)方法中增加codeUrl参数判断,只有在NATIVE方式才返回codeUrl参数。 --- .../weixin/mp/api/WxMpServiceImpl.java | 55 ++++++++++++------- 1 file changed, 36 insertions(+), 19 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 7c109be5..f259b0d4 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 @@ -821,25 +821,40 @@ public class WxMpServiceImpl implements WxMpService { throw new IllegalArgumentException("Reqiured argument 'product_id' is missing when trade_type is 'NATIVE'."); } + @Override + public Map getJsapiPayInfo(String openId,String outTradeNo, double amt, String body,String ip, String callbackUrl) throws WxErrorException{ + Map packageParams = new HashMap(); + packageParams.put("appid", wxMpConfigStorage.getAppId()); + packageParams.put("mch_id", wxMpConfigStorage.getPartnerId()); + packageParams.put("body", body); + packageParams.put("out_trade_no", outTradeNo); + packageParams.put("total_fee", (int) (amt * 100) + ""); + packageParams.put("spbill_create_ip", ip); + packageParams.put("notify_url", callbackUrl); + packageParams.put("trade_type", "JSAPI"); + packageParams.put("openid", openId); + + return getPayInfo(packageParams); + } + + @Override + public Map getNativePayInfo(String productId,String outTradeNo, double amt, String body,String ip, String callbackUrl) throws WxErrorException{ + Map packageParams = new HashMap(); + packageParams.put("appid", wxMpConfigStorage.getAppId()); + packageParams.put("mch_id", wxMpConfigStorage.getPartnerId()); + packageParams.put("body", body); + packageParams.put("out_trade_no", outTradeNo); + packageParams.put("total_fee", (int) (amt * 100) + ""); + packageParams.put("spbill_create_ip", ip); + packageParams.put("notify_url", callbackUrl); + packageParams.put("trade_type", "NATIVE"); + packageParams.put("product_id", productId); + + return getPayInfo(packageParams); + } + @Override - public Map getJSSDKPayInfo(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, String callbackUrl) - throws WxErrorException { - Map packageParams = new HashMap(); - packageParams.put("appid", wxMpConfigStorage.getAppId()); - packageParams.put("mch_id", wxMpConfigStorage.getPartnerId()); - packageParams.put("body", body); - packageParams.put("out_trade_no", outTradeNo); - packageParams.put("total_fee", String.format("%.0f", amt * 100)); - packageParams.put("spbill_create_ip", ip); - packageParams.put("notify_url", callbackUrl); - packageParams.put("trade_type", tradeType); - packageParams.put("openid", openId); - - return getJSSDKPayInfo(packageParams); - } - - @Override - public Map getJSSDKPayInfo(Map parameters) throws WxErrorException { + public Map getPayInfo(Map parameters) throws WxErrorException { WxMpPrepayIdResult wxMpPrepayIdResult = getPrepayId(parameters); if (!"SUCCESS".equalsIgnoreCase(wxMpPrepayIdResult.getReturn_code()) @@ -866,7 +881,9 @@ public class WxMpServiceImpl implements WxMpService { payInfo.put("nonceStr", System.currentTimeMillis() + ""); payInfo.put("package", "prepay_id=" + prepayId); payInfo.put("signType", "MD5"); - payInfo.put("code_url",wxMpPrepayIdResult.getCode_url()); + if("NATIVE".equals(parameters.get("trade_type"))){ + payInfo.put("codeUrl", wxMpPrepayIdResult.getCode_url()); + } String finalSign = WxCryptUtil.createSign(payInfo, wxMpConfigStorage.getPartnerKey()); payInfo.put("paySign", finalSign); From 52e9b67c0f83047783fb4c402e4a75735da39c91 Mon Sep 17 00:00:00 2001 From: YuJian Date: Sun, 24 Apr 2016 13:16:10 +0800 Subject: [PATCH 04/33] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E3=80=82data=E6=98=AFdatum=E7=9A=84=E5=A4=8D?= =?UTF-8?q?=E6=95=B0=EF=BC=8Cdatas=E6=98=AF=E9=94=99=E8=AF=AF=E5=86=99?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/bean/WxMpTemplateMessage.java | 14 +++++++++----- .../util/json/WxMpTemplateMessageGsonAdapter.java | 14 +++++++------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java index aa061e3b..dd822ba5 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java @@ -12,7 +12,7 @@ public class WxMpTemplateMessage implements Serializable { private String templateId; private String url; private String topColor; - private List datas = new ArrayList(); + private List data = new ArrayList(); public String getToUser() { return toUser; @@ -46,12 +46,16 @@ public class WxMpTemplateMessage implements Serializable { this.topColor = topColor; } - public List getDatas() { - return datas; + public List getData() { + return data; } - public void setDatas(List datas) { - this.datas = datas; + public void setData(List data) { + this.data = data; + } + + public void addWxMpTemplateData(WxMpTemplateData datum) { + this.data.add(datum); } public String toJson() { diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java index c34ac2c2..be792df5 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java @@ -30,16 +30,16 @@ public class WxMpTemplateMessageGsonAdapter implements JsonSerializer Date: Sat, 14 May 2016 14:26:28 +0800 Subject: [PATCH 05/33] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=B8=AA=E6=80=A7?= =?UTF-8?q?=E5=8C=96=E8=8F=9C=E5=8D=95=E6=8E=A5=E5=8F=A3group=5Fid?= =?UTF-8?q?=E6=94=B9=E4=B8=BAtag=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 详细参见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1455782296&token=&lang=zh_CN --- .../java/me/chanjar/weixin/common/bean/WxMenu.java | 12 ++++++------ .../weixin/common/util/json/WxMenuGsonAdapter.java | 2 +- .../me/chanjar/weixin/common/bean/WxMenuTest.java | 2 +- 3 files changed, 8 insertions(+), 8 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 ccc7bc49..aa259c08 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,7 +129,7 @@ public class WxMenu implements Serializable { } public static class WxMenuRule { - private String groupId; + private String tagId; private String sex; private String country; private String province; @@ -137,12 +137,12 @@ public class WxMenu implements Serializable { private String clientPlatformType; private String language; - public String getGroupId() { - return groupId; + public String getTagId() { + return tagId; } - public void setGroupId(String groupId) { - this.groupId = groupId; + public void setTagId(String tagId) { + this.tagId = tagId; } public String getSex() { @@ -196,7 +196,7 @@ public class WxMenu implements Serializable { @Override public String toString() { return "matchrule:{" + - "group_id='" + groupId + '\'' + + "tag_id='" + tagId + '\'' + ", sex='" + sex + '\'' + ", country" + country + '\'' + ", province" + province + '\'' + 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 d4d9ea5a..51a19fec 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 @@ -62,7 +62,7 @@ public class WxMenuGsonAdapter implements JsonSerializer, JsonDeserializ protected JsonObject convertToJson(WxMenu.WxMenuRule menuRule){ JsonObject matchRule = new JsonObject(); - matchRule.addProperty("group_id",menuRule.getGroupId()); + matchRule.addProperty("tag_id",menuRule.getTagId()); matchRule.addProperty("sex",menuRule.getSex()); matchRule.addProperty("country",menuRule.getCountry()); matchRule.addProperty("province",menuRule.getProvince()); diff --git a/weixin-java-common/src/test/java/me/chanjar/weixin/common/bean/WxMenuTest.java b/weixin-java-common/src/test/java/me/chanjar/weixin/common/bean/WxMenuTest.java index 79d28e47..2ae12c2c 100644 --- a/weixin-java-common/src/test/java/me/chanjar/weixin/common/bean/WxMenuTest.java +++ b/weixin-java-common/src/test/java/me/chanjar/weixin/common/bean/WxMenuTest.java @@ -67,7 +67,7 @@ public class WxMenuTest { menu.getButtons().add(button1); WxMenu.WxMenuRule wxMenuRule = new WxMenu.WxMenuRule(); - wxMenuRule.setGroupId("2"); + wxMenuRule.setTagId("2"); wxMenuRule.setSex("1"); wxMenuRule.setCountry("中国"); wxMenuRule.setProvince("广东"); From 902b6897a1f04a7a1a3a5cdb69a2b70bdb530b7a Mon Sep 17 00:00:00 2001 From: miller Date: Wed, 1 Jun 2016 10:07:20 +0800 Subject: [PATCH 06/33] =?UTF-8?q?=E7=BE=A4=E5=8F=91=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=93=8D=E5=BA=94=20=E5=A2=9E=E5=8A=A0msgDataId=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20=E7=94=A8=E4=BA=8E=E5=9B=BE=E6=96=87=E5=88=86?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/bean/result/WxMpMassSendResult.java | 11 ++++++++++- .../mp/util/json/WxMpMassSendResultAdapter.java | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassSendResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassSendResult.java index adf6ebbc..dd12a53a 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassSendResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassSendResult.java @@ -20,6 +20,7 @@ public class WxMpMassSendResult implements Serializable { private String errorCode; private String errorMsg; private String msgId; + private String msgDataId; public String getErrorCode() { return errorCode; @@ -44,7 +45,15 @@ public class WxMpMassSendResult implements Serializable { public void setMsgId(String msgId) { this.msgId = msgId; } - + + public String getMsgDataId() { + return msgDataId; + } + + public void setMsgDataId(String msgDataId) { + this.msgDataId = msgDataId; + } + public static WxMpMassSendResult fromJson(String json) { return WxMpGsonBuilder.create().fromJson(json, WxMpMassSendResult.class); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassSendResultAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassSendResultAdapter.java index 99fc02b8..658ac358 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassSendResultAdapter.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassSendResultAdapter.java @@ -34,6 +34,9 @@ public class WxMpMassSendResultAdapter implements JsonDeserializer Date: Wed, 1 Jun 2016 10:39:10 +0800 Subject: [PATCH 07/33] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=BE=A4=E5=8F=91?= =?UTF-8?q?=E7=9A=84=E9=A2=84=E8=A7=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/WxMpService.java | 33 ++++++--- .../weixin/mp/api/WxMpServiceImpl.java | 7 ++ .../mp/bean/WxMpMassPreviewMessage.java | 68 +++++++++++++++++++ .../weixin/mp/util/json/WxMpGsonBuilder.java | 1 + .../WxMpMassPreviewMessageGsonAdapter.java | 48 +++++++++++++ 5 files changed, 146 insertions(+), 11 deletions(-) create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassPreviewMessageGsonAdapter.java 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 16ca6bca..162ef689 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 @@ -351,7 +351,7 @@ public interface WxMpService { * @throws WxErrorException */ public void menuDelete(String menuid) throws WxErrorException; - + /** *
    * 自定义菜单查询接口
@@ -361,7 +361,7 @@ public interface WxMpService {
    * @throws WxErrorException
    */
   public WxMenu menuGet() throws WxErrorException;
-  
+
   /**
    * 
    * 测试个性化菜单匹配结果
@@ -723,7 +723,7 @@ public interface WxMpService {
   /**
    * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1)
    * 在发起微信支付前,需要调用统一下单接口,获取"预支付交易会话标识"
-   * 
+   *
    * @param parameters
    *            All required/optional parameters for weixin payment
    * @return
@@ -737,10 +737,10 @@ public interface WxMpService {
    * @param parameters
    *            the required or optional parameters
    * @return
- * @throws WxErrorException 
+ * @throws WxErrorException
    */
-  Map getJSSDKPayInfo(Map parameters) throws WxErrorException;  	
-  	
+  Map getJSSDKPayInfo(Map parameters) throws WxErrorException;
+
   /**
    * 该接口调用“统一下单”接口,并拼装JSSDK发起支付请求需要的参数
    * 详见http://mp.weixin.qq.com/wiki/7/aaa137b55fb2e0456bf8dd9148dd613f.html#.E5.8F.91.E8.B5.B7.E4.B8.80.E4.B8.AA.E5.BE.AE.E4.BF.A1.E6.94.AF.E4.BB.98.E8.AF.B7.E6.B1.82
@@ -752,7 +752,7 @@ public interface WxMpService {
    * @param ip 发起支付的客户端IP
    * @param notifyUrl 通知地址
    * @return
- * @throws WxErrorException 
+ * @throws WxErrorException
    * @deprecated Use me.chanjar.weixin.mp.api.WxMpService.getJSSDKPayInfo(Map) instead
    */
   @Deprecated
@@ -773,7 +773,7 @@ public interface WxMpService {
      * @return
      */
     WxMpPayCallback getJSSDKCallbackData(String xmlData);
-    
+
     /**
      * 微信支付-申请退款
      * 详见 https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_4
@@ -784,10 +784,10 @@ public interface WxMpService {
      *        
  • total_fee *
  • refund_fee * @return 退款操作结果 - * @throws WxErrorException + * @throws WxErrorException */ public WxMpPayRefundResult refundPay(Map parameters) throws WxErrorException; - + /** *
          * 计算Map键值对是否和签名相符,
    @@ -914,7 +914,7 @@ public interface WxMpService {
          */
       public void markCardCode(String code, String cardId, String openId, boolean isMark) throws
           WxErrorException;
    -  
    +
       /**
        * 查看卡券详情接口
        * 详见 https://mp.weixin.qq.com/wiki/14/8dd77aeaee85f922db5f8aa6386d385e.html#.E6.9F.A5.E7.9C.8B.E5.8D.A1.E5.88.B8.E8.AF.A6.E6.83.85
    @@ -925,4 +925,15 @@ public interface WxMpService {
        * @throws WxErrorException
        */
       public String getCardDetail(String cardId) throws WxErrorException;
    +
    +  /*
    +     * 
    +     * 预览接口
    +     * 详情请见:http://mp.weixin.qq.com/wiki/15/40b6865b893947b764e2de8e4a1fb55f.html#.E9.A2.84.E8.A7.88.E6.8E.A5.E5.8F.A3.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91
    +     * 
    + * @param wxMpMassPreviewMessage + * @return wxMpMassSendResult + * @throws WxErrorException + */ + public WxMpMassSendResult massMessagePreview(WxMpMassPreviewMessage wxMpMassPreviewMessage) throws Exception; } 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 1805b271..e2d68752 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 @@ -1259,4 +1259,11 @@ public class WxMpServiceImpl implements WxMpService { return responseContent; } + @Override + public WxMpMassSendResult massMessagePreview(WxMpMassPreviewMessage wxMpMassPreviewMessage) throws Exception { + String url = "https://api.weixin.qq.com/cgi-bin/message/mass/preview"; + String responseContent = execute(new SimplePostRequestExecutor(), url, wxMpMassPreviewMessage.toJson()); + return WxMpMassSendResult.fromJson(responseContent); + } + } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java new file mode 100644 index 00000000..154195db --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java @@ -0,0 +1,68 @@ +package me.chanjar.weixin.mp.bean; + +import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; + +import java.io.Serializable; + +/** + * @author miller + */ +public class WxMpMassPreviewMessage implements Serializable { + private String toWxUsername; + private String msgType; + private String content; + private String mediaId; + + public WxMpMassPreviewMessage() { + super(); + } + + public String getToWxUsername() { + return toWxUsername; + } + + public void setToWxUsername(String toWxUsername) { + this.toWxUsername = toWxUsername; + } + + public String getMsgType() { + return msgType; + } + + /** + *
    +   * 请使用
    +   * {@link me.chanjar.weixin.common.api.WxConsts#MASS_MSG_IMAGE}
    +   * {@link me.chanjar.weixin.common.api.WxConsts#MASS_MSG_NEWS}
    +   * {@link me.chanjar.weixin.common.api.WxConsts#MASS_MSG_TEXT}
    +   * {@link me.chanjar.weixin.common.api.WxConsts#MASS_MSG_VIDEO}
    +   * {@link me.chanjar.weixin.common.api.WxConsts#MASS_MSG_VOICE}
    +   * 如果msgtype和media_id不匹配的话,会返回系统繁忙的错误
    +   * 
    + * + * @param msgType + */ + public void setMsgType(String msgType) { + this.msgType = msgType; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getMediaId() { + return mediaId; + } + + public void setMediaId(String mediaId) { + this.mediaId = mediaId; + } + + public String toJson() { + return WxMpGsonBuilder.INSTANCE.create().toJson(this); + } +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java index 316f22f5..4458bf62 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java @@ -40,6 +40,7 @@ public class WxMpGsonBuilder { INSTANCE.registerTypeAdapter(WxMpMaterialFileBatchGetResult.WxMaterialFileBatchGetNewsItem.class, new WxMpMaterialFileBatchGetGsonItemAdapter()); INSTANCE.registerTypeAdapter(WxMpCardResult.class, new WxMpCardResultGsonAdapter()); INSTANCE.registerTypeAdapter(WxMpCard.class, new WxMpCardGsonAdapter()); + INSTANCE.registerTypeAdapter(WxMpMassPreviewMessage.class, new WxMpMassPreviewMessageGsonAdapter()); } public static Gson create() { diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassPreviewMessageGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassPreviewMessageGsonAdapter.java new file mode 100644 index 00000000..fd3e52df --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassPreviewMessageGsonAdapter.java @@ -0,0 +1,48 @@ +package me.chanjar.weixin.mp.util.json; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; +import me.chanjar.weixin.common.api.WxConsts; +import me.chanjar.weixin.mp.bean.WxMpMassPreviewMessage; + +import java.lang.reflect.Type; + +/** + * @author miller + */ +public class WxMpMassPreviewMessageGsonAdapter implements JsonSerializer { + @Override + public JsonElement serialize(WxMpMassPreviewMessage wxMpMassPreviewMessage, Type type, JsonSerializationContext jsonSerializationContext) { + JsonObject jsonObject = new JsonObject(); + jsonObject.addProperty("towxname", wxMpMassPreviewMessage.getToWxUsername()); + if (WxConsts.MASS_MSG_NEWS.equals(wxMpMassPreviewMessage.getMsgType())) { + JsonObject news = new JsonObject(); + news.addProperty("media_id", wxMpMassPreviewMessage.getMediaId()); + jsonObject.add(WxConsts.MASS_MSG_NEWS, news); + } + if (WxConsts.MASS_MSG_TEXT.equals(wxMpMassPreviewMessage.getMsgType())) { + JsonObject sub = new JsonObject(); + sub.addProperty("content", wxMpMassPreviewMessage.getContent()); + jsonObject.add(WxConsts.MASS_MSG_TEXT, sub); + } + if (WxConsts.MASS_MSG_VOICE.equals(wxMpMassPreviewMessage.getMsgType())) { + JsonObject sub = new JsonObject(); + sub.addProperty("media_id", wxMpMassPreviewMessage.getMediaId()); + jsonObject.add(WxConsts.MASS_MSG_VOICE, sub); + } + if (WxConsts.MASS_MSG_IMAGE.equals(wxMpMassPreviewMessage.getMsgType())) { + JsonObject sub = new JsonObject(); + sub.addProperty("media_id", wxMpMassPreviewMessage.getMediaId()); + jsonObject.add(WxConsts.MASS_MSG_IMAGE, sub); + } + if (WxConsts.MASS_MSG_VIDEO.equals(wxMpMassPreviewMessage.getMsgType())) { + JsonObject sub = new JsonObject(); + sub.addProperty("media_id", wxMpMassPreviewMessage.getMediaId()); + jsonObject.add(WxConsts.MASS_MSG_VIDEO, sub); + } + jsonObject.addProperty("msgtype", wxMpMassPreviewMessage.getMsgType()); + return jsonObject; + } +} From 46b3eba7e6d36632895672cca25fa271590f10c4 Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Wed, 1 Jun 2016 10:41:48 +0800 Subject: [PATCH 08/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9groupId=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8DPom=E6=96=87=E4=BB=B6=EF=BC=8C=E5=90=8C?= =?UTF-8?q?=E6=AD=A5README.md=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 40 +++++++++++++++++++------------------- pom.xml | 16 +++++++++------ weixin-java-common/pom.xml | 9 ++------- weixin-java-cp/pom.xml | 11 +++-------- weixin-java-mp/pom.xml | 11 +++-------- 5 files changed, 38 insertions(+), 49 deletions(-) diff --git a/README.md b/README.md index 84ad680e..4bf7de63 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,25 @@ -weixin-java-tools +# Weixin-java-tools +## 微信公众号、企业号Java SDK。 -[![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) -[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/chanjarster/weixin-java-tools?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +[![Build Status](https://travis-ci.org/binarywang/weixin-java-tools.svg?branch=develop)](https://travis-ci.org/binarywang/weixin-java-tools) +![Maven Central](https://img.shields.io/maven-central/v/com.github.binarywang/weixin-java-parent.svg) + +### 详细文档请看 [wiki](https://github.com/chanjarster/weixin-java-tools/wiki)。 + +#### 1.3.4版发布!!! By Binary Wang 2016-06-01 -=========== -* 群/聊天室:请点击上方的GITTER按钮 -* 本项目的发布周期:本人子2015年6月开始进入到了一个非常忙碌的状态,且公司目前也没有开发微信相关的项目,因此本项目的维护基本靠“等”。所以靠人不如靠自己,提交pull request吧。 +=========== +* QQ群:343954419 +* 微信群: +![Alt text](https://raw.githubusercontent.com/binarywang/weixin-java-tools/master/weixinqun.jpg "微信群") + =========== -微信公众号、企业号Java SDK。 +## 发布周期 +暂定为一月一次发布,月初或月底发布新版本,遇到重大问题需修复会及时提交新版本,欢迎大家随时提交Pull Request。 -详细文档请看 [wiki](https://github.com/chanjarster/weixin-java-tools/wiki)。 ## Quick Start @@ -21,9 +27,9 @@ weixin-java-tools ```xml - me.chanjar + com.github.binarywang weixin-java-mp - 1.3.3 + 1.3.4 ``` @@ -31,9 +37,9 @@ weixin-java-tools ```xml - me.chanjar + com.github.binarywang weixin-java-cp - 1.3.3 + 1.3.4 ``` @@ -51,14 +57,8 @@ weixin-java-tools ``` -## 升级指南 - -* [1.0.3升级指南](https://github.com/chanjarster/weixin-java-tools/wiki/1_0_3升级指南) -* [1.1.0升级指南](https://github.com/chanjarster/weixin-java-tools/wiki/1_1_0升级指南) -* [1.1.1升级指南](https://github.com/chanjarster/weixin-java-tools/wiki/1_1_1升级指南) - ## 关于Pull Request 非常欢迎和感谢对本项目发起Pull Request的同学,不过本项目基于[git flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)开发流程,因此在发起Pull Request的时候请选择develop分支。 -且本项目代码风格是用2个空格代表一个tab,因此在发起PR时注意一下,否则很容易发生在IDE格式化代码后与原代码产生大量diff,这样我在阅读PR的时候就很困难。 +且本项目代码风格是用2个空格代表一个tab,因此在发起PR时注意一下,否则很容易发生在IDE格式化代码后与原代码产生大量diff,这样我在阅读PR的时候就很困难。 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7f6b66a6..df70e322 100644 --- a/pom.xml +++ b/pom.xml @@ -3,13 +3,13 @@ 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"> 4.0.0 - me.chanjar + com.github.binarywang weixin-java-parent - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT pom WeiXin Java Tools - Parent 微信公众号、企业号上级POM - https://github.com/chanjarster/weixin-java-tools + https://github.com/binarywang/weixin-java-tools @@ -23,12 +23,16 @@ Daniel Qian chanjarster@gmail.com + + Binary Wang + binarywang@gmail.com + - scm:git:https://github.com/chanjarster/weixin-java-tools.git - scm:git:git@github.com:chanjarster/weixin-java-tools.git - https://github.com/chanjarster/weixin-java-tools + scm:git:https://github.com/binarywang/weixin-java-tools.git + scm:git:git@github.com:binarywang/weixin-java-tools.git + https://github.com/binarywang/weixin-java-tools diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml index 230484ac..38749b9f 100644 --- a/weixin-java-common/pom.xml +++ b/weixin-java-common/pom.xml @@ -4,9 +4,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - me.chanjar + com.github.binarywang weixin-java-parent - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT weixin-java-common @@ -27,31 +27,26 @@ org.testng testng - 6.8.7 test org.mockito mockito-all - 1.9.5 test com.google.inject guice - 3.0 test org.eclipse.jetty jetty-server - 9.3.0.M0 test org.eclipse.jetty jetty-servlet - 9.3.0.M0 test diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml index 2fc13c3d..38e14fa7 100644 --- a/weixin-java-cp/pom.xml +++ b/weixin-java-cp/pom.xml @@ -4,9 +4,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - me.chanjar + com.github.binarywang weixin-java-parent - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT weixin-java-cp @@ -15,7 +15,7 @@ - me.chanjar + com.github.binarywang weixin-java-common ${project.version} @@ -27,31 +27,26 @@ org.testng testng - 6.8.7 test org.mockito mockito-all - 1.9.5 test com.google.inject guice - 3.0 test org.eclipse.jetty jetty-server - 9.3.0.M0 test org.eclipse.jetty jetty-servlet - 9.3.0.M0 test diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml index cc761298..ada2e442 100644 --- a/weixin-java-mp/pom.xml +++ b/weixin-java-mp/pom.xml @@ -4,9 +4,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - me.chanjar + com.github.binarywang weixin-java-parent - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT weixin-java-mp WeiXin Java Tools - MP @@ -14,7 +14,7 @@ - me.chanjar + com.github.binarywang weixin-java-common ${project.version} @@ -26,31 +26,26 @@ org.testng testng - 6.8.7 test org.mockito mockito-all - 1.9.5 test com.google.inject guice - 3.0 test org.eclipse.jetty jetty-server - 9.3.0.M0 test org.eclipse.jetty jetty-servlet - 9.3.0.M0 test From ba54ff50043e34f36bea072a4ac7a8c49e72dbb2 Mon Sep 17 00:00:00 2001 From: miller Date: Wed, 1 Jun 2016 11:17:53 +0800 Subject: [PATCH 09/33] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E6=96=87?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=86=85=E7=9A=84=E5=9B=BE=E7=89=87=E8=8E=B7?= =?UTF-8?q?=E5=8F=96URL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/WxMpService.java | 11 ++++ .../weixin/mp/api/WxMpServiceImpl.java | 6 +++ .../bean/result/WxMediaImgUploadResult.java | 24 +++++++++ .../http/MediaImgUploadRequestExecutor.java | 51 +++++++++++++++++++ .../WxMediaImgUploadResultGsonAdapter.java | 22 ++++++++ .../weixin/mp/util/json/WxMpGsonBuilder.java | 1 + 6 files changed, 115 insertions(+) create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMediaImgUploadResult.java create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMediaImgUploadResultGsonAdapter.java 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 162ef689..c2c2f216 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 @@ -936,4 +936,15 @@ public interface WxMpService { * @throws WxErrorException */ public WxMpMassSendResult massMessagePreview(WxMpMassPreviewMessage wxMpMassPreviewMessage) throws Exception; + + /* + *
    +     * 上传图文消息内的图片获取URL
    +     * 详情请见:http://mp.weixin.qq.com/wiki/15/40b6865b893947b764e2de8e4a1fb55f.html#.E4.B8.8A.E4.BC.A0.E5.9B.BE.E6.96.87.E6.B6.88.E6.81.AF.E5.86.85.E7.9A.84.E5.9B.BE.E7.89.87.E8.8E.B7.E5.8F.96URL.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91
    +     * 
    + * @param file + * @return WxMediaImgUploadResult 返回图片url + * @throws WxErrorException + */ + public WxMediaImgUploadResult mediaImgUpload(File file) throws WxErrorException; } 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 e2d68752..cbfa7dec 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 @@ -1266,4 +1266,10 @@ public class WxMpServiceImpl implements WxMpService { return WxMpMassSendResult.fromJson(responseContent); } + @Override + public WxMediaImgUploadResult mediaImgUpload(File file) throws WxErrorException { + String url = "https://api.weixin.qq.com/cgi-bin/media/uploadimg"; + return execute(new MediaImgUploadRequestExecutor(), url, file); + } + } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMediaImgUploadResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMediaImgUploadResult.java new file mode 100644 index 00000000..3e5ff6b2 --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMediaImgUploadResult.java @@ -0,0 +1,24 @@ +package me.chanjar.weixin.mp.bean.result; + +import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; + +import java.io.Serializable; + +/** + * @author miller + */ +public class WxMediaImgUploadResult implements Serializable { + private String url; + + public static WxMediaImgUploadResult fromJson(String json) { + return WxMpGsonBuilder.create().fromJson(json, WxMediaImgUploadResult.class); + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java new file mode 100644 index 00000000..bdbc8f67 --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java @@ -0,0 +1,51 @@ +package me.chanjar.weixin.mp.util.http; + +import me.chanjar.weixin.common.bean.result.WxError; +import me.chanjar.weixin.common.exception.WxErrorException; +import me.chanjar.weixin.common.util.http.RequestExecutor; +import me.chanjar.weixin.common.util.http.Utf8ResponseHandler; +import me.chanjar.weixin.mp.bean.result.WxMediaImgUploadResult; +import org.apache.http.HttpEntity; +import org.apache.http.HttpHost; +import org.apache.http.client.ClientProtocolException; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.mime.HttpMultipartMode; +import org.apache.http.entity.mime.MultipartEntityBuilder; +import org.apache.http.impl.client.CloseableHttpClient; + +import java.io.File; +import java.io.IOException; + +/** + * @author miller + */ +public class MediaImgUploadRequestExecutor implements RequestExecutor { + @Override + public WxMediaImgUploadResult execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, File data) throws WxErrorException, ClientProtocolException, IOException { + HttpPost httpPost = new HttpPost(uri); + if (httpProxy != null) { + RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build(); + httpPost.setConfig(config); + } + if (data != null) { + HttpEntity entity = MultipartEntityBuilder + .create() + .addBinaryBody("media", data) + .setMode(HttpMultipartMode.RFC6532) + .build(); + httpPost.setEntity(entity); + httpPost.setHeader("Content-Type", ContentType.MULTIPART_FORM_DATA.toString()); + } + try (CloseableHttpResponse response = httpclient.execute(httpPost)) { + String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); + WxError error = WxError.fromJson(responseContent); + if (error.getErrorCode() != 0) { + throw new WxErrorException(error); + } + return WxMediaImgUploadResult.fromJson(responseContent); + } + } +} \ No newline at end of file diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMediaImgUploadResultGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMediaImgUploadResultGsonAdapter.java new file mode 100644 index 00000000..39746ccd --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMediaImgUploadResultGsonAdapter.java @@ -0,0 +1,22 @@ +package me.chanjar.weixin.mp.util.json; + +import com.google.gson.*; +import me.chanjar.weixin.common.util.json.GsonHelper; +import me.chanjar.weixin.mp.bean.result.WxMediaImgUploadResult; + +import java.lang.reflect.Type; + +/** + * @author miller + */ +public class WxMediaImgUploadResultGsonAdapter implements JsonDeserializer { + @Override + public WxMediaImgUploadResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + WxMediaImgUploadResult wxMediaImgUploadResult = new WxMediaImgUploadResult(); + JsonObject jsonObject = json.getAsJsonObject(); + if (null != jsonObject.get("url") && !jsonObject.get("url").isJsonNull()) { + wxMediaImgUploadResult.setUrl(GsonHelper.getAsString(jsonObject.get("url"))); + } + return wxMediaImgUploadResult; + } +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java index 4458bf62..a451673d 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java @@ -41,6 +41,7 @@ public class WxMpGsonBuilder { INSTANCE.registerTypeAdapter(WxMpCardResult.class, new WxMpCardResultGsonAdapter()); INSTANCE.registerTypeAdapter(WxMpCard.class, new WxMpCardGsonAdapter()); INSTANCE.registerTypeAdapter(WxMpMassPreviewMessage.class, new WxMpMassPreviewMessageGsonAdapter()); + INSTANCE.registerTypeAdapter(WxMediaImgUploadResult.class, new WxMediaImgUploadResultGsonAdapter()); } public static Gson create() { From a6fecf5f1f1ad8b0075184302cfd77e865bb177a Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Wed, 1 Jun 2016 21:42:32 +0800 Subject: [PATCH 10/33] disable doclint for java8 --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index df70e322..3ac86ee8 100644 --- a/pom.xml +++ b/pom.xml @@ -148,6 +148,16 @@ + + doclint-java8-disable + + [1.8,) + + + -Xdoclint:none + + + release @@ -178,6 +188,7 @@ + ${javadoc.opts} UTF-8 zh_CN From 14057344a5886c00b52b96ea1a9bb3e4ca88ceaa Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Thu, 2 Jun 2016 09:47:49 +0800 Subject: [PATCH 11/33] remove unused imports --- .../java/me/chanjar/weixin/common/util/crypto/SHA1.java | 5 ++--- .../chanjar/weixin/common/util/http/RequestExecutor.java | 1 - .../weixin/common/util/xml/XStreamInitializer.java | 8 ++------ 3 files changed, 4 insertions(+), 10 deletions(-) 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 index a711c590..bd6ec15e 100644 --- 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 @@ -1,11 +1,10 @@ package me.chanjar.weixin.common.util.crypto; -import org.apache.commons.codec.digest.DigestUtils; - -import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; +import org.apache.commons.codec.digest.DigestUtils; + /** * Created by Daniel Qian on 14/10/19. */ diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/RequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/RequestExecutor.java index 5d407cb9..b0d498a3 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/RequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/RequestExecutor.java @@ -5,7 +5,6 @@ import java.io.IOException; import org.apache.http.HttpHost; import org.apache.http.client.ClientProtocolException; import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; import me.chanjar.weixin.common.exception.WxErrorException; diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java index d545a796..1caa0a06 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java @@ -1,19 +1,15 @@ package me.chanjar.weixin.common.util.xml; +import java.io.Writer; + import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.converters.basic.DoubleConverter; -import com.thoughtworks.xstream.converters.basic.FloatConverter; -import com.thoughtworks.xstream.converters.basic.IntConverter; import com.thoughtworks.xstream.core.util.QuickWriter; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.io.xml.PrettyPrintWriter; import com.thoughtworks.xstream.io.xml.XppDriver; -import com.thoughtworks.xstream.security.NoTypePermission; import com.thoughtworks.xstream.security.NullPermission; import com.thoughtworks.xstream.security.PrimitiveTypePermission; -import java.io.Writer; - public class XStreamInitializer { public static XStream getInstance() { From fb3a093be18115ccd4fc8dbbe048dc4d32b803de Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Thu, 2 Jun 2016 09:50:00 +0800 Subject: [PATCH 12/33] fix weird assignment statement --- .../java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java index a9ebfc2c..a8fa9e15 100755 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java @@ -83,7 +83,7 @@ public class WxCryptUtil { String encryptedXml = encrypt(genRandomStr(), plainText); // 生成安全签名 - String timeStamp = timeStamp = Long.toString(System.currentTimeMillis() / 1000l); + String timeStamp = Long.toString(System.currentTimeMillis() / 1000l); String nonce = genRandomStr(); try { From dca8e307a02a2c007e68da1a7a0dca4729d031af Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Thu, 2 Jun 2016 09:52:58 +0800 Subject: [PATCH 13/33] add serialVersionUID for the classes which implement Serializable interface --- .../main/java/me/chanjar/weixin/common/bean/WxAccessToken.java | 1 + .../java/me/chanjar/weixin/common/bean/WxCardApiSignature.java | 2 ++ .../java/me/chanjar/weixin/common/bean/WxJsapiSignature.java | 2 ++ .../src/main/java/me/chanjar/weixin/common/bean/WxMenu.java | 2 ++ .../java/me/chanjar/weixin/common/bean/result/WxError.java | 2 ++ .../chanjar/weixin/common/bean/result/WxMediaUploadResult.java | 3 ++- 6 files changed, 11 insertions(+), 1 deletion(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxAccessToken.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxAccessToken.java index c923e4f6..ce69a104 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxAccessToken.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxAccessToken.java @@ -5,6 +5,7 @@ import me.chanjar.weixin.common.util.json.WxGsonBuilder; import java.io.Serializable; public class WxAccessToken implements Serializable { + private static final long serialVersionUID = 8709719312922168909L; private String accessToken; diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxCardApiSignature.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxCardApiSignature.java index 5d4d46a9..e1d1b058 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxCardApiSignature.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxCardApiSignature.java @@ -10,6 +10,8 @@ import java.io.Serializable; */ public class WxCardApiSignature implements Serializable { + private static final long serialVersionUID = 158176707226975979L; + private String appId; private String cardId; diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java index 886fd360..74f0b1b1 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java @@ -6,6 +6,8 @@ import java.io.Serializable; * jspai signature */ public class WxJsapiSignature implements Serializable { + private static final long serialVersionUID = -1116808193154384804L; + private String appid; private String noncestr; 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 ccc7bc49..d33f47e3 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 @@ -16,6 +16,8 @@ import java.util.List; */ public class WxMenu implements Serializable { + private static final long serialVersionUID = -7083914585539687746L; + private List buttons = new ArrayList(); private WxMenuRule matchRule; diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxError.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxError.java index 740841b9..737f506f 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxError.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxError.java @@ -12,6 +12,8 @@ import java.io.Serializable; */ public class WxError implements Serializable { + private static final long serialVersionUID = 7869786563361406291L; + private int errorCode; private String errorMsg; diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxMediaUploadResult.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxMediaUploadResult.java index 0ac7fe8a..500dc000 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxMediaUploadResult.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxMediaUploadResult.java @@ -5,7 +5,8 @@ import me.chanjar.weixin.common.util.json.WxGsonBuilder; import java.io.Serializable; public class WxMediaUploadResult implements Serializable { - + private static final long serialVersionUID = 330834334738622341L; + private String type; private String mediaId; private String thumbMediaId; From 5349da96f6b030ce03a1ce6e6cd7d4a52f8c9b2b Mon Sep 17 00:00:00 2001 From: tianmu Date: Tue, 7 Jun 2016 14:32:22 +0800 Subject: [PATCH 14/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=8B=BC?= =?UTF-8?q?=E6=8E=A5=E7=9A=84=E6=A8=A1=E5=BC=8F=EF=BC=8C=E4=BB=8E=20+=20?= =?UTF-8?q?=E6=94=B9=E4=B8=BAStringBuffer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/api/WxMpConfigStorage.java | 6 +- .../weixin/mp/api/WxMpMessageRouter.java | 464 +++++++++--------- .../me/chanjar/weixin/mp/api/WxMpService.java | 4 +- .../weixin/mp/api/WxMpServiceImpl.java | 72 +-- .../mp/util/http/QrCodeRequestExecutor.java | 12 +- .../mp/util/json/WxMpCardGsonAdapter.java | 9 +- .../util/json/WxMpCardResultGsonAdapter.java | 9 +- 7 files changed, 288 insertions(+), 288 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpConfigStorage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpConfigStorage.java index 739e16b7..d57b94a8 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpConfigStorage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpConfigStorage.java @@ -69,9 +69,9 @@ public interface WxMpConfigStorage { public String getSecret(); - public String getPartnerId(); - - public String getPartnerKey(); + public String getPartnerId(); + + public String getPartnerKey(); public String getToken(); diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java index 2c610f07..4cc7df21 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java @@ -1,232 +1,232 @@ -package me.chanjar.weixin.mp.api; - -import me.chanjar.weixin.common.session.InternalSession; -import me.chanjar.weixin.common.session.InternalSessionManager; -import me.chanjar.weixin.common.session.StandardSessionManager; -import me.chanjar.weixin.common.session.WxSessionManager; -import me.chanjar.weixin.common.util.LogExceptionHandler; -import me.chanjar.weixin.common.api.WxErrorExceptionHandler; -import me.chanjar.weixin.common.api.WxMessageDuplicateChecker; -import me.chanjar.weixin.common.api.WxMessageInMemoryDuplicateChecker; -import me.chanjar.weixin.mp.bean.WxMpXmlMessage; -import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; - -/** - *
    - * 微信消息路由器,通过代码化的配置,把来自微信的消息交给handler处理
    - * 
    - * 说明:
    - * 1. 配置路由规则时要按照从细到粗的原则,否则可能消息可能会被提前处理
    - * 2. 默认情况下消息只会被处理一次,除非使用 {@link WxMpMessageRouterRule#next()}
    - * 3. 规则的结束必须用{@link WxMpMessageRouterRule#end()}或者{@link WxMpMessageRouterRule#next()},否则不会生效
    - * 
    - * 使用方法:
    - * WxMpMessageRouter router = new WxMpMessageRouter();
    - * router
    - *   .rule()
    - *       .msgType("MSG_TYPE").event("EVENT").eventKey("EVENT_KEY").content("CONTENT")
    - *       .interceptor(interceptor, ...).handler(handler, ...)
    - *   .end()
    - *   .rule()
    - *       // 另外一个匹配规则
    - *   .end()
    - * ;
    - * 
    - * // 将WxXmlMessage交给消息路由器
    - * router.route(message);
    - * 
    - * 
    - * @author Daniel Qian - * - */ -public class WxMpMessageRouter { - - protected final Logger log = LoggerFactory.getLogger(WxMpMessageRouter.class); - - private static final int DEFAULT_THREAD_POOL_SIZE = 100; - - private final List rules = new ArrayList(); - - private final WxMpService wxMpService; - - private ExecutorService executorService; - - private WxMessageDuplicateChecker messageDuplicateChecker; - - private WxSessionManager sessionManager; - - private WxErrorExceptionHandler exceptionHandler; - - public WxMpMessageRouter(WxMpService wxMpService) { - this.wxMpService = wxMpService; - this.executorService = Executors.newFixedThreadPool(DEFAULT_THREAD_POOL_SIZE); - this.messageDuplicateChecker = new WxMessageInMemoryDuplicateChecker(); - this.sessionManager = new StandardSessionManager(); - this.exceptionHandler = new LogExceptionHandler(); - } - - /** - *
    -   * 设置自定义的 {@link ExecutorService}
    -   * 如果不调用该方法,默认使用 Executors.newFixedThreadPool(100)
    -   * 
    - * @param executorService - */ - public void setExecutorService(ExecutorService executorService) { - this.executorService = executorService; - } - - /** - *
    -   * 设置自定义的 {@link me.chanjar.weixin.common.api.WxMessageDuplicateChecker}
    -   * 如果不调用该方法,默认使用 {@link me.chanjar.weixin.common.api.WxMessageInMemoryDuplicateChecker}
    -   * 
    - * @param messageDuplicateChecker - */ - public void setMessageDuplicateChecker(WxMessageDuplicateChecker messageDuplicateChecker) { - this.messageDuplicateChecker = messageDuplicateChecker; - } - - /** - *
    -   * 设置自定义的{@link me.chanjar.weixin.common.session.WxSessionManager}
    -   * 如果不调用该方法,默认使用 {@link me.chanjar.weixin.common.session.StandardSessionManager}
    -   * 
    - * @param sessionManager - */ - public void setSessionManager(WxSessionManager sessionManager) { - this.sessionManager = sessionManager; - } - - /** - *
    -   * 设置自定义的{@link me.chanjar.weixin.common.api.WxErrorExceptionHandler}
    -   * 如果不调用该方法,默认使用 {@link me.chanjar.weixin.common.util.LogExceptionHandler}
    -   * 
    - * @param exceptionHandler - */ - public void setExceptionHandler(WxErrorExceptionHandler exceptionHandler) { - this.exceptionHandler = exceptionHandler; - } - - List getRules() { - return this.rules; - } - - /** - * 开始一个新的Route规则 - * @return - */ - public WxMpMessageRouterRule rule() { - return new WxMpMessageRouterRule(this); - } - - /** - * 处理微信消息 - * @param wxMessage - */ - public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) { - if (isDuplicateMessage(wxMessage)) { - // 如果是重复消息,那么就不做处理 - return null; - } - - final List matchRules = new ArrayList(); - // 收集匹配的规则 - for (final WxMpMessageRouterRule rule : rules) { - if (rule.test(wxMessage)) { - matchRules.add(rule); - if(!rule.isReEnter()) { - break; - } - } - } - - if (matchRules.size() == 0) { - return null; - } - - WxMpXmlOutMessage res = null; - final List futures = new ArrayList(); - for (final WxMpMessageRouterRule rule : matchRules) { - // 返回最后一个非异步的rule的执行结果 - if(rule.isAsync()) { - futures.add( - executorService.submit(new Runnable() { - public void run() { - rule.service(wxMessage, wxMpService, sessionManager, exceptionHandler); - } - }) - ); - } else { - res = rule.service(wxMessage, wxMpService, sessionManager, exceptionHandler); - // 在同步操作结束,session访问结束 - log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUserName()); - sessionEndAccess(wxMessage); - } - } - - if (futures.size() > 0) { - executorService.submit(new Runnable() { - @Override - public void run() { - for (Future future : futures) { - try { - future.get(); - log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUserName()); - // 异步操作结束,session访问结束 - sessionEndAccess(wxMessage); - } catch (InterruptedException e) { - log.error("Error happened when wait task finish", e); - } catch (ExecutionException e) { - log.error("Error happened when wait task finish", e); - } - } - } - }); - } - return res; - } - - protected boolean isDuplicateMessage(WxMpXmlMessage wxMessage) { - - String messageId = ""; - if (wxMessage.getMsgId() == null) { - messageId = String.valueOf(wxMessage.getCreateTime()) - + "-" + wxMessage.getFromUserName() - + "-" + String.valueOf(wxMessage.getEventKey() == null ? "" : wxMessage.getEventKey()) - + "-" + String.valueOf(wxMessage.getEvent() == null ? "" : wxMessage.getEvent()) - ; - } else { - messageId = String.valueOf(wxMessage.getMsgId()); - } - - if (messageDuplicateChecker.isDuplicate(messageId)) { - return true; - } - return false; - - } - - /** - * 对session的访问结束 - * @param wxMessage - */ - protected void sessionEndAccess(WxMpXmlMessage wxMessage) { - - InternalSession session = ((InternalSessionManager)sessionManager).findSession(wxMessage.getFromUserName()); - if (session != null) { - session.endAccess(); - } - - } -} +package me.chanjar.weixin.mp.api; + +import me.chanjar.weixin.common.session.InternalSession; +import me.chanjar.weixin.common.session.InternalSessionManager; +import me.chanjar.weixin.common.session.StandardSessionManager; +import me.chanjar.weixin.common.session.WxSessionManager; +import me.chanjar.weixin.common.util.LogExceptionHandler; +import me.chanjar.weixin.common.api.WxErrorExceptionHandler; +import me.chanjar.weixin.common.api.WxMessageDuplicateChecker; +import me.chanjar.weixin.common.api.WxMessageInMemoryDuplicateChecker; +import me.chanjar.weixin.mp.bean.WxMpXmlMessage; +import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; + +/** + *
    + * 微信消息路由器,通过代码化的配置,把来自微信的消息交给handler处理
    + * 
    + * 说明:
    + * 1. 配置路由规则时要按照从细到粗的原则,否则可能消息可能会被提前处理
    + * 2. 默认情况下消息只会被处理一次,除非使用 {@link WxMpMessageRouterRule#next()}
    + * 3. 规则的结束必须用{@link WxMpMessageRouterRule#end()}或者{@link WxMpMessageRouterRule#next()},否则不会生效
    + * 
    + * 使用方法:
    + * WxMpMessageRouter router = new WxMpMessageRouter();
    + * router
    + *   .rule()
    + *       .msgType("MSG_TYPE").event("EVENT").eventKey("EVENT_KEY").content("CONTENT")
    + *       .interceptor(interceptor, ...).handler(handler, ...)
    + *   .end()
    + *   .rule()
    + *       // 另外一个匹配规则
    + *   .end()
    + * ;
    + * 
    + * // 将WxXmlMessage交给消息路由器
    + * router.route(message);
    + * 
    + * 
    + * @author Daniel Qian + * + */ +public class WxMpMessageRouter { + + protected final Logger log = LoggerFactory.getLogger(WxMpMessageRouter.class); + + private static final int DEFAULT_THREAD_POOL_SIZE = 100; + + private final List rules = new ArrayList(); + + private final WxMpService wxMpService; + + private ExecutorService executorService; + + private WxMessageDuplicateChecker messageDuplicateChecker; + + private WxSessionManager sessionManager; + + private WxErrorExceptionHandler exceptionHandler; + + public WxMpMessageRouter(WxMpService wxMpService) { + this.wxMpService = wxMpService; + this.executorService = Executors.newFixedThreadPool(DEFAULT_THREAD_POOL_SIZE); + this.messageDuplicateChecker = new WxMessageInMemoryDuplicateChecker(); + this.sessionManager = new StandardSessionManager(); + this.exceptionHandler = new LogExceptionHandler(); + } + + /** + *
    +   * 设置自定义的 {@link ExecutorService}
    +   * 如果不调用该方法,默认使用 Executors.newFixedThreadPool(100)
    +   * 
    + * @param executorService + */ + public void setExecutorService(ExecutorService executorService) { + this.executorService = executorService; + } + + /** + *
    +   * 设置自定义的 {@link me.chanjar.weixin.common.api.WxMessageDuplicateChecker}
    +   * 如果不调用该方法,默认使用 {@link me.chanjar.weixin.common.api.WxMessageInMemoryDuplicateChecker}
    +   * 
    + * @param messageDuplicateChecker + */ + public void setMessageDuplicateChecker(WxMessageDuplicateChecker messageDuplicateChecker) { + this.messageDuplicateChecker = messageDuplicateChecker; + } + + /** + *
    +   * 设置自定义的{@link me.chanjar.weixin.common.session.WxSessionManager}
    +   * 如果不调用该方法,默认使用 {@link me.chanjar.weixin.common.session.StandardSessionManager}
    +   * 
    + * @param sessionManager + */ + public void setSessionManager(WxSessionManager sessionManager) { + this.sessionManager = sessionManager; + } + + /** + *
    +   * 设置自定义的{@link me.chanjar.weixin.common.api.WxErrorExceptionHandler}
    +   * 如果不调用该方法,默认使用 {@link me.chanjar.weixin.common.util.LogExceptionHandler}
    +   * 
    + * @param exceptionHandler + */ + public void setExceptionHandler(WxErrorExceptionHandler exceptionHandler) { + this.exceptionHandler = exceptionHandler; + } + + List getRules() { + return this.rules; + } + + /** + * 开始一个新的Route规则 + * @return + */ + public WxMpMessageRouterRule rule() { + return new WxMpMessageRouterRule(this); + } + + /** + * 处理微信消息 + * @param wxMessage + */ + public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) { + if (isDuplicateMessage(wxMessage)) { + // 如果是重复消息,那么就不做处理 + return null; + } + + final List matchRules = new ArrayList(); + // 收集匹配的规则 + for (final WxMpMessageRouterRule rule : rules) { + if (rule.test(wxMessage)) { + matchRules.add(rule); + if(!rule.isReEnter()) { + break; + } + } + } + + if (matchRules.size() == 0) { + return null; + } + + WxMpXmlOutMessage res = null; + final List futures = new ArrayList(); + for (final WxMpMessageRouterRule rule : matchRules) { + // 返回最后一个非异步的rule的执行结果 + if(rule.isAsync()) { + futures.add( + executorService.submit(new Runnable() { + public void run() { + rule.service(wxMessage, wxMpService, sessionManager, exceptionHandler); + } + }) + ); + } else { + res = rule.service(wxMessage, wxMpService, sessionManager, exceptionHandler); + // 在同步操作结束,session访问结束 + log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUserName()); + sessionEndAccess(wxMessage); + } + } + + if (futures.size() > 0) { + executorService.submit(new Runnable() { + @Override + public void run() { + for (Future future : futures) { + try { + future.get(); + log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUserName()); + // 异步操作结束,session访问结束 + sessionEndAccess(wxMessage); + } catch (InterruptedException e) { + log.error("Error happened when wait task finish", e); + } catch (ExecutionException e) { + log.error("Error happened when wait task finish", e); + } + } + } + }); + } + return res; + } + + protected boolean isDuplicateMessage(WxMpXmlMessage wxMessage) { + + StringBuffer messageId = new StringBuffer(); + if (wxMessage.getMsgId() == null) { + messageId.append(wxMessage.getCreateTime()) + .append("-").append(wxMessage.getFromUserName()) + .append("-").append(wxMessage.getEventKey() == null ? "" : wxMessage.getEventKey()) + .append("-").append(wxMessage.getEvent() == null ? "" : wxMessage.getEvent()) + ; + } else { + messageId.append(wxMessage.getMsgId()); + } + + if (messageDuplicateChecker.isDuplicate(messageId.toString())) { + return true; + } + return false; + + } + + /** + * 对session的访问结束 + * @param wxMessage + */ + protected void sessionEndAccess(WxMpXmlMessage wxMessage) { + + InternalSession session = ((InternalSessionManager)sessionManager).findSession(wxMessage.getFromUserName()); + if (session != null) { + session.endAccess(); + } + + } +} 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 66a98e6e..3dfe15c1 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 @@ -728,8 +728,8 @@ public interface WxMpService { * @return * @throws WxErrorException */ - Map getJSSDKPayInfo(Map parameters) throws WxErrorException; - + Map getJSSDKPayInfo(Map parameters) throws WxErrorException; + /** * 该接口调用“统一下单”接口,并拼装JSSDK发起支付请求需要的参数 * 详见http://mp.weixin.qq.com/wiki/7/aaa137b55fb2e0456bf8dd9148dd613f.html#.E5.8F.91.E8.B5.B7.E4.B8.80.E4.B8.AA.E5.BE.AE.E4.BF.A1.E6.94.AF.E4.BB.98.E8.AF.B7.E6.B1.82 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 7c4f290f..99168ee4 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 @@ -100,9 +100,10 @@ public class WxMpServiceImpl implements WxMpService { if (wxMpConfigStorage.isAccessTokenExpired()) { synchronized (globalAccessTokenRefreshLock) { if (wxMpConfigStorage.isAccessTokenExpired()) { - String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential" - + "&appid=" + wxMpConfigStorage.getAppId() - + "&secret=" + wxMpConfigStorage.getSecret(); + String url = new StringBuffer() + .append("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential") + .append("&appid=").append(wxMpConfigStorage.getAppId()) + .append("&secret=").append(wxMpConfigStorage.getSecret()).toString(); try { HttpGet httpGet = new HttpGet(url); if (httpProxy != null) { @@ -505,29 +506,31 @@ public class WxMpServiceImpl implements WxMpService { @Override public String oauth2buildAuthorizationUrl(String redirectURI, String scope, String state) { - String url = "https://open.weixin.qq.com/connect/oauth2/authorize?"; - url += "appid=" + wxMpConfigStorage.getAppId(); - url += "&redirect_uri=" + URIUtil.encodeURIComponent(redirectURI); - url += "&response_type=code"; - url += "&scope=" + scope; + StringBuffer url = new StringBuffer(); + url.append("https://open.weixin.qq.com/connect/oauth2/authorize?"); + url.append("appid=").append(wxMpConfigStorage.getAppId()); + url.append("&redirect_uri=").append(URIUtil.encodeURIComponent(redirectURI)); + url.append("&response_type=code"); + url.append("&scope=").append(scope); if (state != null) { - url += "&state=" + state; + url.append("&state=").append(state); } - url += "#wechat_redirect"; - return url; + url.append("#wechat_redirect"); + return url.toString(); } @Override public WxMpOAuth2AccessToken oauth2getAccessToken(String code) throws WxErrorException { - String url = "https://api.weixin.qq.com/sns/oauth2/access_token?"; - url += "appid=" + wxMpConfigStorage.getAppId(); - url += "&secret=" + wxMpConfigStorage.getSecret(); - url += "&code=" + code; - url += "&grant_type=authorization_code"; + StringBuffer url = new StringBuffer(); + url.append("https://api.weixin.qq.com/sns/oauth2/access_token?"); + url.append("appid=").append(wxMpConfigStorage.getAppId()); + url.append("&secret=").append(wxMpConfigStorage.getSecret()); + url.append("&code=").append(code); + url.append("&grant_type=authorization_code"); try { RequestExecutor executor = new SimpleGetRequestExecutor(); - String responseText = executor.execute(getHttpclient(), httpProxy, url, null); + String responseText = executor.execute(getHttpclient(), httpProxy, url.toString(), null); return WxMpOAuth2AccessToken.fromJson(responseText); } catch (ClientProtocolException e) { throw new RuntimeException(e); @@ -538,14 +541,15 @@ public class WxMpServiceImpl implements WxMpService { @Override public WxMpOAuth2AccessToken oauth2refreshAccessToken(String refreshToken) throws WxErrorException { - String url = "https://api.weixin.qq.com/sns/oauth2/refresh_token?"; - url += "appid=" + wxMpConfigStorage.getAppId(); - url += "&grant_type=refresh_token"; - url += "&refresh_token=" + refreshToken; + StringBuffer url = new StringBuffer(); + url.append("https://api.weixin.qq.com/sns/oauth2/refresh_token?"); + url.append("appid=").append(wxMpConfigStorage.getAppId()); + url.append("&grant_type=refresh_token"); + url.append("&refresh_token=").append(refreshToken); try { RequestExecutor executor = new SimpleGetRequestExecutor(); - String responseText = executor.execute(getHttpclient(), httpProxy, url, null); + String responseText = executor.execute(getHttpclient(), httpProxy, url.toString(), null); return WxMpOAuth2AccessToken.fromJson(responseText); } catch (ClientProtocolException e) { throw new RuntimeException(e); @@ -556,18 +560,19 @@ public class WxMpServiceImpl implements WxMpService { @Override public WxMpUser oauth2getUserInfo(WxMpOAuth2AccessToken oAuth2AccessToken, String lang) throws WxErrorException { - String url = "https://api.weixin.qq.com/sns/userinfo?"; - url += "access_token=" + oAuth2AccessToken.getAccessToken(); - url += "&openid=" + oAuth2AccessToken.getOpenId(); + StringBuffer url = new StringBuffer(); + url.append("https://api.weixin.qq.com/sns/userinfo?"); + url.append("access_token=").append(oAuth2AccessToken.getAccessToken()); + url.append("&openid=").append(oAuth2AccessToken.getOpenId()); if (lang == null) { - url += "&lang=zh_CN"; + url.append("&lang=zh_CN"); } else { - url += "&lang=" + lang; + url.append("&lang=").append(lang); } try { RequestExecutor executor = new SimpleGetRequestExecutor(); - String responseText = executor.execute(getHttpclient(), httpProxy, url, null); + String responseText = executor.execute(getHttpclient(), httpProxy, url.toString(), null); return WxMpUser.fromJson(responseText); } catch (ClientProtocolException e) { throw new RuntimeException(e); @@ -578,13 +583,14 @@ public class WxMpServiceImpl implements WxMpService { @Override public boolean oauth2validateAccessToken(WxMpOAuth2AccessToken oAuth2AccessToken) { - String url = "https://api.weixin.qq.com/sns/auth?"; - url += "access_token=" + oAuth2AccessToken.getAccessToken(); - url += "&openid=" + oAuth2AccessToken.getOpenId(); + StringBuffer url = new StringBuffer(); + url.append("https://api.weixin.qq.com/sns/auth?"); + url.append("access_token=").append(oAuth2AccessToken.getAccessToken()); + url.append("&openid=").append(oAuth2AccessToken.getOpenId()); try { RequestExecutor executor = new SimpleGetRequestExecutor(); - executor.execute(getHttpclient(), httpProxy, url, null); + executor.execute(getHttpclient(), httpProxy, url.toString(), null); } catch (ClientProtocolException e) { throw new RuntimeException(e); } catch (IOException e) { @@ -984,7 +990,7 @@ public class WxMpServiceImpl implements WxMpService { @Override public boolean checkJSSDKCallbackDataSignature(Map kvm, String signature) { - return signature.equals(WxCryptUtil.createSign(kvm, wxMpConfigStorage.getPartnerKey())); + return signature.equals(WxCryptUtil.createSign(kvm, wxMpConfigStorage.getPartnerKey())); } @Override diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java index bde25cfb..a643c68d 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java @@ -30,15 +30,15 @@ import java.util.UUID; public class QrCodeRequestExecutor implements RequestExecutor { @Override - public File execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, WxMpQrCodeTicket ticket) throws WxErrorException, ClientProtocolException, IOException { + public File execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, + WxMpQrCodeTicket ticket) throws WxErrorException, ClientProtocolException, IOException { if (ticket != null) { if (uri.indexOf('?') == -1) { uri += '?'; } - uri += uri.endsWith("?") ? - "ticket=" + URLEncoder.encode(ticket.getTicket(), "UTF-8") - : - "&ticket=" + URLEncoder.encode(ticket.getTicket(), "UTF-8"); + uri += uri.endsWith("?") + ? "ticket=" + URLEncoder.encode(ticket.getTicket(), "UTF-8") + : "&ticket=" + URLEncoder.encode(ticket.getTicket(), "UTF-8"); } HttpGet httpGet = new HttpGet(uri); @@ -59,7 +59,7 @@ public class QrCodeRequestExecutor implements RequestExecutor Date: Thu, 16 Jun 2016 23:03:32 +0800 Subject: [PATCH 15/33] =?UTF-8?q?=E4=B8=BAWxError=E5=8A=A0=E5=85=A5builder?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/common/bean/result/WxError.java | 29 +++++++++++++++++-- .../weixin/mp/api/WxMpServiceImpl.java | 5 ++-- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxError.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxError.java index 737f506f..66e22ee7 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxError.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxError.java @@ -5,8 +5,7 @@ import me.chanjar.weixin.common.util.json.WxGsonBuilder; import java.io.Serializable; /** - * 微信错误码说明 - * http://mp.weixin.qq.com/wiki/index.php?title=全局返回码说明 + * 微信错误码说明,请阅读: 全局返回码说明 * @author Daniel Qian * */ @@ -54,4 +53,30 @@ public class WxError implements Serializable { return "微信错误: errcode=" + errorCode + ", errmsg=" + errorMsg + "\njson:" + json; } + public static Builder newBuilder(){ + return new Builder(); + } + + public static class Builder{ + private int errorCode; + private String errorMsg; + + public Builder setErrorCode(int errorCode) { + this.errorCode = errorCode; + return this; + } + + public Builder setErrorMsg(String errorMsg) { + this.errorMsg = errorMsg; + return this; + } + + public WxError build(){ + WxError wxError = new WxError(); + wxError.setErrorCode(this.errorCode); + wxError.setErrorMsg(this.errorMsg); + return wxError; + } + + } } 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 cbfa7dec..dd62cf38 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 @@ -483,9 +483,8 @@ public class WxMpServiceImpl implements WxMpService { try { return String.format(url, URLEncoder.encode(ticket, Charsets.UTF_8.name())); } catch (UnsupportedEncodingException e) { - WxError error = new WxError(); - error.setErrorCode(-1); - error.setErrorMsg(e.getMessage()); + WxError error = WxError.newBuilder().setErrorCode(-1) + .setErrorMsg(e.getMessage()).build(); throw new WxErrorException(error); } } From af2f12267e24d81319f04465845df3e479c015e1 Mon Sep 17 00:00:00 2001 From: miller Date: Sun, 19 Jun 2016 10:13:31 +0800 Subject: [PATCH 16/33] =?UTF-8?q?=E8=A1=8C=E4=B8=9A=E7=9B=B8=E5=85=B3api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/WxMpService.java | 23 ++++++++++ .../weixin/mp/api/WxMpServiceImpl.java | 16 +++++++ .../me/chanjar/weixin/mp/bean/Industry.java | 38 ++++++++++++++++ .../chanjar/weixin/mp/bean/WxMpIndustry.java | 39 ++++++++++++++++ .../weixin/mp/util/json/WxMpGsonBuilder.java | 1 + .../mp/util/json/WxMpIndustryGsonAdapter.java | 44 +++++++++++++++++++ 6 files changed, 161 insertions(+) create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/Industry.java create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpIndustry.java create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java 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 0fc8ad91..223893e1 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 @@ -965,4 +965,27 @@ public interface WxMpService { * @throws WxErrorException */ public WxMediaImgUploadResult mediaImgUpload(File file) throws WxErrorException; + + /* + *
    +     * 设置所属行业
    +     * 官方文档中暂未告知响应内容
    +     * 详情请见:http://mp.weixin.qq.com/wiki/5/6dde9eaa909f83354e0094dc3ad99e05.html#.E8.AE.BE.E7.BD.AE.E6.89.80.E5.B1.9E.E8.A1.8C.E4.B8.9A
    +     * 
    + * @param wxMpIndustry + * @return JsonObject + * @throws WxErrorException + */ + String setIndustry(WxMpIndustry wxMpIndustry) throws WxErrorException; + + /*** + *
    +   * 获取设置的行业信息
    +   * 详情请见:http://mp.weixin.qq.com/wiki/5/6dde9eaa909f83354e0094dc3ad99e05.html#.E8.AE.BE.E7.BD.AE.E6.89.80.E5.B1.9E.E8.A1.8C.E4.B8.9A
    +   * 
    + * + * @return wxMpIndustry + * @throws WxErrorException + */ + WxMpIndustry getIndustry() throws WxErrorException; } 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 00ca446c..d20e5c5f 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 @@ -1294,4 +1294,20 @@ public class WxMpServiceImpl implements WxMpService { return execute(new MediaImgUploadRequestExecutor(), url, file); } + @Override + public String setIndustry(WxMpIndustry wxMpIndustry) throws WxErrorException { + if (null == wxMpIndustry.getPrimaryIndustry() || null == wxMpIndustry.getPrimaryIndustry().getId() + || null == wxMpIndustry.getSecondIndustry() || null == wxMpIndustry.getSecondIndustry().getId()) { + throw new IllegalArgumentException("industry id is empty"); + } + String url = "https://api.weixin.qq.com/cgi-bin/template/api_set_industry"; + return execute(new SimplePostRequestExecutor(), url, wxMpIndustry.toJson()); + } + + @Override + public WxMpIndustry getIndustry() throws WxErrorException { + String url = "https://api.weixin.qq.com/cgi-bin/template/get_industry"; + String responseContent = execute(new SimpleGetRequestExecutor(), url, null); + return WxMpIndustry.fromJson(responseContent); + } } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/Industry.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/Industry.java new file mode 100644 index 00000000..1270e7f5 --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/Industry.java @@ -0,0 +1,38 @@ +package me.chanjar.weixin.mp.bean; + +import java.io.Serializable; + +/** + * @author miller + * 官方文档中,创建和获取的数据结构不一样。所以采用冗余字段的方式,实现相应的接口 + */ +public class Industry implements Serializable { + private static final long serialVersionUID = -1707184885588012142L; + private String id; + private String firstClass; + private String secondClass; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getFirstClass() { + return firstClass; + } + + public void setFirstClass(String firstClass) { + this.firstClass = firstClass; + } + + public String getSecondClass() { + return secondClass; + } + + public void setSecondClass(String secondClass) { + this.secondClass = secondClass; + } +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpIndustry.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpIndustry.java new file mode 100644 index 00000000..be62084d --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpIndustry.java @@ -0,0 +1,39 @@ +package me.chanjar.weixin.mp.bean; + + +import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; + +import java.io.Serializable; + +/** + * @author miller + */ +public class WxMpIndustry implements Serializable { + private static final long serialVersionUID = -7700398224795914722L; + private Industry primaryIndustry; + private Industry secondIndustry; + + public static WxMpIndustry fromJson(String json) { + return WxMpGsonBuilder.create().fromJson(json, WxMpIndustry.class); + } + + public String toJson() { + return WxMpGsonBuilder.create().toJson(this); + } + + public Industry getPrimaryIndustry() { + return primaryIndustry; + } + + public void setPrimaryIndustry(Industry primaryIndustry) { + this.primaryIndustry = primaryIndustry; + } + + public Industry getSecondIndustry() { + return secondIndustry; + } + + public void setSecondIndustry(Industry secondIndustry) { + this.secondIndustry = secondIndustry; + } +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java index a451673d..34570b30 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java @@ -42,6 +42,7 @@ public class WxMpGsonBuilder { INSTANCE.registerTypeAdapter(WxMpCard.class, new WxMpCardGsonAdapter()); INSTANCE.registerTypeAdapter(WxMpMassPreviewMessage.class, new WxMpMassPreviewMessageGsonAdapter()); INSTANCE.registerTypeAdapter(WxMediaImgUploadResult.class, new WxMediaImgUploadResultGsonAdapter()); + INSTANCE.registerTypeAdapter(WxMpIndustry.class, new WxMpIndustryGsonAdapter()); } public static Gson create() { diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java new file mode 100644 index 00000000..79fb5f0b --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java @@ -0,0 +1,44 @@ +package me.chanjar.weixin.mp.util.json; + +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 com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; +import me.chanjar.weixin.common.util.json.GsonHelper; +import me.chanjar.weixin.mp.bean.Industry; +import me.chanjar.weixin.mp.bean.WxMpIndustry; + +import java.lang.reflect.Type; + +/** + * @author miller + */ +public class WxMpIndustryGsonAdapter implements JsonSerializer, JsonDeserializer { + @Override + public JsonElement serialize(WxMpIndustry wxMpIndustry, Type type, JsonSerializationContext jsonSerializationContext) { + JsonObject json = new JsonObject(); + json.addProperty("industry_id1", wxMpIndustry.getPrimaryIndustry().getId()); + json.addProperty("industry_id2", wxMpIndustry.getSecondIndustry().getId()); + return json; + } + + @Override + public WxMpIndustry deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException { + WxMpIndustry wxMpIndustry = new WxMpIndustry(); + JsonObject primaryIndustry = jsonElement.getAsJsonObject().get("primary_industry").getAsJsonObject(); + wxMpIndustry.setPrimaryIndustry(convertFromJson(primaryIndustry)); + JsonObject secondaryIndustry = jsonElement.getAsJsonObject().get("secondary_industry").getAsJsonObject(); + wxMpIndustry.setSecondIndustry(convertFromJson(secondaryIndustry)); + return wxMpIndustry; + } + + private Industry convertFromJson(JsonObject json) { + Industry industry = new Industry(); + industry.setFirstClass(GsonHelper.getString(json, "first_class")); + industry.setSecondClass(GsonHelper.getString(json, "second_class")); + return industry; + } +} From f631df34fcda4f23da492a7e422f81613893b349 Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Mon, 20 Jun 2016 10:42:48 +0800 Subject: [PATCH 17/33] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djavadoc=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/me/chanjar/weixin/mp/api/WxMpService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 223893e1..14555498 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 @@ -944,7 +944,7 @@ public interface WxMpService { */ public String getCardDetail(String cardId) throws WxErrorException; - /* + /** *
          * 预览接口
          * 详情请见:http://mp.weixin.qq.com/wiki/15/40b6865b893947b764e2de8e4a1fb55f.html#.E9.A2.84.E8.A7.88.E6.8E.A5.E5.8F.A3.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91
    @@ -955,7 +955,7 @@ public interface WxMpService {
          */
       public WxMpMassSendResult massMessagePreview(WxMpMassPreviewMessage wxMpMassPreviewMessage) throws Exception;
     
    -  /*
    +  /**
          * 
          * 上传图文消息内的图片获取URL
          * 详情请见:http://mp.weixin.qq.com/wiki/15/40b6865b893947b764e2de8e4a1fb55f.html#.E4.B8.8A.E4.BC.A0.E5.9B.BE.E6.96.87.E6.B6.88.E6.81.AF.E5.86.85.E7.9A.84.E5.9B.BE.E7.89.87.E8.8E.B7.E5.8F.96URL.E3.80.90.E8.AE.A2.E9.98.85.E5.8F.B7.E4.B8.8E.E6.9C.8D.E5.8A.A1.E5.8F.B7.E8.AE.A4.E8.AF.81.E5.90.8E.E5.9D.87.E5.8F.AF.E7.94.A8.E3.80.91
    @@ -966,7 +966,7 @@ public interface WxMpService {
          */
       public WxMediaImgUploadResult mediaImgUpload(File file) throws WxErrorException;
     
    -  /*
    +  /**
          * 
          * 设置所属行业
          * 官方文档中暂未告知响应内容
    
    From 1e6cf09e7e4d7009bfe45651aa9de17dfb8768aa Mon Sep 17 00:00:00 2001
    From: Binary Wang 
    Date: Mon, 20 Jun 2016 10:49:41 +0800
    Subject: [PATCH 18/33] Update README.md
    
    ---
     README.md | 5 ++---
     1 file changed, 2 insertions(+), 3 deletions(-)
    
    diff --git a/README.md b/README.md
    index 4bf7de63..eda1730d 100644
    --- a/README.md
    +++ b/README.md
    @@ -1,5 +1,4 @@
    -# Weixin-java-tools
    -## 微信公众号、企业号Java SDK。
    +# Weixin-java-tools 微信公众号、企业号Java SDK。
     
     [![Build Status](https://travis-ci.org/binarywang/weixin-java-tools.svg?branch=develop)](https://travis-ci.org/binarywang/weixin-java-tools)
     ![Maven Central](https://img.shields.io/maven-central/v/com.github.binarywang/weixin-java-parent.svg)
    @@ -61,4 +60,4 @@
     
     非常欢迎和感谢对本项目发起Pull Request的同学,不过本项目基于[git flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)开发流程,因此在发起Pull Request的时候请选择develop分支。
     
    -且本项目代码风格是用2个空格代表一个tab,因此在发起PR时注意一下,否则很容易发生在IDE格式化代码后与原代码产生大量diff,这样我在阅读PR的时候就很困难。
    \ No newline at end of file
    +且本项目代码风格是用2个空格代表一个tab,因此在发起PR时注意一下,否则很容易发生在IDE格式化代码后与原代码产生大量diff,这样我在阅读PR的时候就很困难。
    
    From c1bbd725e8cf835b68d4088bdcf7e7c76a9dd9eb Mon Sep 17 00:00:00 2001
    From: Binary Wang 
    Date: Mon, 20 Jun 2016 10:49:55 +0800
    Subject: [PATCH 19/33] Update README.md
    
    ---
     README.md | 2 +-
     1 file changed, 1 insertion(+), 1 deletion(-)
    
    diff --git a/README.md b/README.md
    index eda1730d..787873e7 100644
    --- a/README.md
    +++ b/README.md
    @@ -1,4 +1,4 @@
    -# Weixin-java-tools 微信公众号、企业号Java SDK。
    +# Weixin-java-tools 微信公众号、企业号Java SDK
     
     [![Build Status](https://travis-ci.org/binarywang/weixin-java-tools.svg?branch=develop)](https://travis-ci.org/binarywang/weixin-java-tools)
     ![Maven Central](https://img.shields.io/maven-central/v/com.github.binarywang/weixin-java-parent.svg)
    
    From 4cce42409af17327859548ccbf9b7fefc2fe95f2 Mon Sep 17 00:00:00 2001
    From: Binary Wang 
    Date: Mon, 20 Jun 2016 10:50:59 +0800
    Subject: [PATCH 20/33] Update README.md
    
    ---
     README.md | 21 +++++++++------------
     1 file changed, 9 insertions(+), 12 deletions(-)
    
    diff --git a/README.md b/README.md
    index 787873e7..6ccfd5bd 100644
    --- a/README.md
    +++ b/README.md
    @@ -1,24 +1,21 @@
    -# Weixin-java-tools 微信公众号、企业号Java SDK
    +# Weixin Java Tools 微信公众号/企业号开发Java SDK
    +## [![Build Status](https://travis-ci.org/binarywang/weixin-java-tools.svg?branch=develop)](https://travis-ci.org/binarywang/weixin-java-tools) ![Maven Central](https://img.shields.io/maven-central/v/com.github.binarywang/weixin-java-parent.svg) weixin-java-tools
     
    -[![Build Status](https://travis-ci.org/binarywang/weixin-java-tools.svg?branch=develop)](https://travis-ci.org/binarywang/weixin-java-tools)
    -![Maven Central](https://img.shields.io/maven-central/v/com.github.binarywang/weixin-java-parent.svg)
    -
    -### 详细文档请看 [wiki](https://github.com/chanjarster/weixin-java-tools/wiki)。
    -
    -####  1.3.4版发布!!! By Binary Wang 2016-06-01
    +### 声明:本项目基于chanjarster/weixin-java-tools,由于原作者长期没有维护,故单独维护和发布,且发布到maven上的groupId也会不同。
    +#### 最新更新:1.3.4版发布!!! on 2016-06-01
     
    +### 详细开发文档请看 [wiki](https://github.com/chanjarster/weixin-java-tools/wiki)。
     
     ===========
    -
    -* QQ群:343954419
    +## 使用开发交流工具:
    +* QQ群:343954419 weixin-java-tools
     * 微信群:
    -![Alt text](https://raw.githubusercontent.com/binarywang/weixin-java-tools/master/weixinqun.jpg  "微信群")
    + ![Alt text](https://raw.githubusercontent.com/binarywang/weixin-java-tools/master/weixinqun.jpg  "微信群")
      
     ===========
     
     ## 发布周期
    -暂定为一月一次发布,月初或月底发布新版本,遇到重大问题需修复会及时提交新版本,欢迎大家随时提交Pull Request。
    -
    +暂定为每月发布一次,月初或月底发布新版本,遇到重大问题需修复会及时提交新版本,欢迎大家随时提交Pull Request。
     
     ## Quick Start
     
    
    From e1ade466c352bbf485f23a22f9b7a13a00bf6b52 Mon Sep 17 00:00:00 2001
    From: BinaryWang 
    Date: Mon, 20 Jun 2016 11:01:02 +0800
    Subject: [PATCH 21/33] add missing @Override
    
    ---
     .../weixin/mp/api/WxMpServiceImpl.java        | 49 +++++++++++++++++++
     1 file changed, 49 insertions(+)
    
    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 d20e5c5f..ebe500bf 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
    @@ -86,6 +86,7 @@ public class WxMpServiceImpl implements WxMpService {
     
       protected WxSessionManager sessionManager = new StandardSessionManager();
     
    +  @Override
       public boolean checkSignature(String timestamp, String nonce, String signature) {
         try {
           return SHA1.gen(wxMpConfigStorage.getToken(), timestamp, nonce).equals(signature);
    @@ -94,10 +95,12 @@ public class WxMpServiceImpl implements WxMpService {
         }
       }
     
    +  @Override
       public String getAccessToken() throws WxErrorException {
         return getAccessToken(false);
       }
     
    +  @Override
       public String getAccessToken(boolean forceRefresh) throws WxErrorException {
         if (forceRefresh) {
           wxMpConfigStorage.expireAccessToken();
    @@ -137,10 +140,12 @@ public class WxMpServiceImpl implements WxMpService {
         return wxMpConfigStorage.getAccessToken();
       }
     
    +  @Override
       public String getJsapiTicket() throws WxErrorException {
         return getJsapiTicket(false);
       }
     
    +  @Override
       public String getJsapiTicket(boolean forceRefresh) throws WxErrorException {
         if (forceRefresh) {
           wxMpConfigStorage.expireJsapiTicket();
    @@ -161,6 +166,7 @@ public class WxMpServiceImpl implements WxMpService {
         return wxMpConfigStorage.getJsapiTicket();
       }
     
    +  @Override
       public WxJsapiSignature createJsapiSignature(String url) throws WxErrorException {
         long timestamp = System.currentTimeMillis() / 1000;
         String noncestr = RandomUtils.getRandomStr();
    @@ -184,11 +190,13 @@ public class WxMpServiceImpl implements WxMpService {
         }
       }
     
    +  @Override
       public void customMessageSend(WxMpCustomMessage message) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/message/custom/send";
         execute(new SimplePostRequestExecutor(), url, message.toJson());
       }
     
    +  @Override
       public void menuCreate(WxMenu menu) throws WxErrorException {
         if (menu.getMatchRule() != null) {
           String url = "https://api.weixin.qq.com/cgi-bin/menu/addconditional";
    @@ -199,16 +207,19 @@ public class WxMpServiceImpl implements WxMpService {
         }
       }
     
    +  @Override
       public void menuDelete() throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/menu/delete";
         execute(new SimpleGetRequestExecutor(), url, null);
       }
       
    +  @Override
       public void menuDelete(String menuid) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/menu/delconditional";
         execute(new SimpleGetRequestExecutor(), url, "menuid=" + menuid);
       }
     
    +  @Override
       public WxMenu menuGet() throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/menu/get";
         try {
    @@ -223,6 +234,7 @@ public class WxMpServiceImpl implements WxMpService {
         }
       }
       
    +  @Override
       public WxMenu menuTryMatch(String userid) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/menu/trymatch";
         try {
    @@ -237,25 +249,30 @@ public class WxMpServiceImpl implements WxMpService {
         }
       }
     
    +  @Override
       public WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputStream inputStream) throws WxErrorException, IOException {
         return mediaUpload(mediaType, FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), fileType));
       }
     
    +  @Override
       public WxMediaUploadResult mediaUpload(String mediaType, File file) throws WxErrorException {
         String url = "http://file.api.weixin.qq.com/cgi-bin/media/upload?type=" + mediaType;
         return execute(new MediaUploadRequestExecutor(), url, file);
       }
     
    +  @Override
       public File mediaDownload(String media_id) throws WxErrorException {
         String url = "http://file.api.weixin.qq.com/cgi-bin/media/get";
         return execute(new MediaDownloadRequestExecutor(wxMpConfigStorage.getTmpDirFile()), url, "media_id=" + media_id);
       }
     
    +  @Override
       public WxMpMaterialUploadResult materialFileUpload(String mediaType, WxMpMaterial material) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/material/add_material?type=" + mediaType;
         return execute(new MaterialUploadRequestExecutor(), url, material);
       }
     
    +  @Override
       public WxMpMaterialUploadResult materialNewsUpload(WxMpMaterialNews news) throws WxErrorException {
         if (news == null || news.isEmpty()) {
           throw new IllegalArgumentException("news is empty!");
    @@ -265,21 +282,25 @@ public class WxMpServiceImpl implements WxMpService {
         return WxMpMaterialUploadResult.fromJson(responseContent);
       }
     
    +  @Override
       public InputStream materialImageOrVoiceDownload(String media_id) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/material/get_material";
         return execute(new MaterialVoiceAndImageDownloadRequestExecutor(wxMpConfigStorage.getTmpDirFile()), url, media_id);
       }
     
    +  @Override
       public WxMpMaterialVideoInfoResult materialVideoInfo(String media_id) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/material/get_material";
         return execute(new MaterialVideoInfoRequestExecutor(), url, media_id);
       }
     
    +  @Override
       public WxMpMaterialNews materialNewsInfo(String media_id) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/material/get_material";
         return execute(new MaterialNewsInfoRequestExecutor(), url, media_id);
       }
     
    +  @Override
       public boolean materialNewsUpdate(WxMpMaterialArticleUpdate wxMpMaterialArticleUpdate) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/material/update_news";
         String responseText = post(url, wxMpMaterialArticleUpdate.toJson());
    @@ -291,11 +312,13 @@ public class WxMpServiceImpl implements WxMpService {
         }
       }
     
    +  @Override
       public boolean materialDelete(String media_id) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/material/del_material";
         return execute(new MaterialDeleteRequestExecutor(), url, media_id);
       }
     
    +  @Override
       public WxMpMaterialCountResult materialCount() throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/material/get_materialcount";
         String responseText = get(url, null);
    @@ -307,6 +330,7 @@ public class WxMpServiceImpl implements WxMpService {
         }
       }
     
    +  @Override
       public WxMpMaterialNewsBatchGetResult materialNewsBatchGet(int offset, int count) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/material/batchget_material";
         Map params = new HashMap<>();
    @@ -322,6 +346,7 @@ public class WxMpServiceImpl implements WxMpService {
         }
       }
     
    +  @Override
       public WxMpMaterialFileBatchGetResult materialFileBatchGet(String type, int offset, int count) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/material/batchget_material";
         Map params = new HashMap<>();
    @@ -337,30 +362,35 @@ public class WxMpServiceImpl implements WxMpService {
         }
       }
     
    +  @Override
       public WxMpMassUploadResult massNewsUpload(WxMpMassNews news) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/media/uploadnews";
         String responseContent = execute(new SimplePostRequestExecutor(), url, news.toJson());
         return WxMpMassUploadResult.fromJson(responseContent);
       }
     
    +  @Override
       public WxMpMassUploadResult massVideoUpload(WxMpMassVideo video) throws WxErrorException {
         String url = "http://file.api.weixin.qq.com/cgi-bin/media/uploadvideo";
         String responseContent = execute(new SimplePostRequestExecutor(), url, video.toJson());
         return WxMpMassUploadResult.fromJson(responseContent);
       }
     
    +  @Override
       public WxMpMassSendResult massGroupMessageSend(WxMpMassGroupMessage message) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/message/mass/sendall";
         String responseContent = execute(new SimplePostRequestExecutor(), url, message.toJson());
         return WxMpMassSendResult.fromJson(responseContent);
       }
     
    +  @Override
       public WxMpMassSendResult massOpenIdsMessageSend(WxMpMassOpenIdsMessage message) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/message/mass/send";
         String responseContent = execute(new SimplePostRequestExecutor(), url, message.toJson());
         return WxMpMassSendResult.fromJson(responseContent);
       }
     
    +  @Override
       public WxMpGroup groupCreate(String name) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/groups/create";
         JsonObject json = new JsonObject();
    @@ -375,6 +405,7 @@ public class WxMpServiceImpl implements WxMpService {
         return WxMpGroup.fromJson(responseContent);
       }
     
    +  @Override
       public List groupGet() throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/groups/get";
         String responseContent = execute(new SimpleGetRequestExecutor(), url, null);
    @@ -388,6 +419,7 @@ public class WxMpServiceImpl implements WxMpService {
             }.getType());
       }
     
    +  @Override
       public long userGetGroup(String openid) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/groups/getid";
         JsonObject o = new JsonObject();
    @@ -397,11 +429,13 @@ public class WxMpServiceImpl implements WxMpService {
         return GsonHelper.getAsLong(tmpJsonElement.getAsJsonObject().get("groupid"));
       }
     
    +  @Override
       public void groupUpdate(WxMpGroup group) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/groups/update";
         execute(new SimplePostRequestExecutor(), url, group.toJson());
       }
     
    +  @Override
       public void userUpdateGroup(String openid, long to_groupid) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/groups/members/update";
         JsonObject json = new JsonObject();
    @@ -410,6 +444,7 @@ public class WxMpServiceImpl implements WxMpService {
         execute(new SimplePostRequestExecutor(), url, json.toString());
       }
     
    +  @Override
       public void userUpdateRemark(String openid, String remark) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/user/info/updateremark";
         JsonObject json = new JsonObject();
    @@ -418,6 +453,7 @@ public class WxMpServiceImpl implements WxMpService {
         execute(new SimplePostRequestExecutor(), url, json.toString());
       }
     
    +  @Override
       public WxMpUser userInfo(String openid, String lang) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/user/info";
         lang = lang == null ? "zh_CN" : lang;
    @@ -425,12 +461,14 @@ public class WxMpServiceImpl implements WxMpService {
         return WxMpUser.fromJson(responseContent);
       }
     
    +  @Override
       public WxMpUserList userList(String next_openid) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/user/get";
         String responseContent = execute(new SimpleGetRequestExecutor(), url, next_openid == null ? null : "next_openid=" + next_openid);
         return WxMpUserList.fromJson(responseContent);
       }
     
    +  @Override
       public WxMpQrCodeTicket qrCodeCreateTmpTicket(int scene_id, Integer expire_seconds) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/qrcode/create";
         JsonObject json = new JsonObject();
    @@ -447,6 +485,7 @@ public class WxMpServiceImpl implements WxMpService {
         return WxMpQrCodeTicket.fromJson(responseContent);
       }
     
    +  @Override
       public WxMpQrCodeTicket qrCodeCreateLastTicket(int scene_id) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/qrcode/create";
         JsonObject json = new JsonObject();
    @@ -460,6 +499,7 @@ public class WxMpServiceImpl implements WxMpService {
         return WxMpQrCodeTicket.fromJson(responseContent);
       }
     
    +  @Override
       public WxMpQrCodeTicket qrCodeCreateLastTicket(String scene_str) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/qrcode/create";
         JsonObject json = new JsonObject();
    @@ -473,6 +513,7 @@ public class WxMpServiceImpl implements WxMpService {
         return WxMpQrCodeTicket.fromJson(responseContent);
       }
     
    +  @Override
       public File qrCodePicture(WxMpQrCodeTicket ticket) throws WxErrorException {
         String url = "https://mp.weixin.qq.com/cgi-bin/showqrcode";
         return execute(new QrCodeRequestExecutor(), url, ticket);
    @@ -490,6 +531,7 @@ public class WxMpServiceImpl implements WxMpService {
         }
       }
     
    +  @Override
       public String shortUrl(String long_url) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/shorturl";
         JsonObject o = new JsonObject();
    @@ -500,6 +542,7 @@ public class WxMpServiceImpl implements WxMpService {
         return tmpJsonElement.getAsJsonObject().get("short_url").getAsString();
       }
     
    +  @Override
       public String templateSend(WxMpTemplateMessage templateMessage) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/message/template/send";
         String responseContent = execute(new SimplePostRequestExecutor(), url, templateMessage.toJson());
    @@ -510,6 +553,7 @@ public class WxMpServiceImpl implements WxMpService {
         throw new WxErrorException(WxError.fromJson(responseContent));
       }
     
    +  @Override
       public WxMpSemanticQueryResult semanticQuery(WxMpSemanticQuery semanticQuery) throws WxErrorException {
         String url = "https://api.weixin.qq.com/semantic/semproxy/search";
         String responseContent = execute(new SimplePostRequestExecutor(), url, semanticQuery.toJson());
    @@ -658,10 +702,12 @@ public class WxMpServiceImpl implements WxMpService {
             }.getType());
       }
     
    +  @Override
       public String get(String url, String queryParam) throws WxErrorException {
         return execute(new SimpleGetRequestExecutor(), url, queryParam);
       }
     
    +  @Override
       public String post(String url, String postData) throws WxErrorException {
         return execute(new SimplePostRequestExecutor(), url, postData);
       }
    @@ -675,6 +721,7 @@ public class WxMpServiceImpl implements WxMpService {
        * @return
        * @throws WxErrorException
        */
    +  @Override
       public  T execute(RequestExecutor executor, String uri, E data) throws WxErrorException {
         int retryTimes = 0;
         do {
    @@ -740,6 +787,7 @@ public class WxMpServiceImpl implements WxMpService {
         return httpClient;
       }
     
    +  @Override
       public void setWxMpConfigStorage(WxMpConfigStorage wxConfigProvider) {
         this.wxMpConfigStorage = wxConfigProvider;
     
    @@ -791,6 +839,7 @@ public class WxMpServiceImpl implements WxMpService {
         return getPrepayId(packageParams);
       }
     
    +  @Override
       public WxMpPrepayIdResult getPrepayId(final Map parameters) {
         String nonce_str = System.currentTimeMillis() + "";
     
    
    From 0b2f4435058253511f9af97b1717e92f63439f39 Mon Sep 17 00:00:00 2001
    From: BinaryWang 
    Date: Mon, 20 Jun 2016 11:02:17 +0800
    Subject: [PATCH 22/33] =?UTF-8?q?add=20missing=20=E2=80=98this=E2=80=99?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    ---
     .../weixin/mp/api/WxMpServiceImpl.java        | 164 +++++++++---------
     1 file changed, 82 insertions(+), 82 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 ebe500bf..c560c970 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
    @@ -89,7 +89,7 @@ public class WxMpServiceImpl implements WxMpService {
       @Override
       public boolean checkSignature(String timestamp, String nonce, String signature) {
         try {
    -      return SHA1.gen(wxMpConfigStorage.getToken(), timestamp, nonce).equals(signature);
    +      return SHA1.gen(this.wxMpConfigStorage.getToken(), timestamp, nonce).equals(signature);
         } catch (Exception e) {
           return false;
         }
    @@ -103,19 +103,19 @@ public class WxMpServiceImpl implements WxMpService {
       @Override
       public String getAccessToken(boolean forceRefresh) throws WxErrorException {
         if (forceRefresh) {
    -      wxMpConfigStorage.expireAccessToken();
    +      this.wxMpConfigStorage.expireAccessToken();
         }
    -    if (wxMpConfigStorage.isAccessTokenExpired()) {
    -      synchronized (globalAccessTokenRefreshLock) {
    -        if (wxMpConfigStorage.isAccessTokenExpired()) {
    +    if (this.wxMpConfigStorage.isAccessTokenExpired()) {
    +      synchronized (this.globalAccessTokenRefreshLock) {
    +        if (this.wxMpConfigStorage.isAccessTokenExpired()) {
               String url = new StringBuffer()
                   .append("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential")
    -              .append("&appid=").append(wxMpConfigStorage.getAppId())
    -              .append("&secret=").append(wxMpConfigStorage.getSecret()).toString();
    +              .append("&appid=").append(this.wxMpConfigStorage.getAppId())
    +              .append("&secret=").append(this.wxMpConfigStorage.getSecret()).toString();
               try {
                 HttpGet httpGet = new HttpGet(url);
    -            if (httpProxy != null) {
    -              RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build();
    +            if (this.httpProxy != null) {
    +              RequestConfig config = RequestConfig.custom().setProxy(this.httpProxy).build();
                   httpGet.setConfig(config);
                 }
                 try (CloseableHttpResponse response = getHttpclient().execute(httpGet)) {
    @@ -125,7 +125,7 @@ public class WxMpServiceImpl implements WxMpService {
                     throw new WxErrorException(error);
                   }
                   WxAccessToken accessToken = WxAccessToken.fromJson(resultContent);
    -              wxMpConfigStorage.updateAccessToken(accessToken.getAccessToken(), accessToken.getExpiresIn());
    +              this.wxMpConfigStorage.updateAccessToken(accessToken.getAccessToken(), accessToken.getExpiresIn());
                 }finally {
                   httpGet.releaseConnection();
                 }
    @@ -137,7 +137,7 @@ public class WxMpServiceImpl implements WxMpService {
             }
           }
         }
    -    return wxMpConfigStorage.getAccessToken();
    +    return this.wxMpConfigStorage.getAccessToken();
       }
     
       @Override
    @@ -148,22 +148,22 @@ public class WxMpServiceImpl implements WxMpService {
       @Override
       public String getJsapiTicket(boolean forceRefresh) throws WxErrorException {
         if (forceRefresh) {
    -      wxMpConfigStorage.expireJsapiTicket();
    +      this.wxMpConfigStorage.expireJsapiTicket();
         }
    -    if (wxMpConfigStorage.isJsapiTicketExpired()) {
    -      synchronized (globalJsapiTicketRefreshLock) {
    -        if (wxMpConfigStorage.isJsapiTicketExpired()) {
    +    if (this.wxMpConfigStorage.isJsapiTicketExpired()) {
    +      synchronized (this.globalJsapiTicketRefreshLock) {
    +        if (this.wxMpConfigStorage.isJsapiTicketExpired()) {
               String url = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?type=jsapi";
               String responseContent = execute(new SimpleGetRequestExecutor(), url, null);
               JsonElement tmpJsonElement = Streams.parse(new JsonReader(new StringReader(responseContent)));
               JsonObject tmpJsonObject = tmpJsonElement.getAsJsonObject();
               String jsapiTicket = tmpJsonObject.get("ticket").getAsString();
               int expiresInSeconds = tmpJsonObject.get("expires_in").getAsInt();
    -          wxMpConfigStorage.updateJsapiTicket(jsapiTicket, expiresInSeconds);
    +          this.wxMpConfigStorage.updateJsapiTicket(jsapiTicket, expiresInSeconds);
             }
           }
         }
    -    return wxMpConfigStorage.getJsapiTicket();
    +    return this.wxMpConfigStorage.getJsapiTicket();
       }
     
       @Override
    @@ -179,7 +179,7 @@ public class WxMpServiceImpl implements WxMpService {
               "url=" + url
           );
           WxJsapiSignature jsapiSignature = new WxJsapiSignature();
    -      jsapiSignature.setAppid(wxMpConfigStorage.getAppId());
    +      jsapiSignature.setAppid(this.wxMpConfigStorage.getAppId());
           jsapiSignature.setTimestamp(timestamp);
           jsapiSignature.setNoncestr(noncestr);
           jsapiSignature.setUrl(url);
    @@ -263,7 +263,7 @@ public class WxMpServiceImpl implements WxMpService {
       @Override
       public File mediaDownload(String media_id) throws WxErrorException {
         String url = "http://file.api.weixin.qq.com/cgi-bin/media/get";
    -    return execute(new MediaDownloadRequestExecutor(wxMpConfigStorage.getTmpDirFile()), url, "media_id=" + media_id);
    +    return execute(new MediaDownloadRequestExecutor(this.wxMpConfigStorage.getTmpDirFile()), url, "media_id=" + media_id);
       }
     
       @Override
    @@ -285,7 +285,7 @@ public class WxMpServiceImpl implements WxMpService {
       @Override
       public InputStream materialImageOrVoiceDownload(String media_id) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/material/get_material";
    -    return execute(new MaterialVoiceAndImageDownloadRequestExecutor(wxMpConfigStorage.getTmpDirFile()), url, media_id);
    +    return execute(new MaterialVoiceAndImageDownloadRequestExecutor(this.wxMpConfigStorage.getTmpDirFile()), url, media_id);
       }
     
       @Override
    @@ -562,14 +562,14 @@ public class WxMpServiceImpl implements WxMpService {
     
       @Override
       public String oauth2buildAuthorizationUrl(String scope, String state) {
    -    return this.oauth2buildAuthorizationUrl(wxMpConfigStorage.getOauth2redirectUri(), scope, state);
    +    return this.oauth2buildAuthorizationUrl(this.wxMpConfigStorage.getOauth2redirectUri(), scope, state);
       }
     
       @Override
       public String oauth2buildAuthorizationUrl(String redirectURI, String scope, String state) {
         StringBuffer url = new StringBuffer();
         url.append("https://open.weixin.qq.com/connect/oauth2/authorize?");
    -    url.append("appid=").append(wxMpConfigStorage.getAppId());
    +    url.append("appid=").append(this.wxMpConfigStorage.getAppId());
         url.append("&redirect_uri=").append(URIUtil.encodeURIComponent(redirectURI));
         url.append("&response_type=code");
         url.append("&scope=").append(scope);
    @@ -584,14 +584,14 @@ public class WxMpServiceImpl implements WxMpService {
       public WxMpOAuth2AccessToken oauth2getAccessToken(String code) throws WxErrorException {
         StringBuffer url = new StringBuffer();
         url.append("https://api.weixin.qq.com/sns/oauth2/access_token?");
    -    url.append("appid=").append(wxMpConfigStorage.getAppId());
    -    url.append("&secret=").append(wxMpConfigStorage.getSecret());
    +    url.append("appid=").append(this.wxMpConfigStorage.getAppId());
    +    url.append("&secret=").append(this.wxMpConfigStorage.getSecret());
         url.append("&code=").append(code);
         url.append("&grant_type=authorization_code");
     
         try {
           RequestExecutor executor = new SimpleGetRequestExecutor();
    -      String responseText = executor.execute(getHttpclient(), httpProxy, url.toString(), null);
    +      String responseText = executor.execute(getHttpclient(), this.httpProxy, url.toString(), null);
           return WxMpOAuth2AccessToken.fromJson(responseText);
         } catch (ClientProtocolException e) {
           throw new RuntimeException(e);
    @@ -604,13 +604,13 @@ public class WxMpServiceImpl implements WxMpService {
       public WxMpOAuth2AccessToken oauth2refreshAccessToken(String refreshToken) throws WxErrorException {
         StringBuffer url = new StringBuffer();
         url.append("https://api.weixin.qq.com/sns/oauth2/refresh_token?");
    -    url.append("appid=").append(wxMpConfigStorage.getAppId());
    +    url.append("appid=").append(this.wxMpConfigStorage.getAppId());
         url.append("&grant_type=refresh_token");
         url.append("&refresh_token=").append(refreshToken);
     
         try {
           RequestExecutor executor = new SimpleGetRequestExecutor();
    -      String responseText = executor.execute(getHttpclient(), httpProxy, url.toString(), null);
    +      String responseText = executor.execute(getHttpclient(), this.httpProxy, url.toString(), null);
           return WxMpOAuth2AccessToken.fromJson(responseText);
         } catch (ClientProtocolException e) {
           throw new RuntimeException(e);
    @@ -633,7 +633,7 @@ public class WxMpServiceImpl implements WxMpService {
     
         try {
           RequestExecutor executor = new SimpleGetRequestExecutor();
    -      String responseText = executor.execute(getHttpclient(), httpProxy, url.toString(), null);
    +      String responseText = executor.execute(getHttpclient(), this.httpProxy, url.toString(), null);
           return WxMpUser.fromJson(responseText);
         } catch (ClientProtocolException e) {
           throw new RuntimeException(e);
    @@ -651,7 +651,7 @@ public class WxMpServiceImpl implements WxMpService {
     
         try {
           RequestExecutor executor = new SimpleGetRequestExecutor();
    -      executor.execute(getHttpclient(), httpProxy, url.toString(), null);
    +      executor.execute(getHttpclient(), this.httpProxy, url.toString(), null);
         } catch (ClientProtocolException e) {
           throw new RuntimeException(e);
         } catch (IOException e) {
    @@ -733,9 +733,9 @@ public class WxMpServiceImpl implements WxMpService {
              * -1 系统繁忙, 1000ms后重试
              */
             if (error.getErrorCode() == -1) {
    -          int sleepMillis = retrySleepMillis * (1 << retryTimes);
    +          int sleepMillis = this.retrySleepMillis * (1 << retryTimes);
               try {
    -            log.debug("微信系统繁忙,{}ms 后重试(第{}次)", sleepMillis, retryTimes + 1);
    +            this.log.debug("微信系统繁忙,{}ms 后重试(第{}次)", sleepMillis, retryTimes + 1);
                 Thread.sleep(sleepMillis);
               } catch (InterruptedException e1) {
                 throw new RuntimeException(e1);
    @@ -744,7 +744,7 @@ public class WxMpServiceImpl implements WxMpService {
               throw e;
             }
           }
    -    } while (++retryTimes < maxRetryTimes);
    +    } while (++retryTimes < this.maxRetryTimes);
     
         throw new RuntimeException("微信服务端异常,超出重试次数");
       }
    @@ -759,7 +759,7 @@ public class WxMpServiceImpl implements WxMpService {
         uriWithAccessToken += uri.indexOf('?') == -1 ? "?access_token=" + accessToken : "&access_token=" + accessToken;
     
         try {
    -      return executor.execute(getHttpclient(), httpProxy, uriWithAccessToken, data);
    +      return executor.execute(getHttpclient(), this.httpProxy, uriWithAccessToken, data);
         } catch (WxErrorException e) {
           WxError error = e.getError();
           /*
    @@ -769,7 +769,7 @@ public class WxMpServiceImpl implements WxMpService {
            */
           if (error.getErrorCode() == 42001 || error.getErrorCode() == 40001) {
             // 强制设置wxMpConfigStorage它的access token过期了,这样在下一次请求里就会刷新access token
    -        wxMpConfigStorage.expireAccessToken();
    +        this.wxMpConfigStorage.expireAccessToken();
             return execute(executor, uri, data);
           }
           if (error.getErrorCode() != 0) {
    @@ -784,21 +784,21 @@ public class WxMpServiceImpl implements WxMpService {
       }
     
       protected CloseableHttpClient getHttpclient() {
    -    return httpClient;
    +    return this.httpClient;
       }
     
       @Override
       public void setWxMpConfigStorage(WxMpConfigStorage wxConfigProvider) {
         this.wxMpConfigStorage = wxConfigProvider;
     
    -    ApacheHttpClientBuilder apacheHttpClientBuilder = wxMpConfigStorage.getApacheHttpClientBuilder();
    +    ApacheHttpClientBuilder apacheHttpClientBuilder = this.wxMpConfigStorage.getApacheHttpClientBuilder();
         if (null == apacheHttpClientBuilder) {
           apacheHttpClientBuilder = DefaultApacheHttpHttpClientBuilder.get();
         }
    -    apacheHttpClientBuilder.httpProxyHost(wxMpConfigStorage.getHttp_proxy_host())
    -      .httpProxyPort(wxMpConfigStorage.getHttp_proxy_port())
    -      .httpProxyUsername(wxMpConfigStorage.getHttp_proxy_username())
    -      .httpProxyPassword(wxMpConfigStorage.getHttp_proxy_password());
    +    apacheHttpClientBuilder.httpProxyHost(this.wxMpConfigStorage.getHttp_proxy_host())
    +      .httpProxyPort(this.wxMpConfigStorage.getHttp_proxy_port())
    +      .httpProxyUsername(this.wxMpConfigStorage.getHttp_proxy_username())
    +      .httpProxyPassword(this.wxMpConfigStorage.getHttp_proxy_password());
     
         if (wxConfigProvider.getSSLContext() != null){
           SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(
    @@ -809,7 +809,7 @@ public class WxMpServiceImpl implements WxMpService {
           apacheHttpClientBuilder.sslConnectionSocketFactory(sslsf);
         }
     
    -    httpClient = apacheHttpClientBuilder.build();
    +    this.httpClient = apacheHttpClientBuilder.build();
       }
     
       @Override
    @@ -826,8 +826,8 @@ public class WxMpServiceImpl implements WxMpService {
       @Override
       public WxMpPrepayIdResult getPrepayId(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, String callbackUrl) {
         Map packageParams = new HashMap();
    -    packageParams.put("appid", wxMpConfigStorage.getAppId());
    -    packageParams.put("mch_id", wxMpConfigStorage.getPartnerId());
    +    packageParams.put("appid", this.wxMpConfigStorage.getAppId());
    +    packageParams.put("mch_id", this.wxMpConfigStorage.getPartnerId());
         packageParams.put("body", body);
         packageParams.put("out_trade_no", outTradeNo);
         packageParams.put("total_fee", (int) (amt * 100) + "");
    @@ -844,12 +844,12 @@ public class WxMpServiceImpl implements WxMpService {
         String nonce_str = System.currentTimeMillis() + "";
     
         final SortedMap packageParams = new TreeMap(parameters);
    -    packageParams.put("appid", wxMpConfigStorage.getAppId());
    -    packageParams.put("mch_id", wxMpConfigStorage.getPartnerId());
    +    packageParams.put("appid", this.wxMpConfigStorage.getAppId());
    +    packageParams.put("mch_id", this.wxMpConfigStorage.getPartnerId());
         packageParams.put("nonce_str", nonce_str);
         checkParameters(packageParams);
     
    -    String sign = WxCryptUtil.createSign(packageParams, wxMpConfigStorage.getPartnerKey());
    +    String sign = WxCryptUtil.createSign(packageParams, this.wxMpConfigStorage.getPartnerKey());
         packageParams.put("sign", sign);
     
         StringBuilder request = new StringBuilder("");
    @@ -859,8 +859,8 @@ public class WxMpServiceImpl implements WxMpService {
         request.append("");
     
         HttpPost httpPost = new HttpPost("https://api.mch.weixin.qq.com/pay/unifiedorder");
    -    if (httpProxy != null) {
    -      RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build();
    +    if (this.httpProxy != null) {
    +      RequestConfig config = RequestConfig.custom().setProxy(this.httpProxy).build();
           httpPost.setConfig(config);
         }
     
    @@ -883,7 +883,7 @@ public class WxMpServiceImpl implements WxMpService {
           "trade_type", };
     
       private void checkParameters(Map parameters) {
    -    for (String para : REQUIRED_ORDER_PARAMETERS) {
    +    for (String para : this.REQUIRED_ORDER_PARAMETERS) {
           if (!parameters.containsKey(para))
             throw new IllegalArgumentException("Reqiured argument '" + para + "' is missing.");
         }
    @@ -896,8 +896,8 @@ public class WxMpServiceImpl implements WxMpService {
      	@Override
     	public Map getJsapiPayInfo(String openId,String outTradeNo, double amt, String body,String ip, String callbackUrl) throws WxErrorException{
     		Map packageParams = new HashMap();
    -		packageParams.put("appid", wxMpConfigStorage.getAppId());
    -		packageParams.put("mch_id", wxMpConfigStorage.getPartnerId());
    +		packageParams.put("appid", this.wxMpConfigStorage.getAppId());
    +		packageParams.put("mch_id", this.wxMpConfigStorage.getPartnerId());
     		packageParams.put("body", body);
     		packageParams.put("out_trade_no", outTradeNo);
     		packageParams.put("total_fee", (int) (amt * 100) + "");
    @@ -912,8 +912,8 @@ public class WxMpServiceImpl implements WxMpService {
     	@Override
     	public Map getNativePayInfo(String productId,String outTradeNo, double amt, String body,String ip, String callbackUrl) throws WxErrorException{
     		Map packageParams = new HashMap();
    -		packageParams.put("appid", wxMpConfigStorage.getAppId());
    -		packageParams.put("mch_id", wxMpConfigStorage.getPartnerId());
    +		packageParams.put("appid", this.wxMpConfigStorage.getAppId());
    +		packageParams.put("mch_id", this.wxMpConfigStorage.getPartnerId());
     		packageParams.put("body", body);
     		packageParams.put("out_trade_no", outTradeNo);
     		packageParams.put("total_fee", (int) (amt * 100) + "");
    @@ -947,7 +947,7 @@ public class WxMpServiceImpl implements WxMpService {
         }
     
         Map payInfo = new HashMap();
    -    payInfo.put("appId", wxMpConfigStorage.getAppId());
    +    payInfo.put("appId", this.wxMpConfigStorage.getAppId());
         // 支付签名时间戳,注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
         payInfo.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000));
         payInfo.put("nonceStr", System.currentTimeMillis() + "");
    @@ -957,7 +957,7 @@ public class WxMpServiceImpl implements WxMpService {
     	payInfo.put("codeUrl", wxMpPrepayIdResult.getCode_url());
         }
     
    -    String finalSign = WxCryptUtil.createSign(payInfo, wxMpConfigStorage.getPartnerKey());
    +    String finalSign = WxCryptUtil.createSign(payInfo, this.wxMpConfigStorage.getPartnerKey());
         payInfo.put("paySign", finalSign);
         return payInfo;
       }
    @@ -967,8 +967,8 @@ public class WxMpServiceImpl implements WxMpService {
         String nonce_str = System.currentTimeMillis() + "";
     
         SortedMap packageParams = new TreeMap();
    -    packageParams.put("appid", wxMpConfigStorage.getAppId());
    -    packageParams.put("mch_id", wxMpConfigStorage.getPartnerId());
    +    packageParams.put("appid", this.wxMpConfigStorage.getAppId());
    +    packageParams.put("mch_id", this.wxMpConfigStorage.getPartnerId());
         if (transactionId != null && !"".equals(transactionId.trim()))
           packageParams.put("transaction_id", transactionId);
         else if (outTradeNo != null && !"".equals(outTradeNo.trim()))
    @@ -976,7 +976,7 @@ public class WxMpServiceImpl implements WxMpService {
         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()));
    +    packageParams.put("sign", WxCryptUtil.createSign(packageParams, this.wxMpConfigStorage.getPartnerKey()));
     
         StringBuilder request = new StringBuilder("");
         for (Entry para : packageParams.entrySet()) {
    @@ -985,14 +985,14 @@ public class WxMpServiceImpl implements WxMpService {
         request.append("");
     
         HttpPost httpPost = new HttpPost("https://api.mch.weixin.qq.com/pay/orderquery");
    -    if (httpProxy != null) {
    -      RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build();
    +    if (this.httpProxy != null) {
    +      RequestConfig config = RequestConfig.custom().setProxy(this.httpProxy).build();
           httpPost.setConfig(config);
         }
     
         StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8);
         httpPost.setEntity(entity);
    -    try(CloseableHttpResponse response = httpClient.execute(httpPost)) {
    +    try(CloseableHttpResponse response = this.httpClient.execute(httpPost)) {
           String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
           XStream xstream = XStreamInitializer.getInstance();
           xstream.alias("xml", WxMpPayResult.class);
    @@ -1019,11 +1019,11 @@ public class WxMpServiceImpl implements WxMpService {
       @Override
       public WxMpPayRefundResult refundPay(Map parameters) throws WxErrorException {
         SortedMap refundParams = new TreeMap(parameters);
    -    refundParams.put("appid", wxMpConfigStorage.getAppId());
    -    refundParams.put("mch_id", wxMpConfigStorage.getPartnerId());
    +    refundParams.put("appid", this.wxMpConfigStorage.getAppId());
    +    refundParams.put("mch_id", this.wxMpConfigStorage.getPartnerId());
         refundParams.put("nonce_str", System.currentTimeMillis() + "");
    -    refundParams.put("op_user_id", wxMpConfigStorage.getPartnerId());
    -    String sign = WxCryptUtil.createSign(refundParams, wxMpConfigStorage.getPartnerKey());
    +    refundParams.put("op_user_id", this.wxMpConfigStorage.getPartnerId());
    +    String sign = WxCryptUtil.createSign(refundParams, this.wxMpConfigStorage.getPartnerKey());
         refundParams.put("sign", sign);
     
         StringBuilder request = new StringBuilder("");
    @@ -1033,8 +1033,8 @@ public class WxMpServiceImpl implements WxMpService {
         request.append("");
         
         HttpPost httpPost = new HttpPost("https://api.mch.weixin.qq.com/secapi/pay/refund");
    -    if (httpProxy != null) {
    -      RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build();
    +    if (this.httpProxy != null) {
    +      RequestConfig config = RequestConfig.custom().setProxy(this.httpProxy).build();
           httpPost.setConfig(config);
         }
         
    @@ -1061,7 +1061,7 @@ public class WxMpServiceImpl implements WxMpService {
           
           return wxMpPayRefundResult;
         } catch (IOException e) {
    -      log.error(MessageFormatter.format("The exception was happened when sending refund '{}'.", request.toString()).getMessage(), e);
    +      this.log.error(MessageFormatter.format("The exception was happened when sending refund '{}'.", request.toString()).getMessage(), e);
           WxError error = new WxError();
           error.setErrorCode(-1);
           error.setErrorMsg("incorrect response.");
    @@ -1073,7 +1073,7 @@ public class WxMpServiceImpl implements WxMpService {
       
       @Override
       public boolean checkJSSDKCallbackDataSignature(Map kvm, String signature) {
    -    return signature.equals(WxCryptUtil.createSign(kvm, wxMpConfigStorage.getPartnerKey()));
    +    return signature.equals(WxCryptUtil.createSign(kvm, this.wxMpConfigStorage.getPartnerKey()));
       }
     
       @Override
    @@ -1081,11 +1081,11 @@ public class WxMpServiceImpl implements WxMpService {
         String nonce_str = System.currentTimeMillis() + "";
     
         SortedMap packageParams = new TreeMap(parameters);
    -    packageParams.put("wxappid", wxMpConfigStorage.getAppId());
    -    packageParams.put("mch_id", wxMpConfigStorage.getPartnerId());
    +    packageParams.put("wxappid", this.wxMpConfigStorage.getAppId());
    +    packageParams.put("mch_id", this.wxMpConfigStorage.getPartnerId());
         packageParams.put("nonce_str", nonce_str);
     
    -    String sign = WxCryptUtil.createSign(packageParams, wxMpConfigStorage.getPartnerKey());
    +    String sign = WxCryptUtil.createSign(packageParams, this.wxMpConfigStorage.getPartnerKey());
         packageParams.put("sign", sign);
         
         StringBuilder request = new StringBuilder("");
    @@ -1095,8 +1095,8 @@ public class WxMpServiceImpl implements WxMpService {
         request.append("");
         
         HttpPost httpPost = new HttpPost("https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack");
    -    if (httpProxy != null) {
    -      RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build();
    +    if (this.httpProxy != null) {
    +      RequestConfig config = RequestConfig.custom().setProxy(this.httpProxy).build();
           httpPost.setConfig(config);
         }
     
    @@ -1109,7 +1109,7 @@ public class WxMpServiceImpl implements WxMpService {
           WxRedpackResult wxMpRedpackResult = (WxRedpackResult) xstream.fromXML(responseContent);
           return wxMpRedpackResult;
         } catch (IOException e) {
    -      log.error(MessageFormatter.format("The exception was happened when sending redpack '{}'.", request.toString()).getMessage(), e);
    +      this.log.error(MessageFormatter.format("The exception was happened when sending redpack '{}'.", request.toString()).getMessage(), e);
           WxError error = new WxError();
           error.setErrorCode(-1);
           throw new WxErrorException(error);
    @@ -1147,22 +1147,22 @@ public class WxMpServiceImpl implements WxMpService {
       @Override
       public String getCardApiTicket(boolean forceRefresh) throws WxErrorException {
         if (forceRefresh) {
    -      wxMpConfigStorage.expireCardApiTicket();
    +      this.wxMpConfigStorage.expireCardApiTicket();
         }
    -    if (wxMpConfigStorage.isCardApiTicketExpired()) {
    -      synchronized (globalCardApiTicketRefreshLock) {
    -        if (wxMpConfigStorage.isCardApiTicketExpired()) {
    +    if (this.wxMpConfigStorage.isCardApiTicketExpired()) {
    +      synchronized (this.globalCardApiTicketRefreshLock) {
    +        if (this.wxMpConfigStorage.isCardApiTicketExpired()) {
               String url = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?type=wx_card";
               String responseContent = execute(new SimpleGetRequestExecutor(), url, null);
               JsonElement tmpJsonElement = Streams.parse(new JsonReader(new StringReader(responseContent)));
               JsonObject tmpJsonObject = tmpJsonElement.getAsJsonObject();
               String cardApiTicket = tmpJsonObject.get("ticket").getAsString();
               int expiresInSeconds = tmpJsonObject.get("expires_in").getAsInt();
    -          wxMpConfigStorage.updateCardApiTicket(cardApiTicket, expiresInSeconds);
    +          this.wxMpConfigStorage.updateCardApiTicket(cardApiTicket, expiresInSeconds);
             }
           }
         }
    -    return wxMpConfigStorage.getCardApiTicket();
    +    return this.wxMpConfigStorage.getCardApiTicket();
       }
     
       /**
    @@ -1305,7 +1305,7 @@ public class WxMpServiceImpl implements WxMpService {
         WxMpCardResult cardResult = WxMpGsonBuilder.INSTANCE.create().fromJson(tmpJsonElement,
             new TypeToken() { }.getType());
         if (!cardResult.getErrorCode().equals("0")) {
    -      log.warn("朋友的券mark失败:{}", cardResult.getErrorMsg());
    +      this.log.warn("朋友的券mark失败:{}", cardResult.getErrorMsg());
         }
       }
     
    
    From 7a68fa6853aaa301de2b34ccf8cd082e0af49aac Mon Sep 17 00:00:00 2001
    From: BinaryWang 
    Date: Mon, 20 Jun 2016 11:03:22 +0800
    Subject: [PATCH 23/33] remove redundant specification of type arguments
    
    ---
     .../chanjar/weixin/mp/api/WxMpServiceImpl.java | 18 +++++++++---------
     1 file changed, 9 insertions(+), 9 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 c560c970..c03a1dff 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
    @@ -825,7 +825,7 @@ public class WxMpServiceImpl implements WxMpService {
     
       @Override
       public WxMpPrepayIdResult getPrepayId(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, String callbackUrl) {
    -    Map packageParams = new HashMap();
    +    Map packageParams = new HashMap<>();
         packageParams.put("appid", this.wxMpConfigStorage.getAppId());
         packageParams.put("mch_id", this.wxMpConfigStorage.getPartnerId());
         packageParams.put("body", body);
    @@ -843,7 +843,7 @@ public class WxMpServiceImpl implements WxMpService {
       public WxMpPrepayIdResult getPrepayId(final Map parameters) {
         String nonce_str = System.currentTimeMillis() + "";
     
    -    final SortedMap packageParams = new TreeMap(parameters);
    +    final SortedMap packageParams = new TreeMap<>(parameters);
         packageParams.put("appid", this.wxMpConfigStorage.getAppId());
         packageParams.put("mch_id", this.wxMpConfigStorage.getPartnerId());
         packageParams.put("nonce_str", nonce_str);
    @@ -895,7 +895,7 @@ public class WxMpServiceImpl implements WxMpService {
     
      	@Override
     	public Map getJsapiPayInfo(String openId,String outTradeNo, double amt, String body,String ip, String callbackUrl) throws WxErrorException{
    -		Map packageParams = new HashMap();
    +		Map packageParams = new HashMap<>();
     		packageParams.put("appid", this.wxMpConfigStorage.getAppId());
     		packageParams.put("mch_id", this.wxMpConfigStorage.getPartnerId());
     		packageParams.put("body", body);
    @@ -911,7 +911,7 @@ public class WxMpServiceImpl implements WxMpService {
     	
     	@Override
     	public Map getNativePayInfo(String productId,String outTradeNo, double amt, String body,String ip, String callbackUrl) throws WxErrorException{
    -		Map packageParams = new HashMap();
    +		Map packageParams = new HashMap<>();
     		packageParams.put("appid", this.wxMpConfigStorage.getAppId());
     		packageParams.put("mch_id", this.wxMpConfigStorage.getPartnerId());
     		packageParams.put("body", body);
    @@ -946,7 +946,7 @@ public class WxMpServiceImpl implements WxMpService {
           throw new RuntimeException(String.format("Failed to get prepay id due to error code '%s'(%s).", wxMpPrepayIdResult.getErr_code(), wxMpPrepayIdResult.getErr_code_des()));
         }
     
    -    Map payInfo = new HashMap();
    +    Map payInfo = new HashMap<>();
         payInfo.put("appId", this.wxMpConfigStorage.getAppId());
         // 支付签名时间戳,注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
         payInfo.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000));
    @@ -954,7 +954,7 @@ public class WxMpServiceImpl implements WxMpService {
         payInfo.put("package", "prepay_id=" + prepayId);
         payInfo.put("signType", "MD5");
         if("NATIVE".equals(parameters.get("trade_type"))){
    -	payInfo.put("codeUrl", wxMpPrepayIdResult.getCode_url());
    +      payInfo.put("codeUrl", wxMpPrepayIdResult.getCode_url());
         }
     
         String finalSign = WxCryptUtil.createSign(payInfo, this.wxMpConfigStorage.getPartnerKey());
    @@ -966,7 +966,7 @@ public class WxMpServiceImpl implements WxMpService {
       public WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo) {
         String nonce_str = System.currentTimeMillis() + "";
     
    -    SortedMap packageParams = new TreeMap();
    +    SortedMap packageParams = new TreeMap<>();
         packageParams.put("appid", this.wxMpConfigStorage.getAppId());
         packageParams.put("mch_id", this.wxMpConfigStorage.getPartnerId());
         if (transactionId != null && !"".equals(transactionId.trim()))
    @@ -1018,7 +1018,7 @@ public class WxMpServiceImpl implements WxMpService {
       
       @Override
       public WxMpPayRefundResult refundPay(Map parameters) throws WxErrorException {
    -    SortedMap refundParams = new TreeMap(parameters);
    +    SortedMap refundParams = new TreeMap<>(parameters);
         refundParams.put("appid", this.wxMpConfigStorage.getAppId());
         refundParams.put("mch_id", this.wxMpConfigStorage.getPartnerId());
         refundParams.put("nonce_str", System.currentTimeMillis() + "");
    @@ -1080,7 +1080,7 @@ public class WxMpServiceImpl implements WxMpService {
       public WxRedpackResult sendRedpack(Map parameters) throws WxErrorException {
         String nonce_str = System.currentTimeMillis() + "";
     
    -    SortedMap packageParams = new TreeMap(parameters);
    +    SortedMap packageParams = new TreeMap<>(parameters);
         packageParams.put("wxappid", this.wxMpConfigStorage.getAppId());
         packageParams.put("mch_id", this.wxMpConfigStorage.getPartnerId());
         packageParams.put("nonce_str", nonce_str);
    
    From cc300b93d0952dfa7f4646ff277ed6aa066fdd03 Mon Sep 17 00:00:00 2001
    From: BinaryWang 
    Date: Mon, 20 Jun 2016 11:04:51 +0800
    Subject: [PATCH 24/33] =?UTF-8?q?qrCodePictureUrl=20=E8=BF=94=E5=9B=9E?=
     =?UTF-8?q?=E7=BD=91=E5=9D=80=E8=BF=87=E9=95=BF=EF=BC=8C=E4=BD=BF=E7=94=A8?=
     =?UTF-8?q?=E7=9F=AD=E7=BD=91=E5=9D=80=E8=BF=9B=E8=A1=8C=E5=8E=8B=E7=BC=A9?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    ---
     .../main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java   | 4 ++--
     1 file changed, 2 insertions(+), 2 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 c03a1dff..ef3975de 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
    @@ -50,7 +50,6 @@ import java.io.InputStream;
     import java.io.StringReader;
     import java.io.UnsupportedEncodingException;
     import java.net.URLEncoder;
    -import java.nio.charset.Charset;
     import java.security.NoSuchAlgorithmException;
     import java.util.*;
     import java.util.Map.Entry;
    @@ -523,7 +522,8 @@ public class WxMpServiceImpl implements WxMpService {
       public String qrCodePictureUrl(String ticket) throws WxErrorException {
         String url = "https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=%s";
         try {
    -      return String.format(url, URLEncoder.encode(ticket, Charsets.UTF_8.name()));
    +      return this.shortUrl(String.format(url, 
    +                            URLEncoder.encode(ticket, Charsets.UTF_8.name())));
         } catch (UnsupportedEncodingException e) {
           WxError error = WxError.newBuilder().setErrorCode(-1)
                 .setErrorMsg(e.getMessage()).build();
    
    From d90ef7fb0031caeaa50af79313cf1e3ce49d1ec9 Mon Sep 17 00:00:00 2001
    From: BinaryWang 
    Date: Mon, 20 Jun 2016 11:10:17 +0800
    Subject: [PATCH 25/33] =?UTF-8?q?add=20missing=20=E2=80=98this.=E2=80=99?=
     =?UTF-8?q?=20and=20@Override?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    ---
     .../mp/api/WxMpInMemoryConfigStorage.java     | 22 +++++++++++++++++++
     1 file changed, 22 insertions(+)
    
    diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java
    index 79064d6f..fc9fd51c 100644
    --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java
    +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java
    @@ -44,27 +44,33 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
     
       protected volatile ApacheHttpClientBuilder apacheHttpClientBuilder;
     
    +  @Override
       public String getAccessToken() {
         return this.accessToken;
       }
     
    +  @Override
       public boolean isAccessTokenExpired() {
         return System.currentTimeMillis() > this.expiresTime;
       }
     
    +  @Override
       public synchronized void updateAccessToken(WxAccessToken accessToken) {
         updateAccessToken(accessToken.getAccessToken(), accessToken.getExpiresIn());
       }
       
    +  @Override
       public synchronized void updateAccessToken(String accessToken, int expiresInSeconds) {
         this.accessToken = accessToken;
         this.expiresTime = System.currentTimeMillis() + (expiresInSeconds - 200) * 1000l;
       }
     
    +  @Override
       public void expireAccessToken() {
         this.expiresTime = 0;
       }
     
    +  @Override
       public String getJsapiTicket() {
         return jsapiTicket;
       }
    @@ -81,16 +87,19 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
         this.jsapiTicketExpiresTime = jsapiTicketExpiresTime;
       }
     
    +  @Override
       public boolean isJsapiTicketExpired() {
         return System.currentTimeMillis() > this.jsapiTicketExpiresTime;
       }
     
    +  @Override
       public synchronized void updateJsapiTicket(String jsapiTicket, int expiresInSeconds) {
         this.jsapiTicket = jsapiTicket;
         // 预留200秒的时间
         this.jsapiTicketExpiresTime = System.currentTimeMillis() + (expiresInSeconds - 200) * 1000l;
       }
     
    +  @Override
       public void expireJsapiTicket() {
         this.jsapiTicketExpiresTime = 0;
       }
    @@ -98,36 +107,44 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
       /**
        * 卡券api_ticket
        */
    +  @Override
       public String getCardApiTicket() {
         return cardApiTicket;
       }
     
    +  @Override
       public boolean isCardApiTicketExpired() {
         return System.currentTimeMillis() > this.cardApiTicketExpiresTime;
       }
     
    +  @Override
       public synchronized void updateCardApiTicket(String cardApiTicket, int expiresInSeconds) {
         this.cardApiTicket = cardApiTicket;
         // 预留200秒的时间
         this.cardApiTicketExpiresTime = System.currentTimeMillis() + (expiresInSeconds - 200) * 1000l;
       }
     
    +  @Override
       public void expireCardApiTicket() {
         this.cardApiTicketExpiresTime = 0;
       }
     
    +  @Override
       public String getAppId() {
         return this.appId;
       }
     
    +  @Override
       public String getSecret() {
         return this.secret;
       }
     
    +  @Override
       public String getToken() {
         return this.token;
       }
     
    +  @Override
       public long getExpiresTime() {
         return this.expiresTime;
       }
    @@ -144,6 +161,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
         this.token = token;
       }
     
    +  @Override
       public String getAesKey() {
         return aesKey;
       }
    @@ -169,6 +187,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
         this.oauth2redirectUri = oauth2redirectUri;
       }
     
    +  @Override
       public String getHttp_proxy_host() {
         return http_proxy_host;
       }
    @@ -177,6 +196,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
         this.http_proxy_host = http_proxy_host;
       }
     
    +  @Override
       public int getHttp_proxy_port() {
         return http_proxy_port;
       }
    @@ -185,6 +205,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
         this.http_proxy_port = http_proxy_port;
       }
     
    +  @Override
       public String getHttp_proxy_username() {
         return http_proxy_username;
       }
    @@ -193,6 +214,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
         this.http_proxy_username = http_proxy_username;
       }
     
    +  @Override
       public String getHttp_proxy_password() {
         return http_proxy_password;
       }
    
    From e34f6de7751c595e55069d895d20e2b5adeff90c Mon Sep 17 00:00:00 2001
    From: BinaryWang 
    Date: Mon, 20 Jun 2016 11:12:08 +0800
    Subject: [PATCH 26/33] =?UTF-8?q?add=20missing=20=E2=80=98this=E2=80=99?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    ---
     .../mp/api/WxMpInMemoryConfigStorage.java     | 58 +++++++++----------
     1 file changed, 29 insertions(+), 29 deletions(-)
    
    diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java
    index fc9fd51c..024f914a 100644
    --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java
    +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java
    @@ -72,7 +72,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
     
       @Override
       public String getJsapiTicket() {
    -    return jsapiTicket;
    +    return this.jsapiTicket;
       }
     
       public void setJsapiTicket(String jsapiTicket) {
    @@ -80,7 +80,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
       }
     
       public long getJsapiTicketExpiresTime() {
    -    return jsapiTicketExpiresTime;
    +    return this.jsapiTicketExpiresTime;
       }
     
       public void setJsapiTicketExpiresTime(long jsapiTicketExpiresTime) {
    @@ -109,7 +109,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
        */
       @Override
       public String getCardApiTicket() {
    -    return cardApiTicket;
    +    return this.cardApiTicket;
       }
     
       @Override
    @@ -163,7 +163,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
     
       @Override
       public String getAesKey() {
    -    return aesKey;
    +    return this.aesKey;
       }
     
       public void setAesKey(String aesKey) {
    @@ -189,7 +189,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
     
       @Override
       public String getHttp_proxy_host() {
    -    return http_proxy_host;
    +    return this.http_proxy_host;
       }
     
       public void setHttp_proxy_host(String http_proxy_host) {
    @@ -198,7 +198,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
     
       @Override
       public int getHttp_proxy_port() {
    -    return http_proxy_port;
    +    return this.http_proxy_port;
       }
     
       public void setHttp_proxy_port(int http_proxy_port) {
    @@ -207,7 +207,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
     
       @Override
       public String getHttp_proxy_username() {
    -    return http_proxy_username;
    +    return this.http_proxy_username;
       }
     
       public void setHttp_proxy_username(String http_proxy_username) {
    @@ -216,7 +216,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
     
       @Override
       public String getHttp_proxy_password() {
    -    return http_proxy_password;
    +    return this.http_proxy_password;
       }
     
       public void setHttp_proxy_password(String http_proxy_password) {
    @@ -226,29 +226,29 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
       @Override
       public String toString() {
         return "WxMpInMemoryConfigStorage{" +
    -        "appId='" + appId + '\'' +
    -        ", secret='" + secret + '\'' +
    -        ", token='" + token + '\'' +
    -        ", partnerId='" + partnerId + '\'' +
    -        ", partnerKey='" + partnerKey + '\'' +
    -        ", accessToken='" + accessToken + '\'' +
    -        ", aesKey='" + aesKey + '\'' +
    -        ", expiresTime=" + expiresTime +
    -        ", http_proxy_host='" + http_proxy_host + '\'' +
    -        ", http_proxy_port=" + http_proxy_port +
    -        ", http_proxy_username='" + http_proxy_username + '\'' +
    -        ", http_proxy_password='" + http_proxy_password + '\'' +
    -        ", jsapiTicket='" + jsapiTicket + '\'' +
    -        ", jsapiTicketExpiresTime='" + jsapiTicketExpiresTime + '\'' +
    -        ", cardApiTicket='" + cardApiTicket + '\'' +
    -        ", cardApiTicketExpiresTime='" + cardApiTicketExpiresTime + '\'' +
    -        ", tmpDirFile='" + tmpDirFile + '\'' +
    +        "appId='" + this.appId + '\'' +
    +        ", secret='" + this.secret + '\'' +
    +        ", token='" + this.token + '\'' +
    +        ", partnerId='" + this.partnerId + '\'' +
    +        ", partnerKey='" + this.partnerKey + '\'' +
    +        ", accessToken='" + this.accessToken + '\'' +
    +        ", aesKey='" + this.aesKey + '\'' +
    +        ", expiresTime=" + this.expiresTime +
    +        ", http_proxy_host='" + this.http_proxy_host + '\'' +
    +        ", http_proxy_port=" + this.http_proxy_port +
    +        ", http_proxy_username='" + this.http_proxy_username + '\'' +
    +        ", http_proxy_password='" + this.http_proxy_password + '\'' +
    +        ", jsapiTicket='" + this.jsapiTicket + '\'' +
    +        ", jsapiTicketExpiresTime='" + this.jsapiTicketExpiresTime + '\'' +
    +        ", cardApiTicket='" + this.cardApiTicket + '\'' +
    +        ", cardApiTicketExpiresTime='" + this.cardApiTicketExpiresTime + '\'' +
    +        ", tmpDirFile='" + this.tmpDirFile + '\'' +
             '}';
       }
     
       @Override
       public String getPartnerId() {
    -      return partnerId;
    +      return this.partnerId;
       }
     
       public void setPartnerId(String partnerId) {
    @@ -257,7 +257,7 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
     
       @Override
       public String getPartnerKey() {
    -      return partnerKey;
    +      return this.partnerKey;
       }
     
       public void setPartnerKey(String partnerKey) {
    @@ -275,11 +275,11 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
     
       @Override
       public SSLContext getSSLContext() {
    -    return sslContext;
    +    return this.sslContext;
       }
       
       public void setSSLContext(SSLContext context) {
    -    sslContext = context;
    +    this.sslContext = context;
       }
     
       @Override
    
    From 5358d68fff579cde1bd51704b40c09731cc96ec3 Mon Sep 17 00:00:00 2001
    From: BinaryWang 
    Date: Mon, 20 Jun 2016 13:54:57 +0800
    Subject: [PATCH 27/33] =?UTF-8?q?=E8=A7=84=E8=8C=83=E9=83=A8=E5=88=86javad?=
     =?UTF-8?q?oc?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    ---
     .../me/chanjar/weixin/mp/api/WxMpService.java | 148 +++++++++---------
     1 file changed, 75 insertions(+), 73 deletions(-)
    
    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 14555498..f5efb570 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
    @@ -94,7 +94,8 @@ public interface WxMpService {
     
       /**
        * 
    -   * 上传多媒体文件
    +   * 新增临时素材
    +   * 本接口即为原“上传多媒体文件”接口。
        *
        * 上传的多媒体文件有格式和大小限制,如下:
        *   图片(image): 1M,支持JPG格式
    @@ -102,7 +103,7 @@ public interface WxMpService {
        *   视频(video):10MB,支持MP4格式
        *   缩略图(thumb):64KB,支持JPG格式
        *
    -   * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=上传下载多媒体文件
    +   * 详情请见: 新增临时素材
        * 
    * @param mediaType 媒体类型, 请看{@link me.chanjar.weixin.common.api.WxConsts} * @param fileType 文件类型,请看{@link me.chanjar.weixin.common.api.WxConsts} @@ -241,6 +242,7 @@ public interface WxMpService { public WxMpMaterialFileBatchGetResult materialFileBatchGet(String type, int offset, int count) throws WxErrorException; /** + * 新增临时素材 * @see #mediaUpload(String, String, InputStream) * @param mediaType * @param file @@ -250,9 +252,10 @@ public interface WxMpService { /** *
    -   * 下载多媒体文件
    +   * 获取临时素材
    +   * 本接口即为原“下载多媒体文件”接口。
        * 根据微信文档,视频文件下载不了,会返回null
    -   * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=上传下载多媒体文件
    +   * 详情请见: 获取临时素材
        * 
    * @params media_id * @return 保存到本地的临时文件 @@ -465,7 +468,7 @@ public interface WxMpService { /** *
        * 换取临时二维码ticket
    -   * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=生成带参数的二维码
    +   * 详情请见: 生成带参数的二维码
        * 
    * @param scene_id 参数。 * @param expire_seconds 过期秒数,默认60秒,最小60秒,最大1800秒 @@ -477,7 +480,7 @@ public interface WxMpService { /** *
        * 换取永久二维码ticket
    -   * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=生成带参数的二维码
    +   * 详情请见: 生成带参数的二维码
        * 
    * @param scene_id 参数。永久二维码时最大值为100000(目前参数只支持1--100000) * @return @@ -488,7 +491,7 @@ public interface WxMpService { /** *
        * 换取永久字符串二维码ticket
    -   * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=生成带参数的二维码
    +   * 详情请见: 生成带参数的二维码
        * 
    * * @param scene_str 参数。字符串类型长度现在为1到64 @@ -500,7 +503,7 @@ public interface WxMpService { /** *
        * 换取二维码图片文件,jpg格式
    -   * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=生成带参数的二维码
    +   * 详情请见: 生成带参数的二维码
        * 
    * @param ticket 二维码ticket * @return @@ -511,7 +514,7 @@ public interface WxMpService { /** *
        * 换取二维码图片url地址
    -   * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=生成带参数的二维码
    +   * 详情请见: 生成带参数的二维码
        * 
    * @param ticket 二维码ticket * @return @@ -769,78 +772,77 @@ public interface WxMpService { * @param ip 发起支付的客户端IP * @param notifyUrl 通知地址 * @return - * @throws WxErrorException + * @throws WxErrorException * @deprecated Use me.chanjar.weixin.mp.api.WxMpService.getPayInfo(Map) instead */ @Deprecated Map getJsapiPayInfo(String openId, String outTradeNo, double amt, String body, String ip, String notifyUrl) throws WxErrorException; + /** + * 该接口提供所有微信支付订单的查询,当支付通知处理异常戒丢失的情冴,商户可以通过该接口查询订单支付状态。 + * 详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_2 + * @param transactionId + * @param outTradeNo + */ + WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo); - /** - * 该接口提供所有微信支付订单的查询,当支付通知处理异常戒丢失的情冴,商户可以通过该接口查询订单支付状态。 - * 详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_2 - * @param transactionId - * @param outTradeNo - */ - WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo); - - /** - * 读取支付结果通知 - * 详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7 - * @param xmlData - * @return - */ - WxMpPayCallback getJSSDKCallbackData(String xmlData); + /** + * 读取支付结果通知 + * 详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7 + * @param xmlData + * @return + */ + WxMpPayCallback getJSSDKCallbackData(String xmlData); - /** - * 微信支付-申请退款 - * 详见 https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_4 - * @param parameters 需要传入的退款参数的Map。以下几项为参数的必须项:
    - *
  • transaction_id - *
  • out_trade_no (仅在上述transaction_id为空时是必须项) - *
  • out_refund_no - *
  • total_fee - *
  • refund_fee - * @return 退款操作结果 - * @throws WxErrorException - */ - public WxMpPayRefundResult refundPay(Map parameters) throws WxErrorException; + /** + * 微信支付-申请退款 + * 详见 https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_4 + * @param parameters 需要传入的退款参数的Map。以下几项为参数的必须项:
    + *
  • transaction_id + *
  • out_trade_no (仅在上述transaction_id为空时是必须项) + *
  • out_refund_no + *
  • total_fee + *
  • refund_fee + * @return 退款操作结果 + * @throws WxErrorException + */ + public WxMpPayRefundResult refundPay(Map parameters) throws WxErrorException; - /** - *
    -     * 计算Map键值对是否和签名相符,
    -     * 按照字段名的 ASCII 码从小到大排序(字典序)后,使用 URL 键值对的 格式(即 key1=value1&key2=value2...)拼接成字符串
    -     * 
    - * @param kvm - * @param signature - * @return - */ - public boolean checkJSSDKCallbackDataSignature(Map kvm, String signature); - - /** - * 发送微信红包给个人用户 - * - * 需要传入的必填参数如下: - * mch_billno//商户订单号 - * send_name//商户名称 - * re_openid//用户openid - * total_amount//红包总额 - * total_num//红包发放总人数 - * wishing//红包祝福语 - * client_ip//服务器Ip地址 - * act_name//活动名称 - * remark //备注 - * 文档详见:https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_5 - * - * 使用现金红包功能需要在xml配置文件中额外设置: - * 微信商户平台ID - * 商户平台设置的API密钥 - * - * @param parameters - * @return - * @throws WxErrorException - */ - public WxRedpackResult sendRedpack(Map parameters) throws WxErrorException; + /** + *
    +   * 计算Map键值对是否和签名相符,
    +   * 按照字段名的 ASCII 码从小到大排序(字典序)后,使用 URL 键值对的 格式(即 key1=value1&key2=value2...)拼接成字符串
    +   * 
    + * @param kvm + * @param signature + * @return + */ + public boolean checkJSSDKCallbackDataSignature(Map kvm, String signature); + + /** + * 发送微信红包给个人用户 + * + * 需要传入的必填参数如下: + * mch_billno//商户订单号 + * send_name//商户名称 + * re_openid//用户openid + * total_amount//红包总额 + * total_num//红包发放总人数 + * wishing//红包祝福语 + * client_ip//服务器Ip地址 + * act_name//活动名称 + * remark //备注 + * 文档详见:https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_5 + * + * 使用现金红包功能需要在xml配置文件中额外设置: + * 微信商户平台ID + * 商户平台设置的API密钥 + * + * @param parameters + * @return + * @throws WxErrorException + */ + public WxRedpackResult sendRedpack(Map parameters) throws WxErrorException; /** * 获得卡券api_ticket,不强制刷新卡券api_ticket From bc22b03ea3bbd1cf76466d2d77034d1218e35e02 Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Tue, 21 Jun 2016 11:46:48 +0800 Subject: [PATCH 28/33] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8D=A2=E5=8F=96?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=9B=BE=E7=89=87url=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E7=9A=84=E9=87=8D=E6=9E=84=E6=96=B9=E6=B3=95=EF=BC=88?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9=E6=98=AF=E5=90=A6=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=8E=8B=E7=BC=A9=E7=9A=84=E7=BD=91=E5=9D=80=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/WxMpService.java | 11 +++++++++++ .../chanjar/weixin/mp/api/WxMpServiceImpl.java | 16 +++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) 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 f5efb570..d822fc33 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 @@ -511,6 +511,17 @@ public interface WxMpService { */ public File qrCodePicture(WxMpQrCodeTicket ticket) throws WxErrorException; + /** + *
    +   * 换取二维码图片url地址(可以选择是否生成压缩的网址)
    +   * 详情请见: 生成带参数的二维码
    +   * 
    + * @param ticket 二维码ticket + * @param needShortUrl 是否需要压缩的二维码地址 + * @return + * @throws WxErrorException + */ + public String qrCodePictureUrl(String ticket, boolean needShortUrl) throws WxErrorException; /** *
        * 换取二维码图片url地址
    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 ef3975de..339368f3 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
    @@ -519,17 +519,27 @@ public class WxMpServiceImpl implements WxMpService {
       }
     
       @Override
    -  public String qrCodePictureUrl(String ticket) throws WxErrorException {
    +  public String qrCodePictureUrl(String ticket, boolean needShortUrl) throws WxErrorException {
         String url = "https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=%s";
         try {
    -      return this.shortUrl(String.format(url, 
    -                            URLEncoder.encode(ticket, Charsets.UTF_8.name())));
    +      String resultUrl = String.format(url, 
    +          URLEncoder.encode(ticket, Charsets.UTF_8.name()));
    +      if(needShortUrl){
    +        return this.shortUrl(resultUrl);
    +      }
    +      
    +      return resultUrl;
         } catch (UnsupportedEncodingException e) {
           WxError error = WxError.newBuilder().setErrorCode(-1)
                 .setErrorMsg(e.getMessage()).build();
           throw new WxErrorException(error);
         }
       }
    +  
    +  @Override
    +  public String qrCodePictureUrl(String ticket) throws WxErrorException {
    +    return qrCodePictureUrl(ticket, false);
    +  }
     
       @Override
       public String shortUrl(String long_url) throws WxErrorException {
    
    From 13d76c1c50a9abda891c0965f08c38a208034364 Mon Sep 17 00:00:00 2001
    From: BinaryWang 
    Date: Fri, 24 Jun 2016 09:26:47 +0800
    Subject: [PATCH 29/33] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E6=9E=84?=
     =?UTF-8?q?=E7=B4=A0=E6=9D=90=E4=B8=8A=E4=BC=A0=E5=A4=84=E7=90=86=E4=BB=A3?=
     =?UTF-8?q?=E7=A0=81?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    ---
     .../http/MaterialUploadRequestExecutor.java   | 36 ++++++++++---------
     1 file changed, 20 insertions(+), 16 deletions(-)
    
    diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java
    index 5e90c07a..2491e0ab 100644
    --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java
    +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java
    @@ -30,22 +30,26 @@ public class MaterialUploadRequestExecutor implements RequestExecutor form = material.getForm();
    -      if (material.getForm() != null) {
    -        multipartEntityBuilder.addTextBody("description", WxGsonBuilder.create().toJson(form));
    -      }
    -      httpPost.setEntity(multipartEntityBuilder.build());
    -      httpPost.setHeader("Content-Type", ContentType.MULTIPART_FORM_DATA.toString());
    +    if (material == null) {
    +      throw new WxErrorException(WxError.newBuilder().setErrorMsg("非法请求,material参数为空").build());
    +    }
    +
    +    File file = material.getFile();
    +    if (file == null || !file.exists()) {
    +      throw new FileNotFoundException();
    +    }
    +    
    +    MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create();
    +    multipartEntityBuilder
    +        .addBinaryBody("media", file)
    +        .setMode(HttpMultipartMode.RFC6532);
    +    Map form = material.getForm();
    +    if (material.getForm() != null) {
    +      multipartEntityBuilder.addTextBody("description", WxGsonBuilder.create().toJson(form));
         }
    +    
    +    httpPost.setEntity(multipartEntityBuilder.build());
    +    httpPost.setHeader("Content-Type", ContentType.MULTIPART_FORM_DATA.toString());
     
         try (CloseableHttpResponse response = httpclient.execute(httpPost)) {
           String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
    @@ -55,7 +59,7 @@ public class MaterialUploadRequestExecutor implements RequestExecutor
    Date: Thu, 30 Jun 2016 10:22:30 +0800
    Subject: [PATCH 30/33] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=BB=A5file.api.weixi?=
     =?UTF-8?q?n.qq.com=E5=9F=9F=E5=90=8D=E4=B8=8B=E7=9A=84api=E4=B8=BAapi.wei?=
     =?UTF-8?q?xin.qq.com=EF=BC=8C=E5=B9=B6=E4=BD=BF=E7=94=A8https?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    ---
     .../main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java | 6 +++---
     1 file changed, 3 insertions(+), 3 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 339368f3..18fb3aef 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
    @@ -255,13 +255,13 @@ public class WxMpServiceImpl implements WxMpService {
     
       @Override
       public WxMediaUploadResult mediaUpload(String mediaType, File file) throws WxErrorException {
    -    String url = "http://file.api.weixin.qq.com/cgi-bin/media/upload?type=" + mediaType;
    +    String url = "https://api.weixin.qq.com/cgi-bin/media/upload?type=" + mediaType;
         return execute(new MediaUploadRequestExecutor(), url, file);
       }
     
       @Override
       public File mediaDownload(String media_id) throws WxErrorException {
    -    String url = "http://file.api.weixin.qq.com/cgi-bin/media/get";
    +    String url = "https://api.weixin.qq.com/cgi-bin/media/get";
         return execute(new MediaDownloadRequestExecutor(this.wxMpConfigStorage.getTmpDirFile()), url, "media_id=" + media_id);
       }
     
    @@ -370,7 +370,7 @@ public class WxMpServiceImpl implements WxMpService {
     
       @Override
       public WxMpMassUploadResult massVideoUpload(WxMpMassVideo video) throws WxErrorException {
    -    String url = "http://file.api.weixin.qq.com/cgi-bin/media/uploadvideo";
    +    String url = "https://api.weixin.qq.com/cgi-bin/media/uploadvideo";
         String responseContent = execute(new SimplePostRequestExecutor(), url, video.toJson());
         return WxMpMassUploadResult.fromJson(responseContent);
       }
    
    From 7deb25b4bb8770b0ba0ad7b20724ad877d5e8e59 Mon Sep 17 00:00:00 2001
    From: BinaryWang 
    Date: Thu, 30 Jun 2016 18:52:11 +0800
    Subject: [PATCH 31/33] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?=
     =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    ---
     .../weixin/mp/api/WxMpBaseAPITest.java        |  4 +--
     .../weixin/mp/api/WxMpMediaAPITest.java       | 28 ++++++++++---------
     .../weixin/mp/api/WxMpQrCodeAPITest.java      | 14 +++++++---
     3 files changed, 27 insertions(+), 19 deletions(-)
    
    diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java
    index c4210b57..49d056af 100644
    --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java
    +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java
    @@ -20,9 +20,9 @@ public class WxMpBaseAPITest {
       protected WxMpServiceImpl wxService;
     
       public void testRefreshAccessToken() throws WxErrorException {
    -    WxMpConfigStorage configStorage = wxService.wxMpConfigStorage;
    +    WxMpConfigStorage configStorage = this.wxService.wxMpConfigStorage;
         String before = configStorage.getAccessToken();
    -    wxService.getAccessToken(false);
    +    this.wxService.getAccessToken(false);
     
         String after = configStorage.getAccessToken();
         Assert.assertNotEquals(before, after);
    diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMediaAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMediaAPITest.java
    index 0df7103d..b2fbc851 100644
    --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMediaAPITest.java
    +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMediaAPITest.java
    @@ -26,21 +26,23 @@ public class WxMpMediaAPITest {
       @Inject
       protected WxMpServiceImpl wxService;
     
    -  private List media_ids = new ArrayList();
    +  private List media_ids = new ArrayList<>();
       
       @Test(dataProvider="uploadMedia")
       public void testUploadMedia(String mediaType, String fileType, String fileName) throws WxErrorException, IOException {
    -    InputStream inputStream = ClassLoader.getSystemResourceAsStream(fileName);
    -    WxMediaUploadResult res = wxService.mediaUpload(mediaType, fileType, inputStream);
    -    Assert.assertNotNull(res.getType());
    -    Assert.assertNotNull(res.getCreatedAt());
    -    Assert.assertTrue(res.getMediaId() != null || res.getThumbMediaId() != null);
    -    
    -    if (res.getMediaId() != null) {
    -      media_ids.add(res.getMediaId());
    -    }
    -    if (res.getThumbMediaId() != null) {
    -      media_ids.add(res.getThumbMediaId());
    +    try(InputStream inputStream = ClassLoader.getSystemResourceAsStream(fileName)){
    +      WxMediaUploadResult res = this.wxService.mediaUpload(mediaType, fileType, inputStream);
    +      Assert.assertNotNull(res.getType());
    +      Assert.assertNotNull(res.getCreatedAt());
    +      Assert.assertTrue(res.getMediaId() != null || res.getThumbMediaId() != null);
    +      
    +      if (res.getMediaId() != null) {
    +        this.media_ids.add(res.getMediaId());
    +      }
    +      
    +      if (res.getThumbMediaId() != null) {
    +        this.media_ids.add(res.getThumbMediaId());
    +      }
         }
       }
       
    @@ -56,7 +58,7 @@ public class WxMpMediaAPITest {
       
       @Test(dependsOnMethods = { "testUploadMedia" }, dataProvider="downloadMedia")
       public void testDownloadMedia(String media_id) throws WxErrorException {
    -    wxService.mediaDownload(media_id);
    +    this.wxService.mediaDownload(media_id);
       }
       
       @DataProvider
    diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpQrCodeAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpQrCodeAPITest.java
    index 1fa76e49..7af300c9 100644
    --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpQrCodeAPITest.java
    +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpQrCodeAPITest.java
    @@ -22,23 +22,29 @@ public class WxMpQrCodeAPITest {
       protected WxMpServiceImpl wxService;
     
       public void testQrCodeCreateTmpTicket() throws WxErrorException {
    -    WxMpQrCodeTicket ticket = wxService.qrCodeCreateTmpTicket(1, null);
    +    WxMpQrCodeTicket ticket = this.wxService.qrCodeCreateTmpTicket(1, null);
         Assert.assertNotNull(ticket.getUrl());
         Assert.assertNotNull(ticket.getTicket());
         Assert.assertTrue(ticket.getExpire_seconds() != -1);
       }
     
       public void testQrCodeCreateLastTicket() throws WxErrorException {
    -    WxMpQrCodeTicket ticket = wxService.qrCodeCreateLastTicket(1);
    +    WxMpQrCodeTicket ticket = this.wxService.qrCodeCreateLastTicket(1);
         Assert.assertNotNull(ticket.getUrl());
         Assert.assertNotNull(ticket.getTicket());
         Assert.assertTrue(ticket.getExpire_seconds() == -1);
       }
     
       public void testQrCodePicture() throws WxErrorException {
    -    WxMpQrCodeTicket ticket = wxService.qrCodeCreateLastTicket(1);
    -    File file = wxService.qrCodePicture(ticket);
    +    WxMpQrCodeTicket ticket = this.wxService.qrCodeCreateLastTicket(1);
    +    File file = this.wxService.qrCodePicture(ticket);
         Assert.assertNotNull(file);
       }
    +  
    +  public void testQrCodePictureUrl() throws WxErrorException {
    +    WxMpQrCodeTicket ticket = this.wxService.qrCodeCreateLastTicket(1);
    +    String url = this.wxService.qrCodePictureUrl(ticket.getTicket());
    +    Assert.assertNotNull(url);
    +  }
     
     }
    
    From e579ef07284efb81d234c84b43ebd9f09d974e59 Mon Sep 17 00:00:00 2001
    From: BinaryWang 
    Date: Thu, 30 Jun 2016 18:54:35 +0800
    Subject: [PATCH 32/33] add spring demo initial
    
    ---
     pom.xml                                     |  1 +
     spring-demo/pom.xml                         | 25 ++++++++++
     spring-demo/src/main/webapp/WEB-INF/web.xml | 55 +++++++++++++++++++++
     3 files changed, 81 insertions(+)
     create mode 100644 spring-demo/pom.xml
     create mode 100644 spring-demo/src/main/webapp/WEB-INF/web.xml
    
    diff --git a/pom.xml b/pom.xml
    index 3ac86ee8..ebbd6155 100644
    --- a/pom.xml
    +++ b/pom.xml
    @@ -39,6 +39,7 @@
         weixin-java-common
         weixin-java-cp
         weixin-java-mp
    +    spring-demo
       
     
       
    diff --git a/spring-demo/pom.xml b/spring-demo/pom.xml
    new file mode 100644
    index 00000000..1ae990ed
    --- /dev/null
    +++ b/spring-demo/pom.xml
    @@ -0,0 +1,25 @@
    +
    +
    +  4.0.0    
    +  
    +        com.github.binarywang
    +        weixin-java-parent
    +        1.3.5-SNAPSHOT
    +    
    +  spring-demo
    +  war
    +  WeiXin Java Tools - demo with spring
    +  spring demo
    +  https://github.com/binarywang/weixin-java-tools
    + 
    +  
    +    
    +        com.github.binarywang
    +        weixin-java-common
    +        ${project.version}
    +    
    +  
    +
    +
    diff --git a/spring-demo/src/main/webapp/WEB-INF/web.xml b/spring-demo/src/main/webapp/WEB-INF/web.xml
    new file mode 100644
    index 00000000..6242f8f1
    --- /dev/null
    +++ b/spring-demo/src/main/webapp/WEB-INF/web.xml
    @@ -0,0 +1,55 @@
    +
    +
    +	api
    +	
    +		contextConfigLocation
    +		classpath:applicationContext.xml
    +	
    +	
    +		encodingFilter
    +		org.springframework.web.filter.CharacterEncodingFilter
    +		
    +			encoding
    +			UTF-8
    +		
    +	
    +	
    +		encodingFilter
    +		/*
    +	
    +	
    +		springSecurityFilterChain
    +		org.springframework.web.filter.DelegatingFilterProxy
    +	
    +	
    +		springSecurityFilterChain
    +		/v1/admin/*
    +	
    +	
    +	
    +		org.springframework.web.context.ContextLoaderListener
    +	
    +	
    +		org.springframework.web.util.IntrospectorCleanupListener
    +	
    +	
    +		spring mvc servlet
    +		springMvc
    +		org.springframework.web.servlet.DispatcherServlet
    +		
    +			contextConfigLocation
    +			classpath:spring-servlet-common.xml
    +		
    +		1
    +	
    +	
    +		springMvc
    +		/
    +	
    +	
    +		30
    +	
    +
    \ No newline at end of file
    
    From 3170945a2ce9dd9eb7f1021d849f251fc5c418fd Mon Sep 17 00:00:00 2001
    From: BinaryWang 
    Date: Thu, 30 Jun 2016 18:57:18 +0800
    Subject: [PATCH 33/33] sync README.md
    
    ---
     README.md | 8 ++++----
     1 file changed, 4 insertions(+), 4 deletions(-)
    
    diff --git a/README.md b/README.md
    index 6ccfd5bd..3af5ff43 100644
    --- a/README.md
    +++ b/README.md
    @@ -1,4 +1,5 @@
    -# Weixin Java Tools 微信公众号/企业号开发Java SDK
    +# Weixin Java Tools 
    +## 微信公众号/企业号开发Java SDK
     ## [![Build Status](https://travis-ci.org/binarywang/weixin-java-tools.svg?branch=develop)](https://travis-ci.org/binarywang/weixin-java-tools) ![Maven Central](https://img.shields.io/maven-central/v/com.github.binarywang/weixin-java-parent.svg) weixin-java-tools
     
     ### 声明:本项目基于chanjarster/weixin-java-tools,由于原作者长期没有维护,故单独维护和发布,且发布到maven上的groupId也会不同。
    @@ -9,8 +10,7 @@
     ===========
     ## 使用开发交流工具:
     * QQ群:343954419 weixin-java-tools
    -* 微信群:
    - ![Alt text](https://raw.githubusercontent.com/binarywang/weixin-java-tools/master/weixinqun.jpg  "微信群")
    +* 微信群: 因二维码有时间限制,如有想加入微信群的,请入QQ群后咨询获取最新入群二维码。
      
     ===========
     
    @@ -57,4 +57,4 @@
     
     非常欢迎和感谢对本项目发起Pull Request的同学,不过本项目基于[git flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)开发流程,因此在发起Pull Request的时候请选择develop分支。
     
    -且本项目代码风格是用2个空格代表一个tab,因此在发起PR时注意一下,否则很容易发生在IDE格式化代码后与原代码产生大量diff,这样我在阅读PR的时候就很困难。
    +且本项目代码风格是用2个空格代表一个tab,因此在发起PR时注意一下,否则很容易发生在IDE格式化代码后与原代码产生大量diff,这样我在阅读PR的时候就很困难。
    \ No newline at end of file