删除PayUtil类,接口转移到PayApi类 #16

weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/Pay2Api.java

@@ -34,12 +34,12 @@ import com.foxinmy.weixin4j.http.weixin.WeixinSSLRequestExecutor;
 import com.foxinmy.weixin4j.model.Consts;
 import com.foxinmy.weixin4j.model.Token;
 import com.foxinmy.weixin4j.model.WeixinPayAccount;
+import com.foxinmy.weixin4j.mp.payment.v2.JsPayRequestV2;
 import com.foxinmy.weixin4j.mp.payment.v2.OrderV2;
-import com.foxinmy.weixin4j.mp.payment.v2.PayUtil2;
+import com.foxinmy.weixin4j.mp.payment.v2.PayPackageV2;
 import com.foxinmy.weixin4j.mp.payment.v2.RefundRecordV2;
 import com.foxinmy.weixin4j.mp.payment.v2.RefundResultV2;
 import com.foxinmy.weixin4j.mp.token.WeixinTokenCreator;
-import com.foxinmy.weixin4j.payment.PayUtil;
 import com.foxinmy.weixin4j.token.TokenHolder;
 import com.foxinmy.weixin4j.token.TokenStorager;
 import com.foxinmy.weixin4j.type.BillType;
@@ -49,6 +49,7 @@ import com.foxinmy.weixin4j.type.SignType;
 import com.foxinmy.weixin4j.util.DateUtil;
 import com.foxinmy.weixin4j.util.DigestUtil;
 import com.foxinmy.weixin4j.util.MapUtil;
+import com.foxinmy.weixin4j.util.RandomUtil;
 import com.foxinmy.weixin4j.util.StringUtil;
 import com.foxinmy.weixin4j.util.Weixin4jConfigUtil;
 import com.foxinmy.weixin4j.util.Weixin4jConst;
@@ -84,6 +85,98 @@ public class Pay2Api extends MpApi {
 				tokenStorager);
 	}
 
