diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java index 3e1eec1..23bbd9a 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java @@ -10,6 +10,8 @@ import com.egzosn.pay.demo.service.handler.FuiouPayMessageHandler; import com.egzosn.pay.fuiou.api.FuiouPayConfigStorage; import com.egzosn.pay.fuiou.api.FuiouPayService; import com.egzosn.pay.fuiou.bean.FuiouTransactionType; +import com.egzosn.pay.fuiou.api.FuiouPayConfigStorage; +import com.egzosn.pay.fuiou.api.FuiouPayService; import com.egzosn.pay.wx.api.WxPayConfigStorage; import com.egzosn.pay.wx.api.WxPayService; import com.egzosn.pay.wx.bean.WxTransactionType; @@ -18,18 +20,20 @@ import com.egzosn.pay.wx.youdian.api.WxYouDianPayService; import com.egzosn.pay.wx.youdian.bean.YoudianTransactionType; + /** * 支付类型 + * * @author egan - * @email egzosn@gmail.com - * @date 2016/11/20 0:30 + * email egzosn@gmail.com + * date 2016/11/20 0:30 */ public enum PayType implements BasePayType { aliPay{ /** - * @see com.egzosn.pay.ali.before.api.AliPayService 17年更新的版本,旧版本请自行切换 + * @see com.egzosn.pay.ali.api.AliPayService 17年更新的版本,旧版本请自行切换 * @param apyAccount * @return */ diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java index 752a617..d1dd637 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java @@ -1,9 +1,10 @@ - - package com.egzosn.pay.demo.service; -import com.egzosn.pay.ali.bean.AliTransactionType; +import com.egzosn.pay.common.api.PayMessageRouter; import com.egzosn.pay.common.http.HttpConfigStorage; +import com.egzosn.pay.demo.service.handler.FuiouPayMessageHandler; +import com.egzosn.pay.demo.service.handler.YouDianPayMessageHandler; +import com.egzosn.pay.demo.service.interceptor.AliPayMessageInterceptor; import com.egzosn.pay.demo.entity.ApyAccount; import com.egzosn.pay.demo.entity.PayType; import com.egzosn.pay.demo.service.handler.AliPayMessageHandler; @@ -13,7 +14,6 @@ import com.egzosn.pay.demo.service.handler.YouDianPayMessageHandler; import com.egzosn.pay.demo.service.interceptor.AliPayMessageInterceptor; import com.egzosn.pay.common.api.PayConfigStorage; import com.egzosn.pay.common.api.PayMessageHandler; -import com.egzosn.pay.common.api.PayMessageRouter; import com.egzosn.pay.common.api.PayService; import com.egzosn.pay.common.bean.MsgType; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java index b5258d1..7f27f51 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java @@ -12,8 +12,8 @@ import java.util.Map; /** * 支付宝回调信息拦截器 * @author: egan - * @email egzosn@gmail.com - * @date 2017/1/18 19:28 + * email egzosn@gmail.com + * date 2017/1/18 19:28 */ public class AliPayMessageInterceptor implements PayMessageInterceptor { diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java index 4f9c416..c09f560 100644 --- a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java +++ b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java @@ -1,12 +1,11 @@ -package com.egzosn.pay.fuiou.api;/** - * Created by Fuzx on 2017/1/16 0016. - */ - +package com.egzosn.pay.fuiou.api; import com.egzosn.pay.common.api.BasePayConfigStorage; /** * @author Fuzx - * @create 2017 2017/1/16 0016 + *
+ * create 2017 2017/1/16 0016
+ * 
*/ public class FuiouPayConfigStorage extends BasePayConfigStorage { 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 5375962..6403930 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,4 @@ -package com.egzosn.pay.fuiou.api;/** - * Created by Fuzx on 2017/1/16 0016. - */ - - +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; @@ -27,7 +23,9 @@ import java.util.*; /** * @author Fuzx - * @create 2017 2017/1/16 0016 + *
+ * create 2017 2017/1/16 0016
+ * 
*/ public class FuiouPayService extends BasePayService { //日志 @@ -51,19 +49,18 @@ public class FuiouPayService extends BasePayService { /** * 构造函数,初始化时候使用 - * @param payConfigStorage - * @param configStorage + * @param payConfigStorage 支付账户配置信息 + * @param configStorage 网络代理配置 */ public FuiouPayService (PayConfigStorage payConfigStorage, HttpConfigStorage configStorage) { super(payConfigStorage, configStorage); } - /** * 构造函数,初始化时候使用 - * @param payConfigStorage + * @param payConfigStorage 支付账户配置信息 */ public FuiouPayService (PayConfigStorage payConfigStorage) { - super(payConfigStorage, null); + super(payConfigStorage); } @@ -401,6 +398,7 @@ public class FuiouPayService extends BasePayService { return null; } + /** * 通用查询接口 * diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouCurType.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouCurType.java index 231aa8c..bd5da4a 100644 --- a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouCurType.java +++ b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouCurType.java @@ -1,13 +1,11 @@ -package com.egzosn.pay.fuiou.bean;/** - * Created by Fuzx on 2017/1/24 0024. - */ +package com.egzosn.pay.fuiou.bean; import com.egzosn.pay.common.bean.CurType; /** * 货币类型 * @author Fuzx - * @create 2017 2017/1/24 0024 + * create 2017 2017/1/24 0024 */ public enum FuiouCurType implements CurType { diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouTransactionType.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouTransactionType.java index d124bf1..273b383 100644 --- a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouTransactionType.java +++ b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/bean/FuiouTransactionType.java @@ -5,7 +5,7 @@ import com.egzosn.pay.common.bean.TransactionType; /** * 支付类型 * @author Fuzx - * @create 2017 2017/1/24 0024 + * create 2017 2017/1/24 0024 */ public enum FuiouTransactionType implements TransactionType { B2B("B2B"), @@ -25,7 +25,7 @@ public enum FuiouTransactionType implements TransactionType { /** * 获取接口名称 - * @return + * @return 接口名称 */ @Override public String getMethod() { diff --git a/pom.xml b/pom.xml index 4264294..bfccbdc 100644 --- a/pom.xml +++ b/pom.xml @@ -51,9 +51,9 @@ pay-java-common pay-java-ali pay-java-wx - pay-java-demo pay-java-wx-youdian pay-java-fuiou + pay-java-demo