将方法touser，改为toUsre

chanjarster · chanjarster · commit 3055312f1e4f · 2014-10-21T13:26:31.000+08:00
diff --git 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 @@
 /**
  * 获得消息builder
  * <pre>
- * 用法: WxCustomMessage m = WxCustomMessage.IMAGE().mediaId(...).touser(...).build();
+ * 用法: WxCustomMessage m = WxCustomMessage.IMAGE().mediaId(...).toUser(...).build();
  * </pre>
  * @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
@@ -12,7 +12,7 @@
  *                      .title(...)
  *                      .thumbMediaId(..)
  *                      .description(..)
- *                      .touser(...)
+ *                      .toUser(...)
  *                      .build();
  * </pre>
  */
diff --git 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 @@
  * 图文消息builder
  * <pre>
  * 用法:
- * WxCustomMessage m = WxCustomMessage.NEWS().addArticle(article).touser(...).build();
+ * WxCustomMessage m = WxCustomMessage.NEWS().addArticle(article).toUser(...).build();
  * </pre>
  * @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
@@ -6,7 +6,7 @@
 /**
  * 文本消息builder
  * <pre>
- * 用法: WxCustomMessage m = WxCustomMessage.TEXT().content(...).touser(...).build();
+ * 用法: WxCustomMessage m = WxCustomMessage.TEXT().content(...).toUser(...).build();
  * </pre>
  * @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
@@ -11,7 +11,7 @@
  *                              .title(...)
  *                              .thumbMediaId(..)
  *                              .description(..)
- *                              .touser(...)
+ *                              .toUser(...)
  *                              .build();
  * </pre>
  * @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
@@ -6,7 +6,7 @@
 /**
  * 语音消息builder
  * <pre>
- * 用法: WxCustomMessage m = WxCustomMessage.VOICE().mediaId(...).touser(...).build();
+ * 用法: WxCustomMessage m = WxCustomMessage.VOICE().mediaId(...).toUser(...).build();
  * </pre>
  * @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
@@ -9,7 +9,7 @@ public abstract class BaseBuilder<BuilderType, ValueType> {
   
   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
@@ -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 void test() {
   }
   
   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 = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" 
         + "<xml>"
         + "<ToUserName><![CDATA[to]]></ToUserName>"
diff --git 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 void test() {
   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
@@ -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 void testBuild() {
     
     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
@@ -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 void test() {
   }
   
   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 = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" 
         + "<xml>"
         + "<ToUserName><![CDATA[to]]></ToUserName>"
diff --git 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 void testBuild() {
     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
@@ -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 void test() {
   }
   
   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 = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" 
         + "<xml>"
         + "<ToUserName><![CDATA[to]]></ToUserName>"
diff --git 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<String, Object> context) {
           WxXmlOutTextMessage m
               = WxXmlOutMessage.TEXT().content("测试加密消息").fromUser(wxMessage.getToUserName())
-              .touser(wxMessage.getFromUserName()).build();
+              .toUser(wxMessage.getFromUserName()).build();
           return m;
         }
       };

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`/**`
`7`	`7`	`* 获得消息builder`
`8`	`8`	`* <pre>`
`9`		`- * 用法: WxCustomMessage m = WxCustomMessage.IMAGE().mediaId(...).touser(...).build();`
	`9`	`+ * 用法: WxCustomMessage m = WxCustomMessage.IMAGE().mediaId(...).toUser(...).build();`
`10`	`10`	`* </pre>`
`11`	`11`	`* @author chanjarster`
`12`	`12`	`*`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* 图文消息builder`
`11`	`11`	`* <pre>`
`12`	`12`	`* 用法:`
`13`		`- * WxCustomMessage m = WxCustomMessage.NEWS().addArticle(article).touser(...).build();`
	`13`	`+ * WxCustomMessage m = WxCustomMessage.NEWS().addArticle(article).toUser(...).build();`
`14`	`14`	`* </pre>`
`15`	`15`	`* @author chanjarster`
`16`	`16`	`*`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`/**`
`7`	`7`	`* 文本消息builder`
`8`	`8`	`* <pre>`
`9`		`- * 用法: WxCustomMessage m = WxCustomMessage.TEXT().content(...).touser(...).build();`
	`9`	`+ * 用法: WxCustomMessage m = WxCustomMessage.TEXT().content(...).toUser(...).build();`
`10`	`10`	`* </pre>`
`11`	`11`	`* @author chanjarster`
`12`	`12`	`*`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`/**`
`7`	`7`	`* 语音消息builder`
`8`	`8`	`* <pre>`
`9`		`- * 用法: WxCustomMessage m = WxCustomMessage.VOICE().mediaId(...).touser(...).build();`
	`9`	`+ * 用法: WxCustomMessage m = WxCustomMessage.VOICE().mediaId(...).toUser(...).build();`
`10`	`10`	`* </pre>`
`11`	`11`	`* @author chanjarster`
`12`	`12`	`*`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public abstract class BaseBuilder<BuilderType, ValueType> {`
`9`	`9`
`10`	`10`	`protected String fromUserName;`
`11`	`11`
`12`		`- public BuilderType touser(String touser) {`
	`12`	`+ public BuilderType toUser(String touser) {`
`13`	`13`	`this.toUserName = touser;`
`14`	`14`	`return (BuilderType) this;`
`15`	`15`	`}`