diff --git a/pay-java-ali/pom.xml b/pay-java-ali/pom.xml index a72437e..f2a9bb4 100644 --- a/pay-java-ali/pom.xml +++ b/pay-java-ali/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.11.3 + 2.11.4 4.0.0 pay-java-ali diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java index 6f8f495..06d5ce7 100644 --- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java @@ -13,8 +13,6 @@ import com.egzosn.pay.common.http.UriVariables; import com.egzosn.pay.common.util.MatrixToImageWriter; import com.egzosn.pay.common.util.sign.SignUtils; import com.egzosn.pay.common.util.str.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.awt.image.BufferedImage; import java.math.BigDecimal; import java.text.DateFormat; @@ -29,7 +27,6 @@ import java.util.*; * date 2017-2-22 20:09 */ public class AliPayService extends BasePayService { - protected final Log log = LogFactory.getLog(AliPayService.class); /** * 正式测试环境 @@ -74,7 +71,7 @@ public class AliPayService extends BasePayService { if (params.get("sign") == null) { - log.debug("支付宝支付异常:params:" + params); + LOG.debug("支付宝支付异常:params:" + params); return false; } @@ -298,7 +295,7 @@ public class AliPayService extends BasePayService { JSONObject result = getHttpRequestTemplate().postForObject(getReqUrl() + "?" + UriVariables.getMapToParameters(orderInfo), null, JSONObject.class); JSONObject response = result.getJSONObject("alipay_trade_pay_response"); if (!"10000".equals(response.getString("code"))){ - log.info("收款失败"); + LOG.info("收款失败"); } return result; } @@ -520,6 +517,7 @@ public class AliPayService extends BasePayService { return getHttpRequestTemplate().postForObject(getReqUrl() + "?" + UriVariables.getMapToParameters(parameters), null, JSONObject.class); } + /** * 获取biz_content。请求参数的集合 不包含下载账单 * @param tradeNo 支付平台订单号 diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java index 145632f..e2cd01d 100644 --- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java @@ -13,8 +13,6 @@ import com.egzosn.pay.common.http.HttpConfigStorage; import com.egzosn.pay.common.http.UriVariables; import com.egzosn.pay.common.util.sign.SignUtils; import com.egzosn.pay.common.util.str.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.awt.image.BufferedImage; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; @@ -24,16 +22,17 @@ import java.text.SimpleDateFormat; import java.util.*; /** - * 支付宝支付通知 + * 支付宝支付服务 * @author egan * * email egzosn@gmail.com * date 2016-5-18 14:09:01 - * + * 旧版本支付服务,2015年之前的支付方式,之后版本请看新类 * @see com.egzosn.pay.ali.api.AliPayService */ +@Deprecated public class AliPayService extends BasePayService { - protected final Log LOG = LogFactory.getLog(AliPayService.class); + private static final String HTTPS_REQ_URL = "https://mapi.alipay.com/gateway.do"; diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml index 7ee6a46..26f998f 100644 --- a/pay-java-fuiou/pom.xml +++ b/pay-java-fuiou/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.11.3 + 2.11.4 4.0.0 pay-java-fuiou diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java index f48a8d8..836e5b9 100644 --- a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java +++ b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayService.java @@ -7,9 +7,6 @@ import com.egzosn.pay.common.http.HttpConfigStorage; import com.egzosn.pay.common.http.UriVariables; import com.egzosn.pay.common.util.sign.SignUtils; import com.egzosn.pay.common.util.str.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.awt.image.BufferedImage; import java.io.InputStream; import java.math.BigDecimal; @@ -25,8 +22,7 @@ import java.util.*; * */ public class FuiouPayService extends BasePayService { - //日志 - protected final Log log = LogFactory.getLog(FuiouPayService.class); + //正式域名 public final static String URL_FuiouBaseDomain = "https://pay.fuiou.com/"; //测试域名 @@ -78,7 +74,7 @@ public class FuiouPayService extends BasePayService { @Override public boolean verify(Map params) { if (!"0000".equals(params.get("order_pay_code"))) { - log.debug(String.format("富友支付异常:order_pay_code=%s,错误原因=%s,参数集=%s", params.get("order_pay_code"), params.get("order_pay_error"), params)); + LOG.debug(String.format("富友支付异常:order_pay_code=%s,错误原因=%s,参数集=%s", params.get("order_pay_code"), params.get("order_pay_error"), params)); return false; } try { diff --git a/pay-java-payoneer/pom.xml b/pay-java-payoneer/pom.xml index 62907e0..7ec0bc0 100644 --- a/pay-java-payoneer/pom.xml +++ b/pay-java-payoneer/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.11.3 + 2.11.4 4.0.0 pay-java-payoneer diff --git a/pay-java-paypal/pom.xml b/pay-java-paypal/pom.xml index 49d85a5..c2b97c8 100644 --- a/pay-java-paypal/pom.xml +++ b/pay-java-paypal/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.11.3 + 2.11.4 4.0.0 diff --git a/pay-java-union/pom.xml b/pay-java-union/pom.xml index 70b7cb7..c8943e8 100644 --- a/pay-java-union/pom.xml +++ b/pay-java-union/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.11.3 + 2.11.4 4.0.0 diff --git a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java index 7b3d62b..b560bc0 100644 --- a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java +++ b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java @@ -15,8 +15,6 @@ import com.egzosn.pay.common.util.sign.encrypt.RSA; import com.egzosn.pay.common.util.sign.encrypt.RSA2; import com.egzosn.pay.union.bean.UnionTransactionType; import com.egzosn.pay.union.bean.SDKConstants; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; @@ -35,7 +33,6 @@ import java.util.*; * */ public class UnionPayService extends BasePayService { - private static final Log log = LogFactory.getLog(UnionPayService.class); /** * 测试域名 */ @@ -158,7 +155,7 @@ public class UnionPayService extends BasePayService { public boolean verify(Map result) { if (null == result || result.get(SDKConstants.param_signature) == null) { - log.debug("银联支付验签异常:params:" + result); + LOG.debug("银联支付验签异常:params:" + result); return false; } return this.signVerify(result, (String) result.get(SDKConstants.param_signature)); @@ -331,13 +328,13 @@ public class UnionPayService extends BasePayService { .build(pkixParams); return cert; } catch (java.security.cert.CertPathBuilderException e) { - log.error("verify certificate chain fail.", e); + LOG.error("verify certificate chain fail.", e); } catch (CertificateExpiredException e) { - log.error(e); + LOG.error(e); } catch (CertificateNotYetValidException e) { - log.error(e); + LOG.error(e); } catch (Exception e) { - log.error(e); + LOG.error(e); } return null; } @@ -393,7 +390,7 @@ public class UnionPayService extends BasePayService { x509CertString.getBytes("ISO-8859-1")); x509Cert = (X509Certificate) cf.generateCertificate(tIn); } catch (Exception e) { - log.error("gen certificate error", e); + throw new PayErrorException(new PayException("证书加载失败", "gen certificate error:"+e.getLocalizedMessage() )); } return x509Cert; } diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml index 7c2d5b3..5bf0cce 100644 --- a/pay-java-wx-youdian/pom.xml +++ b/pay-java-wx-youdian/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.11.3 + 2.11.4 4.0.0 pay-java-wx-youdian diff --git a/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java b/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java index 8e8861a..8d2bd4b 100644 --- a/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java +++ b/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java @@ -12,8 +12,6 @@ import com.egzosn.pay.common.util.sign.SignUtils; import com.egzosn.pay.common.util.str.StringUtils; import com.egzosn.pay.wx.youdian.bean.YdPayError; import com.egzosn.pay.wx.youdian.bean.YoudianTransactionType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.awt.image.BufferedImage; import java.io.InputStream; import java.math.BigDecimal; @@ -28,7 +26,6 @@ import java.util.concurrent.locks.Lock; * date 2017/01/12 22:58 */ public class WxYouDianPayService extends BasePayService { - protected static final Log LOG = LogFactory.getLog(WxYouDianPayService.class); private final static String URL = "http://life.51youdian.com/Api/CheckoutCounter/"; diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml index 7ebabdf..89b476e 100644 --- a/pay-java-wx/pom.xml +++ b/pay-java-wx/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.11.3 + 2.11.4 4.0.0 pay-java-wx diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java index 6931352..141f3cf 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java @@ -15,8 +15,6 @@ import com.egzosn.pay.wx.bean.WxPayError; import com.egzosn.pay.wx.bean.WxTransactionType; import com.egzosn.pay.common.util.XML; import com.egzosn.pay.wx.bean.WxTransferType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; @@ -38,7 +36,6 @@ import static com.egzosn.pay.wx.bean.WxTransferType.*; * */ public class WxPayService extends BasePayService { - protected final Log LOG = LogFactory.getLog(WxPayService.class); /** diff --git a/pom.xml b/pom.xml index ef4c72c..62c13cf 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.egzosn pay-java-parent pom - 2.11.3 + 2.11.4 Pay Java - Parent Pay Java Parent @@ -56,7 +56,7 @@ - 2.11.3 + 2.11.4 4.5.4 1.2.17 1.2.41 @@ -173,7 +173,7 @@ - + \ No newline at end of file