From 97ee7a115a31966dd6b13e93e8ee87c1123b2dc1 Mon Sep 17 00:00:00 2001 From: egan Date: Sat, 29 Sep 2018 17:53:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E4=BB=98=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=B3=9B=E5=9E=8B=EF=BC=8C=E4=BD=BF=E5=BE=97=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E6=89=A9=E5=B1=95=E6=9B=B4=E6=96=B9=E4=BE=BF=EF=BC=8C?= =?UTF-8?q?=E5=85=B7=E4=BD=93=E6=94=AF=E4=BB=98=E6=9C=8D=E5=8A=A1=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=85=B7=E4=BD=93=E6=94=AF=E4=BB=98=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pay-java-ali/pom.xml | 2 +- .../main/java/com/egzosn/pay/ali/api/AliPayService.java | 9 +++------ .../com/egzosn/pay/ali/before/api/AliPayService.java | 8 ++++---- pay-java-fuiou/pom.xml | 2 +- .../java/com/egzosn/pay/fuiou/api/FuiouPayService.java | 8 +++----- pay-java-payoneer/pom.xml | 2 +- .../com/egzosn/pay/payoneer/api/AdvancedPayService.java | 2 +- .../com/egzosn/pay/payoneer/api/PayoneerPayService.java | 7 +++---- pay-java-paypal/pom.xml | 2 +- .../java/com/egzosn/pay/paypal/api/PayPalPayService.java | 8 ++------ 10 files changed, 20 insertions(+), 30 deletions(-) diff --git a/pay-java-ali/pom.xml b/pay-java-ali/pom.xml index 768bacb..6395dcd 100644 --- a/pay-java-ali/pom.xml +++ b/pay-java-ali/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.10.3-SNAPSHOT + 2.11.1-SNAPSHOT 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 d175235..6f8f495 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 @@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject; import com.egzosn.pay.ali.bean.AliTransactionType; import com.egzosn.pay.common.api.BasePayService; import com.egzosn.pay.common.api.Callback; -import com.egzosn.pay.common.api.PayConfigStorage; import com.egzosn.pay.common.bean.*; import com.egzosn.pay.common.bean.result.PayException; import com.egzosn.pay.common.exception.PayErrorException; @@ -17,8 +16,6 @@ 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.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -31,7 +28,7 @@ import java.util.*; * email egzosn@gmail.com * date 2017-2-22 20:09 */ -public class AliPayService extends BasePayService { +public class AliPayService extends BasePayService { protected final Log log = LogFactory.getLog(AliPayService.class); /** @@ -53,11 +50,11 @@ public class AliPayService extends BasePayService { } - public AliPayService(PayConfigStorage payConfigStorage, HttpConfigStorage configStorage) { + public AliPayService(AliPayConfigStorage payConfigStorage, HttpConfigStorage configStorage) { super(payConfigStorage, configStorage); } - public AliPayService(PayConfigStorage payConfigStorage) { + public AliPayService(AliPayConfigStorage payConfigStorage) { super(payConfigStorage); } 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 a5000b1..145632f 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 @@ -2,10 +2,10 @@ package com.egzosn.pay.ali.before.api; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.egzosn.pay.ali.api.AliPayConfigStorage; import com.egzosn.pay.ali.before.bean.AliTransactionType; import com.egzosn.pay.common.api.BasePayService; import com.egzosn.pay.common.api.Callback; -import com.egzosn.pay.common.api.PayConfigStorage; import com.egzosn.pay.common.bean.*; import com.egzosn.pay.common.bean.result.PayException; import com.egzosn.pay.common.exception.PayErrorException; @@ -32,7 +32,7 @@ import java.util.*; * * @see com.egzosn.pay.ali.api.AliPayService */ -public class AliPayService extends BasePayService { +public class AliPayService extends BasePayService { protected final Log LOG = LogFactory.getLog(AliPayService.class); @@ -42,11 +42,11 @@ public class AliPayService extends BasePayService { { df.setTimeZone(TimeZone.getTimeZone("GMT+8")); } - public AliPayService(PayConfigStorage payConfigStorage) { + public AliPayService(AliPayConfigStorage payConfigStorage) { super(payConfigStorage); } - public AliPayService(PayConfigStorage payConfigStorage, HttpConfigStorage configStorage) { + public AliPayService(AliPayConfigStorage payConfigStorage, HttpConfigStorage configStorage) { super(payConfigStorage, configStorage); } diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml index 356cf63..1196970 100644 --- a/pay-java-fuiou/pom.xml +++ b/pay-java-fuiou/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.10.3-SNAPSHOT + 2.11.1-SNAPSHOT 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 8a5eb69..f48a8d8 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 @@ -1,8 +1,6 @@ package com.egzosn.pay.fuiou.api; import com.alibaba.fastjson.JSONObject; import com.egzosn.pay.common.api.BasePayService; -import com.egzosn.pay.common.api.Callback; -import com.egzosn.pay.common.api.PayConfigStorage; import com.egzosn.pay.common.bean.*; import com.egzosn.pay.common.exception.PayErrorException; import com.egzosn.pay.common.http.HttpConfigStorage; @@ -26,7 +24,7 @@ import java.util.*; * create 2017 2017/1/16 0016 * */ -public class FuiouPayService extends BasePayService { +public class FuiouPayService extends BasePayService { //日志 protected final Log log = LogFactory.getLog(FuiouPayService.class); //正式域名 @@ -60,14 +58,14 @@ public class FuiouPayService extends BasePayService { * @param payConfigStorage 支付账户配置信息 * @param configStorage 网络代理配置 */ - public FuiouPayService (PayConfigStorage payConfigStorage, HttpConfigStorage configStorage) { + public FuiouPayService (FuiouPayConfigStorage payConfigStorage, HttpConfigStorage configStorage) { super(payConfigStorage, configStorage); } /** * 构造函数，初始化时候使用 * @param payConfigStorage 支付账户配置信息 */ - public FuiouPayService (PayConfigStorage payConfigStorage) { + public FuiouPayService (FuiouPayConfigStorage payConfigStorage) { super(payConfigStorage); } diff --git a/pay-java-payoneer/pom.xml b/pay-java-payoneer/pom.xml index 42314fa..93f4364 100644 --- a/pay-java-payoneer/pom.xml +++ b/pay-java-payoneer/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.10.3-SNAPSHOT + 2.11.1-SNAPSHOT 4.0.0 pay-java-payoneer diff --git a/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/AdvancedPayService.java b/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/AdvancedPayService.java index 796be43..9ef4017 100644 --- a/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/AdvancedPayService.java +++ b/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/AdvancedPayService.java @@ -15,7 +15,7 @@ import java.util.Map; * */ -public interface AdvancedPayService extends PayService { +public interface AdvancedPayService extends PayService { /** * 获取授权页面 * @param payeeId 用户id diff --git a/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerPayService.java b/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerPayService.java index abd9236..014307b 100644 --- a/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerPayService.java +++ b/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerPayService.java @@ -3,7 +3,6 @@ package com.egzosn.pay.payoneer.api; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.egzosn.pay.common.api.BasePayService; -import com.egzosn.pay.common.api.PayConfigStorage; import com.egzosn.pay.common.bean.*; import com.egzosn.pay.common.bean.outbuilder.PayTextOutMessage; import com.egzosn.pay.common.bean.result.PayException; @@ -33,7 +32,7 @@ import java.util.*; * create 2018-01-19 * */ -public class PayoneerPayService extends BasePayService implements AdvancedPayService { +public class PayoneerPayService extends BasePayService implements AdvancedPayService { /** * 测试地址 */ @@ -52,11 +51,11 @@ public class PayoneerPayService extends BasePayService implements AdvancedPaySer private final static String OUT_TRADE_NO = "client_reference_id"; - public PayoneerPayService(PayConfigStorage payConfigStorage) { + public PayoneerPayService(PayoneerConfigStorage payConfigStorage) { super(payConfigStorage); } - public PayoneerPayService(PayConfigStorage payConfigStorage, HttpConfigStorage configStorage) { + public PayoneerPayService(PayoneerConfigStorage payConfigStorage, HttpConfigStorage configStorage) { super(payConfigStorage, configStorage); } diff --git a/pay-java-paypal/pom.xml b/pay-java-paypal/pom.xml index 79b1c7e..0fa40f3 100644 --- a/pay-java-paypal/pom.xml +++ b/pay-java-paypal/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.10.3-SNAPSHOT + 2.11.1-SNAPSHOT 4.0.0 diff --git a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java index 412075b..508922b 100644 --- a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java +++ b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java @@ -1,13 +1,9 @@ package com.egzosn.pay.paypal.api; -/** - * Created by egzosn on 2018/4/8. - */ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.egzosn.pay.common.api.BasePayService; -import com.egzosn.pay.common.api.PayConfigStorage; import com.egzosn.pay.common.bean.*; import com.egzosn.pay.common.bean.result.PayException; import com.egzosn.pay.common.exception.PayErrorException; @@ -32,7 +28,7 @@ import java.util.concurrent.locks.Lock; * email egzosn@gmail.com * date 2018-4-8 ‏‎22:15:09 */ -public class PayPalPayService extends BasePayService{ +public class PayPalPayService extends BasePayService{ /** * 沙箱环境 @@ -52,7 +48,7 @@ public class PayPalPayService extends BasePayService{ } - public PayPalPayService(PayConfigStorage payConfigStorage) { + public PayPalPayService(PayPalConfigStorage payConfigStorage) { super(payConfigStorage); }