version upgrade to 1.7.0

2016-06-20 10:30:41 +08:00
parent 0b0f9bb31d
commit 7f2f1d8f64
21 changed files with 42 additions and 378 deletions
@@ -1806,5 +1806,5 @@ public class WeixinProxy {
 	public Integer[] getUserTags(String openId) throws WeixinException {
 		return tagApi.getUserTags(openId);
 	}
-
+
 	public final static String VERSION = "1.7.0";
@@ -21,7 +21,6 @@ import com.foxinmy.weixin4j.mp.model.SemResult;
 import com.foxinmy.weixin4j.token.TokenManager;
 import com.foxinmy.weixin4j.tuple.MpArticle;
 import com.foxinmy.weixin4j.type.ButtonType;
-import com.foxinmy.weixin4j.util.ReflectionUtil;

 /**
 * 辅助相关API
@@ -142,6 +141,7 @@ public class HelperApi extends MpApi {
 	private static final class ButtonExtraProcessor implements ExtraProcessor {
 		private static ButtonExtraProcessor global = new ButtonExtraProcessor();
 		private static final String KEY = "news_info";
+
 		private ButtonExtraProcessor() {
 		}

@@ -160,11 +160,7 @@ public class HelperApi extends MpApi {
 							article.remove("source_url"));
 					newsList.add(JSON.toJavaObject(article, MpArticle.class));
 				}
-				if (ReflectionUtil.getAccessibleField(object, "articles") != null) {
-					JSONPath.set(object, "$.articles", newsList);
-				} else {
-					JSONPath.set(object, "$.content", newsList);
-				}
+				JSONPath.set(object, "$.extar", newsList);
 			} else {
 				JSONPath.set(object, "$.content", value);
 			}
@@ -1,42 +0,0 @@
-package com.foxinmy.weixin4j.mp.card;
-
-import com.foxinmy.weixin4j.mp.type.CardType;
-
-/**
- * 卡券
- *
- * @className CardCoupon
- * @author jinyu(foxinmy@gmail.com)
- * @date 2016年4月4日
- * @since JDK 1.6
- * @see
- */
-public interface CardCoupon {
-	/**
-	 * 卡券类型
-	 *
-	 * @return
-	 */
-	public CardType getCardType();
-
-	/**
-	 * 卡券基本信息
-	 *
-	 * @return
-	 */
-	public CouponBaseInfo getBaseInfo();
-
-	/**
-	 * 卡券高级信息
-	 *
-	 * @return
-	 */
-	public CouponAdvancedInfo getAdvancedInfo();
-
-	/**
-	 * 卡券详细信息
-	 *
-	 * @return
-	 */
-	public CouponDetailInfo getDetailInfo();
-}
@@ -1,14 +0,0 @@
-package com.foxinmy.weixin4j.mp.card;
-
-
-/**
- * 卡券构造器
- *
- * @className CardCouponBuilder
- * @author jinyu(foxinmy@gmail.com)
- * @date 2016年6月1日
- * @since JDK 1.6
- * @see
- */
-public class CardCouponBuilder {
-}
@@ -1,18 +0,0 @@
-package com.foxinmy.weixin4j.mp.card;
-
-import java.io.Serializable;
-
-/**
- * 卡券高级信息
- *
- * @className CouponAdvancedInfo
- * @author jinyu(foxinmy@gmail.com)
- * @date 2016年6月1日
- * @since JDK 1.6
- * @see
- */
-public class CouponAdvancedInfo implements Serializable {
-
-	private static final long serialVersionUID = 3626615706377721404L;
-
-}
@@ -1,18 +0,0 @@
-package com.foxinmy.weixin4j.mp.card;
-
-import java.io.Serializable;
-
-/**
- * 卡券基本信息
- *
- * @className CouponBaseInfo
- * @author jinyu(foxinmy@gmail.com)
- * @date 2016年6月1日
- * @since JDK 1.6
- * @see
- */
-public class CouponBaseInfo implements Serializable {
-
-	private static final long serialVersionUID = -5725424121330101716L;
-
-}
@@ -1,18 +0,0 @@
-package com.foxinmy.weixin4j.mp.card;
-
-import java.io.Serializable;
-
-import com.alibaba.fastjson.JSONObject;
-
-/**
- * 卡券详情信息
- *
- * @className CouponDetailInfo
- * @author jinyu(foxinmy@gmail.com)
- * @date 2016年6月1日
- * @since JDK 1.6
- * @see
- */
-public interface CouponDetailInfo extends Serializable {
-	public JSONObject toContent();
-}
@@ -1,30 +0,0 @@
-package com.foxinmy.weixin4j.mp.card;
-
-import com.foxinmy.weixin4j.mp.type.CardType;
-
-public class GrouponCoupon implements CardCoupon {
-
-	@Override
-	public CardType getCardType() {
-		return CardType.GROUPON;
-	}
-
-	@Override
-	public CouponBaseInfo getBaseInfo() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public CouponAdvancedInfo getAdvancedInfo() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public CouponDetailInfo getDetailInfo() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}