From 251646d43513e2bfd8416ba45e42886808eb0a83 Mon Sep 17 00:00:00 2001 From: hocgin Date: Sun, 24 Nov 2019 16:27:01 +0800 Subject: [PATCH] =?UTF-8?q?#=20=E7=AD=BE=E5=90=8D=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/baidu/api/BaiduPayConfigStorage.java | 1 + .../egzosn/pay/baidu/api/BaiduPayService.java | 90 +++++++------------ .../pay/common/util/sign/SignUtils.java | 20 ++++- 3 files changed, 48 insertions(+), 63 deletions(-) diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java b/pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java index df84f5e..f1496e7 100644 --- a/pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java +++ b/pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java @@ -42,6 +42,7 @@ public class BaiduPayConfigStorage extends BasePayConfigStorage { return super.getKeyPrivate(); } + @Override public void setKeyPublic(String keyPublic) { super.setKeyPublic(keyPublic); } diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayService.java b/pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayService.java index a7a1ad8..3826166 100644 --- a/pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayService.java +++ b/pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayService.java @@ -35,6 +35,7 @@ public class BaiduPayService extends BasePayService { public static final String ORDER_ID = "orderId"; public static final String USER_ID = "userId"; public static final String SITE_ID = "siteId"; + public static final String SIGN = "sign"; public static final String METHOD = "method"; public static final String TYPE = "type"; @@ -63,7 +64,7 @@ public class BaiduPayService extends BasePayService { public boolean signVerify(Map params, String sign) { String keyPrivate = payConfigStorage.getKeyPrivate(); String rsaSign = String.valueOf(params.get(RSA_SIGN)); - String targetRsaSign = getRsaSign(params, keyPrivate, RSA_SIGN); + String targetRsaSign = getRsaSign(params, RSA_SIGN); LOG.debug("百度返回的签名: " + rsaSign + " 本地产生的签名: " + targetRsaSign); return StringUtils.equals(rsaSign, targetRsaSign); } @@ -89,11 +90,11 @@ public class BaiduPayService extends BasePayService { * * @return */ - public NoNullMap getUseQueryPay() { + public Map getUseQueryPay() { String appKey = payConfigStorage.getAppKey(); - NoNullMap result = new NoNullMap<>(); - result.putIfNoNull(APP_KEY, appKey) - .putIfNoNull(APP_ID, payConfigStorage.getAppid()); + Map result = new HashMap<>(); + result.put(APP_KEY, appKey); + result.put(APP_ID, payConfigStorage.getAppid()); return result; } @@ -273,18 +274,18 @@ public class BaiduPayService extends BasePayService { } public Map refundUseBaidu(BaiduRefundOrder refundOrder) { - NoNullMap parameters = getUseQueryPay(); + Map parameters = getUseQueryPay(); BaiduTransactionType transactionType = BaiduTransactionType.APPLY_REFUND; - parameters.putIfNoNull(METHOD, transactionType.getMethod()) - .putIfNoNull(ORDER_ID, refundOrder.getTradeNo()) - .putIfNoNull(USER_ID, refundOrder.getUserId()) - .putIfNoNull("refundType", refundOrder.getRefundType()) - .putIfNoNull("refundReason", String.valueOf(refundOrder.getRefundReason())) - .putIfNoNull(TP_ORDER_ID, refundOrder.getTpOrderId()) - .putIfNoNull("applyRefundMoney", refundOrder.getApplyRefundMoney()) - .putIfNoNull("bizRefundBatchId", refundOrder.getBizRefundBatchId()) - .putIfNoNull(APP_KEY, payConfigStorage.getAppKey()) - .putIfNoNull(RSA_SIGN, getRsaSign(parameters, payConfigStorage.getKeyPrivate())); + parameters.put(METHOD, transactionType.getMethod()); + parameters.put(ORDER_ID, refundOrder.getTradeNo()); + parameters.put(USER_ID, refundOrder.getUserId()); + parameters.put("refundType", refundOrder.getRefundType()); + parameters.put("refundReason", String.valueOf(refundOrder.getRefundReason())); + parameters.put(TP_ORDER_ID, refundOrder.getTpOrderId()); + parameters.put("applyRefundMoney", refundOrder.getApplyRefundMoney()); + parameters.put("bizRefundBatchId", refundOrder.getBizRefundBatchId()); + parameters.put(APP_KEY, payConfigStorage.getAppKey()); + parameters.put(RSA_SIGN, getRsaSign(parameters, RSA_SIGN)); return requestTemplate.getForObject(String.format("%s?%s", getReqUrl(transactionType), UriVariables.getMapToParameters(parameters)), JSONObject.class); } @@ -296,14 +297,14 @@ public class BaiduPayService extends BasePayService { @Override public Map refundquery(String orderId, String userId) { - NoNullMap parameters = getUseQueryPay(); + Map parameters = getUseQueryPay(); BaiduTransactionType transactionType = BaiduTransactionType.REFUND_QUERY; - parameters.putIfNoNull(METHOD, transactionType.getMethod()) - .putIfNoNull(TYPE, 3) - .putIfNoNull(ORDER_ID, orderId) - .putIfNoNull(USER_ID, userId) - .putIfNoNull(APP_KEY, payConfigStorage.getAppKey()) - .putIfNoNull(RSA_SIGN, getRsaSign(parameters, payConfigStorage.getKeyPrivate())); + parameters.put(METHOD, transactionType.getMethod()); + parameters.put(TYPE, 3); + parameters.put(ORDER_ID, orderId); + parameters.put(USER_ID, userId); + parameters.put(APP_KEY, payConfigStorage.getAppKey()); + parameters.put(RSA_SIGN, getRsaSign(parameters, RSA_SIGN)); return requestTemplate.getForObject(String.format("%s?%s", getReqUrl(transactionType), UriVariables.getMapToParameters(parameters)), JSONObject.class); } @@ -337,10 +338,10 @@ public class BaiduPayService extends BasePayService { throw new UnsupportedOperationException("不支持该操作"); } - NoNullMap parameters = getUseQueryPay(); - parameters.putIfNoNull(ORDER_ID, orderId) - .putIfNoNull(SITE_ID, siteId) - .putIfNoNull("sign", getRsaSignUsePayQuery(parameters, payConfigStorage.getKeyPrivate())); + Map parameters = getUseQueryPay(); + parameters.put(ORDER_ID, orderId); + parameters.put(SITE_ID, siteId); + parameters.put(SIGN, getRsaSign(parameters, SIGN)); return requestTemplate.getForObject(String.format("%s?%s", getReqUrl(transactionType), UriVariables.getMapToParameters(parameters)), JSONObject.class); } @@ -362,39 +363,8 @@ public class BaiduPayService extends BasePayService { return SignUtils.RSA.sign(params, privateKey, "UTF-8"); } - /** - * "支付状态查询" 使用的签名 - * - * @param params - * @param privateKey - * @return - */ - private String getRsaSignUsePayQuery(Map params, String privateKey) { - Map signParams = new HashMap<>(); - signParams.put(APP_KEY, String.valueOf(params.get(APP_KEY))); - signParams.put(APP_ID, String.valueOf(params.get(APP_ID))); - signParams.put(ORDER_ID, String.valueOf(params.get(ORDER_ID))); - signParams.put(SITE_ID, String.valueOf(params.get(SITE_ID))); - if (signParams.containsValue(null)) { - throw new IllegalArgumentException("参数 " + signParams.keySet().toString() + " 均为必填"); - } - - return SignUtils.RSA.sign(params, privateKey, "UTF-8"); - } - - private String getRsaSign(Map params, String privateKey) { - Map signParams = new HashMap<>(); - signParams.put(APP_KEY, String.valueOf(params.get(APP_KEY))); - signParams.put(USER_ID, String.valueOf(params.get(USER_ID))); - signParams.put(ORDER_ID, String.valueOf(params.get(ORDER_ID))); - if (signParams.containsValue(null)) { - throw new IllegalArgumentException("参数 " + signParams.keySet().toString() + " 均为必填"); - } - - return SignUtils.RSA.sign(params, privateKey, "UTF-8"); - } - private String getRsaSign(Map params, String... ignoreKeys) { - return SignUtils.RSA.createSign(SignUtils.parameterText(params, "&", ignoreKeys), payConfigStorage.getKeyPrivate(), "UTF-8"); + String waitSignVal = SignUtils.parameterText(params, "&", false, ignoreKeys); + return SignUtils.RSA.createSign(waitSignVal, payConfigStorage.getKeyPrivate(), "UTF-8"); } } diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/SignUtils.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/SignUtils.java index 3d13bf5..a971b05 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/SignUtils.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/SignUtils.java @@ -178,7 +178,8 @@ public enum SignUtils { public static String parameterText(Map parameters, String separator) { return parameterText(parameters, separator, "signature", "sign", "key", "sign_type"); } - + + /** * * 把数组所有元素排序，并按照“参数=参数值”的模式用“@param separator”字符拼接成字符串 @@ -187,7 +188,20 @@ public enum SignUtils { * @param ignoreKey 需要忽略添加的key * @return 去掉空值与签名参数后的新签名，拼接后字符串 */ - public static String parameterText(Map parameters, String separator, String... ignoreKey ) { + public static String parameterText(Map parameters, String separator, String... ignoreKey) { + return parameterText(parameters, separator, true, ignoreKey); + } + + /** + * + * 把数组所有元素排序，并按照“参数=参数值”的模式用“@param separator”字符拼接成字符串 + * @param parameters 参数 + * @param separator 分隔符 + * @param ignoreNullValue 需要忽略NULL值 + * @param ignoreKey 需要忽略添加的key + * @return 去掉空值与签名参数后的新签名，拼接后字符串 + */ + public static String parameterText(Map parameters, String separator, boolean ignoreNullValue, String... ignoreKey ) { if(parameters == null){ return ""; } @@ -219,7 +233,7 @@ public enum SignUtils { for (String k : keys) { String valueStr = ""; Object o = parameters.get(k); - if (null == o) { + if (ignoreNullValue && null == o) { continue; } if (o instanceof String[]) {