binarywang#260 修复小程序发送模版消息接口的问题，并重新整理javadoc

binarywang · binarywang · commit cc7a83e350c5 · 2017-09-03T00:00:58.000+08:00
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMsgService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMsgService.java
@@ -18,7 +18,7 @@ public interface WxMaMsgService {
   /**
    * <pre>
    * 发送客服消息
-   * 详情请见: <a href="http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140547&token=&lang=zh_CN">发送客服消息</a>
+   * 详情请见: <a href="https://mp.weixin.qq.com/debug/wxadoc/dev/api/custommsg/conversation.html">发送客服消息</a>
    * 接口url格式：https://api.weixin.qq.com/cgi-bin/message/custom/send?access_token=ACCESS_TOKEN
    * </pre>
    */
@@ -27,10 +27,9 @@ public interface WxMaMsgService {
   /**
    * <pre>
    * 发送模板消息
-   * 详情请见: http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751277&token=&lang=zh_CN
+   * 详情请见: <a href="https://mp.weixin.qq.com/debug/wxadoc/dev/api/notice.html#接口说明">发送模板消息</a>
+   * 接口url格式：https://api.weixin.qq.com/cgi-bin/message/wxopen/template/send?access_token=ACCESS_TOKEN
    * </pre>
-   *
-   * @return 消息Id
    */
-  String sendTemplateMsg(WxMaTemplateMessage templateMessage) throws WxErrorException;
+  void sendTemplateMsg(WxMaTemplateMessage templateMessage) throws WxErrorException;
 }
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImpl.java
@@ -27,14 +27,12 @@ public boolean sendKefuMsg(WxMaKefuMessage message) throws WxErrorException {
   }
 
   @Override
-  public String sendTemplateMsg(WxMaTemplateMessage templateMessage) throws WxErrorException {
+  public void sendTemplateMsg(WxMaTemplateMessage templateMessage) throws WxErrorException {
     String responseContent = this.wxMaService.post(TEMPLATE_MSG_SEND_URL, templateMessage.toJson());
     JsonObject jsonObject = JSON_PARSER.parse(responseContent).getAsJsonObject();
-    if (jsonObject.get("errcode").getAsInt() == 0) {
-      return jsonObject.get("msgid").getAsString();
+    if (jsonObject.get("errcode").getAsInt() != 0) {
+      throw new WxErrorException(WxError.fromJson(responseContent));
     }
-
-    throw new WxErrorException(WxError.fromJson(responseContent));
   }
 
 }
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java
@@ -193,7 +193,7 @@ public synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor, Str
 
     try {
       T result = executor.execute(uriWithAccessToken, data);
-      this.log.debug("\n[URL]:  {}\n[PARAMS]: {}\n[RESPONSE]: {}", uriWithAccessToken, data, result);
+      this.log.debug("\n【请求地址】: {}\n【请求参数】：{}\n【响应数据】：{}", uriWithAccessToken, data, result);
       return result;
     } catch (WxErrorException e) {
       WxError error = e.getError();
@@ -212,12 +212,12 @@ public synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor, Str
       }
 
       if (error.getErrorCode() != 0) {
-        this.log.error("\n[URL]:  {}\n[PARAMS]: {}\n[RESPONSE]: {}", uriWithAccessToken, data, error);
+        this.log.error("\n【请求地址】: {}\n【请求参数】：{}\n【错误信息】：{}", uriWithAccessToken, data, error);
         throw new WxErrorException(error);
       }
       return null;
     } catch (IOException e) {
-      this.log.error("\n[URL]:  {}\n[PARAMS]: {}\n[EXCEPTION]: {}", uriWithAccessToken, data, e.getMessage());
+      this.log.error("\n【请求地址】: {}\n【请求参数】：{}\n【异常信息】：{}", uriWithAccessToken, data, e.getMessage());
       throw new RuntimeException(e);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,12 @@ public boolean sendKefuMsg(WxMaKefuMessage message) throws WxErrorException {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
`30`		`- public String sendTemplateMsg(WxMaTemplateMessage templateMessage) throws WxErrorException {`
	`30`	`+ public void sendTemplateMsg(WxMaTemplateMessage templateMessage) throws WxErrorException {`
`31`	`31`	`String responseContent = this.wxMaService.post(TEMPLATE_MSG_SEND_URL, templateMessage.toJson());`
`32`	`32`	`JsonObject jsonObject = JSON_PARSER.parse(responseContent).getAsJsonObject();`
`33`		`- if (jsonObject.get("errcode").getAsInt() == 0) {`
`34`		`- return jsonObject.get("msgid").getAsString();`
	`33`	`+ if (jsonObject.get("errcode").getAsInt() != 0) {`
	`34`	`+ throw new WxErrorException(WxError.fromJson(responseContent));`
`35`	`35`	`}`
`36`		`-`
`37`		`- throw new WxErrorException(WxError.fromJson(responseContent));`
`38`	`36`	`}`
`39`	`37`
`40`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor, Str`
`193`	`193`
`194`	`194`	`try {`
`195`	`195`	`T result = executor.execute(uriWithAccessToken, data);`
`196`		`- this.log.debug("\n[URL]: {}\n[PARAMS]: {}\n[RESPONSE]: {}", uriWithAccessToken, data, result);`
	`196`	`+ this.log.debug("\n【请求地址】: {}\n【请求参数】：{}\n【响应数据】：{}", uriWithAccessToken, data, result);`
`197`	`197`	`return result;`
`198`	`198`	`} catch (WxErrorException e) {`
`199`	`199`	`WxError error = e.getError();`
`@@ -212,12 +212,12 @@ public synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor, Str`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`if (error.getErrorCode() != 0) {`
`215`		`- this.log.error("\n[URL]: {}\n[PARAMS]: {}\n[RESPONSE]: {}", uriWithAccessToken, data, error);`
	`215`	`+ this.log.error("\n【请求地址】: {}\n【请求参数】：{}\n【错误信息】：{}", uriWithAccessToken, data, error);`
`216`	`216`	`throw new WxErrorException(error);`
`217`	`217`	`}`
`218`	`218`	`return null;`
`219`	`219`	`} catch (IOException e) {`
`220`		`- this.log.error("\n[URL]: {}\n[PARAMS]: {}\n[EXCEPTION]: {}", uriWithAccessToken, data, e.getMessage());`
	`220`	`+ this.log.error("\n【请求地址】: {}\n【请求参数】：{}\n【异常信息】：{}", uriWithAccessToken, data, e.getMessage());`
`221`	`221`	`throw new RuntimeException(e);`
`222`	`222`	`}`
`223`	`223`	`}`