| @@ -10,7 +10,7 @@ import java.util.List; | |||||
| @XmlRootElement(name = "xml") | @XmlRootElement(name = "xml") | ||||
| @XmlAccessorType(XmlAccessType.FIELD) | @XmlAccessorType(XmlAccessType.FIELD) | ||||
| public class WxCpXmlOutMewsMessage extends WxCpXmlOutMessage { | |||||
| public class WxCpXmlOutNewsMessage extends WxCpXmlOutMessage { | |||||
| @XmlElement(name = "ArticleCount") | @XmlElement(name = "ArticleCount") | ||||
| protected int articleCount; | protected int articleCount; | ||||
| @@ -19,7 +19,7 @@ public class WxCpXmlOutMewsMessage extends WxCpXmlOutMessage { | |||||
| @XmlElement(name = "item") | @XmlElement(name = "item") | ||||
| protected final List<Item> articles = new ArrayList<Item>(); | protected final List<Item> articles = new ArrayList<Item>(); | ||||
| public WxCpXmlOutMewsMessage() { | |||||
| public WxCpXmlOutNewsMessage() { | |||||
| this.msgType = WxConsts.XML_MSG_NEWS; | this.msgType = WxConsts.XML_MSG_NEWS; | ||||
| } | } | ||||
| @@ -3,14 +3,14 @@ package me.chanjar.weixin.cp.bean.outxmlbuilder; | |||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import java.util.List; | import java.util.List; | ||||
| import me.chanjar.weixin.cp.bean.WxCpXmlOutMewsMessage; | |||||
| import me.chanjar.weixin.cp.bean.WxCpXmlOutMewsMessage.Item; | |||||
| import me.chanjar.weixin.cp.bean.WxCpXmlOutNewsMessage; | |||||
| import me.chanjar.weixin.cp.bean.WxCpXmlOutNewsMessage.Item; | |||||
| /** | /** | ||||
| * 图文消息builder | * 图文消息builder | ||||
| * @author Daniel Qian | * @author Daniel Qian | ||||
| */ | */ | ||||
| public final class NewsBuilder extends BaseBuilder<NewsBuilder, WxCpXmlOutMewsMessage> { | |||||
| public final class NewsBuilder extends BaseBuilder<NewsBuilder, WxCpXmlOutNewsMessage> { | |||||
| protected final List<Item> articles = new ArrayList<Item>(); | protected final List<Item> articles = new ArrayList<Item>(); | ||||
| @@ -19,8 +19,8 @@ public final class NewsBuilder extends BaseBuilder<NewsBuilder, WxCpXmlOutMewsMe | |||||
| return this; | return this; | ||||
| } | } | ||||
| public WxCpXmlOutMewsMessage build() { | |||||
| WxCpXmlOutMewsMessage m = new WxCpXmlOutMewsMessage(); | |||||
| public WxCpXmlOutNewsMessage build() { | |||||
| WxCpXmlOutNewsMessage m = new WxCpXmlOutNewsMessage(); | |||||
| for(Item item : articles) { | for(Item item : articles) { | ||||
| m.addArticle(item); | m.addArticle(item); | ||||
| } | } | ||||
| @@ -79,7 +79,7 @@ public class XmlTransformer { | |||||
| return JAXBContext.newInstance( | return JAXBContext.newInstance( | ||||
| WxCpXmlOutMessage.class, | WxCpXmlOutMessage.class, | ||||
| WxCpXmlOutImageMessage.class, | WxCpXmlOutImageMessage.class, | ||||
| WxCpXmlOutMewsMessage.class, | |||||
| WxCpXmlOutNewsMessage.class, | |||||
| WxCpXmlOutTextMessage.class, | WxCpXmlOutTextMessage.class, | ||||
| WxCpXmlOutVideoMessage.class, | WxCpXmlOutVideoMessage.class, | ||||
| WxCpXmlOutVoiceMessage.class, | WxCpXmlOutVoiceMessage.class, | ||||
| @@ -7,12 +7,12 @@ import org.testng.annotations.Test; | |||||
| public class WxCpXmlOutNewsMessageTest { | public class WxCpXmlOutNewsMessageTest { | ||||
| public void test() { | public void test() { | ||||
| WxCpXmlOutMewsMessage m = new WxCpXmlOutMewsMessage(); | |||||
| WxCpXmlOutNewsMessage m = new WxCpXmlOutNewsMessage(); | |||||
| m.setCreateTime(1122l); | m.setCreateTime(1122l); | ||||
| m.setFromUserName("fromUser"); | m.setFromUserName("fromUser"); | ||||
| m.setToUserName("toUser"); | m.setToUserName("toUser"); | ||||
| WxCpXmlOutMewsMessage.Item item = new WxCpXmlOutMewsMessage.Item(); | |||||
| WxCpXmlOutNewsMessage.Item item = new WxCpXmlOutNewsMessage.Item(); | |||||
| item.setDescription("description"); | item.setDescription("description"); | ||||
| item.setPicUrl("picUrl"); | item.setPicUrl("picUrl"); | ||||
| item.setTitle("title"); | item.setTitle("title"); | ||||
| @@ -46,13 +46,13 @@ public class WxCpXmlOutNewsMessageTest { | |||||
| } | } | ||||
| public void testBuild() { | public void testBuild() { | ||||
| WxCpXmlOutMewsMessage.Item item = new WxCpXmlOutMewsMessage.Item(); | |||||
| WxCpXmlOutNewsMessage.Item item = new WxCpXmlOutNewsMessage.Item(); | |||||
| item.setDescription("description"); | item.setDescription("description"); | ||||
| item.setPicUrl("picUrl"); | item.setPicUrl("picUrl"); | ||||
| item.setTitle("title"); | item.setTitle("title"); | ||||
| item.setUrl("url"); | item.setUrl("url"); | ||||
| WxCpXmlOutMewsMessage m = WxCpXmlOutMessage.NEWS() | |||||
| WxCpXmlOutNewsMessage m = WxCpXmlOutMessage.NEWS() | |||||
| .fromUser("fromUser") | .fromUser("fromUser") | ||||
| .toUser("toUser") | .toUser("toUser") | ||||
| .addArticle(item) | .addArticle(item) | ||||
| @@ -10,7 +10,7 @@ import java.util.List; | |||||
| @XmlRootElement(name = "xml") | @XmlRootElement(name = "xml") | ||||
| @XmlAccessorType(XmlAccessType.FIELD) | @XmlAccessorType(XmlAccessType.FIELD) | ||||
| public class WxMpXmlOutMewsMessage extends WxMpXmlOutMessage { | |||||
| public class WxMpXmlOutNewsMessage extends WxMpXmlOutMessage { | |||||
| @XmlElement(name = "ArticleCount") | @XmlElement(name = "ArticleCount") | ||||
| protected int articleCount; | protected int articleCount; | ||||
| @@ -19,7 +19,7 @@ public class WxMpXmlOutMewsMessage extends WxMpXmlOutMessage { | |||||
| @XmlElement(name = "item") | @XmlElement(name = "item") | ||||
| protected final List<Item> articles = new ArrayList<Item>(); | protected final List<Item> articles = new ArrayList<Item>(); | ||||
| public WxMpXmlOutMewsMessage() { | |||||
| public WxMpXmlOutNewsMessage() { | |||||
| this.msgType = WxConsts.XML_MSG_NEWS; | this.msgType = WxConsts.XML_MSG_NEWS; | ||||
| } | } | ||||
| @@ -1,6 +1,6 @@ | |||||
| package me.chanjar.weixin.mp.bean.outxmlbuilder; | package me.chanjar.weixin.mp.bean.outxmlbuilder; | ||||
| import me.chanjar.weixin.mp.bean.WxMpXmlOutMewsMessage; | |||||
| import me.chanjar.weixin.mp.bean.WxMpXmlOutNewsMessage; | |||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -9,18 +9,18 @@ import java.util.List; | |||||
| * 图文消息builder | * 图文消息builder | ||||
| * @author chanjarster | * @author chanjarster | ||||
| */ | */ | ||||
| public final class NewsBuilder extends BaseBuilder<NewsBuilder, WxMpXmlOutMewsMessage> { | |||||
| public final class NewsBuilder extends BaseBuilder<NewsBuilder, WxMpXmlOutNewsMessage> { | |||||
| protected final List<WxMpXmlOutMewsMessage.Item> articles = new ArrayList<WxMpXmlOutMewsMessage.Item>(); | |||||
| protected final List<WxMpXmlOutNewsMessage.Item> articles = new ArrayList<WxMpXmlOutNewsMessage.Item>(); | |||||
| public NewsBuilder addArticle(WxMpXmlOutMewsMessage.Item item) { | |||||
| public NewsBuilder addArticle(WxMpXmlOutNewsMessage.Item item) { | |||||
| this.articles.add(item); | this.articles.add(item); | ||||
| return this; | return this; | ||||
| } | } | ||||
| public WxMpXmlOutMewsMessage build() { | |||||
| WxMpXmlOutMewsMessage m = new WxMpXmlOutMewsMessage(); | |||||
| for(WxMpXmlOutMewsMessage.Item item : articles) { | |||||
| public WxMpXmlOutNewsMessage build() { | |||||
| WxMpXmlOutNewsMessage m = new WxMpXmlOutNewsMessage(); | |||||
| for(WxMpXmlOutNewsMessage.Item item : articles) { | |||||
| m.addArticle(item); | m.addArticle(item); | ||||
| } | } | ||||
| setCommon(m); | setCommon(m); | ||||
| @@ -76,7 +76,7 @@ public class XmlTransformer { | |||||
| return JAXBContext.newInstance( | return JAXBContext.newInstance( | ||||
| WxMpXmlOutMessage.class, | WxMpXmlOutMessage.class, | ||||
| WxMpMpXmlOutImageMessage.class, | WxMpMpXmlOutImageMessage.class, | ||||
| WxMpXmlOutMewsMessage.class, | |||||
| WxMpXmlOutNewsMessage.class, | |||||
| WxMpXmlOutMusicMessage.class, | WxMpXmlOutMusicMessage.class, | ||||
| WxMpXmlOutTextMessage.class, | WxMpXmlOutTextMessage.class, | ||||
| WxMpXmlOutVideoMessage.class, | WxMpXmlOutVideoMessage.class, | ||||
| @@ -7,12 +7,12 @@ import org.testng.annotations.Test; | |||||
| public class WxXmlOutNewsMessageTest { | public class WxXmlOutNewsMessageTest { | ||||
| public void test() { | public void test() { | ||||
| WxMpXmlOutMewsMessage m = new WxMpXmlOutMewsMessage(); | |||||
| WxMpXmlOutNewsMessage m = new WxMpXmlOutNewsMessage(); | |||||
| m.setCreateTime(1122l); | m.setCreateTime(1122l); | ||||
| m.setFromUserName("fromUser"); | m.setFromUserName("fromUser"); | ||||
| m.setToUserName("toUser"); | m.setToUserName("toUser"); | ||||
| WxMpXmlOutMewsMessage.Item item = new WxMpXmlOutMewsMessage.Item(); | |||||
| WxMpXmlOutNewsMessage.Item item = new WxMpXmlOutNewsMessage.Item(); | |||||
| item.setDescription("description"); | item.setDescription("description"); | ||||
| item.setPicUrl("picUrl"); | item.setPicUrl("picUrl"); | ||||
| item.setTitle("title"); | item.setTitle("title"); | ||||
| @@ -46,13 +46,13 @@ public class WxXmlOutNewsMessageTest { | |||||
| } | } | ||||
| public void testBuild() { | public void testBuild() { | ||||
| WxMpXmlOutMewsMessage.Item item = new WxMpXmlOutMewsMessage.Item(); | |||||
| WxMpXmlOutNewsMessage.Item item = new WxMpXmlOutNewsMessage.Item(); | |||||
| item.setDescription("description"); | item.setDescription("description"); | ||||
| item.setPicUrl("picUrl"); | item.setPicUrl("picUrl"); | ||||
| item.setTitle("title"); | item.setTitle("title"); | ||||
| item.setUrl("url"); | item.setUrl("url"); | ||||
| WxMpXmlOutMewsMessage m = WxMpXmlOutMessage.NEWS() | |||||
| WxMpXmlOutNewsMessage m = WxMpXmlOutMessage.NEWS() | |||||
| .fromUser("fromUser") | .fromUser("fromUser") | ||||
| .toUser("toUser") | .toUser("toUser") | ||||
| .addArticle(item) | .addArticle(item) | ||||