{
m.setToUser(this.toUser);
m.setToParty(this.toParty);
m.setToTag(this.toTag);
+ m.setSafe(
+ (this.safe == null || "".equals(this.safe))? WxConsts.CUSTOM_MSG_SAFE_NO: this.safe);
return m;
}
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 57655e0b..651cda3e 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -6,7 +6,7 @@
me.chanjar
weixin-java-parent
- 1.3.2
+ 1.3.3
weixin-java-mp
WeiXin Java Tools - MP
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
index 6dd96f58..e6ce30cf 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
@@ -324,6 +324,8 @@ public interface WxMpService {
*
* 自定义菜单创建接口
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=自定义菜单创建接口
+ * 如果要创建个性化菜单,请设置matchrule属性
+ * 详情请见:http://mp.weixin.qq.com/wiki/0/c48ccd12b69ae023159b4bfaa7c39c20.html
*
* @param menu
* @throws WxErrorException
@@ -339,6 +341,16 @@ public interface WxMpService {
*/
public void menuDelete() throws WxErrorException;
+ /**
+ *
+ * 删除个性化菜单接口
+ * 详情请见: http://mp.weixin.qq.com/wiki/0/c48ccd12b69ae023159b4bfaa7c39c20.html
+ *
+ * @param menuid
+ * @throws WxErrorException
+ */
+ public void menuDelete(String menuid) throws WxErrorException;
+
/**
*
* 自定义菜单查询接口
@@ -348,6 +360,16 @@ public interface WxMpService {
* @throws WxErrorException
*/
public WxMenu menuGet() throws WxErrorException;
+
+ /**
+ *
+ * 测试个性化菜单匹配结果
+ * 详情请见: http://mp.weixin.qq.com/wiki/0/c48ccd12b69ae023159b4bfaa7c39c20.html
+ *
+ * @param userid 可以是粉丝的OpenID,也可以是粉丝的微信号。
+ * @throws WxErrorException
+ */
+ public WxMenu menuTryMatch(String userid) throws WxErrorException;
/**
*
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 232dc198..4223caef 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
@@ -230,14 +230,24 @@ public class WxMpServiceImpl implements WxMpService {
}
public void menuCreate(WxMenu menu) throws WxErrorException {
- String url = "https://api.weixin.qq.com/cgi-bin/menu/create";
- execute(new SimplePostRequestExecutor(), url, menu.toJson());
+ if (menu.getMatchRule() != null) {
+ String url = "https://api.weixin.qq.com/cgi-bin/menu/addconditional";
+ execute(new SimplePostRequestExecutor(), url, menu.toJson());
+ } else {
+ String url = "https://api.weixin.qq.com/cgi-bin/menu/create";
+ execute(new SimplePostRequestExecutor(), url, menu.toJson());
+ }
}
public void menuDelete() throws WxErrorException {
String url = "https://api.weixin.qq.com/cgi-bin/menu/delete";
execute(new SimpleGetRequestExecutor(), url, null);
}
+
+ public void menuDelete(String menuid) throws WxErrorException {
+ String url = "https://api.weixin.qq.com/cgi-bin/menu/delconditional";
+ execute(new SimpleGetRequestExecutor(), url, "menuid=" + menuid);
+ }
public WxMenu menuGet() throws WxErrorException {
String url = "https://api.weixin.qq.com/cgi-bin/menu/get";
@@ -252,6 +262,20 @@ public class WxMpServiceImpl implements WxMpService {
throw e;
}
}
+
+ public WxMenu menuTryMatch(String userid) throws WxErrorException {
+ String url = "https://api.weixin.qq.com/cgi-bin/menu/trymatch";
+ try {
+ String resultContent = execute(new SimpleGetRequestExecutor(), url, "user_id=" + userid);
+ return WxMenu.fromJson(resultContent);
+ } catch (WxErrorException e) {
+ // 46003 不存在的菜单数据 46002 不存在的菜单版本
+ if (e.getError().getErrorCode() == 46003 || e.getError().getErrorCode() == 46002) {
+ return null;
+ }
+ throw e;
+ }
+ }
public WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputStream inputStream) throws WxErrorException, IOException {
return mediaUpload(mediaType, FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), fileType));
@@ -892,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 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);
-
- String sign = WxCryptUtil.createSign(packageParams, wxMpConfigStorage.getPartnerKey());
- String xml = "" +
- "" + wxMpConfigStorage.getAppId() + "" +
- "" + wxMpConfigStorage.getPartnerId() + "" +
- "" + transactionId + "" +
- "" + outTradeNo + "" +
- "" + nonce_str + "" +
- "" + sign + "" +
- "";
-
- 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("");
+ for (Entry para : packageParams.entrySet()) {
+ request.append(String.format("<%s>%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);
+ }
+
+ 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/WxMpOAuth2AccessToken.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java
index 2d6696d4..6ac77c83 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/bean/result/WxMpPayResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java
index 7fd850fb..3c788729 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;
-
- 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 + '\'' +
+ '}';
+ }
}
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 6d73131a..753e22d1 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