From 98e7b1785207d1bca2efb8eb6bec3997c47fb1ea Mon Sep 17 00:00:00 2001 From: jinyu Date: Mon, 28 Mar 2016 19:12:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B3=A8=E9=87=8A=E4=B8=8A?= =?UTF-8?q?=E7=9A=84link?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin4j/message/ImageMessage.java | 2 +- .../foxinmy/weixin4j/message/LinkMessage.java | 12 +- .../weixin4j/message/LocationMessage.java | 2 +- .../foxinmy/weixin4j/message/TextMessage.java | 84 +++---- .../weixin4j/message/VideoMessage.java | 2 +- .../weixin4j/message/VoiceMessage.java | 2 +- .../weixin4j/message/event/EventMessage.java | 2 +- .../message/event/LocationEventMessage.java | 2 +- .../message/event/MenuEventMessage.java | 2 +- .../event/MenuLocationEventMessage.java | 220 +++++++++--------- .../message/event/MenuPhotoEventMessage.java | 216 ++++++++--------- .../message/event/MenuScanEventMessage.java | 150 ++++++------ .../mp/event/KfCloseEventMessage.java | 82 +++---- .../mp/event/KfCreateEventMessage.java | 82 +++---- .../mp/event/KfSwitchEventMessage.java | 100 ++++---- .../weixin4j/mp/event/MassEventMessage.java | 160 ++++++------- .../weixin4j/mp/event/ScanEventMessage.java | 2 +- .../weixin4j/mp/event/ScribeEventMessage.java | 2 +- .../event/TemplatesendjobfinishMessage.java | 82 +++---- .../mp/event/VerifyExpireEventMessage.java | 98 ++++---- .../mp/event/VerifyFailEventMessage.java | 108 ++++----- .../weixin4j/response/WeixinResponse.java | 78 +++---- .../foxinmy/weixin4j/util/MessageUtil.java | 2 +- 23 files changed, 749 insertions(+), 743 deletions(-) diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/ImageMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/ImageMessage.java index 60d723e6..244d2920 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/ImageMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/ImageMessage.java @@ -13,7 +13,7 @@ import com.foxinmy.weixin4j.type.MessageType; * @date 2014年4月6日 * @since JDK 1.6 * @see 订阅号、服务号的图片消息 + * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140453&token=&lang=zh_CN">订阅号、服务号的图片消息 * @see 企业号的图片消息 */ diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/LinkMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/LinkMessage.java index ec5fe61e..ce2e980b 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/LinkMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/LinkMessage.java @@ -12,8 +12,12 @@ import com.foxinmy.weixin4j.type.MessageType; * @author jy.hu * @date 2014年4月6日 * @since JDK 1.6 - * @see 订阅号、服务号的链接消息 + * @see + * 订阅号、服务号的链接消息 + * @see + * 企业号的链接消息 */ public class LinkMessage extends WeixinMessage { @@ -53,7 +57,7 @@ public class LinkMessage extends WeixinMessage { @Override public String toString() { - return "LinkMessage [title=" + title + ", description=" + description - + ", url=" + url + ", " + super.toString() + "]"; + return "LinkMessage [title=" + title + ", description=" + description + ", url=" + url + ", " + super.toString() + + "]"; } } diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/LocationMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/LocationMessage.java index afecf57d..8bb2d5d0 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/LocationMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/LocationMessage.java @@ -13,7 +13,7 @@ import com.foxinmy.weixin4j.type.MessageType; * @date 2014年4月6日 * @since JDK 1.6 * @see 订阅号、服务号的地理位置消息 + * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140453&token=&lang=zh_CN">订阅号、服务号的地理位置消息 * @see 企业号的地理位置消息 */ diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/TextMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/TextMessage.java index ca115822..3cddfae9 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/TextMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/TextMessage.java @@ -1,43 +1,43 @@ -package com.foxinmy.weixin4j.message; - -import javax.xml.bind.annotation.XmlElement; - -import com.foxinmy.weixin4j.request.WeixinMessage; -import com.foxinmy.weixin4j.type.MessageType; - -/** - * 文本消息 - * - * @className TextMessage - * @author jy.hu - * @date 2014年4月6日 - * @since JDK 1.6 - * @see 订阅号、服务号的文本消息 - * @see 企业号的文本消息 - */ -public class TextMessage extends WeixinMessage { - - private static final long serialVersionUID = -7018053906644190260L; - - public TextMessage() { - super(MessageType.text.name()); - } - - /** - * 消息内容 - */ - @XmlElement(name = "Content") - private String content; - - public String getContent() { - return content; - } - - @Override - public String toString() { - return "TextMessage [content=" + content + ", " + super.toString() - + "]"; - } +package com.foxinmy.weixin4j.message; + +import javax.xml.bind.annotation.XmlElement; + +import com.foxinmy.weixin4j.request.WeixinMessage; +import com.foxinmy.weixin4j.type.MessageType; + +/** + * 文本消息 + * + * @className TextMessage + * @author jy.hu + * @date 2014年4月6日 + * @since JDK 1.6 + * @see 订阅号、服务号的文本消息 + * @see 企业号的文本消息 + */ +public class TextMessage extends WeixinMessage { + + private static final long serialVersionUID = -7018053906644190260L; + + public TextMessage() { + super(MessageType.text.name()); + } + + /** + * 消息内容 + */ + @XmlElement(name = "Content") + private String content; + + public String getContent() { + return content; + } + + @Override + public String toString() { + return "TextMessage [content=" + content + ", " + super.toString() + + "]"; + } } \ No newline at end of file diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/VideoMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/VideoMessage.java index f46204aa..cfdbed17 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/VideoMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/VideoMessage.java @@ -13,7 +13,7 @@ import com.foxinmy.weixin4j.type.MessageType; * @date 2014年4月6日 * @since JDK 1.6 * @see 订阅号、服务号的视频消息 + * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140453&token=&lang=zh_CN">订阅号、服务号的视频消息 * @see 企业号的视频消息 */ diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/VoiceMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/VoiceMessage.java index 6fb892e2..06b685d9 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/VoiceMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/VoiceMessage.java @@ -16,7 +16,7 @@ import com.foxinmy.weixin4j.type.MessageType; * @date 2014年4月6日 * @since JDK 1.6 * @see 订阅号、服务号的语音消息 + * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140453&token=&lang=zh_CN">订阅号、服务号的语音消息 * @see 企业号的语音消息 */ diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/EventMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/EventMessage.java index 8cfc0b1c..1611fba7 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/EventMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/EventMessage.java @@ -13,7 +13,7 @@ import com.foxinmy.weixin4j.type.MessageType; * @date 2014年4月6日 * @since JDK 1.6 * @see 订阅号、服务号的事件推送 + * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140454&token=&lang=zh_CN">订阅号、服务号的事件推送 * @see 企业号的事件消息 */ diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/LocationEventMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/LocationEventMessage.java index 0cea7b66..8c50ee79 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/LocationEventMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/LocationEventMessage.java @@ -12,7 +12,7 @@ import com.foxinmy.weixin4j.type.EventType; * @date 2014年4月6日 * @since JDK 1.6 * @see 订阅号、服务号的上报地理位置事件 + * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140454&token=&lang=zh_CN">订阅号、服务号的上报地理位置事件 * @see 企业号的上报地理位置事件 */ diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuEventMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuEventMessage.java index 4d7e4fe0..2e911d07 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuEventMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuEventMessage.java @@ -12,7 +12,7 @@ import com.foxinmy.weixin4j.type.EventType; * @date 2014年4月6日 * @since JDK 1.6 * @see 订阅号、服务号的菜单事件 + * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140454&token=&lang=zh_CN">订阅号、服务号的菜单事件 * @see 企业号的菜单事件 */ diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuLocationEventMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuLocationEventMessage.java index ea17e888..672c1e7f 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuLocationEventMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuLocationEventMessage.java @@ -1,110 +1,110 @@ -package com.foxinmy.weixin4j.message.event; - -import java.io.Serializable; - -import javax.xml.bind.annotation.XmlElement; - -import com.foxinmy.weixin4j.type.EventType; - -/** - * 弹出地理位置选择器的事件推送 - * - * @className MenuLocationEventMessage - * @author jy - * @date 2014年9月30日 - * @since JDK 1.6 - * @see 订阅号、服务号的弹出地理位置选择事件推送 - * @see 企业号的弹出地理位置选择事件推送 - */ -public class MenuLocationEventMessage extends MenuEventMessage { - - private static final long serialVersionUID = 145223888272819563L; - - public MenuLocationEventMessage() { - super(EventType.location_select); - } - - /** - * 发送的位置消息 - */ - @XmlElement(name = "SendLocationInfo") - private LocationInfo locationInfo; - - public LocationInfo getLocationInfo() { - return locationInfo; - } - - /** - * 地理位置信息 - * - * @className LocationInfo - * @author jy - * @date 2015年3月29日 - * @since JDK 1.6 - * @see - */ - public static class LocationInfo implements Serializable { - - private static final long serialVersionUID = 4904181780216819965L; - - /** - * 地理位置维度 - */ - @XmlElement(name = "Location_X") - private double x; - /** - * 地理位置经度 - */ - @XmlElement(name = "Location_Y") - private double y; - /** - * 地图缩放大小 - */ - @XmlElement(name = "Scale") - private double scale; - /** - * 地理位置信息 - */ - @XmlElement(name = "Label") - private String label; - /** - * 朋友圈POI的名字，可能为空 - */ - @XmlElement(name = "Poiname") - private String poiname; - - public double getX() { - return x; - } - - public double getY() { - return y; - } - - public double getScale() { - return scale; - } - - public String getLabel() { - return label; - } - - public String getPoiname() { - return poiname; - } - - @Override - public String toString() { - return "LocationInfo [x=" + x + ", y=" + y + ", scale=" + scale - + ", label=" + label + ", poiname=" + poiname + "]"; - } - } - - @Override - public String toString() { - return "MenuLocationEventMessage [locationInfo=" + locationInfo + ", " - + super.toString() + "]"; - } -} +package com.foxinmy.weixin4j.message.event; + +import java.io.Serializable; + +import javax.xml.bind.annotation.XmlElement; + +import com.foxinmy.weixin4j.type.EventType; + +/** + * 弹出地理位置选择器的事件推送 + * + * @className MenuLocationEventMessage + * @author jy + * @date 2014年9月30日 + * @since JDK 1.6 + * @see 订阅号、服务号的弹出地理位置选择事件推送 + * @see 企业号的弹出地理位置选择事件推送 + */ +public class MenuLocationEventMessage extends MenuEventMessage { + + private static final long serialVersionUID = 145223888272819563L; + + public MenuLocationEventMessage() { + super(EventType.location_select); + } + + /** + * 发送的位置消息 + */ + @XmlElement(name = "SendLocationInfo") + private LocationInfo locationInfo; + + public LocationInfo getLocationInfo() { + return locationInfo; + } + + /** + * 地理位置信息 + * + * @className LocationInfo + * @author jy + * @date 2015年3月29日 + * @since JDK 1.6 + * @see + */ + public static class LocationInfo implements Serializable { + + private static final long serialVersionUID = 4904181780216819965L; + + /** + * 地理位置维度 + */ + @XmlElement(name = "Location_X") + private double x; + /** + * 地理位置经度 + */ + @XmlElement(name = "Location_Y") + private double y; + /** + * 地图缩放大小 + */ + @XmlElement(name = "Scale") + private double scale; + /** + * 地理位置信息 + */ + @XmlElement(name = "Label") + private String label; + /** + * 朋友圈POI的名字，可能为空 + */ + @XmlElement(name = "Poiname") + private String poiname; + + public double getX() { + return x; + } + + public double getY() { + return y; + } + + public double getScale() { + return scale; + } + + public String getLabel() { + return label; + } + + public String getPoiname() { + return poiname; + } + + @Override + public String toString() { + return "LocationInfo [x=" + x + ", y=" + y + ", scale=" + scale + + ", label=" + label + ", poiname=" + poiname + "]"; + } + } + + @Override + public String toString() { + return "MenuLocationEventMessage [locationInfo=" + locationInfo + ", " + + super.toString() + "]"; + } +} diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuPhotoEventMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuPhotoEventMessage.java index 956ee27d..4276f4e7 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuPhotoEventMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuPhotoEventMessage.java @@ -1,108 +1,108 @@ -package com.foxinmy.weixin4j.message.event; - -import java.io.Serializable; -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; - -/** - * 弹出拍照或者相册发图的事件推送(pic_sysphoto|pic_photo_or_album|pic_weixin) - * - * @className MenuPhotoEventMessage - * @author jy - * @date 2014年9月30日 - * @since JDK 1.6 - * @see 订阅号、服务号的系统发图的事件推送 - * @see 企业号的系统发图的事件推送 - */ -public class MenuPhotoEventMessage extends MenuEventMessage { - - private static final long serialVersionUID = 3142350663022709730L; - - /** - * 发送的图片信息 - */ - @XmlElement(name = "SendPicsInfo") - private PictureInfo pictureInfo; - - public PictureInfo getPictureInfo() { - return pictureInfo; - } - - /** - * 图片信息 - * - * @className PictureInfo - * @author jy - * @date 2015年3月29日 - * @since JDK 1.6 - * @see - */ - public static class PictureInfo implements Serializable { - - private static final long serialVersionUID = -3361375879168233258L; - - /** - * 发送的图片数量 - */ - @XmlElement(name = "Count") - private int count; - /** - * 图片列表 - */ - @XmlElementWrapper(name = "PicList") - @XmlElement(name = "item") - private List items; - - public int getCount() { - return count; - } - - public List getItems() { - return items; - } - - @Override - public String toString() { - return "PictureInfo [count=" + count + ", items=" + items + "]"; - } - } - - /** - * 图片 - * - * @className PictureItem - * @author jy - * @date 2015年3月29日 - * @since JDK 1.6 - * @see - */ - public static class PictureItem implements Serializable { - - private static final long serialVersionUID = -7636697449096645590L; - - /** - * 图片的MD5值，开发者若需要，可用于验证接收到图片 - */ - @XmlElement(name = "PicMd5Sum") - private String md5; - - public String getMd5() { - return md5; - } - - @Override - public String toString() { - return "PictureItem [md5=" + md5 + "]"; - } - } - - @Override - public String toString() { - return "MenuPhotoEventMessage [pictureInfo=" + pictureInfo + ", " - + super.toString() + "]"; - } -} +package com.foxinmy.weixin4j.message.event; + +import java.io.Serializable; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; + +/** + * 弹出拍照或者相册发图的事件推送(pic_sysphoto|pic_photo_or_album|pic_weixin) + * + * @className MenuPhotoEventMessage + * @author jy + * @date 2014年9月30日 + * @since JDK 1.6 + * @see 订阅号、服务号的系统发图的事件推送 + * @see 企业号的系统发图的事件推送 + */ +public class MenuPhotoEventMessage extends MenuEventMessage { + + private static final long serialVersionUID = 3142350663022709730L; + + /** + * 发送的图片信息 + */ + @XmlElement(name = "SendPicsInfo") + private PictureInfo pictureInfo; + + public PictureInfo getPictureInfo() { + return pictureInfo; + } + + /** + * 图片信息 + * + * @className PictureInfo + * @author jy + * @date 2015年3月29日 + * @since JDK 1.6 + * @see + */ + public static class PictureInfo implements Serializable { + + private static final long serialVersionUID = -3361375879168233258L; + + /** + * 发送的图片数量 + */ + @XmlElement(name = "Count") + private int count; + /** + * 图片列表 + */ + @XmlElementWrapper(name = "PicList") + @XmlElement(name = "item") + private List items; + + public int getCount() { + return count; + } + + public List getItems() { + return items; + } + + @Override + public String toString() { + return "PictureInfo [count=" + count + ", items=" + items + "]"; + } + } + + /** + * 图片 + * + * @className PictureItem + * @author jy + * @date 2015年3月29日 + * @since JDK 1.6 + * @see + */ + public static class PictureItem implements Serializable { + + private static final long serialVersionUID = -7636697449096645590L; + + /** + * 图片的MD5值，开发者若需要，可用于验证接收到图片 + */ + @XmlElement(name = "PicMd5Sum") + private String md5; + + public String getMd5() { + return md5; + } + + @Override + public String toString() { + return "PictureItem [md5=" + md5 + "]"; + } + } + + @Override + public String toString() { + return "MenuPhotoEventMessage [pictureInfo=" + pictureInfo + ", " + + super.toString() + "]"; + } +} diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuScanEventMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuScanEventMessage.java index 7294bee7..e8934340 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuScanEventMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/message/event/MenuScanEventMessage.java @@ -1,75 +1,75 @@ -package com.foxinmy.weixin4j.message.event; - -import java.io.Serializable; - -import javax.xml.bind.annotation.XmlElement; - -/** - * 扫码推事件(scancode_push|scancode_waitmsg) - * - * @className MenuScanEventMessage - * @author jy - * @date 2014年9月30日 - * @since JDK 1.6 - * @see 订阅号、服务号的扫码推事件 - * @see 企业号的的扫码推事件 - */ -public class MenuScanEventMessage extends MenuEventMessage { - - private static final long serialVersionUID = 3142350663022709730L; - - /** - * 扫描信息 - */ - @XmlElement(name = "ScanCodeInfo") - private ScanInfo scanInfo; - - public ScanInfo getScanInfo() { - return scanInfo; - } - - /** - * 扫描信息 - * - * @className ScanInfo - * @author jy - * @date 2015年3月29日 - * @since JDK 1.6 - * @see - */ - public static class ScanInfo implements Serializable { - - private static final long serialVersionUID = 2237570238164900421L; - /** - * 扫描类型，一般是qrcode - */ - @XmlElement(name = "ScanType") - private String type; - /** - * 扫描结果，即二维码对应的字符串信息 - */ - @XmlElement(name = "ScanResult") - private String result; - - public String getType() { - return type; - } - - public String getResult() { - return result; - } - - @Override - public String toString() { - return "ScanInfo [type=" + type + ", result=" + result + "]"; - } - } - - @Override - public String toString() { - return "MenuScanEventMessage [scanInfo=" + scanInfo + ", " - + super.toString() + "]"; - } -} +package com.foxinmy.weixin4j.message.event; + +import java.io.Serializable; + +import javax.xml.bind.annotation.XmlElement; + +/** + * 扫码推事件(scancode_push|scancode_waitmsg) + * + * @className MenuScanEventMessage + * @author jy + * @date 2014年9月30日 + * @since JDK 1.6 + * @see 订阅号、服务号的扫码推事件 + * @see 企业号的的扫码推事件 + */ +public class MenuScanEventMessage extends MenuEventMessage { + + private static final long serialVersionUID = 3142350663022709730L; + + /** + * 扫描信息 + */ + @XmlElement(name = "ScanCodeInfo") + private ScanInfo scanInfo; + + public ScanInfo getScanInfo() { + return scanInfo; + } + + /** + * 扫描信息 + * + * @className ScanInfo + * @author jy + * @date 2015年3月29日 + * @since JDK 1.6 + * @see + */ + public static class ScanInfo implements Serializable { + + private static final long serialVersionUID = 2237570238164900421L; + /** + * 扫描类型，一般是qrcode + */ + @XmlElement(name = "ScanType") + private String type; + /** + * 扫描结果，即二维码对应的字符串信息 + */ + @XmlElement(name = "ScanResult") + private String result; + + public String getType() { + return type; + } + + public String getResult() { + return result; + } + + @Override + public String toString() { + return "ScanInfo [type=" + type + ", result=" + result + "]"; + } + } + + @Override + public String toString() { + return "MenuScanEventMessage [scanInfo=" + scanInfo + ", " + + super.toString() + "]"; + } +} diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/KfCloseEventMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/KfCloseEventMessage.java index b6c7557f..980ea159 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/KfCloseEventMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/KfCloseEventMessage.java @@ -1,41 +1,41 @@ -package com.foxinmy.weixin4j.mp.event; - -import javax.xml.bind.annotation.XmlElement; - -import com.foxinmy.weixin4j.message.event.EventMessage; -import com.foxinmy.weixin4j.type.EventType; - -/** - * 客服关闭会话事件 - * - * @className KfCloseEventMessage - * @author jy - * @date 2015年3月22日 - * @since JDK 1.6 - * @see 会话状态通知事件 - */ -public class KfCloseEventMessage extends EventMessage { - - private static final long serialVersionUID = 3644449346935205541L; - - public KfCloseEventMessage() { - super(EventType.kf_close_session.name()); - } - - /** - * 客服账号 - */ - @XmlElement(name = "KfAccount") - private String kfAccount; - - public String getKfAccount() { - return kfAccount; - } - - @Override - public String toString() { - return "KfCloseEventMessage [kfAccount=" + kfAccount + ", =" - + super.toString() + "]"; - } -} +package com.foxinmy.weixin4j.mp.event; + +import javax.xml.bind.annotation.XmlElement; + +import com.foxinmy.weixin4j.message.event.EventMessage; +import com.foxinmy.weixin4j.type.EventType; + +/** + * 客服关闭会话事件 + * + * @className KfCloseEventMessage + * @author jy + * @date 2015年3月22日 + * @since JDK 1.6 + * @see 会话状态通知事件 + */ +public class KfCloseEventMessage extends EventMessage { + + private static final long serialVersionUID = 3644449346935205541L; + + public KfCloseEventMessage() { + super(EventType.kf_close_session.name()); + } + + /** + * 客服账号 + */ + @XmlElement(name = "KfAccount") + private String kfAccount; + + public String getKfAccount() { + return kfAccount; + } + + @Override + public String toString() { + return "KfCloseEventMessage [kfAccount=" + kfAccount + ", =" + + super.toString() + "]"; + } +} diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/KfCreateEventMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/KfCreateEventMessage.java index f1b6cd02..1dde517b 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/KfCreateEventMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/KfCreateEventMessage.java @@ -1,41 +1,41 @@ -package com.foxinmy.weixin4j.mp.event; - -import javax.xml.bind.annotation.XmlElement; - -import com.foxinmy.weixin4j.message.event.EventMessage; -import com.foxinmy.weixin4j.type.EventType; - -/** - * 客服接入会话事件 - * - * @className KfCreateEventMessage - * @author jy - * @date 2015年3月22日 - * @since JDK 1.6 - * @see 会话状态通知事件 - */ -public class KfCreateEventMessage extends EventMessage { - - private static final long serialVersionUID = -8968189700999202108L; - - public KfCreateEventMessage() { - super(EventType.kf_create_session.name()); - } - - /** - * 客服账号 - */ - @XmlElement(name = "KfAccount") - private String kfAccount; - - public String getKfAccount() { - return kfAccount; - } - - @Override - public String toString() { - return "KfCreateEventMessage [kfAccount=" + kfAccount + ", =" - + super.toString() + "]"; - } -} +package com.foxinmy.weixin4j.mp.event; + +import javax.xml.bind.annotation.XmlElement; + +import com.foxinmy.weixin4j.message.event.EventMessage; +import com.foxinmy.weixin4j.type.EventType; + +/** + * 客服接入会话事件 + * + * @className KfCreateEventMessage + * @author jy + * @date 2015年3月22日 + * @since JDK 1.6 + * @see 会话状态通知事件 + */ +public class KfCreateEventMessage extends EventMessage { + + private static final long serialVersionUID = -8968189700999202108L; + + public KfCreateEventMessage() { + super(EventType.kf_create_session.name()); + } + + /** + * 客服账号 + */ + @XmlElement(name = "KfAccount") + private String kfAccount; + + public String getKfAccount() { + return kfAccount; + } + + @Override + public String toString() { + return "KfCreateEventMessage [kfAccount=" + kfAccount + ", =" + + super.toString() + "]"; + } +} diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/KfSwitchEventMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/KfSwitchEventMessage.java index 39700669..2c7f8cce 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/KfSwitchEventMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/KfSwitchEventMessage.java @@ -1,50 +1,50 @@ -package com.foxinmy.weixin4j.mp.event; - -import javax.xml.bind.annotation.XmlElement; - -import com.foxinmy.weixin4j.message.event.EventMessage; -import com.foxinmy.weixin4j.type.EventType; - -/** - * 客服转接会话事件 - * - * @className KfSwitchEventMessage - * @author jy - * @date 2015年3月22日 - * @since JDK 1.6 - * @see 会话状态通知事件 - */ -public class KfSwitchEventMessage extends EventMessage { - - private static final long serialVersionUID = 4319501074109623413L; - - public KfSwitchEventMessage() { - super(EventType.kf_switch_session.name()); - } - - /** - * 来自的客服账号 - */ - @XmlElement(name = "FromKfAccount") - private String fromKfAccount; - /** - * 转移给客服账号 - */ - @XmlElement(name = "ToKfAccount") - private String toKfAccount; - - public String getFromKfAccount() { - return fromKfAccount; - } - - public String getToKfAccount() { - return toKfAccount; - } - - @Override - public String toString() { - return "KfSwitchEventMessage [fromKfAccount=" + fromKfAccount - + ", toKfAccount=" + toKfAccount + "]"; - } -} +package com.foxinmy.weixin4j.mp.event; + +import javax.xml.bind.annotation.XmlElement; + +import com.foxinmy.weixin4j.message.event.EventMessage; +import com.foxinmy.weixin4j.type.EventType; + +/** + * 客服转接会话事件 + * + * @className KfSwitchEventMessage + * @author jy + * @date 2015年3月22日 + * @since JDK 1.6 + * @see 会话状态通知事件 + */ +public class KfSwitchEventMessage extends EventMessage { + + private static final long serialVersionUID = 4319501074109623413L; + + public KfSwitchEventMessage() { + super(EventType.kf_switch_session.name()); + } + + /** + * 来自的客服账号 + */ + @XmlElement(name = "FromKfAccount") + private String fromKfAccount; + /** + * 转移给客服账号 + */ + @XmlElement(name = "ToKfAccount") + private String toKfAccount; + + public String getFromKfAccount() { + return fromKfAccount; + } + + public String getToKfAccount() { + return toKfAccount; + } + + @Override + public String toString() { + return "KfSwitchEventMessage [fromKfAccount=" + fromKfAccount + + ", toKfAccount=" + toKfAccount + "]"; + } +} diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/MassEventMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/MassEventMessage.java index ce4198d0..474a4940 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/MassEventMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/MassEventMessage.java @@ -1,80 +1,80 @@ -package com.foxinmy.weixin4j.mp.event; - -import javax.xml.bind.annotation.XmlElement; - -import com.foxinmy.weixin4j.message.event.EventMessage; -import com.foxinmy.weixin4j.type.EventType; - -/** - * 群发消息事件推送 - * - * @className MassEventMessage - * @author jy - * @date 2014年4月27日 - * @since JDK 1.6 - * @see 群发回调 - */ -public class MassEventMessage extends EventMessage { - - private static final long serialVersionUID = -1660543255873723895L; - - public MassEventMessage() { - super(EventType.masssendjobfinish.name()); - } - - /** - * 群发后的状态信息 为“send success”或“send fail”或“err(num) - */ - @XmlElement(name = "Status") - private String status; - /** - * group_id下粉丝数；或者openid_list中的粉丝数 - */ - @XmlElement(name = "TotalCount") - private int totalCount; - /** - * 过滤（过滤是指特定地区、性别的过滤、用户设置拒收的过滤，用户接收已超4条的过滤）后，准备发送的粉丝数，原则上，FilterCount = - * SentCount + ErrorCount - */ - @XmlElement(name = "FilterCount") - private int filterCount; - /** - * 发送成功的粉丝数 - */ - @XmlElement(name = "SentCount") - private int sentCount; - /** - * 发送失败的粉丝数 - */ - @XmlElement(name = "ErrorCount") - private int errorCount; - - public String getStatus() { - return status; - } - - public int getTotalCount() { - return totalCount; - } - - public int getFilterCount() { - return filterCount; - } - - public int getSentCount() { - return sentCount; - } - - public int getErrorCount() { - return errorCount; - } - - @Override - public String toString() { - return "MassEventMessage [status=" + status + ", totalCount=" - + totalCount + ", filterCount=" + filterCount + ", sentCount=" - + sentCount + ", errorCount=" + errorCount + ", " - + super.toString() + "]"; - } -} +package com.foxinmy.weixin4j.mp.event; + +import javax.xml.bind.annotation.XmlElement; + +import com.foxinmy.weixin4j.message.event.EventMessage; +import com.foxinmy.weixin4j.type.EventType; + +/** + * 群发消息事件推送 + * + * @className MassEventMessage + * @author jy + * @date 2014年4月27日 + * @since JDK 1.6 + * @see 群发回调 + */ +public class MassEventMessage extends EventMessage { + + private static final long serialVersionUID = -1660543255873723895L; + + public MassEventMessage() { + super(EventType.masssendjobfinish.name()); + } + + /** + * 群发后的状态信息 为“send success”或“send fail”或“err(num) + */ + @XmlElement(name = "Status") + private String status; + /** + * group_id下粉丝数；或者openid_list中的粉丝数 + */ + @XmlElement(name = "TotalCount") + private int totalCount; + /** + * 过滤（过滤是指特定地区、性别的过滤、用户设置拒收的过滤，用户接收已超4条的过滤）后，准备发送的粉丝数，原则上，FilterCount = + * SentCount + ErrorCount + */ + @XmlElement(name = "FilterCount") + private int filterCount; + /** + * 发送成功的粉丝数 + */ + @XmlElement(name = "SentCount") + private int sentCount; + /** + * 发送失败的粉丝数 + */ + @XmlElement(name = "ErrorCount") + private int errorCount; + + public String getStatus() { + return status; + } + + public int getTotalCount() { + return totalCount; + } + + public int getFilterCount() { + return filterCount; + } + + public int getSentCount() { + return sentCount; + } + + public int getErrorCount() { + return errorCount; + } + + @Override + public String toString() { + return "MassEventMessage [status=" + status + ", totalCount=" + + totalCount + ", filterCount=" + filterCount + ", sentCount=" + + sentCount + ", errorCount=" + errorCount + ", " + + super.toString() + "]"; + } +} diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/ScanEventMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/ScanEventMessage.java index 92400aa6..cb770a1a 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/ScanEventMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/ScanEventMessage.java @@ -14,7 +14,7 @@ import com.foxinmy.weixin4j.type.EventType; * @date 2014年4月6日 * @since JDK 1.6 * @see 扫描二维码事件 + * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140454&token=&lang=zh_CN">扫描二维码事件 */ public class ScanEventMessage extends EventMessage { diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/ScribeEventMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/ScribeEventMessage.java index 723617ad..2b7d0fbe 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/ScribeEventMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/ScribeEventMessage.java @@ -10,7 +10,7 @@ import com.foxinmy.weixin4j.type.EventType; * @date 2014年4月6日 * @since JDK 1.6 * @see 订阅号、服务号的关注/取消关注事件 + * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140454&token=&lang=zh_CN">订阅号、服务号的关注/取消关注事件 */ public class ScribeEventMessage extends ScanEventMessage { diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/TemplatesendjobfinishMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/TemplatesendjobfinishMessage.java index dea66090..4e1e0d06 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/TemplatesendjobfinishMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/TemplatesendjobfinishMessage.java @@ -1,41 +1,41 @@ -package com.foxinmy.weixin4j.mp.event; - -import javax.xml.bind.annotation.XmlElement; - -import com.foxinmy.weixin4j.message.event.EventMessage; -import com.foxinmy.weixin4j.type.EventType; - -/** - * 模板消息事件推送(公众平台) - * - * @className TemplatesendjobfinishMessage - * @author jy - * @date 2014年9月19日 - * @since JDK 1.6 - * @see 模板消息事件推送 - */ -public class TemplatesendjobfinishMessage extends EventMessage { - - private static final long serialVersionUID = -2903359365988594012L; - - public TemplatesendjobfinishMessage() { - super(EventType.templatesendjobfinish.name()); - } - - /** - * 推送状态 如failed: system failed - */ - @XmlElement(name = "Status") - private String status; - - public String getStatus() { - return status; - } - - @Override - public String toString() { - return "TemplatesendjobfinishMessage [status=" + status + ", " - + super.toString() + "]"; - } -} +package com.foxinmy.weixin4j.mp.event; + +import javax.xml.bind.annotation.XmlElement; + +import com.foxinmy.weixin4j.message.event.EventMessage; +import com.foxinmy.weixin4j.type.EventType; + +/** + * 模板消息事件推送(公众平台) + * + * @className TemplatesendjobfinishMessage + * @author jy + * @date 2014年9月19日 + * @since JDK 1.6 + * @see 模板消息事件推送 + */ +public class TemplatesendjobfinishMessage extends EventMessage { + + private static final long serialVersionUID = -2903359365988594012L; + + public TemplatesendjobfinishMessage() { + super(EventType.templatesendjobfinish.name()); + } + + /** + * 推送状态 如failed: system failed + */ + @XmlElement(name = "Status") + private String status; + + public String getStatus() { + return status; + } + + @Override + public String toString() { + return "TemplatesendjobfinishMessage [status=" + status + ", " + + super.toString() + "]"; + } +} diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/VerifyExpireEventMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/VerifyExpireEventMessage.java index 1c753fca..86260ef5 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/VerifyExpireEventMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/VerifyExpireEventMessage.java @@ -1,49 +1,49 @@ -package com.foxinmy.weixin4j.mp.event; - -import java.util.Date; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; - -import com.foxinmy.weixin4j.message.event.EventMessage; -import com.foxinmy.weixin4j.type.EventType; - -/** - * 认证通知(资质认证成功/名称认证成功/年审通知/认证过期失效通知) - * - * @className VerifyExpireEventMessage - * @author jy - * @date 2015年10月25日 - * @since JDK 1.6 - * @see 认证事件 - */ -public class VerifyExpireEventMessage extends EventMessage { - - private static final long serialVersionUID = -4309074299189681095L; - - public VerifyExpireEventMessage() { - super(EventType.annual_renew.name()); - } - - /** - * 有效期 (整形)，指的是时间戳，将于该时间戳认证过期 - */ - @XmlElement(name = "EventKey") - private long expiredTime; - - public long getExpiredTime() { - return expiredTime; - } - - @XmlTransient - public Date getFormatExpiredTime() { - return new Date(expiredTime * 1000l); - } - - @Override - public String toString() { - return "VerifyExpireEventMessage [expiredTime=" + expiredTime + ", " - + super.toString() + "]"; - } -} +package com.foxinmy.weixin4j.mp.event; + +import java.util.Date; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlTransient; + +import com.foxinmy.weixin4j.message.event.EventMessage; +import com.foxinmy.weixin4j.type.EventType; + +/** + * 认证通知(资质认证成功/名称认证成功/年审通知/认证过期失效通知) + * + * @className VerifyExpireEventMessage + * @author jy + * @date 2015年10月25日 + * @since JDK 1.6 + * @see 认证事件 + */ +public class VerifyExpireEventMessage extends EventMessage { + + private static final long serialVersionUID = -4309074299189681095L; + + public VerifyExpireEventMessage() { + super(EventType.annual_renew.name()); + } + + /** + * 有效期 (整形)，指的是时间戳，将于该时间戳认证过期 + */ + @XmlElement(name = "EventKey") + private long expiredTime; + + public long getExpiredTime() { + return expiredTime; + } + + @XmlTransient + public Date getFormatExpiredTime() { + return new Date(expiredTime * 1000l); + } + + @Override + public String toString() { + return "VerifyExpireEventMessage [expiredTime=" + expiredTime + ", " + + super.toString() + "]"; + } +} diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/VerifyFailEventMessage.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/VerifyFailEventMessage.java index 2f0f94f1..d1c56f53 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/VerifyFailEventMessage.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/mp/event/VerifyFailEventMessage.java @@ -1,53 +1,55 @@ -package com.foxinmy.weixin4j.mp.event; - -import java.util.Date; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; - -/** - * 认证失败事件(资质认证失败/名称认证失败) - * - * @className VerifyFailEventMessage - * @author jy - * @date 2015年10月25日 - * @since JDK 1.6 - * @see - */ -public class VerifyFailEventMessage extends VerifyExpireEventMessage { - - /** - * - */ - private static final long serialVersionUID = 2155899086751787490L; - - /** - * 失败发生时间 (整形)，时间戳 - */ - @XmlElement(name = "FailTime") - private long failTime; - /** - * 认证失败的原因 - */ - @XmlElement(name = "FailReason") - private String failReason; - - public long getFailTime() { - return failTime; - } - - @XmlTransient - public Date getFormatFailTime() { - return new Date(failTime * 1000l); - } - - public String getFailReason() { - return failReason; - } - - @Override - public String toString() { - return "VerifyFailEventMessage [failTime=" + failTime + ", failReason=" - + failReason + ", " + super.toString() + "]"; - } -} +package com.foxinmy.weixin4j.mp.event; + +import java.util.Date; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlTransient; + +/** + * 认证失败事件(资质认证失败/名称认证失败) + * + * @className VerifyFailEventMessage + * @author jy + * @date 2015年10月25日 + * @since JDK 1.6 + * @see + * 认证事件 + */ +public class VerifyFailEventMessage extends VerifyExpireEventMessage { + + /** + * + */ + private static final long serialVersionUID = 2155899086751787490L; + + /** + * 失败发生时间 (整形)，时间戳 + */ + @XmlElement(name = "FailTime") + private long failTime; + /** + * 认证失败的原因 + */ + @XmlElement(name = "FailReason") + private String failReason; + + public long getFailTime() { + return failTime; + } + + @XmlTransient + public Date getFormatFailTime() { + return new Date(failTime * 1000l); + } + + public String getFailReason() { + return failReason; + } + + @Override + public String toString() { + return "VerifyFailEventMessage [failTime=" + failTime + ", failReason=" + failReason + ", " + super.toString() + + "]"; + } +} diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/response/WeixinResponse.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/response/WeixinResponse.java index 1874fdef..8d12ee34 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/response/WeixinResponse.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/response/WeixinResponse.java @@ -1,39 +1,39 @@ -package com.foxinmy.weixin4j.response; - - -/** - * 微信被动消息回复 - * - * @className WeixinResponse - * @author jy - * @date 2015年5月5日 - * @since JDK 1.6 - * @see TextResponse - * @see ImageResponse - * @see MusicResponse - * @see VoiceResponse - * @see VideoResponse - * @see NewsResponse - * @see TransferCustomerResponse - * @see SingleResponse - * @see BlankResponse - * @see 订阅号、服务号的被动响应消息 - * @see 企业号的被动响应消息 - */ -public interface WeixinResponse { - /** - * 回复的消息类型 - * - * @return - */ - public String getMsgType(); - - /** - * 回复的消息内容 - * - * @return - */ - public String toContent(); -} +package com.foxinmy.weixin4j.response; + + +/** + * 微信被动消息回复 + * + * @className WeixinResponse + * @author jy + * @date 2015年5月5日 + * @since JDK 1.6 + * @see TextResponse + * @see ImageResponse + * @see MusicResponse + * @see VoiceResponse + * @see VideoResponse + * @see NewsResponse + * @see TransferCustomerResponse + * @see SingleResponse + * @see BlankResponse + * @see 订阅号、服务号的被动响应消息 + * @see 企业号的被动响应消息 + */ +public interface WeixinResponse { + /** + * 回复的消息类型 + * + * @return + */ + public String getMsgType(); + + /** + * 回复的消息内容 + * + * @return + */ + public String toContent(); +} diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/util/MessageUtil.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/util/MessageUtil.java index d9adffdd..835f8272 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/util/MessageUtil.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/util/MessageUtil.java @@ -26,7 +26,7 @@ public final class MessageUtil { * @return 开发者通过检验signature对请求进行相关校验。若确认此次GET请求来自微信服务器 * 请原样返回echostr参数内容，则接入生效 成为开发者成功，否则接入失败 * @see 接入指南 + * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421135319&token=&lang=zh_CN">接入指南 */ public static String signature(String... para) { Arrays.sort(para);