update from upstreammaster
@@ -23,7 +23,7 @@ weixin-java-tools | |||||
<dependency> | <dependency> | ||||
<groupId>me.chanjar</groupId> | <groupId>me.chanjar</groupId> | ||||
<artifactId>weixin-java-mp</artifactId> | <artifactId>weixin-java-mp</artifactId> | ||||
<version>1.3.2</version> | |||||
<version>1.3.3</version> | |||||
</dependency> | </dependency> | ||||
``` | ``` | ||||
@@ -33,7 +33,7 @@ weixin-java-tools | |||||
<dependency> | <dependency> | ||||
<groupId>me.chanjar</groupId> | <groupId>me.chanjar</groupId> | ||||
<artifactId>weixin-java-cp</artifactId> | <artifactId>weixin-java-cp</artifactId> | ||||
<version>1.3.2</version> | |||||
<version>1.3.3</version> | |||||
</dependency> | </dependency> | ||||
``` | ``` | ||||
@@ -5,7 +5,7 @@ | |||||
<modelVersion>4.0.0</modelVersion> | <modelVersion>4.0.0</modelVersion> | ||||
<groupId>me.chanjar</groupId> | <groupId>me.chanjar</groupId> | ||||
<artifactId>weixin-java-parent</artifactId> | <artifactId>weixin-java-parent</artifactId> | ||||
<version>1.3.3-SNAPSHOT</version> | |||||
<version>1.3.4-SNAPSHOT</version> | |||||
<packaging>pom</packaging> | <packaging>pom</packaging> | ||||
<name>WeiXin Java Tools - Parent</name> | <name>WeiXin Java Tools - Parent</name> | ||||
<description>微信公众号、企业号上级POM</description> | <description>微信公众号、企业号上级POM</description> | ||||
@@ -6,7 +6,7 @@ | |||||
<parent> | <parent> | ||||
<groupId>me.chanjar</groupId> | <groupId>me.chanjar</groupId> | ||||
<artifactId>weixin-java-parent</artifactId> | <artifactId>weixin-java-parent</artifactId> | ||||
<version>1.3.3-SNAPSHOT</version> | |||||
<version>1.3.4-SNAPSHOT</version> | |||||
</parent> | </parent> | ||||
<artifactId>weixin-java-common</artifactId> | <artifactId>weixin-java-common</artifactId> | ||||
@@ -6,7 +6,7 @@ | |||||
<parent> | <parent> | ||||
<groupId>me.chanjar</groupId> | <groupId>me.chanjar</groupId> | ||||
<artifactId>weixin-java-parent</artifactId> | <artifactId>weixin-java-parent</artifactId> | ||||
<version>1.3.3-SNAPSHOT</version> | |||||
<version>1.3.4-SNAPSHOT</version> | |||||
</parent> | </parent> | ||||
<artifactId>weixin-java-cp</artifactId> | <artifactId>weixin-java-cp</artifactId> | ||||
@@ -6,7 +6,7 @@ | |||||
<parent> | <parent> | ||||
<groupId>me.chanjar</groupId> | <groupId>me.chanjar</groupId> | ||||
<artifactId>weixin-java-parent</artifactId> | <artifactId>weixin-java-parent</artifactId> | ||||
<version>1.3.3-SNAPSHOT</version> | |||||
<version>1.3.4-SNAPSHOT</version> | |||||
</parent> | </parent> | ||||
<artifactId>weixin-java-mp</artifactId> | <artifactId>weixin-java-mp</artifactId> | ||||
<name>WeiXin Java Tools - MP</name> | <name>WeiXin Java Tools - MP</name> | ||||
@@ -916,44 +916,44 @@ public class WxMpServiceImpl implements WxMpService { | |||||
@Override | @Override | ||||
public WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo) { | public WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo) { | ||||
String nonce_str = System.currentTimeMillis() + ""; | |||||
String nonce_str = System.currentTimeMillis() + ""; | |||||
SortedMap<String, String> packageParams = new TreeMap<String, String>(); | |||||
packageParams.put("appid", wxMpConfigStorage.getAppId()); | |||||
packageParams.put("mch_id", wxMpConfigStorage.getPartnerId()); | |||||
SortedMap<String, String> packageParams = new TreeMap<String, String>(); | |||||
packageParams.put("appid", wxMpConfigStorage.getAppId()); | |||||
packageParams.put("mch_id", wxMpConfigStorage.getPartnerId()); | |||||
if (transactionId != null && !"".equals(transactionId.trim())) | |||||
packageParams.put("transaction_id", transactionId); | packageParams.put("transaction_id", transactionId); | ||||
else if (outTradeNo != null && !"".equals(outTradeNo.trim())) | |||||
packageParams.put("out_trade_no", outTradeNo); | packageParams.put("out_trade_no", outTradeNo); | ||||
packageParams.put("nonce_str", nonce_str); | |||||
String sign = WxCryptUtil.createSign(packageParams, wxMpConfigStorage.getPartnerKey()); | |||||
String xml = "<xml>" + | |||||
"<appid>" + wxMpConfigStorage.getAppId() + "</appid>" + | |||||
"<mch_id>" + wxMpConfigStorage.getPartnerId() + "</mch_id>" + | |||||
"<transaction_id>" + transactionId + "</transaction_id>" + | |||||
"<out_trade_no>" + outTradeNo + "</out_trade_no>" + | |||||
"<nonce_str>" + nonce_str + "</nonce_str>" + | |||||
"<sign>" + sign + "</sign>" + | |||||
"</xml>"; | |||||
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); | |||||
} | |||||
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())); | |||||
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(); | |||||
StringBuilder request = new StringBuilder("<xml>"); | |||||
for (Entry<String, String> para : packageParams.entrySet()) { | |||||
request.append(String.format("<%s>%s</%s>", para.getKey(), para.getValue(), para.getKey())); | |||||
} | |||||
request.append("</xml>"); | |||||
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(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 | @Override | ||||
@@ -1,9 +1,9 @@ | |||||
package me.chanjar.weixin.mp.bean.result; | package me.chanjar.weixin.mp.bean.result; | ||||
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; | |||||
import java.io.Serializable; | import java.io.Serializable; | ||||
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; | |||||
public class WxMpOAuth2AccessToken implements Serializable { | public class WxMpOAuth2AccessToken implements Serializable { | ||||
private String accessToken; | private String accessToken; | ||||
@@ -16,6 +16,8 @@ public class WxMpOAuth2AccessToken implements Serializable { | |||||
private String scope; | private String scope; | ||||
private String unionId; | |||||
public String getRefreshToken() { | public String getRefreshToken() { | ||||
return refreshToken; | return refreshToken; | ||||
} | } | ||||
@@ -56,6 +58,14 @@ public class WxMpOAuth2AccessToken implements Serializable { | |||||
this.expiresIn = expiresIn; | this.expiresIn = expiresIn; | ||||
} | } | ||||
public String getUnionId() { | |||||
return unionId; | |||||
} | |||||
public void setUnionId(String unionId) { | |||||
this.unionId = unionId; | |||||
} | |||||
public static WxMpOAuth2AccessToken fromJson(String json) { | public static WxMpOAuth2AccessToken fromJson(String json) { | ||||
return WxMpGsonBuilder.create().fromJson(json, WxMpOAuth2AccessToken.class); | return WxMpGsonBuilder.create().fromJson(json, WxMpOAuth2AccessToken.class); | ||||
} | } | ||||
@@ -68,6 +78,7 @@ public class WxMpOAuth2AccessToken implements Serializable { | |||||
", refreshToken='" + refreshToken + '\'' + | ", refreshToken='" + refreshToken + '\'' + | ||||
", openId='" + openId + '\'' + | ", openId='" + openId + '\'' + | ||||
", scope='" + scope + '\'' + | ", scope='" + scope + '\'' + | ||||
", unionId='" + unionId + '\'' + | |||||
'}'; | '}'; | ||||
} | } | ||||
} | } |
@@ -13,203 +13,245 @@ import java.io.Serializable; | |||||
* @author ukid | * @author ukid | ||||
*/ | */ | ||||
public class WxMpPayResult implements Serializable { | 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; | |||||
public String getReturn_code() { | |||||
return return_code; | |||||
} | |||||
public String getReturn_msg() { | |||||
return return_msg; | |||||
} | |||||
public String getAppid() { | |||||
return appid; | |||||
} | |||||
public String getMch_id() { | |||||
return mch_id; | |||||
} | |||||
public String getNonce_str() { | |||||
return nonce_str; | |||||
} | |||||
public String getSign() { | |||||
return sign; | |||||
} | |||||
public String getResult_code() { | |||||
return result_code; | |||||
} | |||||
public String getErr_code() { | |||||
return err_code; | |||||
} | |||||
public String getErr_code_des() { | |||||
return err_code_des; | |||||
} | |||||
public String getTrade_state() { | |||||
return trade_state; | |||||
} | |||||
public String getDevice_info() { | |||||
return device_info; | |||||
} | |||||
public String getOpenid() { | |||||
return openid; | |||||
} | |||||
public String getIs_subscribe() { | |||||
return is_subscribe; | |||||
} | |||||
public String getTrade_type() { | |||||
return trade_type; | |||||
} | |||||
public String getBank_type() { | |||||
return bank_type; | |||||
} | |||||
public String getTotal_fee() { | |||||
return total_fee; | |||||
} | |||||
public String getCoupon_fee() { | |||||
return coupon_fee; | |||||
} | |||||
public String getFee_type() { | |||||
return fee_type; | |||||
} | |||||
public String getTransaction_id() { | |||||
return transaction_id; | |||||
} | |||||
public String getOut_trade_no() { | |||||
return out_trade_no; | |||||
} | |||||
public String getAttach() { | |||||
return attach; | |||||
} | |||||
public String getTime_end() { | |||||
return time_end; | |||||
} | |||||
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 setAppid(String appid) { | |||||
this.appid = appid; | |||||
} | |||||
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 setSign(String sign) { | |||||
this.sign = sign; | |||||
} | |||||
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_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 setDevice_info(String device_info) { | |||||
this.device_info = device_info; | |||||
} | |||||
public void setOpenid(String openid) { | |||||
this.openid = openid; | |||||
} | |||||
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 setBank_type(String bank_type) { | |||||
this.bank_type = bank_type; | |||||
} | |||||
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 setFee_type(String fee_type) { | |||||
this.fee_type = fee_type; | |||||
} | |||||
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 setAttach(String attach) { | |||||
this.attach = attach; | |||||
} | |||||
public void setTime_end(String time_end) { | |||||
this.time_end = 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_msg() { | |||||
return return_msg; | |||||
} | |||||
public String getAppid() { | |||||
return appid; | |||||
} | |||||
public String getMch_id() { | |||||
return mch_id; | |||||
} | |||||
public String getNonce_str() { | |||||
return nonce_str; | |||||
} | |||||
public String getSign() { | |||||
return sign; | |||||
} | |||||
public String getResult_code() { | |||||
return result_code; | |||||
} | |||||
public String getErr_code() { | |||||
return err_code; | |||||
} | |||||
public String getErr_code_des() { | |||||
return err_code_des; | |||||
} | |||||
public String getTrade_state() { | |||||
return trade_state; | |||||
} | |||||
public String getDevice_info() { | |||||
return device_info; | |||||
} | |||||
public String getOpenid() { | |||||
return openid; | |||||
} | |||||
public String getIs_subscribe() { | |||||
return is_subscribe; | |||||
} | |||||
public String getTrade_type() { | |||||
return trade_type; | |||||
} | |||||
public String getBank_type() { | |||||
return bank_type; | |||||
} | |||||
public String getTotal_fee() { | |||||
return total_fee; | |||||
} | |||||
public String getCoupon_fee() { | |||||
return coupon_fee; | |||||
} | |||||
public String getFee_type() { | |||||
return fee_type; | |||||
} | |||||
public String getTransaction_id() { | |||||
return transaction_id; | |||||
} | |||||
public String getOut_trade_no() { | |||||
return out_trade_no; | |||||
} | |||||
public String getAttach() { | |||||
return attach; | |||||
} | |||||
public String getTime_end() { | |||||
return time_end; | |||||
} | |||||
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 setAppid(String appid) { | |||||
this.appid = appid; | |||||
} | |||||
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 setSign(String sign) { | |||||
this.sign = sign; | |||||
} | |||||
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_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 setDevice_info(String device_info) { | |||||
this.device_info = device_info; | |||||
} | |||||
public void setOpenid(String openid) { | |||||
this.openid = openid; | |||||
} | |||||
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 setBank_type(String bank_type) { | |||||
this.bank_type = bank_type; | |||||
} | |||||
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 setFee_type(String fee_type) { | |||||
this.fee_type = fee_type; | |||||
} | |||||
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 setAttach(String attach) { | |||||
this.attach = attach; | |||||
} | |||||
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 + '\'' + | |||||
'}'; | |||||
} | |||||
} | } |
@@ -1,11 +1,16 @@ | |||||
package me.chanjar.weixin.mp.util.json; | 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.common.util.json.GsonHelper; | ||||
import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; | import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; | ||||
import java.lang.reflect.Type; | |||||
public class WxMpOAuth2AccessTokenAdapter implements JsonDeserializer<WxMpOAuth2AccessToken> { | public class WxMpOAuth2AccessTokenAdapter implements JsonDeserializer<WxMpOAuth2AccessToken> { | ||||
public WxMpOAuth2AccessToken deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws | public WxMpOAuth2AccessToken deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws | ||||
@@ -28,6 +33,9 @@ public class WxMpOAuth2AccessTokenAdapter implements JsonDeserializer<WxMpOAuth2 | |||||
if (accessTokenJsonObject.get("scope") != null && !accessTokenJsonObject.get("scope").isJsonNull()) { | if (accessTokenJsonObject.get("scope") != null && !accessTokenJsonObject.get("scope").isJsonNull()) { | ||||
accessToken.setScope(GsonHelper.getAsString(accessTokenJsonObject.get("scope"))); | accessToken.setScope(GsonHelper.getAsString(accessTokenJsonObject.get("scope"))); | ||||
} | } | ||||
if (accessTokenJsonObject.get("unionid") != null && !accessTokenJsonObject.get("unionid").isJsonNull()) { | |||||
accessToken.setUnionId(GsonHelper.getAsString(accessTokenJsonObject.get("unionid"))); | |||||
} | |||||
return accessToken; | return accessToken; | ||||
} | } | ||||