From a5637066a90995c07ee5b6a1bbd00d47e2ab4c32 Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Tue, 11 Nov 2014 10:18:05 +0800 Subject: [PATCH] =?UTF-8?q?issue=20#36=20News=E5=86=99=E6=88=90Mews?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...MewsMessage.java => WxCpXmlOutNewsMessage.java} | 4 ++-- .../weixin/cp/bean/outxmlbuilder/NewsBuilder.java | 10 +++++----- .../chanjar/weixin/cp/util/xml/XmlTransformer.java | 2 +- .../weixin/cp/bean/WxCpXmlOutNewsMessageTest.java | 8 ++++---- ...MewsMessage.java => WxMpXmlOutNewsMessage.java} | 4 ++-- .../weixin/mp/bean/outxmlbuilder/NewsBuilder.java | 14 +++++++------- .../chanjar/weixin/mp/util/xml/XmlTransformer.java | 2 +- .../weixin/mp/bean/WxXmlOutNewsMessageTest.java | 8 ++++---- 8 files changed, 26 insertions(+), 26 deletions(-) rename weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/{WxCpXmlOutMewsMessage.java => WxCpXmlOutNewsMessage.java} (95%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/{WxMpXmlOutMewsMessage.java => WxMpXmlOutNewsMessage.java} (95%) diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutMewsMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessage.java similarity index 95% rename from weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutMewsMessage.java rename to weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessage.java index 63c01fbfc..76f28e2ea 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutMewsMessage.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessage.java @@ -10,7 +10,7 @@ import java.util.List; @XmlRootElement(name = "xml") @XmlAccessorType(XmlAccessType.FIELD) -public class WxCpXmlOutMewsMessage extends WxCpXmlOutMessage { +public class WxCpXmlOutNewsMessage extends WxCpXmlOutMessage { @XmlElement(name = "ArticleCount") protected int articleCount; @@ -19,7 +19,7 @@ public class WxCpXmlOutMewsMessage extends WxCpXmlOutMessage { @XmlElement(name = "item") protected final List articles = new ArrayList(); - public WxCpXmlOutMewsMessage() { + public WxCpXmlOutNewsMessage() { this.msgType = WxConsts.XML_MSG_NEWS; } diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/NewsBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/NewsBuilder.java index 1785f714a..5f0fa6149 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/NewsBuilder.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/NewsBuilder.java @@ -3,14 +3,14 @@ package me.chanjar.weixin.cp.bean.outxmlbuilder; import java.util.ArrayList; 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 * @author Daniel Qian */ -public final class NewsBuilder extends BaseBuilder { +public final class NewsBuilder extends BaseBuilder { protected final List articles = new ArrayList(); @@ -19,8 +19,8 @@ public final class NewsBuilder extends BaseBuilder articles = new ArrayList(); - public WxMpXmlOutMewsMessage() { + public WxMpXmlOutNewsMessage() { this.msgType = WxConsts.XML_MSG_NEWS; } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/NewsBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/NewsBuilder.java index 08a9da1ef..6f2258254 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/NewsBuilder.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/outxmlbuilder/NewsBuilder.java @@ -1,6 +1,6 @@ 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.List; @@ -9,18 +9,18 @@ import java.util.List; * 图文消息builder * @author chanjarster */ -public final class NewsBuilder extends BaseBuilder { +public final class NewsBuilder extends BaseBuilder { - protected final List articles = new ArrayList(); + protected final List articles = new ArrayList(); - public NewsBuilder addArticle(WxMpXmlOutMewsMessage.Item item) { + public NewsBuilder addArticle(WxMpXmlOutNewsMessage.Item item) { this.articles.add(item); 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); } setCommon(m); diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/XmlTransformer.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/XmlTransformer.java index 5e6197469..0e8c69cd8 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/XmlTransformer.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/XmlTransformer.java @@ -76,7 +76,7 @@ public class XmlTransformer { return JAXBContext.newInstance( WxMpXmlOutMessage.class, WxMpMpXmlOutImageMessage.class, - WxMpXmlOutMewsMessage.class, + WxMpXmlOutNewsMessage.class, WxMpXmlOutMusicMessage.class, WxMpXmlOutTextMessage.class, WxMpXmlOutVideoMessage.class, diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutNewsMessageTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutNewsMessageTest.java index 782a6abef..a4a8ac5d8 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutNewsMessageTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutNewsMessageTest.java @@ -7,12 +7,12 @@ import org.testng.annotations.Test; public class WxXmlOutNewsMessageTest { public void test() { - WxMpXmlOutMewsMessage m = new WxMpXmlOutMewsMessage(); + WxMpXmlOutNewsMessage m = new WxMpXmlOutNewsMessage(); m.setCreateTime(1122l); m.setFromUserName("fromUser"); m.setToUserName("toUser"); - WxMpXmlOutMewsMessage.Item item = new WxMpXmlOutMewsMessage.Item(); + WxMpXmlOutNewsMessage.Item item = new WxMpXmlOutNewsMessage.Item(); item.setDescription("description"); item.setPicUrl("picUrl"); item.setTitle("title"); @@ -46,13 +46,13 @@ public class WxXmlOutNewsMessageTest { } public void testBuild() { - WxMpXmlOutMewsMessage.Item item = new WxMpXmlOutMewsMessage.Item(); + WxMpXmlOutNewsMessage.Item item = new WxMpXmlOutNewsMessage.Item(); item.setDescription("description"); item.setPicUrl("picUrl"); item.setTitle("title"); item.setUrl("url"); - WxMpXmlOutMewsMessage m = WxMpXmlOutMessage.NEWS() + WxMpXmlOutNewsMessage m = WxMpXmlOutMessage.NEWS() .fromUser("fromUser") .toUser("toUser") .addArticle(item)