@@ -6,7 +6,7 @@ import me.chanjar.weixin.bean.WxCustomMessage; | |||||
/** | /** | ||||
* 获得消息builder | * 获得消息builder | ||||
* <pre> | * <pre> | ||||
* 用法: WxCustomMessage m = WxCustomMessage.IMAGE().mediaId(...).touser(...).build(); | |||||
* 用法: WxCustomMessage m = WxCustomMessage.IMAGE().mediaId(...).toUser(...).build(); | |||||
* </pre> | * </pre> | ||||
* @author chanjarster | * @author chanjarster | ||||
* | * | ||||
@@ -12,7 +12,7 @@ import me.chanjar.weixin.bean.WxCustomMessage; | |||||
* .title(...) | * .title(...) | ||||
* .thumbMediaId(..) | * .thumbMediaId(..) | ||||
* .description(..) | * .description(..) | ||||
* .touser(...) | |||||
* .toUser(...) | |||||
* .build(); | * .build(); | ||||
* </pre> | * </pre> | ||||
*/ | */ | ||||
@@ -10,7 +10,7 @@ import me.chanjar.weixin.bean.WxCustomMessage; | |||||
* 图文消息builder | * 图文消息builder | ||||
* <pre> | * <pre> | ||||
* 用法: | * 用法: | ||||
* WxCustomMessage m = WxCustomMessage.NEWS().addArticle(article).touser(...).build(); | |||||
* WxCustomMessage m = WxCustomMessage.NEWS().addArticle(article).toUser(...).build(); | |||||
* </pre> | * </pre> | ||||
* @author chanjarster | * @author chanjarster | ||||
* | * | ||||
@@ -6,7 +6,7 @@ import me.chanjar.weixin.bean.WxCustomMessage; | |||||
/** | /** | ||||
* 文本消息builder | * 文本消息builder | ||||
* <pre> | * <pre> | ||||
* 用法: WxCustomMessage m = WxCustomMessage.TEXT().content(...).touser(...).build(); | |||||
* 用法: WxCustomMessage m = WxCustomMessage.TEXT().content(...).toUser(...).build(); | |||||
* </pre> | * </pre> | ||||
* @author chanjarster | * @author chanjarster | ||||
* | * | ||||
@@ -11,7 +11,7 @@ import me.chanjar.weixin.bean.WxCustomMessage; | |||||
* .title(...) | * .title(...) | ||||
* .thumbMediaId(..) | * .thumbMediaId(..) | ||||
* .description(..) | * .description(..) | ||||
* .touser(...) | |||||
* .toUser(...) | |||||
* .build(); | * .build(); | ||||
* </pre> | * </pre> | ||||
* @author chanjarster | * @author chanjarster | ||||
@@ -6,7 +6,7 @@ import me.chanjar.weixin.bean.WxCustomMessage; | |||||
/** | /** | ||||
* 语音消息builder | * 语音消息builder | ||||
* <pre> | * <pre> | ||||
* 用法: WxCustomMessage m = WxCustomMessage.VOICE().mediaId(...).touser(...).build(); | |||||
* 用法: WxCustomMessage m = WxCustomMessage.VOICE().mediaId(...).toUser(...).build(); | |||||
* </pre> | * </pre> | ||||
* @author chanjarster | * @author chanjarster | ||||
* | * | ||||
@@ -9,7 +9,7 @@ public abstract class BaseBuilder<BuilderType, ValueType> { | |||||
protected String fromUserName; | protected String fromUserName; | ||||
public BuilderType touser(String touser) { | |||||
public BuilderType toUser(String touser) { | |||||
this.toUserName = touser; | this.toUserName = touser; | ||||
return (BuilderType) this; | return (BuilderType) this; | ||||
} | } | ||||
@@ -1,7 +1,5 @@ | |||||
package me.chanjar.weixin.bean; | package me.chanjar.weixin.bean; | ||||
import me.chanjar.weixin.bean.WxXmlOutImageMessage; | |||||
import me.chanjar.weixin.bean.WxXmlOutMessage; | |||||
import org.testng.Assert; | import org.testng.Assert; | ||||
import org.testng.annotations.Test; | import org.testng.annotations.Test; | ||||
@@ -28,7 +26,7 @@ public class WxXmlOutImageMessageTest { | |||||
} | } | ||||
public void testBuild() { | 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\"?>" | String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | ||||
+ "<xml>" | + "<xml>" | ||||
+ "<ToUserName><![CDATA[to]]></ToUserName>" | + "<ToUserName><![CDATA[to]]></ToUserName>" | ||||
@@ -38,7 +38,7 @@ public class WxXmlOutMusicMessageTest { | |||||
public void testBuild() { | public void testBuild() { | ||||
WxXmlOutMusicMessage m = WxXmlOutMessage.MUSIC() | WxXmlOutMusicMessage m = WxXmlOutMessage.MUSIC() | ||||
.fromUser("fromUser") | .fromUser("fromUser") | ||||
.touser("toUser") | |||||
.toUser("toUser") | |||||
.title("title") | .title("title") | ||||
.description("ddfff") | .description("ddfff") | ||||
.hqMusicUrl("hQMusicUrl") | .hqMusicUrl("hQMusicUrl") | ||||
@@ -1,7 +1,5 @@ | |||||
package me.chanjar.weixin.bean; | package me.chanjar.weixin.bean; | ||||
import me.chanjar.weixin.bean.WxXmlOutMessage; | |||||
import me.chanjar.weixin.bean.WxXmlOutMewsMessage; | |||||
import org.testng.Assert; | import org.testng.Assert; | ||||
import org.testng.annotations.Test; | import org.testng.annotations.Test; | ||||
@@ -56,7 +54,7 @@ public class WxXmlOutNewsMessageTest { | |||||
WxXmlOutMewsMessage m = WxXmlOutMessage.NEWS() | WxXmlOutMewsMessage m = WxXmlOutMessage.NEWS() | ||||
.fromUser("fromUser") | .fromUser("fromUser") | ||||
.touser("toUser") | |||||
.toUser("toUser") | |||||
.addArticle(item) | .addArticle(item) | ||||
.addArticle(item) | .addArticle(item) | ||||
.build(); | .build(); | ||||
@@ -1,7 +1,5 @@ | |||||
package me.chanjar.weixin.bean; | package me.chanjar.weixin.bean; | ||||
import me.chanjar.weixin.bean.WxXmlOutMessage; | |||||
import me.chanjar.weixin.bean.WxXmlOutTextMessage; | |||||
import org.testng.Assert; | import org.testng.Assert; | ||||
import org.testng.annotations.Test; | import org.testng.annotations.Test; | ||||
@@ -28,7 +26,7 @@ public class WxXmlOutTextMessageTest { | |||||
} | } | ||||
public void testBuild() { | 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\"?>" | String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | ||||
+ "<xml>" | + "<xml>" | ||||
+ "<ToUserName><![CDATA[to]]></ToUserName>" | + "<ToUserName><![CDATA[to]]></ToUserName>" | ||||
@@ -1,7 +1,5 @@ | |||||
package me.chanjar.weixin.bean; | package me.chanjar.weixin.bean; | ||||
import me.chanjar.weixin.bean.WxXmlOutMessage; | |||||
import me.chanjar.weixin.bean.WxXmlOutVideoMessage; | |||||
import org.testng.Assert; | import org.testng.Assert; | ||||
import org.testng.annotations.Test; | import org.testng.annotations.Test; | ||||
@@ -37,7 +35,7 @@ public class WxXmlOutVideoMessageTest { | |||||
WxXmlOutVideoMessage m = WxXmlOutMessage.VIDEO() | WxXmlOutVideoMessage m = WxXmlOutMessage.VIDEO() | ||||
.mediaId("media_id") | .mediaId("media_id") | ||||
.fromUser("fromUser") | .fromUser("fromUser") | ||||
.touser("toUser") | |||||
.toUser("toUser") | |||||
.title("title") | .title("title") | ||||
.description("ddfff") | .description("ddfff") | ||||
.build(); | .build(); | ||||
@@ -1,7 +1,5 @@ | |||||
package me.chanjar.weixin.bean; | package me.chanjar.weixin.bean; | ||||
import me.chanjar.weixin.bean.WxXmlOutMessage; | |||||
import me.chanjar.weixin.bean.WxXmlOutVoiceMessage; | |||||
import org.testng.Assert; | import org.testng.Assert; | ||||
import org.testng.annotations.Test; | import org.testng.annotations.Test; | ||||
@@ -28,7 +26,7 @@ public class WxXmlOutVoiceMessageTest { | |||||
} | } | ||||
public void testBuild() { | 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\"?>" | String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" | ||||
+ "<xml>" | + "<xml>" | ||||
+ "<ToUserName><![CDATA[to]]></ToUserName>" | + "<ToUserName><![CDATA[to]]></ToUserName>" | ||||
@@ -39,7 +39,7 @@ public class WxTestServlet extends HttpServlet { | |||||
@Override public WxXmlOutMessage handle(WxXmlMessage wxMessage, Map<String, Object> context) { | @Override public WxXmlOutMessage handle(WxXmlMessage wxMessage, Map<String, Object> context) { | ||||
WxXmlOutTextMessage m | WxXmlOutTextMessage m | ||||
= WxXmlOutMessage.TEXT().content("测试加密消息").fromUser(wxMessage.getToUserName()) | = WxXmlOutMessage.TEXT().content("测试加密消息").fromUser(wxMessage.getToUserName()) | ||||
.touser(wxMessage.getFromUserName()).build(); | |||||
.toUser(wxMessage.getFromUserName()).build(); | |||||
return m; | return m; | ||||
} | } | ||||
}; | }; | ||||