version upgrade to 1.7.0

weixin4j-base/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.6.9</version>
+		<version>1.7.0</version>
 	</parent>
 	<artifactId>weixin4j-base</artifactId>
 	<name>weixin4j-base</name>
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
-			<version>1.2.3</version>
+			<version>${fastjson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/Button.java

@@ -6,7 +6,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.foxinmy.weixin4j.tuple.MpArticle;
 import com.foxinmy.weixin4j.type.ButtonType;
 
 /**
@@ -49,10 +48,10 @@ public class Button implements Serializable {
 	 */
 	private String content;
 	/**
-	 * 图文列表 只有在公众平台设置的菜单才有
+	 * 扩展属性，比如在公众平台设置菜单时的图文列表
 	 */
 	@JSONField(serialize = false, deserialize = false)
-	private List<MpArticle> articles;
+	private Object extra;
 	/**
 	 * 二级菜单数组，个数应为1~5个
 	 */
@@ -117,17 +116,17 @@ public class Button implements Serializable {
 		this.content = content;
 	}
 
-	public List<MpArticle> getArticles() {
-		return articles;
+	public Object getExtra() {
+		return extra;
 	}
 
 	/**
-	 * <font color="red">创建菜单设置无效</font>
-	 *
-	 * @param articles
+	 * 扩展只读属性，设置无效
+	 * 
+	 * @param extra
 	 */
-	public void setArticles(List<MpArticle> articles) {
-		this.articles = articles;
+	public void setExtra(Object extra) {
+		this.extra = extra;
 	}
 
 	public List<Button> getSubs() {
@@ -146,6 +145,6 @@ public class Button implements Serializable {
 	@Override
 	public String toString() {
 		return "Button [name=" + name + ", type=" + type + ", content="
-				+ content + ", articles=" + articles + ", subs=" + subs + "]";
+				+ content + ", extra=" + extra + ", subs=" + subs + "]";
 	}
 }

weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java

@@ -951,5 +951,5 @@ public class WeixinPayProxy {
 		return customsApi.queryCustomsOrder(idQuery, customsCity);
 	}
 
-	public final static String VERSION = "1.6.9";
+	public final static String VERSION = "1.7.0";
 }