Merge remote-tracking branch 'origin/master'

egzosn · May 9, 2017 · 464dc09 · 464dc09
2 parents f5b5c48 + e4626fa
commit 464dc09
Show file tree

Hide file tree

Showing 100 changed files with 460 additions and 432 deletions.
diff --git 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">
     <parent>
         <artifactId>pay-java-parent</artifactId>
-        <groupId>in.egan</groupId>
+        <groupId>com.egzosn</groupId>
         <version>2.0.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -15,7 +15,7 @@
 
         <!-- pay-java  -->
         <dependency>
-            <groupId>in.egan</groupId>
+            <groupId>com.egzosn</groupId>
             <artifactId>pay-java-common</artifactId>
         </dependency>
         <!-- /pay-java  -->

diff --git a/...egan/pay/ali/api/AliPayConfigStorage.java → ...zosn/pay/ali/api/AliPayConfigStorage.java b/...egan/pay/ali/api/AliPayConfigStorage.java → ...zosn/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/...va/in/egan/pay/ali/api/AliPayService.java → ...com/egzosn/pay/ali/api/AliPayService.java b/...va/in/egan/pay/ali/api/AliPayService.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 <T> T downloadbill(Date billDate, String billType, Callback<T> callback)
     /**
      *
      * @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/...egan/pay/ali/bean/AliTransactionType.java → ...zosn/pay/ali/bean/AliTransactionType.java b/...egan/pay/ali/bean/AliTransactionType.java → ...zosn/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/...gan/pay/ali/before/api/AliPayService.java → ...osn/pay/ali/before/api/AliPayService.java b/...gan/pay/ali/before/api/AliPayService.java → ...osn/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 @@
  * @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 <T> T downloadbill(Date billDate, String billType, Callback<T> callback)
     /**
      *
      * @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/...y/ali/before/bean/AliTransactionType.java → ...y/ali/before/bean/AliTransactionType.java b/...y/ali/before/bean/AliTransactionType.java → ...y/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 @@
  * @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/...before/util/SimpleGetRequestExecutor.java → ...before/util/SimpleGetRequestExecutor.java b/...before/util/SimpleGetRequestExecutor.java → ...before/util/SimpleGetRequestExecutor.java
@@ -1,15 +1,15 @@
-package in.egan.pay.ali.before.util;
+package com.egzosn.pay.ali.before.util;
 
 /**
  * @author  egan
  * @email egzosn@gmail.com
  * @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
@@ -4,12 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>pay-java-parent</artifactId>
-        <groupId>in.egan</groupId>
+        <groupId>com.egzosn</groupId>
         <version>2.0.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <groupId>in.egan</groupId>
+    <groupId>com.egzosn</groupId>
     <artifactId>pay-java-common</artifactId>
 
 

diff --git a/.../pay/common/api/BasePayConfigStorage.java → .../pay/common/api/BasePayConfigStorage.java b/.../pay/common/api/BasePayConfigStorage.java → .../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/...n/egan/pay/common/api/BasePayService.java → ...egzosn/pay/common/api/BasePayService.java b/...n/egan/pay/common/api/BasePayService.java → ...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/...java/in/egan/pay/common/api/Callback.java → ...a/com/egzosn/pay/common/api/Callback.java b/...java/in/egan/pay/common/api/Callback.java → ...a/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/...egan/pay/common/api/PayConfigStorage.java → ...zosn/pay/common/api/PayConfigStorage.java b/...egan/pay/common/api/PayConfigStorage.java → ...zosn/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/.../common/api/PayErrorExceptionHandler.java → .../common/api/PayErrorExceptionHandler.java b/.../common/api/PayErrorExceptionHandler.java → .../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/...gan/pay/common/api/PayMessageHandler.java → ...osn/pay/common/api/PayMessageHandler.java b/...gan/pay/common/api/PayMessageHandler.java → ...osn/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/common/api/PayMessageInterceptor.java → ...pay/common/api/PayMessageInterceptor.java b/...pay/common/api/PayMessageInterceptor.java → ...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/...egan/pay/common/api/PayMessageRouter.java → ...zosn/pay/common/api/PayMessageRouter.java b/...egan/pay/common/api/PayMessageRouter.java → ...zosn/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/common/api/PayMessageRouterRule.java → .../pay/common/api/PayMessageRouterRule.java b/.../pay/common/api/PayMessageRouterRule.java → .../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/...va/in/egan/pay/common/api/PayService.java → ...com/egzosn/pay/common/api/PayService.java b/...va/in/egan/pay/common/api/PayService.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/.../in/egan/pay/common/bean/BasePayType.java → ...m/egzosn/pay/common/bean/BasePayType.java b/.../in/egan/pay/common/bean/BasePayType.java → ...m/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/...java/in/egan/pay/common/bean/CurType.java → ...a/com/egzosn/pay/common/bean/CurType.java b/...java/in/egan/pay/common/bean/CurType.java → ...a/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/...a/in/egan/pay/common/bean/MethodType.java → ...om/egzosn/pay/common/bean/MethodType.java b/...a/in/egan/pay/common/bean/MethodType.java → ...om/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/...java/in/egan/pay/common/bean/MsgType.java → ...a/com/egzosn/pay/common/bean/MsgType.java b/...java/in/egan/pay/common/bean/MsgType.java → ...a/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/...a/in/egan/pay/common/bean/PayMessage.java → ...om/egzosn/pay/common/bean/PayMessage.java b/...a/in/egan/pay/common/bean/PayMessage.java → ...om/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/...ava/in/egan/pay/common/bean/PayOrder.java → .../com/egzosn/pay/common/bean/PayOrder.java b/...ava/in/egan/pay/common/bean/PayOrder.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/...n/egan/pay/common/bean/PayOutMessage.java → ...egzosn/pay/common/bean/PayOutMessage.java b/...n/egan/pay/common/bean/PayOutMessage.java → ...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/...egan/pay/common/bean/TransactionType.java → ...zosn/pay/common/bean/TransactionType.java b/...egan/pay/common/bean/TransactionType.java → ...zosn/pay/common/bean/TransactionType.java
@@ -1,4 +1,4 @@
-package in.egan.pay.common.bean;
+package com.egzosn.pay.common.bean;
 
 /**
  * 交易类型

diff --git a/...y/common/bean/outbuilder/BaseBuilder.java → ...y/common/bean/outbuilder/BaseBuilder.java b/...y/common/bean/outbuilder/BaseBuilder.java → ...y/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
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ @@
      */
-    package in.egan.pay.common.api;
+    package com.egzosn.pay.common.api;
     import java.util.Map;
@@ Expand Down @@