From 3055312f1e4f90668b4e5bae19c8042447273568 Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Tue, 21 Oct 2014 13:26:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=96=B9=E6=B3=95touser=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E4=B8=BAtoUsre?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/bean/custombuilder/ImageBuilder.java | 2 +- .../me/chanjar/weixin/bean/custombuilder/MusicBuilder.java | 2 +- .../me/chanjar/weixin/bean/custombuilder/NewsBuilder.java | 2 +- .../me/chanjar/weixin/bean/custombuilder/TextBuilder.java | 2 +- .../me/chanjar/weixin/bean/custombuilder/VideoBuilder.java | 2 +- .../me/chanjar/weixin/bean/custombuilder/VoiceBuilder.java | 2 +- .../me/chanjar/weixin/bean/outxmlbuilder/BaseBuilder.java | 2 +- .../java/me/chanjar/weixin/bean/WxXmlOutImageMessageTest.java | 4 +--- .../java/me/chanjar/weixin/bean/WxXmlOutMusicMessageTest.java | 2 +- .../java/me/chanjar/weixin/bean/WxXmlOutNewsMessageTest.java | 4 +--- .../java/me/chanjar/weixin/bean/WxXmlOutTextMessageTest.java | 4 +--- .../java/me/chanjar/weixin/bean/WxXmlOutVideoMessageTest.java | 4 +--- .../java/me/chanjar/weixin/bean/WxXmlOutVoiceMessageTest.java | 4 +--- src/test/java/me/chanjar/weixin/demo/WxTestServlet.java | 2 +- 14 files changed, 14 insertions(+), 24 deletions(-) diff --git a/src/main/java/me/chanjar/weixin/bean/custombuilder/ImageBuilder.java b/src/main/java/me/chanjar/weixin/bean/custombuilder/ImageBuilder.java index fe278842..de5cc8d0 100644 --- a/src/main/java/me/chanjar/weixin/bean/custombuilder/ImageBuilder.java +++ b/src/main/java/me/chanjar/weixin/bean/custombuilder/ImageBuilder.java @@ -6,7 +6,7 @@ import me.chanjar.weixin.bean.WxCustomMessage; /** * 获得消息builder *
- * 用法: WxCustomMessage m = WxCustomMessage.IMAGE().mediaId(...).touser(...).build();
+ * 用法: WxCustomMessage m = WxCustomMessage.IMAGE().mediaId(...).toUser(...).build();
  * 
* @author chanjarster * diff --git a/src/main/java/me/chanjar/weixin/bean/custombuilder/MusicBuilder.java b/src/main/java/me/chanjar/weixin/bean/custombuilder/MusicBuilder.java index 104078c7..b0c587b3 100644 --- a/src/main/java/me/chanjar/weixin/bean/custombuilder/MusicBuilder.java +++ b/src/main/java/me/chanjar/weixin/bean/custombuilder/MusicBuilder.java @@ -12,7 +12,7 @@ import me.chanjar.weixin.bean.WxCustomMessage; * .title(...) * .thumbMediaId(..) * .description(..) - * .touser(...) + * .toUser(...) * .build(); * */ diff --git a/src/main/java/me/chanjar/weixin/bean/custombuilder/NewsBuilder.java b/src/main/java/me/chanjar/weixin/bean/custombuilder/NewsBuilder.java index 43593d28..f05b5dbc 100644 --- a/src/main/java/me/chanjar/weixin/bean/custombuilder/NewsBuilder.java +++ b/src/main/java/me/chanjar/weixin/bean/custombuilder/NewsBuilder.java @@ -10,7 +10,7 @@ import me.chanjar.weixin.bean.WxCustomMessage; * 图文消息builder *
  * 用法:
- * WxCustomMessage m = WxCustomMessage.NEWS().addArticle(article).touser(...).build();
+ * WxCustomMessage m = WxCustomMessage.NEWS().addArticle(article).toUser(...).build();
  * 