+	/**
+	 * 生成V2.x版本JSAPI支付字符串
+	 * 
+	 * @param body
+	 *            支付详情
+	 * @param outTradeNo
+	 *            订单号
+	 * @param totalFee
+	 *            订单总额 按实际金额传入即可(元) 构造函数会转换为分
+	 * @param notifyUrl
+	 *            支付回调URL
+	 * @param createIp
+	 *            订单生成的机器 IP
+	 * @return 支付json串
+	 */
+	public String createPayJsRequestJson(String body, String outTradeNo,
+			double totalFee, String notifyUrl, String createIp) {
+		return createPayJsRequestJson(body, outTradeNo, totalFee, notifyUrl,
+				createIp, null, null, null, 0d, 0d, null);
+	}
+
+	/**
+	 * 生成V2.x版本JSAPI支付字符串
+	 * 
+	 * @param body
+	 *            支付详情
+	 * @param outTradeNo
+	 *            订单号
+	 * @param totalFee
+	 *            订单总额 按实际金额传入即可(元) 构造函数会转换为分
+	 * @param notifyUrl
+	 *            支付回调URL
+	 * @param createIp
+	 *            订单生成的机器 IP
+	 * @param attach
+	 *            附加数据，在查询API和支付通知中原样返回，该字段主要用于商户携带订单的自定义数据
+	 * @param timeStart
+	 *            订单生成时间，格式为yyyyMMddHHmmss
+	 * @param timeExpire
+	 *            订单失效时间，格式为yyyyMMddHHmmss;注意：最短失效时间间隔必须大于5分钟
+	 * @param transportFee
+	 *            物流费用 如有值 必须保证 transportFee+productFee=totalFee
+	 * @param transportFee
+	 *            商品费用 如有值 必须保证 transportFee+productFee=totalFee
+	 * @param goodsTag
+	 *            商品标记，代金券或立减优惠功能的参数
+	 * @return 支付json串
+	 */
+	public String createPayJsRequestJson(String body, String outTradeNo,
+			double totalFee, String notifyUrl, String createIp, String attach,
+			Date timeStart, Date timeExpire, double transportFee,
+			double productFee, String goodsTag) {
+		PayPackageV2 payPackage = new PayPackageV2(
+				weixinAccount.getPartnerId(), body, outTradeNo, totalFee,
+				notifyUrl, createIp);
+		payPackage.setAttach(attach);
+		payPackage.setTimeStart(timeStart);
+		payPackage.setTimeExpire(timeExpire);
+		payPackage.setTransportFee(transportFee);
+		payPackage.setProductFee(productFee);
+		payPackage.setGoodsTag(goodsTag);
+		JsPayRequestV2 jsPayRequest = new JsPayRequestV2(weixinAccount,
+				payPackage);
+		jsPayRequest.setPaySign(DigestUtil.paysignSha(jsPayRequest,
+				weixinAccount.getPaySignKey()));
+		jsPayRequest.setSignType(SignType.SHA1);
+		return JSON.toJSONString(jsPayRequest);
+	}
+
+	/**
+	 * 创建V2.x NativePay支付链接
+	 * 
+	 * @param productId
+	 *            与订单ID等价
+	 * @return 支付链接
+	 */
+	public String createNativePayRequestURL(String productId) {
+		Map<String, String> map = new HashMap<String, String>();
+		String timestamp = DateUtil.timestamp2string();
+		String noncestr = RandomUtil.generateString(16);
+		map.put("appid", weixinAccount.getId());
+		map.put("timestamp", timestamp);
+		map.put("noncestr", noncestr);
+		map.put("productid", productId);
+		map.put("appkey", weixinAccount.getPaySignKey());
+		String sign = DigestUtil.paysignSha(map, null);
+		return String
+				.format("􏳈􏳈􏳈􏳈􏱗􏱗􏱗􏱗􏱕􏱕􏱕􏱕􏳉􏳉􏳉􏳉􏱕􏱕􏱕􏱕􏱩􏱩􏱩􏱩􏰛􏰛􏰛􏰛􏳊􏳊􏳊􏳊􏳊􏳊􏳊􏳊􏳈􏳈􏳈􏳈􏳉􏳉􏳉􏳉􏱶􏱶􏱶􏱶􏱓􏱓􏱓􏱓􏱭􏱭􏱭􏱭􏳊􏳊􏳊􏳊􏳋􏳋􏳋􏳋􏱕􏱕􏱕􏱕􏳌􏳌􏳌􏳌􏱶􏱶􏱶􏱶􏱓􏱓􏱓􏱓􏱭􏱭􏱭􏱭􏱰􏱰􏱰􏱰􏱨􏱨􏱨􏱨􏳍􏳍􏳍􏳍􏳎􏳎􏳎􏳎􏱱􏱱􏱱􏱱􏱕􏱕􏱕􏱕􏱦􏱦􏱦􏱦􏱩􏱩􏱩􏱩􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱓􏱓􏱓􏱓􏱶􏱶􏱶􏱶􏱶􏱶􏱶􏱶􏱕􏱕􏱕􏱕􏱪􏱪􏱪􏱪􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱶􏱶􏱶􏱶􏱨􏱨􏱨􏱨􏳟􏳟􏳟􏳟􏱪􏱪􏱪􏱪􏱰􏱰􏱰􏱰􏱷􏱷􏱷􏱷􏱔􏱔􏱔􏱔􏱕􏱕􏱕􏱕􏱪􏱪􏱪􏱪􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱔􏱔􏱔􏱔􏱕􏱕􏱕􏱕􏳈􏳈􏳈􏳈􏱗􏱗􏱗􏱗􏱕􏱕􏱕􏱕􏳉􏳉􏳉􏳉􏱕􏱕􏱕􏱕􏱩􏱩􏱩􏱩􏰛􏰛􏰛􏰛􏳊􏳊􏳊􏳊􏳊􏳊􏳊􏳊􏳈􏳈􏳈􏳈􏳉􏳉􏳉􏳉􏱶􏱶􏱶􏱶􏱓􏱓􏱓􏱓􏱭􏱭􏱭􏱭􏳊􏳊􏳊􏳊􏳋􏳋􏳋􏳋􏱕􏱕􏱕􏱕􏳌􏳌􏳌􏳌􏱶􏱶􏱶􏱶􏱓􏱓􏱓􏱓􏱭􏱭􏱭􏱭􏱰􏱰􏱰􏱰􏱨􏱨􏱨􏱨􏳍􏳍􏳍􏳍􏳎􏳎􏳎􏳎􏱱􏱱􏱱􏱱􏱕􏱕􏱕􏱕􏱦􏱦􏱦􏱦􏱩􏱩􏱩􏱩􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱓􏱓􏱓􏱓􏱶􏱶􏱶􏱶􏱶􏱶􏱶􏱶􏱕􏱕􏱕􏱕􏱪􏱪􏱪􏱪􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱶􏱶􏱶􏱶􏱨􏱨􏱨􏱨􏳟􏳟􏳟􏳟􏱪􏱪􏱪􏱪􏱰􏱰􏱰􏱰􏱷􏱷􏱷􏱷􏱔􏱔􏱔􏱔􏱕􏱕􏱕􏱕􏱪􏱪􏱪􏱪􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱔􏱔􏱔􏱔􏱕􏱕􏱕􏱕􏳠􏳠􏳠􏳠􏱗􏱗􏱗􏱗􏱱􏱱􏱱􏱱􏱔􏱔􏱔􏱔􏱓􏱓􏱓􏱓􏳠􏳠􏳠􏳠􏱶􏱶􏱶􏱶􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱩􏱩􏱩􏱩􏳟􏳟􏳟􏳟􏱩􏱩􏱩􏱩􏱷􏱷􏱷􏱷􏱗􏱗􏱗􏱗􏱱􏱱􏱱􏱱􏱔􏱔􏱔􏱔􏱨􏱨􏱨􏱨􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝weixin://wxpay/bizpayurl?sign=%s&appid=%s&productid=%s&timestamp=%s&nocestr=%s􏳠􏳠􏳠􏳠􏱗􏱗􏱗􏱗􏱱􏱱􏱱􏱱􏱔􏱔􏱔􏱔􏱓􏱓􏱓􏱓􏳠􏳠􏳠􏳠􏱶􏱶􏱶􏱶􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱩􏱩􏱩􏱩􏳟􏳟􏳟􏳟􏱩􏱩􏱩􏱩􏱷􏱷􏱷􏱷􏱗􏱗􏱗􏱗􏱱􏱱􏱱􏱱􏱔􏱔􏱔􏱔􏱨􏱨􏱨􏱨􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝",
+						sign, weixinAccount.getId(), productId, timestamp,
+						noncestr);
+	}
+
 	/**
 	 * 订单查询
 	 * 
@@ -113,7 +206,7 @@ public class Pay2Api extends MpApi {
 		obj.put("appkey", weixinAccount.getPaySignKey());
 		obj.put("package", sb.toString());
 		obj.put("timestamp", timestamp);
-		String signature = PayUtil2.paysignSha(obj);
+		String signature = DigestUtil.paysignSha(obj, null);
 
 		obj.clear();
 		obj.put("appid", weixinAccount.getId());
@@ -190,8 +283,8 @@ public class Pay2Api extends MpApi {
 			if (mopara != null && !mopara.isEmpty()) {
 				map.putAll(mopara);
 			}
-			String sign = PayUtil
-					.paysignMd5(map, weixinAccount.getPartnerKey());
+			String sign = DigestUtil.paysignMd5(map,
+					weixinAccount.getPartnerKey());
 			map.put("sign", sign.toUpperCase());
 
 			SSLContext ctx = null;
@@ -426,7 +519,7 @@ public class Pay2Api extends MpApi {
 		map.put("input_charset", Consts.UTF_8.name());
 		map.put("partner", weixinAccount.getPartnerId());
 		map.put(idQuery.getType().getName(), idQuery.getId());
-		String sign = PayUtil.paysignMd5(map, weixinAccount.getPartnerKey());
+		String sign = DigestUtil.paysignMd5(map, weixinAccount.getPartnerKey());
 		map.put("sign", sign.toLowerCase());
 		WeixinResponse response = weixinExecutor.get(refundquery_uri, map);
 		return ListsuffixResultDeserializer.deserialize(response.getAsString(),
@@ -464,7 +557,7 @@ public class Pay2Api extends MpApi {
 		map.put("deliver_timestamp", DateUtil.timestamp2string());
 		map.put("deliver_status", status ? "1" : "0");
 		map.put("deliver_msg", statusMsg);
-		map.put("app_signature", PayUtil2.paysignSha(map));
+		map.put("app_signature", DigestUtil.paysignSha(map, null));
 		map.put("sign_method", SignType.SHA1.name().toLowerCase());
 
 		WeixinResponse response = weixinExecutor.post(

weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayResponseV2.java

@@ -1,12 +1,20 @@
 package com.foxinmy.weixin4j.mp.payment.v2;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.foxinmy.weixin4j.model.WeixinPayAccount;
+import com.foxinmy.weixin4j.util.DateUtil;
+import com.foxinmy.weixin4j.util.DigestUtil;
+import com.foxinmy.weixin4j.util.RandomUtil;
+import com.foxinmy.weixin4j.xml.XmlStream;
 
 /**
  * V2 Native支付时的回调响应
@@ -35,6 +43,10 @@ public class NativePayResponseV2 extends JsPayRequestV2 {
 	@XmlElement(name = "RetErrMsg")
 	private String retMsg;
 
+	@XmlTransient
+	@JSONField(serialize = false)
+	private WeixinPayAccount weixinAccount;
+
 	protected NativePayResponseV2() {
 		// jaxb required
 	}
@@ -44,6 +56,7 @@ public class NativePayResponseV2 extends JsPayRequestV2 {
 		super(weixinAccount, payPackage);
 		this.retCode = "0";
 		this.retMsg = "OK";
+		this.weixinAccount = weixinAccount;
 	}
 
 	public String getRetCode() {
@@ -62,6 +75,26 @@ public class NativePayResponseV2 extends JsPayRequestV2 {
 		this.retMsg = retMsg;
 	}
 
+	/**
+	 * 生成 回调字符串
+	 * 
+	 * @return native回调字符串
+	 */
+	@XmlTransient
+	@JSONField(serialize = false)
+	public String asReqeustXml() {
+		Map<String, String> map = new HashMap<String, String>();
+		map.put("appid", weixinAccount.getId());
+		map.put("appkey", weixinAccount.getPaySignKey());
+		map.put("timestamp", DateUtil.timestamp2string());
+		map.put("noncestr", RandomUtil.generateString(16));
+		map.put("package", getPackageInfo());
+		map.put("retcode", getRetCode());
+		map.put("reterrmsg", getRetMsg());
+		this.setPaySign(DigestUtil.paysignSha(map, null));
+		return XmlStream.toXML(this);
+	}
+
 	@Override
 	public String toString() {
 		return "NativePayResponseV2 [retCode=" + retCode + ", retMsg=" + retMsg

weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayUtil2.java

@@ -1,203 +0,0 @@
-package com.foxinmy.weixin4j.mp.payment.v2;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.alibaba.fastjson.JSON;
-import com.foxinmy.weixin4j.exception.WeixinPayException;
-import com.foxinmy.weixin4j.model.WeixinPayAccount;
-import com.foxinmy.weixin4j.type.SignType;
-import com.foxinmy.weixin4j.util.DateUtil;
-import com.foxinmy.weixin4j.util.DigestUtil;
-import com.foxinmy.weixin4j.util.MapUtil;
-import com.foxinmy.weixin4j.util.RandomUtil;
-import com.foxinmy.weixin4j.util.Weixin4jConfigUtil;
-import com.foxinmy.weixin4j.xml.XmlStream;
-
-/**
- * V2支付工具类(JSAPI,NATIVE)
- * 
- * @className PayUtil2
- * @author jy
- * @date 2014年10月28日
- * @since JDK 1.6
- * @see
- */
-public class PayUtil2 {
-
-	/**
-	 * 生成V2.x版本JSAPI支付字符串
-	 * 
-	 * @param body
-	 *            支付详情
-	 * @param outTradeNo
-	 *            订单号
-	 * @param totalFee
-	 *            订单总额 按实际金额传入即可(元) 构造函数会转换为分
-	 * @param notifyUrl
-	 *            支付回调URL
-	 * @param createIp
-	 *            订单生成的机器 IP
-	 * @param weixinAccount
-	 *            商户信息
-	 * @return 支付json串
-	 */
-	public static String createPayJsRequestJsonV2(String body,
-			String outTradeNo, double totalFee, String notifyUrl,
-			String createIp, WeixinPayAccount weixinAccount) {
-		return createPayJsRequestJsonV2(weixinAccount, body, outTradeNo,
-				totalFee, notifyUrl, createIp, null, null, null, 0d, 0d, null);
-	}
-
-	/**
-	 * 生成V2.x版本JSAPI支付字符串
-	 * 
-	 * @param weixinAccount
-	 *            商户信息
-	 * @param body
-	 *            支付详情
-	 * @param outTradeNo
-	 *            订单号
-	 * @param totalFee
-	 *            订单总额 按实际金额传入即可(元) 构造函数会转换为分
-	 * @param notifyUrl
-	 *            支付回调URL
-	 * @param createIp
-	 *            订单生成的机器 IP
-	 * @param attach
-	 *            附加数据，在查询API和支付通知中原样返回，该字段主要用于商户携带订单的自定义数据
-	 * @param timeStart
-	 *            订单生成时间，格式为yyyyMMddHHmmss
-	 * @param timeExpire
-	 *            订单失效时间，格式为yyyyMMddHHmmss;注意：最短失效时间间隔必须大于5分钟
-	 * @param transportFee
-	 *            物流费用 如有值 必须保证 transportFee+productFee=totalFee
-	 * @param transportFee
-	 *            商品费用 如有值 必须保证 transportFee+productFee=totalFee
-	 * @param goodsTag
-	 *            商品标记，代金券或立减优惠功能的参数
-	 * @return 支付json串
-	 */
-	public static String createPayJsRequestJsonV2(
-			WeixinPayAccount weixinAccount, String body, String outTradeNo,
-			double totalFee, String notifyUrl, String createIp, String attach,
-			Date timeStart, Date timeExpire, double transportFee,
-			double productFee, String goodsTag) {
-		PayPackageV2 payPackage = new PayPackageV2(
-				weixinAccount.getPartnerId(), body, outTradeNo, totalFee,
-				notifyUrl, createIp);
-		payPackage.setAttach(attach);
-		payPackage.setTimeStart(timeStart);
-		payPackage.setTimeExpire(timeExpire);
-		payPackage.setTransportFee(transportFee);
-		payPackage.setProductFee(productFee);
-		payPackage.setGoodsTag(goodsTag);
-		JsPayRequestV2 jsPayRequest = new JsPayRequestV2(weixinAccount,
-				payPackage);
-		jsPayRequest.setPaySign(paysignSha(jsPayRequest,
-				weixinAccount.getPaySignKey()));
-		jsPayRequest.setSignType(SignType.SHA1);
-		return JSON.toJSONString(jsPayRequest);
-	}
-
-	/**
-	 * sha签名(一般用于V2.x支付接口)
-	 * 
-	 * @param obj
-	 *            签名对象
-	 * @return
-	 */
-	public static String paysignSha(Object obj) {
-		return DigestUtil.SHA1(MapUtil.toJoinString(obj, false, true, null));
-	}
-
-	/**
-	 * sha签名(一般用于V2.x支付接口)
-	 * 
-	 * @param obj
-	 *            签名对象
-	 * @param paySignKey
-	 *            支付API的密钥<font color="red">请注意排序放进去的是put("appKey",
-	 *            paySignKey)</font>
-	 * @return
-	 */
-	public static String paysignSha(Object obj, String paySignKey) {
-		Map<String, String> extra = new HashMap<String, String>();
-		extra.put("appKey", paySignKey);
-		return DigestUtil.SHA1(MapUtil.toJoinString(obj, false, true, extra));
-	}
-
-	/**
-	 * 创建V2.x NativePay支付链接
-	 * 
-	 * @param weixinAccount
-	 *            商户信息
-	 * @param productId
-	 *            与订单ID等价
-	 * @return 支付链接
-	 */
-	public static String createNativePayRequestURLV2(
-			WeixinPayAccount weixinAccount, String productId) {
-		Map<String, String> map = new HashMap<String, String>();
-		String timestamp = DateUtil.timestamp2string();
-		String noncestr = RandomUtil.generateString(16);
-		map.put("appid", weixinAccount.getId());
-		map.put("timestamp", timestamp);
-		map.put("noncestr", noncestr);
-		map.put("productid", productId);
-		map.put("appkey", weixinAccount.getPaySignKey());
-		String sign = paysignSha(map);
-		return String
-				.format("􏳈􏳈􏳈􏳈􏱗􏱗􏱗􏱗􏱕􏱕􏱕􏱕􏳉􏳉􏳉􏳉􏱕􏱕􏱕􏱕􏱩􏱩􏱩􏱩􏰛􏰛􏰛􏰛􏳊􏳊􏳊􏳊􏳊􏳊􏳊􏳊􏳈􏳈􏳈􏳈􏳉􏳉􏳉􏳉􏱶􏱶􏱶􏱶􏱓􏱓􏱓􏱓􏱭􏱭􏱭􏱭􏳊􏳊􏳊􏳊􏳋􏳋􏳋􏳋􏱕􏱕􏱕􏱕􏳌􏳌􏳌􏳌􏱶􏱶􏱶􏱶􏱓􏱓􏱓􏱓􏱭􏱭􏱭􏱭􏱰􏱰􏱰􏱰􏱨􏱨􏱨􏱨􏳍􏳍􏳍􏳍􏳎􏳎􏳎􏳎􏱱􏱱􏱱􏱱􏱕􏱕􏱕􏱕􏱦􏱦􏱦􏱦􏱩􏱩􏱩􏱩􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱓􏱓􏱓􏱓􏱶􏱶􏱶􏱶􏱶􏱶􏱶􏱶􏱕􏱕􏱕􏱕􏱪􏱪􏱪􏱪􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱶􏱶􏱶􏱶􏱨􏱨􏱨􏱨􏳟􏳟􏳟􏳟􏱪􏱪􏱪􏱪􏱰􏱰􏱰􏱰􏱷􏱷􏱷􏱷􏱔􏱔􏱔􏱔􏱕􏱕􏱕􏱕􏱪􏱪􏱪􏱪􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱔􏱔􏱔􏱔􏱕􏱕􏱕􏱕􏳈􏳈􏳈􏳈􏱗􏱗􏱗􏱗􏱕􏱕􏱕􏱕􏳉􏳉􏳉􏳉􏱕􏱕􏱕􏱕􏱩􏱩􏱩􏱩􏰛􏰛􏰛􏰛􏳊􏳊􏳊􏳊􏳊􏳊􏳊􏳊􏳈􏳈􏳈􏳈􏳉􏳉􏳉􏳉􏱶􏱶􏱶􏱶􏱓􏱓􏱓􏱓􏱭􏱭􏱭􏱭􏳊􏳊􏳊􏳊􏳋􏳋􏳋􏳋􏱕􏱕􏱕􏱕􏳌􏳌􏳌􏳌􏱶􏱶􏱶􏱶􏱓􏱓􏱓􏱓􏱭􏱭􏱭􏱭􏱰􏱰􏱰􏱰􏱨􏱨􏱨􏱨􏳍􏳍􏳍􏳍􏳎􏳎􏳎􏳎􏱱􏱱􏱱􏱱􏱕􏱕􏱕􏱕􏱦􏱦􏱦􏱦􏱩􏱩􏱩􏱩􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱓􏱓􏱓􏱓􏱶􏱶􏱶􏱶􏱶􏱶􏱶􏱶􏱕􏱕􏱕􏱕􏱪􏱪􏱪􏱪􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱶􏱶􏱶􏱶􏱨􏱨􏱨􏱨􏳟􏳟􏳟􏳟􏱪􏱪􏱪􏱪􏱰􏱰􏱰􏱰􏱷􏱷􏱷􏱷􏱔􏱔􏱔􏱔􏱕􏱕􏱕􏱕􏱪􏱪􏱪􏱪􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱔􏱔􏱔􏱔􏱕􏱕􏱕􏱕􏳠􏳠􏳠􏳠􏱗􏱗􏱗􏱗􏱱􏱱􏱱􏱱􏱔􏱔􏱔􏱔􏱓􏱓􏱓􏱓􏳠􏳠􏳠􏳠􏱶􏱶􏱶􏱶􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱩􏱩􏱩􏱩􏳟􏳟􏳟􏳟􏱩􏱩􏱩􏱩􏱷􏱷􏱷􏱷􏱗􏱗􏱗􏱗􏱱􏱱􏱱􏱱􏱔􏱔􏱔􏱔􏱨􏱨􏱨􏱨􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝weixin://wxpay/bizpayurl?sign=%s&appid=%s&productid=%s&timestamp=%s&nocestr=%s􏳠􏳠􏳠􏳠􏱗􏱗􏱗􏱗􏱱􏱱􏱱􏱱􏱔􏱔􏱔􏱔􏱓􏱓􏱓􏱓􏳠􏳠􏳠􏳠􏱶􏱶􏱶􏱶􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳞􏳞􏳞􏳞􏱩􏱩􏱩􏱩􏳟􏳟􏳟􏳟􏱩􏱩􏱩􏱩􏱷􏱷􏱷􏱷􏱗􏱗􏱗􏱗􏱱􏱱􏱱􏱱􏱔􏱔􏱔􏱔􏱨􏱨􏱨􏱨􏳜􏳜􏳜􏳜􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝􏳝",
-						sign, weixinAccount.getId(), productId, timestamp,
-						noncestr);
-	}
-
-	/**
-	 * 创建V2.x NATIVE回调时的响应字符串
-	 * 
-	 * @param weixinAccount
-	 *            商户信息
-	 * @param payPackage
-	 *            订单信息
-	 * @return
-	 */
-	public static String createNativePayResponseV2(
-			WeixinPayAccount weixinAccount, PayPackageV2 payPackage) {
-		NativePayResponseV2 payRequest = new NativePayResponseV2(weixinAccount,
-				payPackage);
-		Map<String, String> map = new HashMap<String, String>();
-		String timestamp = DateUtil.timestamp2string();
-		String noncestr = RandomUtil.generateString(16);
-		map.put("appid", weixinAccount.getId());
-		map.put("appkey", weixinAccount.getPaySignKey());
-		map.put("timestamp", timestamp);
-		map.put("noncestr", noncestr);
-		map.put("package", payRequest.getPackageInfo());
-		map.put("retcode", payRequest.getRetCode());
-		map.put("reterrmsg", payRequest.getRetMsg());
-		payRequest.setPaySign(paysignSha(map));
-		return XmlStream.toXML(payRequest);
-	}
-
-	private static String JSAPIV2() {
-		WeixinPayAccount weixinAccount = JSON.parseObject(
-				Weixin4jConfigUtil.getValue("account"), WeixinPayAccount.class);
-		return createPayJsRequestJsonV2("支付测试", "JSAPI01", 0.01d, "127.0.0.0",
-				"http://127.0.0.1/jsapi/notify", weixinAccount);
-	}
-
-	private static String NATIVEV2() {
-		WeixinPayAccount weixinAccount = JSON.parseObject(
-				Weixin4jConfigUtil.getValue("account"), WeixinPayAccount.class);
-		return createNativePayRequestURLV2(weixinAccount, "P1");
-	}
-
-	public static void main(String[] args) throws WeixinPayException {
-		// V2版本下的JS支付
-		System.out.println(JSAPIV2());
-		// V2版本下的原生支付
-		System.out.println(NATIVEV2());
-	}
-}

weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/PayTest.java

@@ -9,12 +9,11 @@ import java.util.Date;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.foxinmy.weixin4j.exception.WeixinPayException;
 import com.foxinmy.weixin4j.exception.WeixinException;
+import com.foxinmy.weixin4j.exception.WeixinPayException;
 import com.foxinmy.weixin4j.http.weixin.XmlResult;
 import com.foxinmy.weixin4j.model.WeixinPayAccount;
 import com.foxinmy.weixin4j.mp.api.Pay2Api;
-import com.foxinmy.weixin4j.payment.PayUtil;
 import com.foxinmy.weixin4j.payment.WeixinPayProxy;
 import com.foxinmy.weixin4j.payment.mch.ApiResult;
 import com.foxinmy.weixin4j.payment.mch.MchPayPackage;
@@ -24,6 +23,7 @@ import com.foxinmy.weixin4j.token.FileTokenStorager;
 import com.foxinmy.weixin4j.type.IdQuery;
 import com.foxinmy.weixin4j.type.IdType;
 import com.foxinmy.weixin4j.type.TradeType;
+import com.foxinmy.weixin4j.util.DigestUtil;
 import com.foxinmy.weixin4j.util.Weixin4jConfigUtil;
 
 public class PayTest {
@@ -84,7 +84,7 @@ public class PayTest {
 		System.err.println(order);
 		String sign = order.getSign();
 		order.setSign(null);
-		String valiSign = PayUtil.paysignMd5(order, ACCOUNT3.getPaySignKey());
+		String valiSign = DigestUtil.paysignMd5(order, ACCOUNT3.getPaySignKey());
 		System.err
 				.println(String.format("sign=%s,valiSign=%s", sign, valiSign));
 		Assert.assertEquals(valiSign, sign);
@@ -98,7 +98,7 @@ public class PayTest {
 		// 这里的验证签名需要把details循环拼接
 		String sign = record.getSign();
 		record.setSign(null);
-		String valiSign = PayUtil.paysignMd5(record, ACCOUNT3.getPaySignKey());
+		String valiSign = DigestUtil.paysignMd5(record, ACCOUNT3.getPaySignKey());
 		System.err
 				.println(String.format("sign=%s,valiSign=%s", sign, valiSign));
 		Assert.assertEquals(valiSign, sign);
@@ -127,7 +127,7 @@ public class PayTest {
 		System.err.println(result);
 		String sign = result.getSign();
 		result.setSign(null);
-		String valiSign = PayUtil.paysignMd5(result, ACCOUNT3.getPaySignKey());
+		String valiSign = DigestUtil.paysignMd5(result, ACCOUNT3.getPaySignKey());
 		System.err
 				.println(String.format("sign=%s,valiSign=%s", sign, valiSign));
 		Assert.assertEquals(valiSign, sign);
@@ -141,8 +141,7 @@ public class PayTest {
 		payPackageV3.setProductId("0001");
 		PrePay prePay = null;
 		try {
-			prePay = PayUtil.createPrePay(payPackageV3,
-					ACCOUNT3.getPaySignKey());
+			prePay = PAY3.createPrePay(payPackageV3);
 		} catch (WeixinPayException e) {
 			e.printStackTrace();
 		}
@@ -155,7 +154,7 @@ public class PayTest {
 		System.err.println(result);
 		String sign = result.getSign();
 		result.setSign(null);
-		String valiSign = PayUtil.paysignMd5(result, ACCOUNT3.getPaySignKey());
+		String valiSign = DigestUtil.paysignMd5(result, ACCOUNT3.getPaySignKey());
 		System.err
 				.println(String.format("sign=%s,valiSign=%s", sign, valiSign));
 		Assert.assertEquals(valiSign, sign);