From 3f0a120047648e14b4b62f55d4e8018c8ce033b7 Mon Sep 17 00:00:00 2001
From: jinyu <foxinmy@gmail.com>
Date: Fri, 8 Jan 2016 22:00:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9B=BE=E6=96=87=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E7=9A=84=E5=B0=81=E9=9D=A2=E5=9B=BE=E7=89=87=E7=9A=84?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foxinmy/weixin4j/http/weixin/error.xml    |  4 ++++
 .../com/foxinmy/weixin4j/tuple/MpArticle.java | 21 ++++++++++++++-----
 .../com/foxinmy/weixin4j/xml/XmlStream.java   |  4 ++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/error.xml b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/error.xml
index 476c6c90..731f29b8 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/error.xml
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/error.xml
@@ -498,6 +498,10 @@
 		<code>42004</code>
 		<text>插件token超时</text>
 	</error>
+	<error>
+		<code>42007</code>
+		<text>用户修改微信密码，accesstoken和refreshtoken失效，需要重新授权</text>
+	</error>
 	<error>
 		<code>43001</code>
 		<desc>require GET method</desc>
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpArticle.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpArticle.java
index 7ac8e75a..764128ec 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpArticle.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpArticle.java
@@ -21,6 +21,11 @@ public class MpArticle implements Serializable {
 	 */
 	@JSONField(name = "thumb_media_id")
 	private String thumbMediaId;
+	/**
+	 * 图文消息的封面图片的地址，第三方开发者也可以使用这个URL下载图片到自己服务器中，然后显示在自己网站上
+	 */
+	@JSONField(name = "thumb_url")
+	private String thumbUrl;
 	/**
 	 * 图文消息的作者 可为空
 	 */
@@ -66,6 +71,7 @@ public class MpArticle implements Serializable {
 
 	@JSONCreator
 	public MpArticle(@JSONField(name = "thumbMediaId") String thumbMediaId,
+			@JSONField(name = "thumbUrl") String thumbUrl,
 			@JSONField(name = "author") String author,
 			@JSONField(name = "title") String title,
 			@JSONField(name = "sourceUrl") String sourceUrl,
@@ -75,6 +81,7 @@ public class MpArticle implements Serializable {
 			@JSONField(name = "contentUrl") String contentUrl,
 			@JSONField(name = "coverUrl") String coverUrl) {
 		this.thumbMediaId = thumbMediaId;
+		this.thumbUrl = thumbUrl;
 		this.author = author;
 		this.title = title;
 		this.sourceUrl = sourceUrl;
@@ -145,12 +152,16 @@ public class MpArticle implements Serializable {
 		this.coverUrl = coverUrl;
 	}
 
+	public String getThumbUrl() {
+		return thumbUrl;
+	}
+
 	@Override
 	public String toString() {
-		return "MpArticle [thumbMediaId=" + thumbMediaId + ", author=" + author
-				+ ", title=" + title + ", sourceUrl=" + sourceUrl
-				+ ", content=" + content + ", digest=" + digest
-				+ ", showCoverPic=" + showCoverPic + ", contentUrl="
-				+ contentUrl + ", coverUrl=" + coverUrl + "]";
+		return "MpArticle [thumbMediaId=" + thumbMediaId + ",thumbUrl="
+				+ thumbUrl + ", author=" + author + ", title=" + title
+				+ ", sourceUrl=" + sourceUrl + ", content=" + content
+				+ ", digest=" + digest + ", showCoverPic=" + showCoverPic
+				+ ", contentUrl=" + contentUrl + ", coverUrl=" + coverUrl + "]";
 	}
 }
diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/XmlStream.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/XmlStream.java
index 1d110ca6..3155adcc 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/XmlStream.java
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/XmlStream.java
@@ -44,8 +44,8 @@ import com.foxinmy.weixin4j.util.StringUtil;
 public final class XmlStream {
 	private final static String ROOT_ELEMENT_XML = "xml";
 	private final static String XML_VERSION = "1.0";
-	private static ThreadLocal<Map<Class<?>, Unmarshaller>> messageUnmarshaller;
-	private static ThreadLocal<Map<Class<?>, Marshaller>> messageMarshaller;
+	private final static ThreadLocal<Map<Class<?>, Unmarshaller>> messageUnmarshaller;
+	private final static ThreadLocal<Map<Class<?>, Marshaller>> messageMarshaller;
 	static {
 		messageUnmarshaller = new ThreadLocal<Map<Class<?>, Unmarshaller>>() {
 			@Override