diff --git a/pay-java-ali/pom.xml b/pay-java-ali/pom.xml index c28082c..8fc2299 100644 --- a/pay-java-ali/pom.xml +++ b/pay-java-ali/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> pay-java-parent - in.egan + com.egzosn 2.0.SNAPSHOT 4.0.0 @@ -15,7 +15,7 @@ - in.egan + com.egzosn pay-java-common diff --git a/pay-java-ali/src/main/java/in/egan/pay/ali/api/AliPayConfigStorage.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayConfigStorage.java similarity index 94% rename from pay-java-ali/src/main/java/in/egan/pay/ali/api/AliPayConfigStorage.java rename to pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayConfigStorage.java index 374d4dd..10c54b6 100644 --- a/pay-java-ali/src/main/java/in/egan/pay/ali/api/AliPayConfigStorage.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayConfigStorage.java @@ -1,6 +1,6 @@ -package in.egan.pay.ali.api; +package com.egzosn.pay.ali.api; -import in.egan.pay.common.api.BasePayConfigStorage; +import com.egzosn.pay.common.api.BasePayConfigStorage; /** * 支付客户端配置存储 diff --git a/pay-java-ali/src/main/java/in/egan/pay/ali/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java similarity index 96% rename from pay-java-ali/src/main/java/in/egan/pay/ali/api/AliPayService.java rename to pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java index 254ef59..2c2da21 100644 --- a/pay-java-ali/src/main/java/in/egan/pay/ali/api/AliPayService.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java @@ -1,21 +1,21 @@ -package in.egan.pay.ali.api; +package com.egzosn.pay.ali.api; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import in.egan.pay.ali.bean.AliTransactionType; -import in.egan.pay.common.api.BasePayService; -import in.egan.pay.common.api.Callback; -import in.egan.pay.common.api.PayConfigStorage; -import in.egan.pay.common.bean.MethodType; -import in.egan.pay.common.bean.PayOrder; -import in.egan.pay.common.bean.PayOutMessage; -import in.egan.pay.common.bean.TransactionType; -import in.egan.pay.common.bean.result.PayException; -import in.egan.pay.common.exception.PayErrorException; -import in.egan.pay.common.http.HttpConfigStorage; -import in.egan.pay.common.http.UriVariables; -import in.egan.pay.common.util.MatrixToImageWriter; -import in.egan.pay.common.util.sign.SignUtils; +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.MethodType; +import com.egzosn.pay.common.bean.PayOrder; +import com.egzosn.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.bean.TransactionType; +import com.egzosn.pay.common.bean.result.PayException; +import com.egzosn.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.http.HttpConfigStorage; +import com.egzosn.pay.common.http.UriVariables; +import com.egzosn.pay.common.util.MatrixToImageWriter; +import com.egzosn.pay.common.util.sign.SignUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.awt.image.BufferedImage; @@ -474,7 +474,7 @@ public class AliPayService extends BasePayService { /** * * @param tradeNoOrBillDate 支付平台订单号或者账单类型， 具体请 - * 类型为{@link String }或者 {@link Date }，类型须强制限制，类型不对应则抛出异常{@link in.egan.pay.common.exception.PayErrorException} + * 类型为{@link String }或者 {@link Date }，类型须强制限制，类型不对应则抛出异常{@link PayErrorException} * @param outTradeNoBillType 商户单号或者 账单类型 * @param transactionType 交易类型 * @param callback 处理器 diff --git a/pay-java-ali/src/main/java/in/egan/pay/ali/bean/AliTransactionType.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/bean/AliTransactionType.java similarity index 94% rename from pay-java-ali/src/main/java/in/egan/pay/ali/bean/AliTransactionType.java rename to pay-java-ali/src/main/java/com/egzosn/pay/ali/bean/AliTransactionType.java index 1b2d934..bc2d1eb 100644 --- a/pay-java-ali/src/main/java/in/egan/pay/ali/bean/AliTransactionType.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/bean/AliTransactionType.java @@ -1,6 +1,6 @@ -package in.egan.pay.ali.bean; +package com.egzosn.pay.ali.bean; -import in.egan.pay.common.bean.TransactionType; +import com.egzosn.pay.common.bean.TransactionType; /** * 阿里交易类型 diff --git a/pay-java-ali/src/main/java/in/egan/pay/ali/before/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java similarity index 95% rename from pay-java-ali/src/main/java/in/egan/pay/ali/before/api/AliPayService.java rename to pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java index 15acb3b..ed29276 100644 --- a/pay-java-ali/src/main/java/in/egan/pay/ali/before/api/AliPayService.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/api/AliPayService.java @@ -1,21 +1,20 @@ -package in.egan.pay.ali.before.api; +package com.egzosn.pay.ali.before.api; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import in.egan.pay.ali.before.bean.AliTransactionType; -import in.egan.pay.common.api.BasePayService; -import in.egan.pay.common.api.Callback; -import in.egan.pay.common.api.PayConfigStorage; -import in.egan.pay.common.bean.MethodType; -import in.egan.pay.common.bean.PayOrder; -import in.egan.pay.common.bean.PayOutMessage; -import in.egan.pay.common.bean.TransactionType; -import in.egan.pay.common.bean.result.PayException; -import in.egan.pay.common.exception.PayErrorException; -import in.egan.pay.common.http.ClientHttpRequest; -import in.egan.pay.common.http.HttpConfigStorage; -import in.egan.pay.common.http.UriVariables; -import in.egan.pay.common.util.sign.SignUtils; +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.MethodType; +import com.egzosn.pay.common.bean.PayOrder; +import com.egzosn.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.bean.TransactionType; +import com.egzosn.pay.common.bean.result.PayException; +import com.egzosn.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.http.HttpConfigStorage; +import com.egzosn.pay.common.http.UriVariables; +import com.egzosn.pay.common.util.sign.SignUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.awt.image.BufferedImage; @@ -32,7 +31,7 @@ import java.util.*; * @author egan * @email egzosn@gmail.com * @date 2016-5-18 14:09:01 - * @see in.egan.pay.ali.api.AliPayService + * @see com.egzosn.pay.ali.api.AliPayService */ public class AliPayService extends BasePayService { protected final Log log = LogFactory.getLog(AliPayService.class); @@ -400,7 +399,7 @@ public class AliPayService extends BasePayService { /** * * @param tradeNoOrBillDate 支付平台订单号或者账单类型， 具体请 - * 类型为{@link String }或者 {@link Date }，类型须强制限制，类型不对应则抛出异常{@link in.egan.pay.common.exception.PayErrorException} + * 类型为{@link String }或者 {@link Date }，类型须强制限制，类型不对应则抛出异常{@link PayErrorException} * @param outTradeNoBillType 商户单号或者 账单类型 * @param transactionType 交易类型 * @param callback 处理器 diff --git a/pay-java-ali/src/main/java/in/egan/pay/ali/before/bean/AliTransactionType.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/bean/AliTransactionType.java similarity index 90% rename from pay-java-ali/src/main/java/in/egan/pay/ali/before/bean/AliTransactionType.java rename to pay-java-ali/src/main/java/com/egzosn/pay/ali/before/bean/AliTransactionType.java index a4f75dd..9fea37b 100644 --- a/pay-java-ali/src/main/java/in/egan/pay/ali/before/bean/AliTransactionType.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/bean/AliTransactionType.java @@ -1,6 +1,6 @@ -package in.egan.pay.ali.before.bean; +package com.egzosn.pay.ali.before.bean; -import in.egan.pay.common.bean.TransactionType; +import com.egzosn.pay.common.bean.TransactionType; /** * 阿里交易类型 @@ -16,7 +16,7 @@ import in.egan.pay.common.bean.TransactionType; * @author egan * @email egzosn@gmail.com * @date 2016/10/19 22:58 - * @see in.egan.pay.ali.bean.AliTransactionType + * @see com.egzosn.pay.ali.bean.AliTransactionType */ @Deprecated public enum AliTransactionType implements TransactionType { diff --git a/pay-java-ali/src/main/java/in/egan/pay/ali/before/util/SimpleGetRequestExecutor.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/util/SimpleGetRequestExecutor.java similarity index 84% rename from pay-java-ali/src/main/java/in/egan/pay/ali/before/util/SimpleGetRequestExecutor.java rename to pay-java-ali/src/main/java/com/egzosn/pay/ali/before/util/SimpleGetRequestExecutor.java index 307f60a..a78e83f 100644 --- a/pay-java-ali/src/main/java/in/egan/pay/ali/before/util/SimpleGetRequestExecutor.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/before/util/SimpleGetRequestExecutor.java @@ -1,4 +1,4 @@ -package in.egan.pay.ali.before.util; +package com.egzosn.pay.ali.before.util; /** * @author egan @@ -6,10 +6,10 @@ package in.egan.pay.ali.before.util; * @date 2016-5-24 */ -import in.egan.pay.common.before.api.RequestExecutor; -import in.egan.pay.common.before.bean.result.PayError; -import in.egan.pay.common.exception.PayErrorException; -import in.egan.pay.common.before.util.http.Utf8ResponseHandler; +import com.egzosn.pay.common.before.api.RequestExecutor; +import com.egzosn.pay.common.before.bean.result.PayError; +import com.egzosn.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.before.util.http.Utf8ResponseHandler; import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; diff --git a/pay-java-common/pom.xml b/pay-java-common/pom.xml index 75f73e9..90dbcc7 100644 --- a/pay-java-common/pom.xml +++ b/pay-java-common/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> pay-java-parent - in.egan + com.egzosn 2.0.SNAPSHOT 4.0.0 jar - in.egan + com.egzosn pay-java-common diff --git a/pay-java-common/src/main/java/in/egan/pay/common/api/BasePayConfigStorage.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayConfigStorage.java similarity index 98% rename from pay-java-common/src/main/java/in/egan/pay/common/api/BasePayConfigStorage.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayConfigStorage.java index 9926cf4..808e9ac 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/api/BasePayConfigStorage.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayConfigStorage.java @@ -1,6 +1,6 @@ -package in.egan.pay.common.api; +package com.egzosn.pay.common.api; -import in.egan.pay.common.bean.MsgType; +import com.egzosn.pay.common.bean.MsgType; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/api/BasePayService.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java similarity index 91% rename from pay-java-common/src/main/java/in/egan/pay/common/api/BasePayService.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java index 1bdfa94..4b28136 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/api/BasePayService.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java @@ -1,8 +1,8 @@ -package in.egan.pay.common.api; +package com.egzosn.pay.common.api; -import in.egan.pay.common.http.HttpConfigStorage; -import in.egan.pay.common.http.HttpRequestTemplate; -import in.egan.pay.common.util.sign.SignUtils; +import com.egzosn.pay.common.http.HttpConfigStorage; +import com.egzosn.pay.common.http.HttpRequestTemplate; +import com.egzosn.pay.common.util.sign.SignUtils; import java.util.Map; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/api/Callback.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/Callback.java similarity index 95% rename from pay-java-common/src/main/java/in/egan/pay/common/api/Callback.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/api/Callback.java index 1b390f9..b985024 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/api/Callback.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/Callback.java @@ -15,7 +15,7 @@ */ -package in.egan.pay.common.api; +package com.egzosn.pay.common.api; import java.util.Map; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/api/PayConfigStorage.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayConfigStorage.java similarity index 96% rename from pay-java-common/src/main/java/in/egan/pay/common/api/PayConfigStorage.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/api/PayConfigStorage.java index cdbe959..e9bffdd 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/api/PayConfigStorage.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayConfigStorage.java @@ -1,6 +1,6 @@ -package in.egan.pay.common.api; +package com.egzosn.pay.common.api; -import in.egan.pay.common.bean.MsgType; +import com.egzosn.pay.common.bean.MsgType; import java.util.concurrent.locks.Lock; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/api/PayErrorExceptionHandler.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayErrorExceptionHandler.java similarity index 74% rename from pay-java-common/src/main/java/in/egan/pay/common/api/PayErrorExceptionHandler.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/api/PayErrorExceptionHandler.java index 83e0539..2981540 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/api/PayErrorExceptionHandler.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayErrorExceptionHandler.java @@ -1,7 +1,7 @@ -package in.egan.pay.common.api; +package com.egzosn.pay.common.api; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.exception.PayErrorException; /** * PayErrorExceptionHandler处理器 diff --git a/pay-java-common/src/main/java/in/egan/pay/common/api/PayMessageHandler.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayMessageHandler.java similarity index 78% rename from pay-java-common/src/main/java/in/egan/pay/common/api/PayMessageHandler.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/api/PayMessageHandler.java index 991acd7..c8a738b 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/api/PayMessageHandler.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayMessageHandler.java @@ -1,8 +1,8 @@ -package in.egan.pay.common.api; +package com.egzosn.pay.common.api; -import in.egan.pay.common.bean.PayMessage; -import in.egan.pay.common.bean.PayOutMessage; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.bean.PayMessage; +import com.egzosn.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.exception.PayErrorException; import java.util.Map; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/api/PayMessageInterceptor.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayMessageInterceptor.java similarity index 81% rename from pay-java-common/src/main/java/in/egan/pay/common/api/PayMessageInterceptor.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/api/PayMessageInterceptor.java index 625f440..56458f9 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/api/PayMessageInterceptor.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayMessageInterceptor.java @@ -1,8 +1,8 @@ -package in.egan.pay.common.api; +package com.egzosn.pay.common.api; -import in.egan.pay.common.bean.PayMessage; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.bean.PayMessage; +import com.egzosn.pay.common.exception.PayErrorException; import java.util.Map; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/api/PayMessageRouter.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayMessageRouter.java similarity index 96% rename from pay-java-common/src/main/java/in/egan/pay/common/api/PayMessageRouter.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/api/PayMessageRouter.java index b518550..074d089 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/api/PayMessageRouter.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayMessageRouter.java @@ -1,8 +1,8 @@ -package in.egan.pay.common.api; +package com.egzosn.pay.common.api; -import in.egan.pay.common.bean.PayMessage; -import in.egan.pay.common.bean.PayOutMessage; -import in.egan.pay.common.util.LogExceptionHandler; +import com.egzosn.pay.common.bean.PayMessage; +import com.egzosn.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.util.LogExceptionHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/api/PayMessageRouterRule.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayMessageRouterRule.java similarity index 98% rename from pay-java-common/src/main/java/in/egan/pay/common/api/PayMessageRouterRule.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/api/PayMessageRouterRule.java index bb18a55..c105582 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/api/PayMessageRouterRule.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayMessageRouterRule.java @@ -1,9 +1,9 @@ -package in.egan.pay.common.api; +package com.egzosn.pay.common.api; -import in.egan.pay.common.bean.PayMessage; -import in.egan.pay.common.bean.PayOutMessage; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.bean.PayMessage; +import com.egzosn.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.exception.PayErrorException; import java.util.ArrayList; import java.util.HashMap; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/api/PayService.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java similarity index 94% rename from pay-java-common/src/main/java/in/egan/pay/common/api/PayService.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java index 206fa6a..c297165 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/api/PayService.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayService.java @@ -1,11 +1,12 @@ -package in.egan.pay.common.api; +package com.egzosn.pay.common.api; -import in.egan.pay.common.bean.MethodType; -import in.egan.pay.common.bean.PayOrder; -import in.egan.pay.common.bean.PayOutMessage; -import in.egan.pay.common.bean.TransactionType; -import in.egan.pay.common.http.HttpConfigStorage; -import in.egan.pay.common.http.HttpRequestTemplate; +import com.egzosn.pay.common.bean.MethodType; +import com.egzosn.pay.common.bean.PayOrder; +import com.egzosn.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.bean.TransactionType; +import com.egzosn.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.http.HttpConfigStorage; +import com.egzosn.pay.common.http.HttpRequestTemplate; import java.awt.image.BufferedImage; import java.io.InputStream; @@ -244,7 +245,7 @@ public interface PayService { /** * 通用查询接口 * - * @param tradeNoOrBillDate 支付平台订单号或者账单日期， 具体请 类型为{@link String }或者 {@link Date }，类型须强制限制，类型不对应则抛出异常{@link in.egan.pay.common.exception.PayErrorException} + * @param tradeNoOrBillDate 支付平台订单号或者账单日期， 具体请 类型为{@link String }或者 {@link Date }，类型须强制限制，类型不对应则抛出异常{@link PayErrorException} * * @param outTradeNoBillType 商户单号或者 账单类型 * @param transactionType 交易类型 diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/BasePayType.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/BasePayType.java similarity index 89% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/BasePayType.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/BasePayType.java index ce4eef8..88f4b6b 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/BasePayType.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/BasePayType.java @@ -1,4 +1,4 @@ -package in.egan.pay.common.bean; +package com.egzosn.pay.common.bean; /** * 基础的支付类型 diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/CurType.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CurType.java similarity index 80% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/CurType.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/CurType.java index dc45655..0d91cea 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/CurType.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CurType.java @@ -1,4 +1,4 @@ -package in.egan.pay.common.bean;/** +package com.egzosn.pay.common.bean;/** * Created by Fuzx on 2017/1/24 0024. */ diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/MethodType.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/MethodType.java similarity index 95% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/MethodType.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/MethodType.java index ae6abe8..0214910 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/MethodType.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/MethodType.java @@ -15,7 +15,7 @@ */ -package in.egan.pay.common.bean; +package com.egzosn.pay.common.bean; /** * @author: egan diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/MsgType.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/MsgType.java similarity index 95% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/MsgType.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/MsgType.java index b980b7a..f79aa3a 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/MsgType.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/MsgType.java @@ -15,7 +15,7 @@ */ -package in.egan.pay.common.bean; +package com.egzosn.pay.common.bean; /** * 消息类型 diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/PayMessage.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayMessage.java similarity index 99% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/PayMessage.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayMessage.java index 5a21510..3cf6e16 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/PayMessage.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayMessage.java @@ -1,4 +1,4 @@ -package in.egan.pay.common.bean; +package com.egzosn.pay.common.bean; import java.io.Serializable; import java.math.BigDecimal; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/PayOrder.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java similarity index 98% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/PayOrder.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java index c6f5f6d..0ee1b60 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/PayOrder.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java @@ -1,4 +1,4 @@ -package in.egan.pay.common.bean; +package com.egzosn.pay.common.bean; import java.math.BigDecimal; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/PayOutMessage.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOutMessage.java similarity index 84% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/PayOutMessage.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOutMessage.java index 71b567e..f4e52ae 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/PayOutMessage.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOutMessage.java @@ -1,9 +1,9 @@ -package in.egan.pay.common.bean; +package com.egzosn.pay.common.bean; import com.alibaba.fastjson.JSONObject; -import in.egan.pay.common.bean.outbuilder.JsonBuilder; -import in.egan.pay.common.bean.outbuilder.TextBuilder; -import in.egan.pay.common.bean.outbuilder.XmlBuilder; +import com.egzosn.pay.common.bean.outbuilder.JsonBuilder; +import com.egzosn.pay.common.bean.outbuilder.TextBuilder; +import com.egzosn.pay.common.bean.outbuilder.XmlBuilder; import java.io.Serializable; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/TransactionType.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/TransactionType.java similarity index 88% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/TransactionType.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/TransactionType.java index 2ffb363..49df677 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/TransactionType.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/TransactionType.java @@ -1,4 +1,4 @@ -package in.egan.pay.common.bean; +package com.egzosn.pay.common.bean; /** * 交易类型 diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/BaseBuilder.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/BaseBuilder.java similarity index 74% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/BaseBuilder.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/BaseBuilder.java index f676df0..274886e 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/BaseBuilder.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/BaseBuilder.java @@ -1,6 +1,6 @@ -package in.egan.pay.common.bean.outbuilder; +package com.egzosn.pay.common.bean.outbuilder; -import in.egan.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.bean.PayOutMessage; /** * @source chanjarster/weixin-java-tools diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/JsonBuilder.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/JsonBuilder.java similarity index 88% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/JsonBuilder.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/JsonBuilder.java index 5345e08..9deca90 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/JsonBuilder.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/JsonBuilder.java @@ -1,8 +1,8 @@ -package in.egan.pay.common.bean.outbuilder; +package com.egzosn.pay.common.bean.outbuilder; import com.alibaba.fastjson.JSONObject; -import in.egan.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.bean.PayOutMessage; /** * @author: egan diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/PayJsonOutMessage.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/PayJsonOutMessage.java similarity index 63% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/PayJsonOutMessage.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/PayJsonOutMessage.java index 0dce6c3..ff554c0 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/PayJsonOutMessage.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/PayJsonOutMessage.java @@ -1,8 +1,7 @@ -package in.egan.pay.common.bean.outbuilder; +package com.egzosn.pay.common.bean.outbuilder; -import in.egan.pay.common.bean.MsgType; -import in.egan.pay.common.before.api.PayConsts; -import in.egan.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.bean.MsgType; +import com.egzosn.pay.common.bean.PayOutMessage; /** * @author egan diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/PayTextOutMessage.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/PayTextOutMessage.java similarity index 62% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/PayTextOutMessage.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/PayTextOutMessage.java index 23042fc..20af460 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/PayTextOutMessage.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/PayTextOutMessage.java @@ -1,8 +1,7 @@ -package in.egan.pay.common.bean.outbuilder; +package com.egzosn.pay.common.bean.outbuilder; -import in.egan.pay.common.bean.MsgType; -import in.egan.pay.common.before.api.PayConsts; -import in.egan.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.bean.MsgType; +import com.egzosn.pay.common.bean.PayOutMessage; /** * @author egan diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/PayXmlOutMessage.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/PayXmlOutMessage.java similarity index 76% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/PayXmlOutMessage.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/PayXmlOutMessage.java index 96fa73c..5f196f8 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/PayXmlOutMessage.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/PayXmlOutMessage.java @@ -1,8 +1,7 @@ -package in.egan.pay.common.bean.outbuilder; +package com.egzosn.pay.common.bean.outbuilder; -import in.egan.pay.common.bean.MsgType; -import in.egan.pay.common.before.api.PayConsts; -import in.egan.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.bean.MsgType; +import com.egzosn.pay.common.bean.PayOutMessage; /** * @author egan diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/TextBuilder.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/TextBuilder.java similarity index 84% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/TextBuilder.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/TextBuilder.java index ad78579..59b5ef5 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/TextBuilder.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/TextBuilder.java @@ -1,6 +1,6 @@ -package in.egan.pay.common.bean.outbuilder; +package com.egzosn.pay.common.bean.outbuilder; -import in.egan.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.bean.PayOutMessage; /** * @source chanjarster/weixin-java-tools diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/XmlBuilder.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/XmlBuilder.java similarity index 87% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/XmlBuilder.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/XmlBuilder.java index 0dc6b17..c0f67b6 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/outbuilder/XmlBuilder.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/XmlBuilder.java @@ -1,6 +1,6 @@ -package in.egan.pay.common.bean.outbuilder; +package com.egzosn.pay.common.bean.outbuilder; -import in.egan.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.bean.PayOutMessage; /** * @source chanjarster/weixin-java-tools * @author egan diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/result/PayError.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/result/PayError.java similarity index 90% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/result/PayError.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/result/PayError.java index 2c5aeaa..5166e34 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/result/PayError.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/result/PayError.java @@ -1,4 +1,4 @@ -package in.egan.pay.common.bean.result; +package com.egzosn.pay.common.bean.result; /** * 支付错误码说明 diff --git a/pay-java-common/src/main/java/in/egan/pay/common/bean/result/PayException.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/result/PayException.java similarity index 97% rename from pay-java-common/src/main/java/in/egan/pay/common/bean/result/PayException.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/bean/result/PayException.java index 13a7c0e..887bada 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/bean/result/PayException.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/result/PayException.java @@ -15,7 +15,7 @@ */ -package in.egan.pay.common.bean.result; +package com.egzosn.pay.common.bean.result; /** * @author: egan diff --git a/pay-java-common/src/main/java/in/egan/pay/common/before/api/BasePayConfigStorage.java b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/BasePayConfigStorage.java similarity index 98% rename from pay-java-common/src/main/java/in/egan/pay/common/before/api/BasePayConfigStorage.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/before/api/BasePayConfigStorage.java index 89afd4e..2a22979 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/before/api/BasePayConfigStorage.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/BasePayConfigStorage.java @@ -1,6 +1,6 @@ -package in.egan.pay.common.before.api; +package com.egzosn.pay.common.before.api; -import in.egan.pay.common.bean.MsgType; +import com.egzosn.pay.common.bean.MsgType; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/before/api/BasePayService.java b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/BasePayService.java similarity index 95% rename from pay-java-common/src/main/java/in/egan/pay/common/before/api/BasePayService.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/before/api/BasePayService.java index f350cc6..3fa2099 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/before/api/BasePayService.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/BasePayService.java @@ -1,7 +1,7 @@ -package in.egan.pay.common.before.api; +package com.egzosn.pay.common.before.api; -import in.egan.pay.common.exception.PayErrorException; -import in.egan.pay.common.util.str.StringUtils; +import com.egzosn.pay.common.util.str.StringUtils; +import com.egzosn.pay.common.exception.PayErrorException; import org.apache.http.HttpHost; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/before/api/PayConfigStorage.java b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayConfigStorage.java similarity index 87% rename from pay-java-common/src/main/java/in/egan/pay/common/before/api/PayConfigStorage.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayConfigStorage.java index a4fbef5..51ef4e5 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/before/api/PayConfigStorage.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayConfigStorage.java @@ -1,6 +1,7 @@ -package in.egan.pay.common.before.api; +package com.egzosn.pay.common.before.api; -import in.egan.pay.common.bean.MsgType; +import com.egzosn.pay.common.bean.MsgType; +import com.egzosn.pay.common.http.HttpConfigStorage; import java.util.concurrent.locks.Lock; @@ -10,7 +11,7 @@ import java.util.concurrent.locks.Lock; * @email egzosn@gmail.com * @date 2016-5-18 14:09:01 * @source chanjarster/weixin-java-tools - * @see in.egan.pay.common.api.PayConfigStorage + * @see com.egzosn.pay.common.api.PayConfigStorage */ @Deprecated public interface PayConfigStorage { @@ -135,7 +136,7 @@ import java.util.concurrent.locks.Lock; /** * http代理地址 * @return - * @see in.egan.pay.common.http.HttpConfigStorage#getHttpProxyHost() + * @see HttpConfigStorage#getHttpProxyHost() */ @Deprecated String getHttpProxyHost(); @@ -143,7 +144,7 @@ import java.util.concurrent.locks.Lock; /** * 代理端口 * @return - * @see in.egan.pay.common.http.HttpConfigStorage#getHttpProxyPort() + * @see HttpConfigStorage#getHttpProxyPort() */ @Deprecated int getHttpProxyPort(); @@ -151,7 +152,7 @@ import java.util.concurrent.locks.Lock; /** * 代理用户名 * @return - * @see in.egan.pay.common.http.HttpConfigStorage#getHttpProxyUsername() + * @see HttpConfigStorage#getHttpProxyUsername() */ @Deprecated String getHttpProxyUsername(); @@ -159,7 +160,7 @@ import java.util.concurrent.locks.Lock; /** * 代理密码 * @return - * @see in.egan.pay.common.http.HttpConfigStorage#getHttpProxyPassword() + * @see HttpConfigStorage#getHttpProxyPassword() */ @Deprecated String getHttpProxyPassword(); diff --git a/pay-java-common/src/main/java/in/egan/pay/common/before/api/PayConsts.java b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayConsts.java similarity index 95% rename from pay-java-common/src/main/java/in/egan/pay/common/before/api/PayConsts.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayConsts.java index c907fc3..c396d0a 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/before/api/PayConsts.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayConsts.java @@ -1,4 +1,4 @@ -package in.egan.pay.common.before.api; +package com.egzosn.pay.common.before.api; /** * 支付宝支付通知 diff --git a/pay-java-common/src/main/java/in/egan/pay/common/before/api/PayMessageHandler.java b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayMessageHandler.java similarity index 68% rename from pay-java-common/src/main/java/in/egan/pay/common/before/api/PayMessageHandler.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayMessageHandler.java index 41ceb03..25b787b 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/before/api/PayMessageHandler.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayMessageHandler.java @@ -1,9 +1,8 @@ -package in.egan.pay.common.before.api; +package com.egzosn.pay.common.before.api; -import in.egan.pay.common.bean.PayMessage; -import in.egan.pay.common.bean.PayOutMessage; -import in.egan.pay.common.before.api.*; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.bean.PayMessage; +import com.egzosn.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.exception.PayErrorException; import java.util.Map; @@ -25,7 +24,7 @@ public interface PayMessageHandler { */ public PayOutMessage handle(PayMessage payMessage, Map context, - in.egan.pay.common.before.api.PayService payService + PayService payService ) throws PayErrorException; } diff --git a/pay-java-common/src/main/java/in/egan/pay/common/before/api/PayMessageInterceptor.java b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayMessageInterceptor.java similarity index 80% rename from pay-java-common/src/main/java/in/egan/pay/common/before/api/PayMessageInterceptor.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayMessageInterceptor.java index 0a63e6f..f5bf45b 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/before/api/PayMessageInterceptor.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayMessageInterceptor.java @@ -1,8 +1,8 @@ -package in.egan.pay.common.before.api; +package com.egzosn.pay.common.before.api; -import in.egan.pay.common.bean.PayMessage; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.bean.PayMessage; +import com.egzosn.pay.common.exception.PayErrorException; import java.util.Map; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/before/api/PayMessageRouter.java b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayMessageRouter.java similarity index 92% rename from pay-java-common/src/main/java/in/egan/pay/common/before/api/PayMessageRouter.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayMessageRouter.java index 893bc59..eaae2b0 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/before/api/PayMessageRouter.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayMessageRouter.java @@ -1,9 +1,9 @@ -package in.egan.pay.common.before.api; +package com.egzosn.pay.common.before.api; -import in.egan.pay.common.api.PayErrorExceptionHandler; -import in.egan.pay.common.bean.PayMessage; -import in.egan.pay.common.bean.PayOutMessage; -import in.egan.pay.common.util.LogExceptionHandler; +import com.egzosn.pay.common.api.PayErrorExceptionHandler; +import com.egzosn.pay.common.bean.PayMessage; +import com.egzosn.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.util.LogExceptionHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -53,13 +53,13 @@ public class PayMessageRouter { private final List rules = new ArrayList(); - private final in.egan.pay.common.before.api.PayService payService; + private final PayService payService; private ExecutorService executorService; private PayErrorExceptionHandler exceptionHandler; - public PayMessageRouter(in.egan.pay.common.before.api.PayService payService) { + public PayMessageRouter(PayService payService) { this.payService = payService; this.executorService = Executors.newFixedThreadPool(DEFAULT_THREAD_POOL_SIZE); this.exceptionHandler = new LogExceptionHandler(); diff --git a/pay-java-common/src/main/java/in/egan/pay/common/before/api/PayMessageRouterRule.java b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayMessageRouterRule.java similarity index 96% rename from pay-java-common/src/main/java/in/egan/pay/common/before/api/PayMessageRouterRule.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayMessageRouterRule.java index 12ba493..3246d8c 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/before/api/PayMessageRouterRule.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayMessageRouterRule.java @@ -1,10 +1,10 @@ -package in.egan.pay.common.before.api; +package com.egzosn.pay.common.before.api; -import in.egan.pay.common.api.PayErrorExceptionHandler; -import in.egan.pay.common.bean.PayMessage; -import in.egan.pay.common.bean.PayOutMessage; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.api.PayErrorExceptionHandler; +import com.egzosn.pay.common.bean.PayMessage; +import com.egzosn.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.exception.PayErrorException; import java.util.ArrayList; import java.util.HashMap; @@ -285,7 +285,7 @@ public class PayMessageRouterRule { * @return true 代表继续执行别的router，false 代表停止执行别的router */ protected PayOutMessage service(PayMessage payMessage, - in.egan.pay.common.before.api.PayService payService, + PayService payService, PayErrorExceptionHandler exceptionHandler) { try { diff --git a/pay-java-common/src/main/java/in/egan/pay/common/before/api/PayService.java b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayService.java similarity index 93% rename from pay-java-common/src/main/java/in/egan/pay/common/before/api/PayService.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayService.java index 2fecb6d..8e9f9a1 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/before/api/PayService.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/PayService.java @@ -1,9 +1,9 @@ -package in.egan.pay.common.before.api; +package com.egzosn.pay.common.before.api; -import in.egan.pay.common.bean.MethodType; -import in.egan.pay.common.bean.PayOrder; -import in.egan.pay.common.bean.PayOutMessage; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.bean.MethodType; +import com.egzosn.pay.common.bean.PayOrder; +import com.egzosn.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.exception.PayErrorException; import java.awt.image.BufferedImage; import java.io.InputStream; @@ -16,7 +16,7 @@ import java.util.Map; * @author egan * @email egzosn@gmail.com * @date 2016-5-18 14:09:01 - * @see in.egan.pay.common.api.PayService + * @see com.egzosn.pay.common.api.PayService */ @Deprecated public interface PayService { diff --git a/pay-java-common/src/main/java/in/egan/pay/common/before/api/RequestExecutor.java b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/RequestExecutor.java similarity index 87% rename from pay-java-common/src/main/java/in/egan/pay/common/before/api/RequestExecutor.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/before/api/RequestExecutor.java index 3164cc4..4a8f46c 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/before/api/RequestExecutor.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/before/api/RequestExecutor.java @@ -1,7 +1,7 @@ -package in.egan.pay.common.before.api; +package com.egzosn.pay.common.before.api; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.exception.PayErrorException; import org.apache.http.HttpHost; import org.apache.http.impl.client.CloseableHttpClient; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/before/bean/result/PayError.java b/pay-java-common/src/main/java/com/egzosn/pay/common/before/bean/result/PayError.java similarity index 91% rename from pay-java-common/src/main/java/in/egan/pay/common/before/bean/result/PayError.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/before/bean/result/PayError.java index c0af030..559cd78 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/before/bean/result/PayError.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/before/bean/result/PayError.java @@ -1,8 +1,8 @@ -package in.egan.pay.common.before.bean.result; +package com.egzosn.pay.common.before.bean.result; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import in.egan.pay.common.util.XML; +import com.egzosn.pay.common.util.XML; import java.io.Serializable; @@ -12,10 +12,10 @@ import java.io.Serializable; * @dete 2017/1/12 9:57 * @author: egan * @source chanjarster/weixin-java-tools - * @see in.egan.pay.common.bean.result.PayError + * @see com.egzosn.pay.common.bean.result.PayError */ @Deprecated -public class PayError implements in.egan.pay.common.bean.result.PayError, Serializable { +public class PayError implements com.egzosn.pay.common.bean.result.PayError, Serializable { private int errorCode; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/before/util/http/SimpleGetRequestExecutor.java b/pay-java-common/src/main/java/com/egzosn/pay/common/before/util/http/SimpleGetRequestExecutor.java similarity index 89% rename from pay-java-common/src/main/java/in/egan/pay/common/before/util/http/SimpleGetRequestExecutor.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/before/util/http/SimpleGetRequestExecutor.java index b3a734f..5787b95 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/before/util/http/SimpleGetRequestExecutor.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/before/util/http/SimpleGetRequestExecutor.java @@ -1,4 +1,4 @@ -package in.egan.pay.common.before.util.http; +package com.egzosn.pay.common.before.util.http; /** * @author egan @@ -7,8 +7,8 @@ package in.egan.pay.common.before.util.http; * @source chanjarster/weixin-java-tools */ -import in.egan.pay.common.before.api.RequestExecutor; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.before.api.RequestExecutor; +import com.egzosn.pay.common.exception.PayErrorException; import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/before/util/http/SimplePostRequestExecutor.java b/pay-java-common/src/main/java/com/egzosn/pay/common/before/util/http/SimplePostRequestExecutor.java similarity index 92% rename from pay-java-common/src/main/java/in/egan/pay/common/before/util/http/SimplePostRequestExecutor.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/before/util/http/SimplePostRequestExecutor.java index aa49df6..fd4741a 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/before/util/http/SimplePostRequestExecutor.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/before/util/http/SimplePostRequestExecutor.java @@ -1,7 +1,7 @@ -package in.egan.pay.common.before.util.http; +package com.egzosn.pay.common.before.util.http; -import in.egan.pay.common.before.api.RequestExecutor; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.before.api.RequestExecutor; +import com.egzosn.pay.common.exception.PayErrorException; import org.apache.http.Consts; import org.apache.http.HttpHost; import org.apache.http.client.ClientProtocolException; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/before/util/http/Utf8ResponseHandler.java b/pay-java-common/src/main/java/com/egzosn/pay/common/before/util/http/Utf8ResponseHandler.java similarity index 95% rename from pay-java-common/src/main/java/in/egan/pay/common/before/util/http/Utf8ResponseHandler.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/before/util/http/Utf8ResponseHandler.java index 405e267..2c15238 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/before/util/http/Utf8ResponseHandler.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/before/util/http/Utf8ResponseHandler.java @@ -1,4 +1,4 @@ -package in.egan.pay.common.before.util.http; +package com.egzosn.pay.common.before.util.http; import org.apache.http.Consts; import org.apache.http.HttpEntity; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/exception/PayErrorException.java b/pay-java-common/src/main/java/com/egzosn/pay/common/exception/PayErrorException.java similarity index 74% rename from pay-java-common/src/main/java/in/egan/pay/common/exception/PayErrorException.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/exception/PayErrorException.java index cc43837..0eac659 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/exception/PayErrorException.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/exception/PayErrorException.java @@ -1,7 +1,6 @@ -package in.egan.pay.common.exception; +package com.egzosn.pay.common.exception; -import com.alibaba.fastjson.JSON; -import in.egan.pay.common.bean.result.PayError; +import com.egzosn.pay.common.bean.result.PayError; /** * @author egan diff --git a/pay-java-common/src/main/java/in/egan/pay/common/http/ClientHttpRequest.java b/pay-java-common/src/main/java/com/egzosn/pay/common/http/ClientHttpRequest.java similarity index 93% rename from pay-java-common/src/main/java/in/egan/pay/common/http/ClientHttpRequest.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/http/ClientHttpRequest.java index ee92398..30a5b88 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/http/ClientHttpRequest.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/http/ClientHttpRequest.java @@ -1,11 +1,11 @@ -package in.egan.pay.common.http; +package com.egzosn.pay.common.http; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONException; -import in.egan.pay.common.bean.MethodType; -import in.egan.pay.common.bean.result.PayException; -import in.egan.pay.common.exception.PayErrorException; -import in.egan.pay.common.util.XML; +import com.egzosn.pay.common.bean.MethodType; +import com.egzosn.pay.common.bean.result.PayException; +import com.egzosn.pay.common.util.XML; +import com.egzosn.pay.common.exception.PayErrorException; import org.apache.http.*; import org.apache.http.client.ClientProtocolException; import org.apache.http.client.HttpResponseException; @@ -18,13 +18,10 @@ import org.apache.http.util.EntityUtils; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.UnsupportedEncodingException; import java.net.URI; -import java.net.URLEncoder; -import java.util.List; import java.util.Map; -import static in.egan.pay.common.http.UriVariables.getMapToParameters; +import static com.egzosn.pay.common.http.UriVariables.getMapToParameters; /** * 一个HTTP请求的客户端 @@ -34,7 +31,7 @@ import static in.egan.pay.common.http.UriVariables.getMapToParameters; */ public class ClientHttpRequest extends HttpEntityEnclosingRequestBase implements org.apache.http.client.ResponseHandler{ //http请求 - private MethodType method; + private MethodType method; //响应类型 private Class responseType; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/http/HttpConfigStorage.java b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpConfigStorage.java similarity index 97% rename from pay-java-common/src/main/java/in/egan/pay/common/http/HttpConfigStorage.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpConfigStorage.java index f0e9d0b..1e8f916 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/http/HttpConfigStorage.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpConfigStorage.java @@ -1,4 +1,4 @@ -package in.egan.pay.common.http; +package com.egzosn.pay.common.http; /** diff --git a/pay-java-common/src/main/java/in/egan/pay/common/http/HttpRequestTemplate.java b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpRequestTemplate.java similarity index 97% rename from pay-java-common/src/main/java/in/egan/pay/common/http/HttpRequestTemplate.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpRequestTemplate.java index c044e2e..ff3831c 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/http/HttpRequestTemplate.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpRequestTemplate.java @@ -1,7 +1,7 @@ -package in.egan.pay.common.http; +package com.egzosn.pay.common.http; -import in.egan.pay.common.bean.MethodType; -import in.egan.pay.common.util.str.StringUtils; +import com.egzosn.pay.common.bean.MethodType; +import com.egzosn.pay.common.util.str.StringUtils; import org.apache.http.HttpHost; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/http/UriVariables.java b/pay-java-common/src/main/java/com/egzosn/pay/common/http/UriVariables.java similarity index 98% rename from pay-java-common/src/main/java/in/egan/pay/common/http/UriVariables.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/http/UriVariables.java index 2262e10..e3cd8af 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/http/UriVariables.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/http/UriVariables.java @@ -1,4 +1,4 @@ -package in.egan.pay.common.http; +package com.egzosn.pay.common.http; import com.alibaba.fastjson.JSON; import org.apache.http.Consts; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/util/LogExceptionHandler.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/LogExceptionHandler.java similarity index 76% rename from pay-java-common/src/main/java/in/egan/pay/common/util/LogExceptionHandler.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/util/LogExceptionHandler.java index 0978611..297d05b 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/util/LogExceptionHandler.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/LogExceptionHandler.java @@ -1,7 +1,7 @@ -package in.egan.pay.common.util; +package com.egzosn.pay.common.util; -import in.egan.pay.common.api.PayErrorExceptionHandler; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.api.PayErrorExceptionHandler; +import com.egzosn.pay.common.exception.PayErrorException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/util/MatrixToImageWriter.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/MatrixToImageWriter.java similarity index 98% rename from pay-java-common/src/main/java/in/egan/pay/common/util/MatrixToImageWriter.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/util/MatrixToImageWriter.java index 94ccc23..d72c10d 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/util/MatrixToImageWriter.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/MatrixToImageWriter.java @@ -1,4 +1,4 @@ -package in.egan.pay.common.util; +package com.egzosn.pay.common.util; import com.google.zxing.BarcodeFormat; import com.google.zxing.EncodeHintType; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/util/XML.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java similarity index 99% rename from pay-java-common/src/main/java/in/egan/pay/common/util/XML.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java index a1295b4..1dfa49d 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/util/XML.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java @@ -1,4 +1,4 @@ -package in.egan.pay.common.util; +package com.egzosn.pay.common.util; import com.alibaba.fastjson.JSONObject; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/util/sign/SignUtils.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/SignUtils.java similarity index 93% rename from pay-java-common/src/main/java/in/egan/pay/common/util/sign/SignUtils.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/SignUtils.java index b1f46d9..2b224b0 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/util/sign/SignUtils.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/SignUtils.java @@ -1,7 +1,7 @@ -package in.egan.pay.common.util.sign; +package com.egzosn.pay.common.util.sign; -import in.egan.pay.common.util.str.StringUtils; +import com.egzosn.pay.common.util.str.StringUtils; import org.apache.http.message.BasicNameValuePair; import java.util.*; @@ -26,7 +26,7 @@ public enum SignUtils { @Override public String createSign(String content, String key, String characterEncoding) { - return in.egan.pay.common.util.sign.encrypt.MD5.sign(content, key, characterEncoding); + return com.egzosn.pay.common.util.sign.encrypt.MD5.sign(content, key, characterEncoding); } /** @@ -38,31 +38,31 @@ public enum SignUtils { * @return 签名结果 */ public boolean verify(String text, String sign, String key, String characterEncoding) { - return in.egan.pay.common.util.sign.encrypt.MD5.verify(text, sign, key, characterEncoding); + return com.egzosn.pay.common.util.sign.encrypt.MD5.verify(text, sign, key, characterEncoding); } }, RSA { @Override public String createSign(String content, String key, String characterEncoding) { - return in.egan.pay.common.util.sign.encrypt.RSA.sign(content, key, characterEncoding); + return com.egzosn.pay.common.util.sign.encrypt.RSA.sign(content, key, characterEncoding); } @Override public boolean verify(String text, String sign, String publicKey, String characterEncoding) { - return in.egan.pay.common.util.sign.encrypt.RSA.verify(text, sign, publicKey, characterEncoding); + return com.egzosn.pay.common.util.sign.encrypt.RSA.verify(text, sign, publicKey, characterEncoding); } }, RSA2 { @Override public String createSign(String content, String key, String characterEncoding) { - return in.egan.pay.common.util.sign.encrypt.RSA2.sign(content, key, characterEncoding); + return com.egzosn.pay.common.util.sign.encrypt.RSA2.sign(content, key, characterEncoding); } @Override public boolean verify(String text, String sign, String publicKey, String characterEncoding) { - return in.egan.pay.common.util.sign.encrypt.RSA2.verify(text, sign, publicKey, characterEncoding); + return com.egzosn.pay.common.util.sign.encrypt.RSA2.verify(text, sign, publicKey, characterEncoding); } }; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/util/sign/encrypt/Base64.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/Base64.java similarity index 99% rename from pay-java-common/src/main/java/in/egan/pay/common/util/sign/encrypt/Base64.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/Base64.java index 8c9f958..d9cf03f 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/util/sign/encrypt/Base64.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/Base64.java @@ -4,7 +4,7 @@ * author: shiqun.shi@alipay.com */ -package in.egan.pay.common.util.sign.encrypt; +package com.egzosn.pay.common.util.sign.encrypt; public final class Base64 { diff --git a/pay-java-common/src/main/java/in/egan/pay/common/util/sign/encrypt/MD5.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/MD5.java similarity index 94% rename from pay-java-common/src/main/java/in/egan/pay/common/util/sign/encrypt/MD5.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/MD5.java index 5975b78..848b91f 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/util/sign/encrypt/MD5.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/MD5.java @@ -1,7 +1,7 @@ -package in.egan.pay.common.util.sign.encrypt; +package com.egzosn.pay.common.util.sign.encrypt; -import in.egan.pay.common.util.str.StringUtils; +import com.egzosn.pay.common.util.str.StringUtils; import org.apache.commons.codec.digest.DigestUtils; import java.io.UnsupportedEncodingException; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/util/sign/encrypt/RSA.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/RSA.java similarity index 98% rename from pay-java-common/src/main/java/in/egan/pay/common/util/sign/encrypt/RSA.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/RSA.java index fa04438..98190a5 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/util/sign/encrypt/RSA.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/RSA.java @@ -1,5 +1,5 @@ -package in.egan.pay.common.util.sign.encrypt; +package com.egzosn.pay.common.util.sign.encrypt; import javax.crypto.Cipher; import java.io.ByteArrayInputStream; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/util/sign/encrypt/RSA2.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/RSA2.java similarity index 96% rename from pay-java-common/src/main/java/in/egan/pay/common/util/sign/encrypt/RSA2.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/RSA2.java index 8f1e7de..b5b93a8 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/util/sign/encrypt/RSA2.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/RSA2.java @@ -1,5 +1,5 @@ -package in.egan.pay.common.util.sign.encrypt; +package com.egzosn.pay.common.util.sign.encrypt; import java.security.PrivateKey; diff --git a/pay-java-common/src/main/java/in/egan/pay/common/util/str/StringUtils.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/str/StringUtils.java similarity index 98% rename from pay-java-common/src/main/java/in/egan/pay/common/util/str/StringUtils.java rename to pay-java-common/src/main/java/com/egzosn/pay/common/util/str/StringUtils.java index d47ebe6..a4cae15 100644 --- a/pay-java-common/src/main/java/in/egan/pay/common/util/str/StringUtils.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/str/StringUtils.java @@ -1,4 +1,4 @@ -package in.egan.pay.common.util.str; +package com.egzosn.pay.common.util.str; /** * Created by ZaoSheng on 2016/6/4. diff --git a/pay-java-demo/README.md b/pay-java-demo/README.md index 57ecbac..09bc678 100644 --- a/pay-java-demo/README.md +++ b/pay-java-demo/README.md @@ -14,7 +14,7 @@ public enum PayType implements BasePayType { aliPay{ /** - * @see in.egan.pay.ali.api.AliPayService 17年更新的版本,旧版本请自行切换{@link in.egan.pay.ali.before.api.AliPayService } + * @see com.egzosn.pay.ali.api.AliPayService 17年更新的版本,旧版本请自行切换{@link com.egzosn.pay.ali.before.api.AliPayService } * @param apyAccount * @return */ @@ -37,7 +37,7 @@ public enum PayType implements BasePayType { @Override public TransactionType getTransactionType(String transactionType) { - // in.egan.pay.ali.bean.AliTransactionType 17年更新的版本,旧版本请自行切换{@link in.egan.pay.ali.before.bean.AliTransactionType} + // com.egzosn.pay.ali.bean.AliTransactionType 17年更新的版本,旧版本请自行切换{@link com.egzosn.pay.ali.before.bean.AliTransactionType} return AliTransactionType.valueOf(transactionType); } @@ -62,7 +62,7 @@ public enum PayType implements BasePayType { /** * 根据支付类型获取交易类型 * @param transactionType 类型值 - * @see in.egan.pay.wx.bean.WxTransactionType + * @see com.egzosn.pay.wx.bean.WxTransactionType * @return */ @Override @@ -90,7 +90,7 @@ public enum PayType implements BasePayType { /** * 根据支付类型获取交易类型 * @param transactionType 类型值 - * @see in.egan.pay.wx.youdian.bean.YoudianTransactionType + * @see com.egzosn.pay.wx.youdian.bean.YoudianTransactionType * @return */ @Override @@ -127,7 +127,7 @@ public class PayResponse { /** * 初始化支付配置 * @param apyAccount 账户信息 - * @see in.egan.pay.demo.entity.ApyAccount 对应表结构详情--》 pay-java-demo/resources/apy_account.sql + * @see com.egzosn.pay.demo.entity.ApyAccount 对应表结构详情--》 pay-java-demo/resources/apy_account.sql */ public void init(ApyAccount apyAccount) { diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml index a893771..299e123 100644 --- a/pay-java-demo/pom.xml +++ b/pay-java-demo/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> pay-java-parent - in.egan + com.egzosn 2.0.SNAPSHOT 4.0.0 war - in.egan + com.egzosn pay-java-demo @@ -23,23 +23,23 @@ - in.egan + com.egzosn pay-java-wx ${pay.version} - in.egan + com.egzosn pay-java-ali ${pay.version} - in.egan + com.egzosn pay-java-wx-youdian ${pay.version} - in.egan + com.egzosn pay-java-fuiou ${pay.version} diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/controller/PayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java similarity index 93% rename from pay-java-demo/src/main/java/in/egan/pay/demo/controller/PayController.java rename to pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java index 2b6c2f5..9ec0f6c 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/controller/PayController.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java @@ -1,16 +1,16 @@ -package in.egan.pay.demo.controller; +package com.egzosn.pay.demo.controller; -import in.egan.pay.common.api.Callback; -import in.egan.pay.common.bean.*; -import in.egan.pay.common.util.str.StringUtils; -import in.egan.pay.demo.entity.ApyAccount; -import in.egan.pay.demo.entity.PayType; -import in.egan.pay.demo.request.QueryOrder; -import in.egan.pay.demo.service.ApyAccountService; -import in.egan.pay.demo.service.PayResponse; -import in.egan.pay.common.api.PayConfigStorage; +import com.egzosn.pay.common.api.Callback; +import com.egzosn.pay.common.bean.*; +import com.egzosn.pay.common.util.str.StringUtils; +import com.egzosn.pay.demo.entity.ApyAccount; +import com.egzosn.pay.demo.request.QueryOrder; +import com.egzosn.pay.demo.service.ApyAccountService; +import com.egzosn.pay.demo.service.PayResponse; +import com.egzosn.pay.demo.entity.PayType; +import com.egzosn.pay.common.api.PayConfigStorage; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import static in.egan.pay.demo.dao.ApyAccountRepository.apyAccounts; +import static com.egzosn.pay.demo.dao.ApyAccountRepository.apyAccounts; /** * 发起支付入口 diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/dao/ApyAccountRepository.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/dao/ApyAccountRepository.java similarity index 93% rename from pay-java-demo/src/main/java/in/egan/pay/demo/dao/ApyAccountRepository.java rename to pay-java-demo/src/main/java/com/egzosn/pay/demo/dao/ApyAccountRepository.java index ac87fb2..56b60ae 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/dao/ApyAccountRepository.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/dao/ApyAccountRepository.java @@ -1,12 +1,12 @@ -package in.egan.pay.demo.dao; +package com.egzosn.pay.demo.dao; -import in.egan.pay.common.bean.MsgType; -import in.egan.pay.common.util.sign.SignUtils; -import in.egan.pay.demo.entity.ApyAccount; -import in.egan.pay.demo.entity.PayType; +import com.egzosn.pay.common.bean.MsgType; +import com.egzosn.pay.common.util.sign.SignUtils; +import com.egzosn.pay.demo.entity.ApyAccount; +import com.egzosn.pay.demo.entity.PayType; import java.util.HashMap; import java.util.Map; @@ -21,7 +21,7 @@ import java.util.Map; public class ApyAccountRepository { // 这里简单模拟，引入orm等框架之后可自行删除 - public static Map apyAccounts = new HashMap<>(); + public static Map apyAccounts = new HashMap<>(); /** * 这里简单初始化，引入orm等框架之后可自行删除 diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/entity/ApyAccount.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/ApyAccount.java similarity index 96% rename from pay-java-demo/src/main/java/in/egan/pay/demo/entity/ApyAccount.java rename to pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/ApyAccount.java index 456e5ca..a22e19f 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/entity/ApyAccount.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/ApyAccount.java @@ -1,8 +1,8 @@ -package in.egan.pay.demo.entity; +package com.egzosn.pay.demo.entity; -import in.egan.pay.common.bean.MsgType; +import com.egzosn.pay.common.bean.MsgType; //import javax.persistence.*; @@ -46,7 +46,7 @@ public class ApyAccount { // 编码类型 枚举值，字符编码 utf-8,gbk等等 // @Column(name = "input_charset") private String inputCharset; - //支付类型,aliPay：支付宝，wxPay：微信, youdianPay: 友店微信,此处开发者自定义对应in.egan.pay.demo.entity.PayType枚举值 + //支付类型,aliPay：支付宝，wxPay：微信, youdianPay: 友店微信,此处开发者自定义对应com.egzosn.pay.demo.entity.PayType枚举值 // @Enumerated(EnumType.STRING) // @Column(name = "pay_type") private PayType payType; diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/entity/PayType.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java similarity index 81% rename from pay-java-demo/src/main/java/in/egan/pay/demo/entity/PayType.java rename to pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java index d896d46..5872929 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/entity/PayType.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java @@ -1,120 +1,119 @@ -package in.egan.pay.demo.entity; - -import in.egan.pay.ali.api.AliPayConfigStorage; -import in.egan.pay.ali.api.AliPayService; -import in.egan.pay.ali.bean.AliTransactionType; -import in.egan.pay.common.api.PayService; -import in.egan.pay.common.bean.BasePayType; -import in.egan.pay.common.bean.TransactionType; -import in.egan.pay.wx.api.WxPayConfigStorage; -import in.egan.pay.wx.api.WxPayService; -import in.egan.pay.wx.bean.WxTransactionType; -import in.egan.pay.wx.youdian.api.WxYouDianPayConfigStorage; -import in.egan.pay.wx.youdian.api.WxYouDianPayService; -import in.egan.pay.wx.youdian.bean.YoudianTransactionType; - - -/** - * 支付类型 - * @author egan - * @email egzosn@gmail.com - * @date 2016/11/20 0:30 - */ -public enum PayType implements BasePayType { - - - aliPay{ - /** - * @see in.egan.pay.ali.before.api.AliPayService 17年更新的版本,旧版本请自行切换 - * @param apyAccount - * @return - */ - @Override - public PayService getPayService(ApyAccount apyAccount) { - AliPayConfigStorage aliPayConfigStorage = new AliPayConfigStorage(); - aliPayConfigStorage.setPid(apyAccount.getPartner()); - aliPayConfigStorage.setAppId(apyAccount.getAppid()); - aliPayConfigStorage.setAliPublicKey(apyAccount.getPublicKey()); - aliPayConfigStorage.setKeyPrivate(apyAccount.getPrivateKey()); - aliPayConfigStorage.setNotifyUrl(apyAccount.getNotifyUrl()); - aliPayConfigStorage.setReturnUrl(apyAccount.getReturnUrl()); - aliPayConfigStorage.setSignType(apyAccount.getSignType()); - aliPayConfigStorage.setSeller(apyAccount.getSeller()); - aliPayConfigStorage.setPayType(apyAccount.getPayType().toString()); - aliPayConfigStorage.setMsgType(apyAccount.getMsgType()); - aliPayConfigStorage.setInputCharset(apyAccount.getInputCharset()); - aliPayConfigStorage.setTest(apyAccount.isTest()); - return new AliPayService(aliPayConfigStorage); - } - - @Override - public TransactionType getTransactionType(String transactionType) { - // in.egan.pay.ali.before.bean.AliTransactionType 17年更新的版本,旧版本请自行切换 - return AliTransactionType.valueOf(transactionType); - } - - - },wxPay { - @Override - public PayService getPayService(ApyAccount apyAccount) { - WxPayConfigStorage wxPayConfigStorage = new WxPayConfigStorage(); - wxPayConfigStorage.setMchId(apyAccount.getPartner()); - wxPayConfigStorage.setAppSecret(apyAccount.getPublicKey()); - wxPayConfigStorage.setKeyPublic(apyAccount.getPublicKey()); - wxPayConfigStorage.setAppid(apyAccount.getAppid()); - wxPayConfigStorage.setKeyPrivate(apyAccount.getPrivateKey()); - wxPayConfigStorage.setNotifyUrl(apyAccount.getNotifyUrl()); - wxPayConfigStorage.setSignType(apyAccount.getSignType()); - wxPayConfigStorage.setPayType(apyAccount.getPayType().toString()); - wxPayConfigStorage.setMsgType(apyAccount.getMsgType()); - wxPayConfigStorage.setInputCharset(apyAccount.getInputCharset()); - wxPayConfigStorage.setTest(apyAccount.isTest()); - return new WxPayService(wxPayConfigStorage); - } - - /** - * 根据支付类型获取交易类型 - * @param transactionType 类型值 - * @see WxTransactionType - * @return - */ - @Override - public TransactionType getTransactionType(String transactionType) { - - return WxTransactionType.valueOf(transactionType); - } - },youdianPay { - @Override - public PayService getPayService(ApyAccount apyAccount) { - // TODO 2017/1/23 14:12 author: egan 集群的话,友店可能会有bug。暂未测试集群环境 - WxYouDianPayConfigStorage wxPayConfigStorage = new WxYouDianPayConfigStorage(); - wxPayConfigStorage.setKeyPrivate(apyAccount.getPrivateKey()); - wxPayConfigStorage.setKeyPublic(apyAccount.getPublicKey()); -// wxPayConfigStorage.setNotifyUrl(apyAccount.getNotifyUrl()); -// wxPayConfigStorage.setReturnUrl(apyAccount.getReturnUrl()); - wxPayConfigStorage.setSignType(apyAccount.getSignType()); - wxPayConfigStorage.setPayType(apyAccount.getPayType().toString()); - wxPayConfigStorage.setMsgType(apyAccount.getMsgType()); - wxPayConfigStorage.setSeller(apyAccount.getSeller()); - wxPayConfigStorage.setInputCharset(apyAccount.getInputCharset()); - wxPayConfigStorage.setTest(apyAccount.isTest()); - return new WxYouDianPayService(wxPayConfigStorage); - } - - /** - * 根据支付类型获取交易类型 - * @param transactionType 类型值 - * @see YoudianTransactionType - * @return - */ - @Override - public TransactionType getTransactionType(String transactionType) { - - return YoudianTransactionType.valueOf(transactionType); - } - }; - - public abstract PayService getPayService(ApyAccount apyAccount); - - -} +package com.egzosn.pay.demo.entity; + +import com.egzosn.pay.ali.api.AliPayConfigStorage; +import com.egzosn.pay.ali.bean.AliTransactionType; +import com.egzosn.pay.common.api.PayService; +import com.egzosn.pay.common.bean.BasePayType; +import com.egzosn.pay.common.bean.TransactionType; +import com.egzosn.pay.wx.api.WxPayConfigStorage; +import com.egzosn.pay.wx.api.WxPayService; +import com.egzosn.pay.wx.bean.WxTransactionType; +import com.egzosn.pay.wx.youdian.api.WxYouDianPayConfigStorage; +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 + */ +public enum PayType implements BasePayType { + + + aliPay{ + /** + * @see AliPayService 17年更新的版本,旧版本请自行切换 + * @param apyAccount + * @return + */ + @Override + public PayService getPayService(ApyAccount apyAccount) { + AliPayConfigStorage aliPayConfigStorage = new AliPayConfigStorage(); + aliPayConfigStorage.setPid(apyAccount.getPartner()); + aliPayConfigStorage.setAppId(apyAccount.getAppid()); + aliPayConfigStorage.setAliPublicKey(apyAccount.getPublicKey()); + aliPayConfigStorage.setKeyPrivate(apyAccount.getPrivateKey()); + aliPayConfigStorage.setNotifyUrl(apyAccount.getNotifyUrl()); + aliPayConfigStorage.setReturnUrl(apyAccount.getReturnUrl()); + aliPayConfigStorage.setSignType(apyAccount.getSignType()); + aliPayConfigStorage.setSeller(apyAccount.getSeller()); + aliPayConfigStorage.setPayType(apyAccount.getPayType().toString()); + aliPayConfigStorage.setMsgType(apyAccount.getMsgType()); + aliPayConfigStorage.setInputCharset(apyAccount.getInputCharset()); + aliPayConfigStorage.setTest(apyAccount.isTest()); + return new com.egzosn.pay.ali.api.AliPayService(aliPayConfigStorage); + } + + @Override + public TransactionType getTransactionType(String transactionType) { + // AliTransactionType 17年更新的版本,旧版本请自行切换 + return AliTransactionType.valueOf(transactionType); + } + + + },wxPay { + @Override + public PayService getPayService(ApyAccount apyAccount) { + WxPayConfigStorage wxPayConfigStorage = new WxPayConfigStorage(); + wxPayConfigStorage.setMchId(apyAccount.getPartner()); + wxPayConfigStorage.setAppSecret(apyAccount.getPublicKey()); + wxPayConfigStorage.setKeyPublic(apyAccount.getPublicKey()); + wxPayConfigStorage.setAppid(apyAccount.getAppid()); + wxPayConfigStorage.setKeyPrivate(apyAccount.getPrivateKey()); + wxPayConfigStorage.setNotifyUrl(apyAccount.getNotifyUrl()); + wxPayConfigStorage.setSignType(apyAccount.getSignType()); + wxPayConfigStorage.setPayType(apyAccount.getPayType().toString()); + wxPayConfigStorage.setMsgType(apyAccount.getMsgType()); + wxPayConfigStorage.setInputCharset(apyAccount.getInputCharset()); + wxPayConfigStorage.setTest(apyAccount.isTest()); + return new WxPayService(wxPayConfigStorage); + } + + /** + * 根据支付类型获取交易类型 + * @param transactionType 类型值 + * @see WxTransactionType + * @return + */ + @Override + public TransactionType getTransactionType(String transactionType) { + + return WxTransactionType.valueOf(transactionType); + } + },youdianPay { + @Override + public PayService getPayService(ApyAccount apyAccount) { + // TODO 2017/1/23 14:12 author: egan 集群的话,友店可能会有bug。暂未测试集群环境 + WxYouDianPayConfigStorage wxPayConfigStorage = new WxYouDianPayConfigStorage(); + wxPayConfigStorage.setKeyPrivate(apyAccount.getPrivateKey()); + wxPayConfigStorage.setKeyPublic(apyAccount.getPublicKey()); +// wxPayConfigStorage.setNotifyUrl(apyAccount.getNotifyUrl()); +// wxPayConfigStorage.setReturnUrl(apyAccount.getReturnUrl()); + wxPayConfigStorage.setSignType(apyAccount.getSignType()); + wxPayConfigStorage.setPayType(apyAccount.getPayType().toString()); + wxPayConfigStorage.setMsgType(apyAccount.getMsgType()); + wxPayConfigStorage.setSeller(apyAccount.getSeller()); + wxPayConfigStorage.setInputCharset(apyAccount.getInputCharset()); + wxPayConfigStorage.setTest(apyAccount.isTest()); + return new WxYouDianPayService(wxPayConfigStorage); + } + + /** + * 根据支付类型获取交易类型 + * @param transactionType 类型值 + * @see YoudianTransactionType + * @return + */ + @Override + public TransactionType getTransactionType(String transactionType) { + + return YoudianTransactionType.valueOf(transactionType); + } + }; + + public abstract PayService getPayService(ApyAccount apyAccount); + + +} diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/request/QueryOrder.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/request/QueryOrder.java similarity index 96% rename from pay-java-demo/src/main/java/in/egan/pay/demo/request/QueryOrder.java rename to pay-java-demo/src/main/java/com/egzosn/pay/demo/request/QueryOrder.java index 79c21f3..d6829dc 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/request/QueryOrder.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/request/QueryOrder.java @@ -1,6 +1,4 @@ -package in.egan.pay.demo.request; - -import in.egan.pay.common.bean.TransactionType; +package com.egzosn.pay.demo.request; import java.math.BigDecimal; import java.util.Date; diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/service/ApyAccountService.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/ApyAccountService.java similarity index 90% rename from pay-java-demo/src/main/java/in/egan/pay/demo/service/ApyAccountService.java rename to pay-java-demo/src/main/java/com/egzosn/pay/demo/service/ApyAccountService.java index b487797..7c497c1 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/service/ApyAccountService.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/ApyAccountService.java @@ -1,8 +1,8 @@ -package in.egan.pay.demo.service; +package com.egzosn.pay.demo.service; -import in.egan.pay.demo.dao.ApyAccountRepository; -import in.egan.pay.demo.entity.ApyAccount; +import com.egzosn.pay.demo.entity.ApyAccount; +import com.egzosn.pay.demo.dao.ApyAccountRepository; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/service/PayResponse.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java similarity index 78% rename from pay-java-demo/src/main/java/in/egan/pay/demo/service/PayResponse.java rename to pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java index 5fee84e..7e41013 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/service/PayResponse.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java @@ -1,19 +1,19 @@ -package in.egan.pay.demo.service; +package com.egzosn.pay.demo.service; -import in.egan.pay.ali.bean.AliTransactionType; -import in.egan.pay.demo.entity.ApyAccount; -import in.egan.pay.demo.entity.PayType; -import in.egan.pay.demo.service.handler.AliPayMessageHandler; -import in.egan.pay.demo.service.handler.WxPayMessageHandler; -import in.egan.pay.demo.service.handler.YouDianPayMessageHandler; -import in.egan.pay.demo.service.interceptor.AliPayMessageInterceptor; -import in.egan.pay.common.api.PayConfigStorage; -import in.egan.pay.common.api.PayMessageHandler; -import in.egan.pay.common.api.PayMessageRouter; -import in.egan.pay.common.api.PayService; -import in.egan.pay.common.bean.MsgType; +import com.egzosn.pay.ali.bean.AliTransactionType; +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; +import com.egzosn.pay.demo.service.handler.WxPayMessageHandler; +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; import javax.annotation.Resource; diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/service/handler/AliPayMessageHandler.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/AliPayMessageHandler.java similarity index 71% rename from pay-java-demo/src/main/java/in/egan/pay/demo/service/handler/AliPayMessageHandler.java rename to pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/AliPayMessageHandler.java index 2172fbc..b5d1514 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/service/handler/AliPayMessageHandler.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/AliPayMessageHandler.java @@ -1,11 +1,10 @@ -package in.egan.pay.demo.service.handler; +package com.egzosn.pay.demo.service.handler; -import in.egan.pay.common.api.PayService; -import in.egan.pay.common.bean.PayMessage; -import in.egan.pay.common.bean.PayOutMessage; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.api.PayService; +import com.egzosn.pay.common.bean.PayMessage; +import com.egzosn.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.exception.PayErrorException; -import java.io.UnsupportedEncodingException; import java.util.Map; /** @@ -24,26 +23,23 @@ public class AliPayMessageHandler extends BasePayMessageHandler { @Override public PayOutMessage handle(PayMessage payMessage, Map context, PayService payService) throws PayErrorException { //交易状态 - String trade_status =payMessage.getPayMessage().get("trade_status"); - - if(trade_status.equals("TRADE_FINISHED")){ - - //判断该笔订单是否在商户网站中已经做过处理 - //如果没有做过处理，根据订单号（out_trade_no）在商户网站的订单系统中查到该笔订单的详细，并执行商户的业务程序 - //如果有做过处理，不执行商户的业务程序 - //注意： - //退款日期超过可退款期限后（如三个月可退款），支付宝系统发送该交易状态通知 - } else if (trade_status.equals("TRADE_SUCCESS")){ + String trade_status = payMessage.getPayMessage().get("trade_status"); + if ("TRADE_SUCCESS".equals(trade_status)){ //判断该笔订单是否在商户网站中已经做过处理 //如果没有做过处理，根据订单号（out_trade_no）在商户网站的订单系统中查到该笔订单的详细，并执行商户的业务程序 //如果有做过处理，不执行商户的业务程序 //注意： //付款完成后，支付宝系统发送该交易状态通知 + } else if("TRADE_FINISHED".equals(trade_status)) { + //判断该笔订单是否在商户网站中已经做过处理 + //如果没有做过处理，根据订单号（out_trade_no）在商户网站的订单系统中查到该笔订单的详细，并执行商户的业务程序 + //如果有做过处理，不执行商户的业务程序 + //注意： + //退款日期超过可退款期限后（如三个月可退款），支付宝系统发送该交易状态通知 + } else if ("WAIT_BUYER_PAY".equals(trade_status) || "TRADE_CLOSED".equals(trade_status)) { - }else if (trade_status.equals("TRADE_SUCCESS")){ - // 交易创建 } return payService.getPayOutMessage("success", "成功"); diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/service/handler/BasePayMessageHandler.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/BasePayMessageHandler.java similarity index 76% rename from pay-java-demo/src/main/java/in/egan/pay/demo/service/handler/BasePayMessageHandler.java rename to pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/BasePayMessageHandler.java index adc52e2..a55947e 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/service/handler/BasePayMessageHandler.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/BasePayMessageHandler.java @@ -1,6 +1,6 @@ -package in.egan.pay.demo.service.handler; +package com.egzosn.pay.demo.service.handler; -import in.egan.pay.common.api.PayMessageHandler; +import com.egzosn.pay.common.api.PayMessageHandler; /** * diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/service/handler/FuiouPayMessageHandler.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/FuiouPayMessageHandler.java similarity index 75% rename from pay-java-demo/src/main/java/in/egan/pay/demo/service/handler/FuiouPayMessageHandler.java rename to pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/FuiouPayMessageHandler.java index d69c50c..e454788 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/service/handler/FuiouPayMessageHandler.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/FuiouPayMessageHandler.java @@ -1,9 +1,9 @@ -package in.egan.pay.demo.service.handler; +package com.egzosn.pay.demo.service.handler; -import in.egan.pay.common.api.PayService; -import in.egan.pay.common.bean.PayMessage; -import in.egan.pay.common.bean.PayOutMessage; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.api.PayService; +import com.egzosn.pay.common.bean.PayMessage; +import com.egzosn.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.exception.PayErrorException; import java.util.Map; diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/service/handler/WxPayMessageHandler.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/WxPayMessageHandler.java similarity index 73% rename from pay-java-demo/src/main/java/in/egan/pay/demo/service/handler/WxPayMessageHandler.java rename to pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/WxPayMessageHandler.java index 777f0ee..0bf21ad 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/service/handler/WxPayMessageHandler.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/WxPayMessageHandler.java @@ -1,9 +1,9 @@ -package in.egan.pay.demo.service.handler; +package com.egzosn.pay.demo.service.handler; -import in.egan.pay.common.api.PayService; -import in.egan.pay.common.bean.PayMessage; -import in.egan.pay.common.bean.PayOutMessage; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.api.PayService; +import com.egzosn.pay.common.bean.PayMessage; +import com.egzosn.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.exception.PayErrorException; import java.util.Map; diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/service/handler/YouDianPayMessageHandler.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/YouDianPayMessageHandler.java similarity index 75% rename from pay-java-demo/src/main/java/in/egan/pay/demo/service/handler/YouDianPayMessageHandler.java rename to pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/YouDianPayMessageHandler.java index b5a36f5..da83ade 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/service/handler/YouDianPayMessageHandler.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/YouDianPayMessageHandler.java @@ -1,9 +1,9 @@ -package in.egan.pay.demo.service.handler; +package com.egzosn.pay.demo.service.handler; -import in.egan.pay.common.api.PayService; -import in.egan.pay.common.bean.PayMessage; -import in.egan.pay.common.bean.PayOutMessage; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.api.PayService; +import com.egzosn.pay.common.bean.PayMessage; +import com.egzosn.pay.common.bean.PayOutMessage; +import com.egzosn.pay.common.exception.PayErrorException; import java.util.Map; diff --git a/pay-java-demo/src/main/java/in/egan/pay/demo/service/interceptor/AliPayMessageInterceptor.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java similarity index 75% rename from pay-java-demo/src/main/java/in/egan/pay/demo/service/interceptor/AliPayMessageInterceptor.java rename to pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java index 7930da6..b5258d1 100644 --- a/pay-java-demo/src/main/java/in/egan/pay/demo/service/interceptor/AliPayMessageInterceptor.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java @@ -1,11 +1,11 @@ -package in.egan.pay.demo.service.interceptor; +package com.egzosn.pay.demo.service.interceptor; -import in.egan.pay.common.api.PayMessageHandler; -import in.egan.pay.common.api.PayMessageInterceptor; -import in.egan.pay.common.api.PayService; -import in.egan.pay.common.bean.PayMessage; -import in.egan.pay.common.exception.PayErrorException; +import com.egzosn.pay.common.api.PayMessageHandler; +import com.egzosn.pay.common.api.PayMessageInterceptor; +import com.egzosn.pay.common.api.PayService; +import com.egzosn.pay.common.bean.PayMessage; +import com.egzosn.pay.common.exception.PayErrorException; import java.util.Map; diff --git a/pay-java-demo/src/main/resources/applicationContext.xml b/pay-java-demo/src/main/resources/applicationContext.xml index 9260d66..c0ba547 100644 --- a/pay-java-demo/src/main/resources/applicationContext.xml +++ b/pay-java-demo/src/main/resources/applicationContext.xml @@ -11,7 +11,7 @@ - + diff --git a/pay-java-demo/src/main/resources/apy_account.sql b/pay-java-demo/src/main/resources/apy_account.sql index 063e3f1..dc183ad 100644 --- a/pay-java-demo/src/main/resources/apy_account.sql +++ b/pay-java-demo/src/main/resources/apy_account.sql @@ -14,7 +14,7 @@ CREATE TABLE `apy_account` ( `seller` varchar(256) DEFAULT NULL COMMENT '收款账号, 针对支付宝', `sign_type` varchar(16) DEFAULT NULL COMMENT '签名类型', `input_charset` varchar(16) DEFAULT NULL COMMENT '枚举值，字符编码 utf-8,gbk等等', - `pay_type` char(16) DEFAULT NULL COMMENT '支付类型,aliPay：支付宝，wxPay：微信, youdianPay: 友店微信,此处开发者自定义对应in.egan.pay.demo.entity.PayType枚举值', + `pay_type` char(16) DEFAULT NULL COMMENT '支付类型,aliPay：支付宝，wxPay：微信, youdianPay: 友店微信,此处开发者自定义对应com.egzosn.pay.demo.entity.PayType枚举值', `msg_type` char(8) DEFAULT NULL COMMENT '消息类型，text,xml,json', `create_by` char(32) DEFAULT NULL COMMENT '创建人', `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间', @@ -24,8 +24,8 @@ CREATE TABLE `apy_account` ( /*Data for the table `apy_account` */ insert into `apy_account`(`pay_id`,`partner`,`appid`,`public_key`,`private_key`,`notify_url`,`return_url`,`seller`,`sign_type`,`input_charset`,`pay_type`,`msg_type`,`create_by`,`create_time`) values -(1,'12******01','wxa**********ba9e9','48gf0iwuhr***********r9weh9eiut9','48gf0iwuhr***********r9weh9eiut9','http://pay.egan.in/payBack2.json','同步回调地址','','MD5','utf-8','wxPay','xml','egan','2017-01-20 17:07:48'), -(2,'20889119449*****','','MIGfMA0GCSqGSIb3DQEB*********gmLCUYuLkxpLQIDAQAB','IqZg51Vx8BvyypnIfKgw=*********MIICdwIBADANBgkqhkiG9w0BAQE','http://pay.egan.in/payBack3.json','同步回调地址','egzosn@gmail.com','RSA','utf-8','aliPay','text','egan','2017-01-20 17:11:46'), +(1,'12******01','wxa**********ba9e9','48gf0iwuhr***********r9weh9eiut9','48gf0iwuhr***********r9weh9eiut9','http://pay.egzosn.com/payBack2.json','同步回调地址','','MD5','utf-8','wxPay','xml','egan','2017-01-20 17:07:48'), +(2,'20889119449*****','','MIGfMA0GCSqGSIb3DQEB*********gmLCUYuLkxpLQIDAQAB','IqZg51Vx8BvyypnIfKgw=*********MIICdwIBADANBgkqhkiG9w0BAQE','http://pay.egzosn.com/payBack3.json','同步回调地址','egzosn@gmail.com','RSA','utf-8','aliPay','text','egan','2017-01-20 17:11:46'), diff --git a/pay-java-demo/src/main/resources/mvc-servlet-context.xml b/pay-java-demo/src/main/resources/mvc-servlet-context.xml index eed8f7a..bf45bb0 100644 --- a/pay-java-demo/src/main/resources/mvc-servlet-context.xml +++ b/pay-java-demo/src/main/resources/mvc-servlet-context.xml @@ -15,7 +15,7 @@ - + diff --git a/pay-java-demo/src/main/webapp/index.html b/pay-java-demo/src/main/webapp/index.html index fffa00e..910fadb 100644 --- a/pay-java-demo/src/main/webapp/index.html +++ b/pay-java-demo/src/main/webapp/index.html @@ -38,7 +38,7 @@ -此处为开发者自定义，详情请查看 in.egan.pay.demo.entity.PayType +此处为开发者自定义，详情请查看 com.egzosn.pay.demo.entity.PayType
消息类型