Merge remote-tracking branch 'upstream/develop' into develop

update from upstream

README.md

@@ -23,7 +23,7 @@ weixin-java-tools
 <dependency>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-mp</artifactId>
-  <version>1.3.2</version>
+  <version>1.3.3</version>
 </dependency>
 ```
 
@@ -33,7 +33,7 @@ weixin-java-tools
 <dependency>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-cp</artifactId>
-  <version>1.3.2</version>
+  <version>1.3.3</version>
 </dependency>
 ```
 

pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>1.3.3-SNAPSHOT</version>
+  <version>1.3.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>

weixin-java-common/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>me.chanjar</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>

weixin-java-cp/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.chanjar</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>weixin-java-cp</artifactId>

weixin-java-mp/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.chanjar</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.4-SNAPSHOT</version>
     </parent>
     <artifactId>weixin-java-mp</artifactId>
     <name>WeiXin Java Tools - MP</name>

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java

@@ -916,44 +916,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<String, String> packageParams = new TreeMap<String, String>();
+    SortedMap<String, String> packageParams = new TreeMap<String, String>();
-      packageParams.put("appid", wxMpConfigStorage.getAppId());
+    packageParams.put("appid", wxMpConfigStorage.getAppId());
-      packageParams.put("mch_id", wxMpConfigStorage.getPartnerId());
+    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());
+    StringBuilder request = new StringBuilder("<xml>");
-      String xml = "<xml>" +
+    for (Entry<String, String> para : packageParams.entrySet()) {
-              "<appid>" + wxMpConfigStorage.getAppId() + "</appid>" +
+      request.append(String.format("<%s>%s</%s>", para.getKey(), para.getValue(), para.getKey()));
-              "<mch_id>" + wxMpConfigStorage.getPartnerId() + "</mch_id>" +
+    }
-              "<transaction_id>" + transactionId + "</transaction_id>" +
+    request.append("</xml>");
-              "<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");
+    HttpPost httpPost = new HttpPost("https://api.mch.weixin.qq.com/pay/orderquery");
-      if (httpProxy != null) {
+    if (httpProxy != null) {
-        RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build();
+      RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build();
-        httpPost.setConfig(config);
+      httpPost.setConfig(config);
-      }
+    }
 
