From a443c29d235ff773b1dee1f1e77c7e16d63e8aa6 Mon Sep 17 00:00:00 2001 From: jinyu Date: Mon, 22 Aug 2016 20:55:04 +0800 Subject: [PATCH] fixed #88 --- .../com/foxinmy/weixin4j/mp/WeixinComponentProxy.java | 2 +- .../java/com/foxinmy/weixin4j/mp/WeixinProxy.java | 2 +- .../java/com/foxinmy/weixin4j/mp/api/HelperApi.java | 11 ++++++----- .../java/com/foxinmy/weixin4j/mp/api/MenuApi.java | 3 +-- .../mp/oldpayment/WeixinOldPaymentSignature.java | 5 ++--- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinComponentProxy.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinComponentProxy.java index b1adc13b..1a7a5f51 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinComponentProxy.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinComponentProxy.java @@ -73,7 +73,7 @@ public class WeixinComponentProxy { CacheStorager cacheStorager) { if (weixinMpAccount == null) { throw new IllegalArgumentException( - "weixinPayAccount must not be empty"); + "weixinMpAccount must not be empty"); } if (cacheStorager == null) { throw new IllegalArgumentException( diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java index 9e4506d7..5409dda4 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java @@ -213,7 +213,7 @@ public class WeixinProxy { private WeixinProxy(WeixinAccount weixinAccount, TokenCreator tokenCreator, CacheStorager cacheStorager) { if (weixinAccount == null) { - throw new IllegalArgumentException("settings must not be empty"); + throw new IllegalArgumentException("weixinAccount must not be empty"); } if (tokenCreator == null) { throw new IllegalArgumentException("tokenCreator must not be empty"); diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java index 2746dcae..e921d83d 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java @@ -6,7 +6,6 @@ import java.util.List; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.JSONPath; import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.parser.deserializer.ExtraProcessor; import com.foxinmy.weixin4j.exception.WeixinException; @@ -127,8 +126,10 @@ public class HelperApi extends MpApi { for (int i = 0; i < buttons.size(); i++) { buttonObj = buttons.getJSONObject(i); if (buttonObj.containsKey("sub_button")) { - JSONPath.set(buttonObj, "$.sub_button", buttonObj - .getJSONObject("sub_button").getJSONArray("list")); + buttonObj.put( + "sub_button", + buttonObj.getJSONObject("sub_button").getJSONArray( + "list")); buttonObj.put("type", ButtonType.popups); } buttonList.add(JSON.parseObject(buttonObj.toJSONString(), @@ -160,9 +161,9 @@ public class HelperApi extends MpApi { article.remove("source_url")); newsList.add(JSON.toJavaObject(article, MpArticle.class)); } - JSONPath.set(object, "$.extar", newsList); + ((Button) object).setExtra(newsList); } else { - JSONPath.set(object, "$.content", value); + ((Button) object).setContent(String.valueOf(value)); } } }; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MenuApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MenuApi.java index 0e33a322..f01e31eb 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MenuApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MenuApi.java @@ -6,7 +6,6 @@ import java.util.List; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.JSONPath; import com.alibaba.fastjson.parser.deserializer.ExtraProcessor; import com.alibaba.fastjson.parser.deserializer.ParseProcess; import com.alibaba.fastjson.serializer.NameFilter; @@ -229,7 +228,7 @@ public class MenuApi extends MpApi { private final ParseProcess buttonProcess = new ExtraProcessor() { @Override public void processExtra(Object object, String key, Object value) { - JSONPath.set(object, "$.content", value); + ((Button) object).setContent(String.valueOf(value)); } }; diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/oldpayment/WeixinOldPaymentSignature.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/oldpayment/WeixinOldPaymentSignature.java index f515fbfa..f5d404a4 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/oldpayment/WeixinOldPaymentSignature.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/oldpayment/WeixinOldPaymentSignature.java @@ -2,7 +2,6 @@ package com.foxinmy.weixin4j.mp.oldpayment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.JSONPath; import com.foxinmy.weixin4j.sign.AbstractWeixinSignature; import com.foxinmy.weixin4j.type.SignType; import com.foxinmy.weixin4j.util.DigestUtil; @@ -41,11 +40,11 @@ public class WeixinOldPaymentSignature extends AbstractWeixinSignature { @Override public String sign(Object obj) { if (obj instanceof String) { - obj = JSON.parse((String) obj); + obj = JSON.parse(String.valueOf(obj)); } else { obj = ((JSONObject) JSON.toJSON(obj)); } - JSONPath.set(obj, "appKey", paySignKey); + ((JSONObject) obj).put("appKey", paySignKey); return DigestUtil.SHA1(join(obj).toString()); }