From 5594c8852d4070c4796600166ea9875df53b7a71 Mon Sep 17 00:00:00 2001 From: Kane Zhu Date: Tue, 1 Dec 2015 11:18:39 +0800 Subject: [PATCH 1/4] Fix the bug that fails to query order due to sign error. --- .../weixin/mp/api/WxMpServiceImpl.java | 64 ++-- .../weixin/mp/bean/result/WxMpPayResult.java | 350 ++++++++++-------- 2 files changed, 228 insertions(+), 186 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java index 232dc198d..65c59c637 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java @@ -892,44 +892,44 @@ public class WxMpServiceImpl implements WxMpService { @Override public WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo) { - String nonce_str = System.currentTimeMillis() + ""; + String nonce_str = System.currentTimeMillis() + ""; - SortedMap packageParams = new TreeMap(); - packageParams.put("appid", wxMpConfigStorage.getAppId()); - packageParams.put("mch_id", wxMpConfigStorage.getPartnerId()); + SortedMap packageParams = new TreeMap(); + packageParams.put("appid", wxMpConfigStorage.getAppId()); + packageParams.put("mch_id", wxMpConfigStorage.getPartnerId()); + if (transactionId != null && !"".equals(transactionId.trim())) packageParams.put("transaction_id", transactionId); + else if (outTradeNo != null && !"".equals(outTradeNo.trim())) packageParams.put("out_trade_no", outTradeNo); - packageParams.put("nonce_str", nonce_str); + else + throw new IllegalArgumentException("Either 'transactionId' or 'outTradeNo' must be given."); + packageParams.put("nonce_str", nonce_str); + packageParams.put("sign", WxCryptUtil.createSign(packageParams, wxMpConfigStorage.getPartnerKey())); - String sign = WxCryptUtil.createSign(packageParams, wxMpConfigStorage.getPartnerKey()); - String xml = "" + - "" + wxMpConfigStorage.getAppId() + "" + - "" + wxMpConfigStorage.getPartnerId() + "" + - "" + transactionId + "" + - "" + outTradeNo + "" + - "" + nonce_str + "" + - "" + sign + "" + - ""; + StringBuilder request = new StringBuilder(""); + for (Entry para : packageParams.entrySet()) { + request.append(String.format("<%s>%s", para.getKey(), para.getValue(), para.getKey())); + } + request.append(""); - HttpPost httpPost = new HttpPost("https://api.mch.weixin.qq.com/pay/orderquery"); - if (httpProxy != null) { - RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build(); - httpPost.setConfig(config); - } + HttpPost httpPost = new HttpPost("https://api.mch.weixin.qq.com/pay/orderquery"); + if (httpProxy != null) { + RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build(); + httpPost.setConfig(config); + } - StringEntity entity = new StringEntity(xml, Consts.UTF_8); - httpPost.setEntity(entity); - try { - CloseableHttpResponse response = httpClient.execute(httpPost); - String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); - XStream xstream = XStreamInitializer.getInstance(); - xstream.alias("xml", WxMpPayResult.class); - WxMpPayResult wxMpPayResult = (WxMpPayResult) xstream.fromXML(responseContent); - return wxMpPayResult; - } catch (IOException e) { - e.printStackTrace(); - } - return new WxMpPayResult(); + StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); + httpPost.setEntity(entity); + try { + CloseableHttpResponse response = httpClient.execute(httpPost); + String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); + XStream xstream = XStreamInitializer.getInstance(); + xstream.alias("xml", WxMpPayResult.class); + WxMpPayResult wxMpPayResult = (WxMpPayResult) xstream.fromXML(responseContent); + return wxMpPayResult; + } catch (IOException e) { + throw new RuntimeException("Failed to query order due to IO exception.", e); + } } @Override diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java index 7fd850fb0..3c7887296 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java @@ -13,203 +13,245 @@ import java.io.Serializable; * @author ukid */ public class WxMpPayResult implements Serializable { - private String return_code; - private String return_msg; - private String appid; - private String mch_id; - private String nonce_str; - private String sign; - private String result_code; - private String err_code; - private String err_code_des; - private String trade_state; - private String device_info; - private String openid; - private String is_subscribe; - private String trade_type; - private String bank_type; - private String total_fee; - private String coupon_fee; - private String fee_type; - private String transaction_id; - private String out_trade_no; - private String attach; - private String time_end; + /** + * + */ + private static final long serialVersionUID = -570934170727777190L; + + private String return_code; + private String return_msg; + private String appid; + private String mch_id; + private String nonce_str; + private String sign; + private String result_code; + private String err_code; + private String err_code_des; + private String trade_state; + private String trade_state_desc; + private String device_info; + private String openid; + private String is_subscribe; + private String trade_type; + private String bank_type; + private String total_fee; + private String coupon_fee; + private String fee_type; + private String transaction_id; + private String out_trade_no; + private String attach; + private String time_end; - public String getReturn_code() { - return return_code; - } + public String getReturn_code() { + return return_code; + } - public String getReturn_msg() { - return return_msg; - } + public String getReturn_msg() { + return return_msg; + } - public String getAppid() { - return appid; - } + public String getAppid() { + return appid; + } - public String getMch_id() { - return mch_id; - } + public String getMch_id() { + return mch_id; + } - public String getNonce_str() { - return nonce_str; - } + public String getNonce_str() { + return nonce_str; + } - public String getSign() { - return sign; - } + public String getSign() { + return sign; + } - public String getResult_code() { - return result_code; - } + public String getResult_code() { + return result_code; + } - public String getErr_code() { - return err_code; - } + public String getErr_code() { + return err_code; + } - public String getErr_code_des() { - return err_code_des; - } + public String getErr_code_des() { + return err_code_des; + } - public String getTrade_state() { - return trade_state; - } + public String getTrade_state() { + return trade_state; + } - public String getDevice_info() { - return device_info; - } + public String getDevice_info() { + return device_info; + } - public String getOpenid() { - return openid; - } + public String getOpenid() { + return openid; + } - public String getIs_subscribe() { - return is_subscribe; - } + public String getIs_subscribe() { + return is_subscribe; + } - public String getTrade_type() { - return trade_type; - } + public String getTrade_type() { + return trade_type; + } - public String getBank_type() { - return bank_type; - } + public String getBank_type() { + return bank_type; + } - public String getTotal_fee() { - return total_fee; - } + public String getTotal_fee() { + return total_fee; + } - public String getCoupon_fee() { - return coupon_fee; - } + public String getCoupon_fee() { + return coupon_fee; + } - public String getFee_type() { - return fee_type; - } + public String getFee_type() { + return fee_type; + } - public String getTransaction_id() { - return transaction_id; - } + public String getTransaction_id() { + return transaction_id; + } - public String getOut_trade_no() { - return out_trade_no; - } + public String getOut_trade_no() { + return out_trade_no; + } - public String getAttach() { - return attach; - } + public String getAttach() { + return attach; + } - public String getTime_end() { - return time_end; - } + public String getTime_end() { + return time_end; + } - public void setReturn_code(String return_code) { - this.return_code = return_code; - } + public void setReturn_code(String return_code) { + this.return_code = return_code; + } - public void setReturn_msg(String return_msg) { - this.return_msg = return_msg; - } + public void setReturn_msg(String return_msg) { + this.return_msg = return_msg; + } - public void setAppid(String appid) { - this.appid = appid; - } + public void setAppid(String appid) { + this.appid = appid; + } - public void setMch_id(String mch_id) { - this.mch_id = mch_id; - } + public void setMch_id(String mch_id) { + this.mch_id = mch_id; + } - public void setNonce_str(String nonce_str) { - this.nonce_str = nonce_str; - } + public void setNonce_str(String nonce_str) { + this.nonce_str = nonce_str; + } - public void setSign(String sign) { - this.sign = sign; - } + public void setSign(String sign) { + this.sign = sign; + } - public void setResult_code(String result_code) { - this.result_code = result_code; - } + public void setResult_code(String result_code) { + this.result_code = result_code; + } - public void setErr_code(String err_code) { - this.err_code = err_code; - } + public void setErr_code(String err_code) { + this.err_code = err_code; + } - public void setErr_code_des(String err_code_des) { - this.err_code_des = err_code_des; - } + public void setErr_code_des(String err_code_des) { + this.err_code_des = err_code_des; + } - public void setTrade_state(String trade_state) { - this.trade_state = trade_state; - } + public void setTrade_state(String trade_state) { + this.trade_state = trade_state; + } - public void setDevice_info(String device_info) { - this.device_info = device_info; - } + public void setDevice_info(String device_info) { + this.device_info = device_info; + } - public void setOpenid(String openid) { - this.openid = openid; - } + public void setOpenid(String openid) { + this.openid = openid; + } - public void setIs_subscribe(String is_subscribe) { - this.is_subscribe = is_subscribe; - } + public void setIs_subscribe(String is_subscribe) { + this.is_subscribe = is_subscribe; + } - public void setTrade_type(String trade_type) { - this.trade_type = trade_type; - } + public void setTrade_type(String trade_type) { + this.trade_type = trade_type; + } - public void setBank_type(String bank_type) { - this.bank_type = bank_type; - } + public void setBank_type(String bank_type) { + this.bank_type = bank_type; + } - public void setTotal_fee(String total_fee) { - this.total_fee = total_fee; - } + public void setTotal_fee(String total_fee) { + this.total_fee = total_fee; + } - public void setCoupon_fee(String coupon_fee) { - this.coupon_fee = coupon_fee; - } + public void setCoupon_fee(String coupon_fee) { + this.coupon_fee = coupon_fee; + } - public void setFee_type(String fee_type) { - this.fee_type = fee_type; - } + public void setFee_type(String fee_type) { + this.fee_type = fee_type; + } - public void setTransaction_id(String transaction_id) { - this.transaction_id = transaction_id; - } + public void setTransaction_id(String transaction_id) { + this.transaction_id = transaction_id; + } - public void setOut_trade_no(String out_trade_no) { - this.out_trade_no = out_trade_no; - } + public void setOut_trade_no(String out_trade_no) { + this.out_trade_no = out_trade_no; + } - public void setAttach(String attach) { - this.attach = attach; - } + public void setAttach(String attach) { + this.attach = attach; + } - public void setTime_end(String time_end) { - this.time_end = time_end; - } + public void setTime_end(String time_end) { + this.time_end = time_end; + } + public String getTrade_state_desc() { + return trade_state_desc; + } + + public void setTrade_state_desc(String trade_state_desc) { + this.trade_state_desc = trade_state_desc; + } + + @Override + public String toString() { + return "WxMpPayResult{" + + "return_code=" + return_code + + ", return_msg='" + return_msg + '\'' + + ", appid='" + appid + '\'' + + ", mch_id='" + mch_id + '\'' + + ", nonce_str='" + nonce_str + '\'' + + ", sign='" + sign + '\'' + + ", result_code='" + result_code + '\'' + + ", err_code='" + err_code + '\'' + + ", err_code_des='" + err_code_des + '\'' + + ", trade_state=" + trade_state + + ", trade_state_desc=" + trade_state_desc + + ", device_info='" + device_info + '\'' + + ", openid='" + openid + '\'' + + ", is_subscribe='" + is_subscribe + '\'' + + ", trade_type='" + trade_type + '\'' + + ", bank_type='" + bank_type + '\'' + + ", total_fee='" + total_fee + '\'' + + ", coupon_fee='" + coupon_fee + '\'' + + ", fee_type='" + fee_type + '\'' + + ", transaction_id='" + transaction_id + '\'' + + ", out_trade_no='" + out_trade_no + '\'' + + ", attach='" + attach + '\'' + + ", time_end='" + time_end + '\'' + + '}'; + } } From ed84f511c713901b201b18c1ef6ba1ae8d946f24 Mon Sep 17 00:00:00 2001 From: SimonDolph Date: Thu, 24 Dec 2015 17:44:48 +0800 Subject: [PATCH 2/4] add unionid --- .../mp/bean/result/WxMpOAuth2AccessToken.java | 15 +++++++++++++-- .../util/json/WxMpOAuth2AccessTokenAdapter.java | 14 +++++++++++--- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java index 2d6696d45..6ac77c83c 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java @@ -1,9 +1,9 @@ package me.chanjar.weixin.mp.bean.result; -import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; - import java.io.Serializable; +import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; + public class WxMpOAuth2AccessToken implements Serializable { private String accessToken; @@ -16,6 +16,8 @@ public class WxMpOAuth2AccessToken implements Serializable { private String scope; + private String unionId; + public String getRefreshToken() { return refreshToken; } @@ -56,6 +58,14 @@ public class WxMpOAuth2AccessToken implements Serializable { this.expiresIn = expiresIn; } + public String getUnionId() { + return unionId; + } + + public void setUnionId(String unionId) { + this.unionId = unionId; + } + public static WxMpOAuth2AccessToken fromJson(String json) { return WxMpGsonBuilder.create().fromJson(json, WxMpOAuth2AccessToken.class); } @@ -68,6 +78,7 @@ public class WxMpOAuth2AccessToken implements Serializable { ", refreshToken='" + refreshToken + '\'' + ", openId='" + openId + '\'' + ", scope='" + scope + '\'' + + ", unionId='" + unionId + '\'' + '}'; } } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpOAuth2AccessTokenAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpOAuth2AccessTokenAdapter.java index 6d73131a2..753e22d17 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpOAuth2AccessTokenAdapter.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpOAuth2AccessTokenAdapter.java @@ -1,11 +1,16 @@ package me.chanjar.weixin.mp.util.json; -import com.google.gson.*; +import java.lang.reflect.Type; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; + import me.chanjar.weixin.common.util.json.GsonHelper; import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; -import java.lang.reflect.Type; - public class WxMpOAuth2AccessTokenAdapter implements JsonDeserializer { public WxMpOAuth2AccessToken deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws @@ -28,6 +33,9 @@ public class WxMpOAuth2AccessTokenAdapter implements JsonDeserializer Date: Fri, 25 Dec 2015 09:27:35 +0800 Subject: [PATCH 3/4] upgrade to 1.3.3 --- README.md | 4 ++-- pom.xml | 2 +- weixin-java-common/pom.xml | 2 +- weixin-java-cp/pom.xml | 2 +- weixin-java-mp/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a41c22e81..84ad680e1 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ weixin-java-tools me.chanjar weixin-java-mp - 1.3.2 + 1.3.3 ``` @@ -33,7 +33,7 @@ weixin-java-tools me.chanjar weixin-java-cp - 1.3.2 + 1.3.3 ``` diff --git a/pom.xml b/pom.xml index ac274f748..fdf6010ee 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 me.chanjar weixin-java-parent - 1.3.3-SNAPSHOT + 1.3.3 pom WeiXin Java Tools - Parent 微信公众号、企业号上级POM diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml index 24438e070..c160ffe35 100644 --- a/weixin-java-common/pom.xml +++ b/weixin-java-common/pom.xml @@ -6,7 +6,7 @@ me.chanjar weixin-java-parent - 1.3.3-SNAPSHOT + 1.3.3 weixin-java-common diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml index 5dc93ea74..3e0613bc4 100644 --- a/weixin-java-cp/pom.xml +++ b/weixin-java-cp/pom.xml @@ -6,7 +6,7 @@ me.chanjar weixin-java-parent - 1.3.3-SNAPSHOT + 1.3.3 weixin-java-cp diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml index 8bc462f8d..651cda3ea 100644 --- a/weixin-java-mp/pom.xml +++ b/weixin-java-mp/pom.xml @@ -6,7 +6,7 @@ me.chanjar weixin-java-parent - 1.3.3-SNAPSHOT + 1.3.3 weixin-java-mp WeiXin Java Tools - MP From 72aab0d7b8a70041757007c909f7347b4f96401a Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Fri, 25 Dec 2015 09:35:17 +0800 Subject: [PATCH 4/4] upgrade to 1.3.4-SNAPSHOT --- pom.xml | 2 +- weixin-java-common/pom.xml | 2 +- weixin-java-cp/pom.xml | 2 +- weixin-java-mp/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index fdf6010ee..61a047391 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 me.chanjar weixin-java-parent - 1.3.3 + 1.3.4-SNAPSHOT pom WeiXin Java Tools - Parent 微信公众号、企业号上级POM diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml index c160ffe35..230484ac3 100644 --- a/weixin-java-common/pom.xml +++ b/weixin-java-common/pom.xml @@ -6,7 +6,7 @@ me.chanjar weixin-java-parent - 1.3.3 + 1.3.4-SNAPSHOT weixin-java-common diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml index 3e0613bc4..2fc13c3d1 100644 --- a/weixin-java-cp/pom.xml +++ b/weixin-java-cp/pom.xml @@ -6,7 +6,7 @@ me.chanjar weixin-java-parent - 1.3.3 + 1.3.4-SNAPSHOT weixin-java-cp diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml index 651cda3ea..cc761298f 100644 --- a/weixin-java-mp/pom.xml +++ b/weixin-java-mp/pom.xml @@ -6,7 +6,7 @@ me.chanjar weixin-java-parent - 1.3.3 + 1.3.4-SNAPSHOT weixin-java-mp WeiXin Java Tools - MP