-      StringEntity entity = new StringEntity(xml, Consts.UTF_8);
+    StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8);
-      httpPost.setEntity(entity);
+    httpPost.setEntity(entity);
-      try {
+    try {
-        CloseableHttpResponse response = httpClient.execute(httpPost);
+      CloseableHttpResponse response = httpClient.execute(httpPost);
-        String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-        XStream xstream = XStreamInitializer.getInstance();
+      XStream xstream = XStreamInitializer.getInstance();
-        xstream.alias("xml", WxMpPayResult.class);
+      xstream.alias("xml", WxMpPayResult.class);
-        WxMpPayResult wxMpPayResult = (WxMpPayResult) xstream.fromXML(responseContent);
+      WxMpPayResult wxMpPayResult = (WxMpPayResult) xstream.fromXML(responseContent);
-        return wxMpPayResult;
+      return wxMpPayResult;
-      } catch (IOException e) {
+    } catch (IOException e) {
-        e.printStackTrace();
+      throw new RuntimeException("Failed to query order due to IO exception.", e);
-      }
+    }
-      return new WxMpPayResult();
   }
 
   @Override

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 + '\'' +
         '}';
   }
 }

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 static final long serialVersionUID = -570934170727777190L;
-    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() {
+  private String return_code;
-        return 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_msg() {
+  public String getReturn_code() {
-        return return_msg;
+    return return_code;
-    }
+  }
 
-    public String getAppid() {
+  public String getReturn_msg() {
-        return appid;
+    return return_msg;
-    }
+  }
 
-    public String getMch_id() {
+  public String getAppid() {
-        return mch_id;
+    return appid;
-    }
+  }
 
-    public String getNonce_str() {
+  public String getMch_id() {
-        return nonce_str;
+    return mch_id;
-    }
+  }
 
-    public String getSign() {
+  public String getNonce_str() {
-        return sign;
+    return nonce_str;
-    }
+  }
 
-    public String getResult_code() {
+  public String getSign() {
-        return result_code;
+    return sign;
-    }
+  }
 
-    public String getErr_code() {
+  public String getResult_code() {
-        return err_code;
+    return result_code;
-    }
+  }
 
-    public String getErr_code_des() {
+  public String getErr_code() {
-        return err_code_des;
+    return err_code;
-    }
+  }
 
-    public String getTrade_state() {
+  public String getErr_code_des() {
-        return trade_state;
+    return err_code_des;
-    }
+  }
 
-    public String getDevice_info() {
+  public String getTrade_state() {
-        return device_info;
+    return trade_state;
-    }
+  }
 
-    public String getOpenid() {
+  public String getDevice_info() {
-        return openid;
+    return device_info;
-    }
+  }
 
-    public String getIs_subscribe() {
+  public String getOpenid() {
-        return is_subscribe;
+    return openid;
-    }
+  }
 
-    public String getTrade_type() {
+  public String getIs_subscribe() {
-        return trade_type;
+    return is_subscribe;
-    }
+  }
 
-    public String getBank_type() {
+  public String getTrade_type() {
-        return bank_type;
+    return trade_type;
-    }
+  }
 
-    public String getTotal_fee() {
+  public String getBank_type() {
-        return total_fee;
+    return bank_type;
-    }
+  }
 
-    public String getCoupon_fee() {
+  public String getTotal_fee() {
-        return coupon_fee;
+    return total_fee;
-    }
+  }
 
-    public String getFee_type() {
+  public String getCoupon_fee() {
-        return fee_type;
+    return coupon_fee;
-    }
+  }
 
-    public String getTransaction_id() {
+  public String getFee_type() {
-        return transaction_id;
+    return fee_type;
-    }
+  }
 
-    public String getOut_trade_no() {
+  public String getTransaction_id() {
-        return out_trade_no;
+    return transaction_id;
-    }
+  }
 
-    public String getAttach() {
+  public String getOut_trade_no() {
-        return attach;
+    return out_trade_no;
-    }
+  }
 
-    public String getTime_end() {
+  public String getAttach() {
-        return time_end;
+    return attach;
-    }
+  }
 
-    public void setReturn_code(String return_code) {
+  public String getTime_end() {
-        this.return_code = return_code;
+    return time_end;
-    }
+  }
 
-    public void setReturn_msg(String return_msg) {
+  public void setReturn_code(String return_code) {
-        this.return_msg = return_msg;
+    this.return_code = return_code;
-    }
+  }
 
-    public void setAppid(String appid) {
+  public void setReturn_msg(String return_msg) {
-        this.appid = appid;
+    this.return_msg = return_msg;
-    }
+  }
 
-    public void setMch_id(String mch_id) {
+  public void setAppid(String appid) {
-        this.mch_id = mch_id;
+    this.appid = appid;
-    }
+  }
 
-    public void setNonce_str(String nonce_str) {
+  public void setMch_id(String mch_id) {
-        this.nonce_str = nonce_str;
+    this.mch_id = mch_id;
-    }
+  }
 
-    public void setSign(String sign) {
+  public void setNonce_str(String nonce_str) {
-        this.sign = sign;
+    this.nonce_str = nonce_str;
-    }
+  }
 
-    public void setResult_code(String result_code) {
+  public void setSign(String sign) {
-        this.result_code = result_code;
+    this.sign = sign;
-    }
+  }
 
-    public void setErr_code(String err_code) {
+  public void setResult_code(String result_code) {
-        this.err_code = err_code;
+    this.result_code = result_code;
-    }
+  }
 
-    public void setErr_code_des(String err_code_des) {
+  public void setErr_code(String err_code) {
-        this.err_code_des = err_code_des;
+    this.err_code = err_code;
-    }
+  }
 
-    public void setTrade_state(String trade_state) {
+  public void setErr_code_des(String err_code_des) {
-        this.trade_state = trade_state;
+    this.err_code_des = err_code_des;
-    }
+  }
 
-    public void setDevice_info(String device_info) {
+  public void setTrade_state(String trade_state) {
-        this.device_info = device_info;
+    this.trade_state = trade_state;
-    }
+  }
 
-    public void setOpenid(String openid) {
+  public void setDevice_info(String device_info) {
-        this.openid = openid;
+    this.device_info = device_info;
-    }
+  }
 
-    public void setIs_subscribe(String is_subscribe) {
+  public void setOpenid(String openid) {
-        this.is_subscribe = is_subscribe;
+    this.openid = openid;
-    }
+  }
 
-    public void setTrade_type(String trade_type) {
+  public void setIs_subscribe(String is_subscribe) {
-        this.trade_type = trade_type;
+    this.is_subscribe = is_subscribe;
-    }
+  }
 
-    public void setBank_type(String bank_type) {
+  public void setTrade_type(String trade_type) {
-        this.bank_type = bank_type;
+    this.trade_type = trade_type;
-    }
+  }
 
-    public void setTotal_fee(String total_fee) {
+  public void setBank_type(String bank_type) {
-        this.total_fee = total_fee;
+    this.bank_type = bank_type;
-    }
+  }
 
-    public void setCoupon_fee(String coupon_fee) {
+  public void setTotal_fee(String total_fee) {
-        this.coupon_fee = coupon_fee;
+    this.total_fee = total_fee;
-    }
+  }
 
-    public void setFee_type(String fee_type) {
+  public void setCoupon_fee(String coupon_fee) {
-        this.fee_type = fee_type;
+    this.coupon_fee = coupon_fee;
-    }
+  }
 
-    public void setTransaction_id(String transaction_id) {
+  public void setFee_type(String fee_type) {
-        this.transaction_id = transaction_id;
+    this.fee_type = fee_type;
-    }
+  }
 
-    public void setOut_trade_no(String out_trade_no) {
+  public void setTransaction_id(String transaction_id) {
-        this.out_trade_no = out_trade_no;
+    this.transaction_id = transaction_id;
-    }
+  }
 
-    public void setAttach(String attach) {
+  public void setOut_trade_no(String out_trade_no) {
-        this.attach = attach;
+    this.out_trade_no = out_trade_no;
-    }
+  }
 
-    public void setTime_end(String time_end) {
+  public void setAttach(String attach) {
-        this.time_end = time_end;
+    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 + '\'' +
+        '}';
+  }
 }

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<WxMpOAuth2AccessToken> {
 
   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()) {
       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;
   }