From 9258310ec99beea753b597e4695d5555a3d4ec3b Mon Sep 17 00:00:00 2001 From: egan Date: Wed, 21 Feb 2018 23:17:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BD=9C=E8=80=85=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/egzosn/pay/payoneer/api/AdvancedPayService.java | 7 +++++-- .../egzosn/pay/payoneer/api/PayoneerConfigStorage.java | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/AdvancedPayService.java b/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/AdvancedPayService.java index 1036d16..3b50f72 100644 --- a/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/AdvancedPayService.java +++ b/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/AdvancedPayService.java @@ -7,8 +7,11 @@ import java.util.Map; /** * 高级支付接口 * @author Actinia - * @email hayesfu@qq.com - * @date 2018/1/18 + * @author egan + * 
+ * email hayesfu@qq.com
+ * date 2018/1/18
+ *
* */ diff --git a/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerConfigStorage.java b/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerConfigStorage.java index e82538b..3bec5ef 100644 --- a/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerConfigStorage.java +++ b/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerConfigStorage.java @@ -2,10 +2,13 @@ package com.egzosn.pay.payoneer.api; import com.egzosn.pay.common.api.BasePayConfigStorage; /** - * @descrption + * Payoneer P卡 支付 配置 * @author Actinia - * @email hayesfu@qq.com - * @date 2018-01-19 + * @author egan + * 
+ * email hayesfu@qq.com
+ * date 2018-01-19
+ *
*/ public class PayoneerConfigStorage extends BasePayConfigStorage { /** From e18ff96cc41fb6bfe839896f3000e6ff33ebea9b Mon Sep 17 00:00:00 2001 From: egan Date: Wed, 21 Feb 2018 23:42:33 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A72.0.7-R?= =?UTF-8?q?ELEASE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- pay-java-ali/pom.xml | 2 +- pay-java-common/pom.xml | 2 +- .../main/java/com/egzosn/pay/common/bean/CurType.java | 2 +- .../com/egzosn/pay/common/http/HttpStringEntity.java | 4 ++-- .../com/egzosn/pay/common/util/sign/CertDescriptor.java | 5 +++-- pay-java-fuiou/pom.xml | 2 +- pay-java-payoneer/pom.xml | 2 +- pay-java-union/pom.xml | 2 +- pay-java-wx-youdian/pom.xml | 2 +- pay-java-wx/pom.xml | 2 +- pom.xml | 9 ++++----- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 58f4705..6c1674a 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ com.egzosn pay-java-common - 2.0.6-RELEASE + 2.0.7-RELEASE ``` @@ -45,7 +45,7 @@ com.egzosn {module-name} - 2.0.6-RELEASE + 2.0.7-RELEASE ``` diff --git a/pay-java-ali/pom.xml b/pay-java-ali/pom.xml index f1d2256..78790d4 100644 --- a/pay-java-ali/pom.xml +++ b/pay-java-ali/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-SNAPSHOT + 2.0.7-RELEASE 4.0.0 pay-java-ali diff --git a/pay-java-common/pom.xml b/pay-java-common/pom.xml index 84efcdf..b03314b 100644 --- a/pay-java-common/pom.xml +++ b/pay-java-common/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-SNAPSHOT + 2.0.7-RELEASE 4.0.0 jar diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CurType.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CurType.java index 08c3cb4..4917abe 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CurType.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CurType.java @@ -3,8 +3,8 @@ package com.egzosn.pay.common.bean; /** * 货币类型 * @author Actinia - * @email hayesfu@qq.com * 
+ * email hayesfu@qq.com
  * create 2017 2017/1/16
  *
*/ diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpStringEntity.java b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpStringEntity.java index cc308fc..2952419 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpStringEntity.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpStringEntity.java @@ -133,7 +133,7 @@ public class HttpStringEntity extends StringEntity { * @param request 请求体 * @param contentType 内容类型 * - * @throws UnsupportedEncodingException 不支持默认的HTTP字符集 + * @throws UnsupportedCharsetException 不支持默认的HTTP字符集 */ public HttpStringEntity(String request, ContentType contentType) throws UnsupportedCharsetException { super(request, contentType); @@ -146,7 +146,7 @@ public class HttpStringEntity extends StringEntity { * @param request 请求体 * @param charset 字符类型 * - * @throws UnsupportedEncodingException 不支持默认的HTTP字符集 + * @throws UnsupportedCharsetException 不支持默认的HTTP字符集 */ public HttpStringEntity(String request, String charset) throws UnsupportedCharsetException { super(request, charset); diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/CertDescriptor.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/CertDescriptor.java index 89dc2a2..3d762db 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/CertDescriptor.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/CertDescriptor.java @@ -74,10 +74,11 @@ public class CertDescriptor { } return encryptCertTemp; } - + /** * 通过keyStore 获取私钥签名证书PrivateKey对象 - * + * + * @param pwd 证书对应密码 * @return PrivateKey 私钥 */ public PrivateKey getSignCertPrivateKey(String pwd) { diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml index 70cf625..722fa07 100644 --- a/pay-java-fuiou/pom.xml +++ b/pay-java-fuiou/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-SNAPSHOT + 2.0.7-RELEASE 4.0.0 pay-java-fuiou diff --git a/pay-java-payoneer/pom.xml b/pay-java-payoneer/pom.xml index dc50d27..ffdde85 100644 --- a/pay-java-payoneer/pom.xml +++ b/pay-java-payoneer/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-SNAPSHOT + 2.0.7-RELEASE 4.0.0 pay-java-payoneer diff --git a/pay-java-union/pom.xml b/pay-java-union/pom.xml index 5eac662..0d801b3 100644 --- a/pay-java-union/pom.xml +++ b/pay-java-union/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-SNAPSHOT + 2.0.7-RELEASE 4.0.0 diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml index efbe4a7..6ea6833 100644 --- a/pay-java-wx-youdian/pom.xml +++ b/pay-java-wx-youdian/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-SNAPSHOT + 2.0.7-RELEASE 4.0.0 pay-java-wx-youdian diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml index 32827f7..35aba1e 100644 --- a/pay-java-wx/pom.xml +++ b/pay-java-wx/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-SNAPSHOT + 2.0.7-RELEASE 4.0.0 pay-java-wx diff --git a/pom.xml b/pom.xml index 1873bb7..3d60b9d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.egzosn pay-java-parent pom - 2.0.7-SNAPSHOT + 2.0.7-RELEASE Pay Java - Parent Pay Java Parent @@ -43,14 +43,13 @@ pay-java-wx pay-java-wx-youdian pay-java-fuiou - pay-java-demo pay-java-union pay-java-payoneer - 2.0.7-SNAPSHOT + 2.0.7-RELEASE 4.5.4 1.2.17 1.2.41 @@ -126,7 +125,7 @@ utf-8 - + \ No newline at end of file From 49d01d1200c2903e9958491581981513b5989c65 Mon Sep 17 00:00:00 2001 From: egan Date: Wed, 21 Feb 2018 23:50:06 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A72.0.7-R?= =?UTF-8?q?ELEASE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 3d60b9d..c619fc7 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,7 @@ pay-java-fuiou pay-java-union pay-java-payoneer + pay-java-demo From b7e532a9826642f6602fdd2b64f52111c534bcc5 Mon Sep 17 00:00:00 2001 From: egan Date: Wed, 21 Feb 2018 23:51:04 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A72.0.7-R?= =?UTF-8?q?ELEASE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c619fc7..3d32fbb 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ utf-8 - + \ No newline at end of file From f1dfa89e67e1f608aecc85f64a1273bf63708daa Mon Sep 17 00:00:00 2001 From: egan Date: Wed, 21 Feb 2018 23:52:42 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A72.0.7-R?= =?UTF-8?q?ELEASE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pay-java-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml index b82db34..e5a8ce8 100644 --- a/pay-java-demo/pom.xml +++ b/pay-java-demo/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-SNAPSHOT + 2.0.7-RELEASE 4.0.0 war From 4b3070cfdcaffac0319cb05084b55c5f786f3bbd Mon Sep 17 00:00:00 2001 From: egan Date: Thu, 22 Feb 2018 00:15:18 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A72.0.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pay-java-ali/pom.xml | 2 +- pay-java-common/pom.xml | 2 +- pay-java-demo/pom.xml | 2 +- pay-java-fuiou/pom.xml | 2 +- pay-java-payoneer/pom.xml | 2 +- pay-java-union/pom.xml | 2 +- pay-java-wx-youdian/pom.xml | 2 +- pay-java-wx/pom.xml | 2 +- pom.xml | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pay-java-ali/pom.xml b/pay-java-ali/pom.xml index 78790d4..f8d3e57 100644 --- a/pay-java-ali/pom.xml +++ b/pay-java-ali/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-RELEASE + 2.0.8-SNAPSHOT 4.0.0 pay-java-ali diff --git a/pay-java-common/pom.xml b/pay-java-common/pom.xml index b03314b..fc6d2b0 100644 --- a/pay-java-common/pom.xml +++ b/pay-java-common/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-RELEASE + 2.0.8-SNAPSHOT 4.0.0 jar diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml index e5a8ce8..d065c0a 100644 --- a/pay-java-demo/pom.xml +++ b/pay-java-demo/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-RELEASE + 2.0.8-SNAPSHOT 4.0.0 war diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml index 722fa07..5071180 100644 --- a/pay-java-fuiou/pom.xml +++ b/pay-java-fuiou/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-RELEASE + 2.0.8-SNAPSHOT 4.0.0 pay-java-fuiou diff --git a/pay-java-payoneer/pom.xml b/pay-java-payoneer/pom.xml index ffdde85..1c8b920 100644 --- a/pay-java-payoneer/pom.xml +++ b/pay-java-payoneer/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-RELEASE + 2.0.8-SNAPSHOT 4.0.0 pay-java-payoneer diff --git a/pay-java-union/pom.xml b/pay-java-union/pom.xml index 0d801b3..40a4c68 100644 --- a/pay-java-union/pom.xml +++ b/pay-java-union/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-RELEASE + 2.0.8-SNAPSHOT 4.0.0 diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml index 6ea6833..3e88c52 100644 --- a/pay-java-wx-youdian/pom.xml +++ b/pay-java-wx-youdian/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-RELEASE + 2.0.8-SNAPSHOT 4.0.0 pay-java-wx-youdian diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml index 35aba1e..0bd3c30 100644 --- a/pay-java-wx/pom.xml +++ b/pay-java-wx/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.0.7-RELEASE + 2.0.8-SNAPSHOT 4.0.0 pay-java-wx diff --git a/pom.xml b/pom.xml index 3d32fbb..d6d7d52 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.egzosn pay-java-parent pom - 2.0.7-RELEASE + 2.0.8-SNAPSHOT Pay Java - Parent Pay Java Parent @@ -50,7 +50,7 @@ - 2.0.7-RELEASE + 2.0.8-SNAPSHOT 4.5.4 1.2.17 1.2.41