* @author chanjarster * diff --git a/src/main/java/me/chanjar/weixin/bean/custombuilder/TextBuilder.java b/src/main/java/me/chanjar/weixin/bean/custombuilder/TextBuilder.java index 1862179f..e36aebe8 100644 --- a/src/main/java/me/chanjar/weixin/bean/custombuilder/TextBuilder.java +++ b/src/main/java/me/chanjar/weixin/bean/custombuilder/TextBuilder.java @@ -6,7 +6,7 @@ import me.chanjar.weixin.bean.WxCustomMessage; /** * 文本消息builder *
- * 用法: WxCustomMessage m = WxCustomMessage.TEXT().content(...).touser(...).build();
+ * 用法: WxCustomMessage m = WxCustomMessage.TEXT().content(...).toUser(...).build();
  * 
* @author chanjarster * diff --git a/src/main/java/me/chanjar/weixin/bean/custombuilder/VideoBuilder.java b/src/main/java/me/chanjar/weixin/bean/custombuilder/VideoBuilder.java index 105759ce..d38c61e3 100644 --- a/src/main/java/me/chanjar/weixin/bean/custombuilder/VideoBuilder.java +++ b/src/main/java/me/chanjar/weixin/bean/custombuilder/VideoBuilder.java @@ -11,7 +11,7 @@ import me.chanjar.weixin.bean.WxCustomMessage; * .title(...) * .thumbMediaId(..) * .description(..) - * .touser(...) + * .toUser(...) * .build(); * * @author chanjarster diff --git a/src/main/java/me/chanjar/weixin/bean/custombuilder/VoiceBuilder.java b/src/main/java/me/chanjar/weixin/bean/custombuilder/VoiceBuilder.java index a85a8031..4d1e2cf9 100644 --- a/src/main/java/me/chanjar/weixin/bean/custombuilder/VoiceBuilder.java +++ b/src/main/java/me/chanjar/weixin/bean/custombuilder/VoiceBuilder.java @@ -6,7 +6,7 @@ import me.chanjar.weixin.bean.WxCustomMessage; /** * 语音消息builder *
- * 用法: WxCustomMessage m = WxCustomMessage.VOICE().mediaId(...).touser(...).build();
+ * 用法: WxCustomMessage m = WxCustomMessage.VOICE().mediaId(...).toUser(...).build();
  * 
* @author chanjarster * diff --git a/src/main/java/me/chanjar/weixin/bean/outxmlbuilder/BaseBuilder.java b/src/main/java/me/chanjar/weixin/bean/outxmlbuilder/BaseBuilder.java index 03d9985e..9bb68aba 100644 --- a/src/main/java/me/chanjar/weixin/bean/outxmlbuilder/BaseBuilder.java +++ b/src/main/java/me/chanjar/weixin/bean/outxmlbuilder/BaseBuilder.java @@ -9,7 +9,7 @@ public abstract class BaseBuilder { protected String fromUserName; - public BuilderType touser(String touser) { + public BuilderType toUser(String touser) { this.toUserName = touser; return (BuilderType) this; } diff --git a/src/test/java/me/chanjar/weixin/bean/WxXmlOutImageMessageTest.java b/src/test/java/me/chanjar/weixin/bean/WxXmlOutImageMessageTest.java index a36b98c4..bbb5ba6e 100644 --- a/src/test/java/me/chanjar/weixin/bean/WxXmlOutImageMessageTest.java +++ b/src/test/java/me/chanjar/weixin/bean/WxXmlOutImageMessageTest.java @@ -1,7 +1,5 @@ package me.chanjar.weixin.bean; -import me.chanjar.weixin.bean.WxXmlOutImageMessage; -import me.chanjar.weixin.bean.WxXmlOutMessage; import org.testng.Assert; import org.testng.annotations.Test; @@ -28,7 +26,7 @@ public class WxXmlOutImageMessageTest { } public void testBuild() { - WxXmlOutImageMessage m = WxXmlOutMessage.IMAGE().mediaId("ddfefesfsdfef").fromUser("from").touser("to").build(); + WxXmlOutImageMessage m = WxXmlOutMessage.IMAGE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build(); String expected = "" + "" + "" diff --git a/src/test/java/me/chanjar/weixin/bean/WxXmlOutMusicMessageTest.java b/src/test/java/me/chanjar/weixin/bean/WxXmlOutMusicMessageTest.java index 7fba03cd..9a9ef6b2 100644 --- a/src/test/java/me/chanjar/weixin/bean/WxXmlOutMusicMessageTest.java +++ b/src/test/java/me/chanjar/weixin/bean/WxXmlOutMusicMessageTest.java @@ -38,7 +38,7 @@ public class WxXmlOutMusicMessageTest { public void testBuild() { WxXmlOutMusicMessage m = WxXmlOutMessage.MUSIC() .fromUser("fromUser") - .touser("toUser") + .toUser("toUser") .title("title") .description("ddfff") .hqMusicUrl("hQMusicUrl") diff --git a/src/test/java/me/chanjar/weixin/bean/WxXmlOutNewsMessageTest.java b/src/test/java/me/chanjar/weixin/bean/WxXmlOutNewsMessageTest.java index aac8308f..3bac0da9 100644 --- a/src/test/java/me/chanjar/weixin/bean/WxXmlOutNewsMessageTest.java +++ b/src/test/java/me/chanjar/weixin/bean/WxXmlOutNewsMessageTest.java @@ -1,7 +1,5 @@ package me.chanjar.weixin.bean; -import me.chanjar.weixin.bean.WxXmlOutMessage; -import me.chanjar.weixin.bean.WxXmlOutMewsMessage; import org.testng.Assert; import org.testng.annotations.Test; @@ -56,7 +54,7 @@ public class WxXmlOutNewsMessageTest { WxXmlOutMewsMessage m = WxXmlOutMessage.NEWS() .fromUser("fromUser") - .touser("toUser") + .toUser("toUser") .addArticle(item) .addArticle(item) .build(); diff --git a/src/test/java/me/chanjar/weixin/bean/WxXmlOutTextMessageTest.java b/src/test/java/me/chanjar/weixin/bean/WxXmlOutTextMessageTest.java index b8291f99..d3168ba6 100644 --- a/src/test/java/me/chanjar/weixin/bean/WxXmlOutTextMessageTest.java +++ b/src/test/java/me/chanjar/weixin/bean/WxXmlOutTextMessageTest.java @@ -1,7 +1,5 @@ package me.chanjar.weixin.bean; -import me.chanjar.weixin.bean.WxXmlOutMessage; -import me.chanjar.weixin.bean.WxXmlOutTextMessage; import org.testng.Assert; import org.testng.annotations.Test; @@ -28,7 +26,7 @@ public class WxXmlOutTextMessageTest { } public void testBuild() { - WxXmlOutTextMessage m = WxXmlOutMessage.TEXT().content("content").fromUser("from").touser("to").build(); + WxXmlOutTextMessage m = WxXmlOutMessage.TEXT().content("content").fromUser("from").toUser("to").build(); String expected = "" + "" + "" diff --git a/src/test/java/me/chanjar/weixin/bean/WxXmlOutVideoMessageTest.java b/src/test/java/me/chanjar/weixin/bean/WxXmlOutVideoMessageTest.java index 12de01b6..5a61e347 100644 --- a/src/test/java/me/chanjar/weixin/bean/WxXmlOutVideoMessageTest.java +++ b/src/test/java/me/chanjar/weixin/bean/WxXmlOutVideoMessageTest.java @@ -1,7 +1,5 @@ package me.chanjar.weixin.bean; -import me.chanjar.weixin.bean.WxXmlOutMessage; -import me.chanjar.weixin.bean.WxXmlOutVideoMessage; import org.testng.Assert; import org.testng.annotations.Test; @@ -37,7 +35,7 @@ public class WxXmlOutVideoMessageTest { WxXmlOutVideoMessage m = WxXmlOutMessage.VIDEO() .mediaId("media_id") .fromUser("fromUser") - .touser("toUser") + .toUser("toUser") .title("title") .description("ddfff") .build(); diff --git a/src/test/java/me/chanjar/weixin/bean/WxXmlOutVoiceMessageTest.java b/src/test/java/me/chanjar/weixin/bean/WxXmlOutVoiceMessageTest.java index 0fe24a0e..e5960875 100644 --- a/src/test/java/me/chanjar/weixin/bean/WxXmlOutVoiceMessageTest.java +++ b/src/test/java/me/chanjar/weixin/bean/WxXmlOutVoiceMessageTest.java @@ -1,7 +1,5 @@ package me.chanjar.weixin.bean; -import me.chanjar.weixin.bean.WxXmlOutMessage; -import me.chanjar.weixin.bean.WxXmlOutVoiceMessage; import org.testng.Assert; import org.testng.annotations.Test; @@ -28,7 +26,7 @@ public class WxXmlOutVoiceMessageTest { } public void testBuild() { - WxXmlOutVoiceMessage m = WxXmlOutMessage.VOICE().mediaId("ddfefesfsdfef").fromUser("from").touser("to").build(); + WxXmlOutVoiceMessage m = WxXmlOutMessage.VOICE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build(); String expected = "" + "" + "" diff --git a/src/test/java/me/chanjar/weixin/demo/WxTestServlet.java b/src/test/java/me/chanjar/weixin/demo/WxTestServlet.java index 40f8ad7c..aa042916 100644 --- a/src/test/java/me/chanjar/weixin/demo/WxTestServlet.java +++ b/src/test/java/me/chanjar/weixin/demo/WxTestServlet.java @@ -39,7 +39,7 @@ public class WxTestServlet extends HttpServlet { @Override public WxXmlOutMessage handle(WxXmlMessage wxMessage, Map context) { WxXmlOutTextMessage m = WxXmlOutMessage.TEXT().content("测试加密消息").fromUser(wxMessage.getToUserName()) - .touser(wxMessage.getFromUserName()).build(); + .toUser(wxMessage.getFromUserName()).build(); return m; } };