From 5e96692dd37e339372676f661473a2a817987d9c Mon Sep 17 00:00:00 2001 From: egzosn Date: Wed, 24 Feb 2021 23:12:26 +0800 Subject: [PATCH] 2.14.1 --- README.md | 2 +- pay-java-ali/README.md | 6 ++++-- pay-java-ali/pom.xml | 2 +- .../com/egzosn/pay/ali/api/AliPayService.java | 2 +- .../pay/ali/utils/AntCertificationUtil.java | 1 + pay-java-ali/src/test/java/PayTest.java | 2 +- pay-java-baidu/pom.xml | 2 +- .../egzosn/pay/baidu/api/BaiduPayService.java | 2 +- .../pay/baidu/bean/BaiduRefundOrder.java | 1 + .../pay/baidu/api/BaiduPayServiceTest.java | 2 +- pay-java-common/pom.xml | 2 +- .../pay/common/api/BasePayConfigStorage.java | 2 +- .../egzosn/pay/common/api/BasePayService.java | 2 +- .../com/egzosn/pay/common/api/Callback.java | 2 +- .../com/egzosn/pay/common/bean/BillType.java | 6 ++++-- .../egzosn/pay/common/bean/MethodType.java | 2 +- .../com/egzosn/pay/common/bean/SignType.java | 2 +- .../common/bean/outbuilder/JsonBuilder.java | 2 +- .../pay/common/bean/result/PayException.java | 2 +- .../pay/common/http/ClientHttpRequest.java | 2 +- .../pay/common/http/HttpConfigStorage.java | 2 +- .../pay/common/http/HttpRequestTemplate.java | 2 +- .../java/com/egzosn/pay/common/util/XML.java | 11 +++++----- pay-java-demo/README.md | 4 ++-- pay-java-demo/pom.xml | 2 +- .../pay/demo/controller/AliPayController.java | 5 +++-- .../demo/controller/FuiouPayController.java | 2 +- .../pay/demo/controller/PayController.java | 2 +- .../demo/controller/PayPalPayController.java | 2 +- .../controller/PayPalV2PayController.java | 2 +- .../demo/controller/UnionPayController.java | 2 +- .../pay/demo/controller/WxPayController.java | 4 ++-- .../pay/demo/dao/ApyAccountRepository.java | 10 ++++----- .../egzosn/pay/demo/entity/ApyAccount.java | 14 ++++++------- .../com/egzosn/pay/demo/entity/PayType.java | 6 +++--- .../egzosn/pay/demo/request/QueryOrder.java | 2 +- .../pay/demo/service/ApyAccountService.java | 2 +- .../egzosn/pay/demo/service/PayResponse.java | 2 +- .../interceptor/AliPayMessageInterceptor.java | 2 +- .../YoudianPayMessageInterceptor.java | 2 +- .../src/main/resources/apy_account.sql | 2 +- pay-java-fuiou/pom.xml | 2 +- pay-java-payoneer/pom.xml | 2 +- .../payoneer/api/PayoneerConfigStorage.java | 1 + pay-java-paypal/pom.xml | 2 +- .../pay/paypal/api/PayPalPayService.java | 2 +- .../egzosn/pay/paypal/bean/order/Error.java | 4 +--- .../egzosn/pay/paypal/bean/order/Links.java | 4 +--- .../pay/paypal/v2/api/PayPalPayService.java | 4 ++-- pay-java-union/pom.xml | 2 +- .../pay/union/api/UnionPayConfigStorage.java | 1 - pay-java-wx-youdian/pom.xml | 2 +- .../pay/wx/youdian/bean/YdPayError.java | 2 +- pay-java-wx/README.md | 2 +- pay-java-wx/pom.xml | 2 +- .../com/egzosn/pay/wx/api/WxBillService.java | 2 +- .../com/egzosn/pay/wx/api/WxPayService.java | 12 +++++------ .../egzosn/pay/wx/bean/WxTransactionType.java | 21 ++++++++++++------- pay-java-wx/src/test/java/PayTest.java | 2 +- pay-java-yiji/pom.xml | 2 +- .../egzosn/pay/yiji/api/YiJiPayService.java | 3 --- pom.xml | 6 ++++-- 62 files changed, 107 insertions(+), 101 deletions(-) diff --git a/README.md b/README.md index 3e2ee479..25cd18c1 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ com.egzosn {module-name} - 2.13.3-b1 + 2.14.1 ``` diff --git a/pay-java-ali/README.md b/pay-java-ali/README.md index 0f278757..166131d2 100644 --- a/pay-java-ali/README.md +++ b/pay-java-ali/README.md @@ -9,7 +9,8 @@ AliPayConfigStorage aliPayConfigStorage = new AliPayConfigStorage(); aliPayConfigStorage.setPid("合作者id"); - aliPayConfigStorage.setAppid("应用id"); + aliPayConfigStorage.setAppId("应用id"); +// aliPayConfigStorage.setAppAuthToken("ISV代商户代用，指定appAuthToken"); aliPayConfigStorage.setKeyPublic("支付宝公钥"); aliPayConfigStorage.setKeyPrivate("应用私钥"); aliPayConfigStorage.setNotifyUrl("异步回调地址"); @@ -27,7 +28,8 @@ AliPayConfigStorage aliPayConfigStorage = new AliPayConfigStorage(); aliPayConfigStorage.setPid("合作者id"); - aliPayConfigStorage.setAppid("应用id"); + aliPayConfigStorage.setAppId("应用id"); +// aliPayConfigStorage.setAppAuthToken("ISV代商户代用，指定appAuthToken"); aliPayConfigStorage.setKeyPrivate("应用私钥"); //设置为证书方式 aliPayConfigStorage.setCertSign(true); diff --git a/pay-java-ali/pom.xml b/pay-java-ali/pom.xml index f31a779c..a791d6ff 100644 --- a/pay-java-ali/pom.xml +++ b/pay-java-ali/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.13.4-SNAPSHOT + 2.14.1 4.0.0 pay-java-ali diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java index 1fb432ba..6e6792f4 100644 --- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java @@ -301,7 +301,7 @@ private Map setExpirationTime(Map bizContent, Pa */ private Map getPublicParameters(TransactionType transactionType) { Map orderInfo = new TreeMap<>(); - orderInfo.put("app_id", payConfigStorage.getAppid()); + orderInfo.put("app_id", payConfigStorage.getAppId()); orderInfo.put("method", transactionType.getMethod()); orderInfo.put("charset", payConfigStorage.getInputCharset()); orderInfo.put("timestamp", DateUtils.format(new Date())); diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/utils/AntCertificationUtil.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/utils/AntCertificationUtil.java index 7dae2ace..e225431b 100644 --- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/utils/AntCertificationUtil.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/utils/AntCertificationUtil.java @@ -54,6 +54,7 @@ public class AntCertificationUtil { * * @param certContent 需要验证的目标证书或者证书链 * @param rootCertContent 可信根证书列表 + * @return 是否校验成功 */ public static boolean isTrusted(String certContent, String rootCertContent) { X509Certificate[] certificates; diff --git a/pay-java-ali/src/test/java/PayTest.java b/pay-java-ali/src/test/java/PayTest.java index c0982597..b22ba22e 100644 --- a/pay-java-ali/src/test/java/PayTest.java +++ b/pay-java-ali/src/test/java/PayTest.java @@ -50,7 +50,7 @@ public static void main(String[] args) { AliPayConfigStorage aliPayConfigStorage = new AliPayConfigStorage(); aliPayConfigStorage.setPid("合作者id"); - aliPayConfigStorage.setAppid("应用id"); + aliPayConfigStorage.setAppId("应用id"); //普通公钥方式与证书公钥方式为两者取其一的方式 keyPublic(aliPayConfigStorage); // certKeyPublic(aliPayConfigStorage); diff --git a/pay-java-baidu/pom.xml b/pay-java-baidu/pom.xml index 228a3d05..d835c66f 100644 --- a/pay-java-baidu/pom.xml +++ b/pay-java-baidu/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.13.4-SNAPSHOT + 2.14.1 4.0.0 pay-java-baidu diff --git a/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayService.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayService.java index b94f00f9..a1e32677 100644 --- a/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayService.java +++ b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayService.java @@ -112,7 +112,7 @@ public Map getUseQueryPay() { String appKey = payConfigStorage.getAppKey(); Map result = new HashMap<>(); result.put(APP_KEY, appKey); - result.put(APP_ID, payConfigStorage.getAppid()); + result.put(APP_ID, payConfigStorage.getAppId()); return result; } diff --git a/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduRefundOrder.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduRefundOrder.java index 91d6510a..50974eb0 100644 --- a/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduRefundOrder.java +++ b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduRefundOrder.java @@ -54,6 +54,7 @@ public String getBizRefundBatchId() { /** * 业务方退款批次id，退款业务流水唯一编号，发起部分退款时必传 + * @param bizRefundBatchId 业务方退款批次id */ public void setBizRefundBatchId(String bizRefundBatchId) { setRefundNo(bizRefundBatchId); diff --git a/pay-java-baidu/src/test/java/com/egzosn/pay/baidu/api/BaiduPayServiceTest.java b/pay-java-baidu/src/test/java/com/egzosn/pay/baidu/api/BaiduPayServiceTest.java index 6f9b5c2b..9cb74345 100644 --- a/pay-java-baidu/src/test/java/com/egzosn/pay/baidu/api/BaiduPayServiceTest.java +++ b/pay-java-baidu/src/test/java/com/egzosn/pay/baidu/api/BaiduPayServiceTest.java @@ -13,7 +13,7 @@ public class BaiduPayServiceTest { @Test public void orderInfo() { BaiduPayConfigStorage configStorage = new BaiduPayConfigStorage(); - configStorage.setAppid("APP ID"); + configStorage.setAppId("APP ID"); configStorage.setAppKey("APP KEY"); configStorage.setDealId("DEAL ID"); configStorage.setKeyPublic("KEY PUBLIC"); diff --git a/pay-java-common/pom.xml b/pay-java-common/pom.xml index e0ad8d16..10822962 100644 --- a/pay-java-common/pom.xml +++ b/pay-java-common/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.13.4-SNAPSHOT + 2.14.1 4.0.0 jar diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayConfigStorage.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayConfigStorage.java index b8b2b171..f8139363 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayConfigStorage.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayConfigStorage.java @@ -7,7 +7,7 @@ /** * 支付基础配置存储 * - * @author: egan + * @author egan * 
  *     email egzosn@gmail.com
  *     date 2017/3/5 20:33
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java
index 43aa78ec..38e00a97 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/BasePayService.java
@@ -31,7 +31,7 @@
 /**
  * 支付基础服务
  *
- * @author: egan
+ * @author egan
  * 
  *      email egzosn@gmail.com
  *      date 2017/3/5 20:36
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/api/Callback.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/Callback.java
index dbb537b5..43289420 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/api/Callback.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/Callback.java
@@ -21,7 +21,7 @@
 
 /**
  * 回调，可用于类型转换
- * @author: egan
+ * @author egan
  * 
  *     email egzosn@gmail.com
  *     date 2017/3/7 18:55
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/BillType.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/BillType.java
index bf65b8f6..a85bb111 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/BillType.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/BillType.java
@@ -3,8 +3,10 @@
 /**
  * 账单类型
  * @author Egan
- * @email egzosn@gmail.com
- * @date 2021/2/22
+ * 
+ * email egzosn@gmail.com
+ * date 2021/2/22
+ * 

  */
 public interface BillType {
     /**
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/MethodType.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/MethodType.java
index dd9f31ba..72d9c9be 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/MethodType.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/MethodType.java
@@ -18,7 +18,7 @@
 package com.egzosn.pay.common.bean;
 
 /**
- * @author: egan
+ * @author egan
  * 
  *     email egzosn@gmail.com
  *     date 2017/2/7 9:52
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/SignType.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/SignType.java
index 11230e82..4f9c159e 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/SignType.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/SignType.java
@@ -6,7 +6,7 @@
 /**
  * 签名类型
  *
- * @author: egan
+ * @author egan
  * 
  * email egzosn@gmail.com
  * date 2019/12/08 13:30
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/JsonBuilder.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/JsonBuilder.java
index 726a2ed3..179865ee 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/JsonBuilder.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/outbuilder/JsonBuilder.java
@@ -5,7 +5,7 @@
 import com.egzosn.pay.common.bean.PayOutMessage;
 
 /**
- * @author: egan
+ * @author egan
  *  
  *      email egzosn@gmail.com
  *      date 2017/1/13 14:30
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/result/PayException.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/result/PayException.java
index e54abc6a..2e738ac3 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/result/PayException.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/result/PayException.java
@@ -19,7 +19,7 @@
 
 /**
  * 支付异常
- * @author: egan
+ * @author egan
  *  
  *      email egzosn@gmail.com
  *      date 2017/3/7 12:32
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/http/ClientHttpRequest.java b/pay-java-common/src/main/java/com/egzosn/pay/common/http/ClientHttpRequest.java
index f58b25fd..8b6fccec 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/http/ClientHttpRequest.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/http/ClientHttpRequest.java
@@ -39,7 +39,7 @@
 /**
  * 一个HTTP请求的客户端
  *
- * @author: egan
+ * @author egan
  * 
  * email egzosn@gmail.com
  * date 2017/3/4 17:56
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpConfigStorage.java b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpConfigStorage.java
index 274b9d9a..f5cfc702 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpConfigStorage.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpConfigStorage.java
@@ -7,7 +7,7 @@
 
 /**
  * HTTP 配置
- * @author: egan
+ * @author egan
  *  
  * email egzosn@gmail.com
  * date 2017/3/3 20:48
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpRequestTemplate.java b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpRequestTemplate.java
index ceaf45bf..ae4ff736 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpRequestTemplate.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/http/HttpRequestTemplate.java
@@ -36,7 +36,7 @@
 
 /**
  * http请求工具
- * @author: egan
+ * @author egan
  *  
  * email egzosn@gmail.com 

  * date 2017/3/3 21:33
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java
index 675bdfd5..5ebf06cc 100644
--- a/pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java
+++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java
@@ -125,7 +125,7 @@ public static JSONObject toJSONObject(byte[] content) {
      */
     public static  T toBean(String content, Class clazz) {
 
-        if (null == content || "".equals(content)) {
+        if (StringUtils.isEmpty(content)) {
             return null;
         }
         try (InputStream in = new ByteArrayInputStream(content.getBytes("UTF-8"))) {
@@ -207,9 +207,8 @@ public static Document newDocument() throws ParserConfigurationException {
      * @param clazz 需要转化的类
      * @param  类型
      * @return 对应的对象
-     * @throws IOException  xml io转化异常
      */
-    public static  T inputStream2Bean(InputStream in, Class clazz) throws IOException {
+    public static  T inputStream2Bean(InputStream in, Class clazz)  {
         JSON json = toJSONObject(in);
         return json.toJavaObject(clazz);
     }
@@ -220,7 +219,7 @@ public static  T inputStream2Bean(InputStream in, Class clazz) throws IOEx
      * @return 整理完成的参数集
      * @throws IOException xml io转化异常
      */
-    public static Map inputStream2Map(InputStream in, Map m) throws IOException {
+    public static Map inputStream2Map(InputStream in, Map m) throws IOException {
         if (null == m) {
             m = new JSONObject();
         }
@@ -351,10 +350,10 @@ public static void map2Xml(Map data, Document document, org.w3c.
     private static void object2Xml(Object value, Document document, org.w3c.dom.Element element) {
 
         if (value instanceof Map) {
-            map2Xml((Map) value, document, element);
+            map2Xml((Map) value, document, element);
         }
         else if (value instanceof List) {
-            List vs = (List) value;
+            List vs = (List) value;
             for (Object v : vs) {
                 object2Xml(v, document, element);
             }
diff --git a/pay-java-demo/README.md b/pay-java-demo/README.md
index 4784feef..cc3061a7 100644
--- a/pay-java-demo/README.md
+++ b/pay-java-demo/README.md
@@ -22,7 +22,7 @@ public enum PayType implements BasePayType {
         public PayService getPayService(ApyAccount apyAccount) {
             AliPayConfigStorage aliPayConfigStorage = new AliPayConfigStorage();
             aliPayConfigStorage.setPid(apyAccount.getPartner());
-            aliPayConfigStorage.setAppid(apyAccount.getAppid());
+            aliPayConfigStorage.setAppId(apyAccount.getAppid());
             aliPayConfigStorage.setKeyPublic(apyAccount.getPublicKey());
             aliPayConfigStorage.setKeyPrivate(apyAccount.getPrivateKey());
             aliPayConfigStorage.setNotifyUrl(apyAccount.getNotifyUrl());
@@ -49,7 +49,7 @@ public enum PayType implements BasePayType {
             wxPayConfigStorage.setMchId(apyAccount.getPartner());
             wxPayConfigStorage.setAppSecret(apyAccount.getPublicKey());
             wxPayConfigStorage.setKeyPublic(apyAccount.getPublicKey());
-            wxPayConfigStorage.setAppid(apyAccount.getAppid());
+            wxPayConfigStorage.setAppId(apyAccount.getAppid());
             wxPayConfigStorage.setKeyPrivate(apyAccount.getPrivateKey());
             wxPayConfigStorage.setNotifyUrl(apyAccount.getNotifyUrl());
             wxPayConfigStorage.setSignType(apyAccount.getSignType());
diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml
index 7c0de2a4..160cca13 100644
--- a/pay-java-demo/pom.xml
+++ b/pay-java-demo/pom.xml
@@ -5,7 +5,7 @@
     
         pay-java-parent
         com.egzosn
-        2.13.4-SNAPSHOT
+        2.14.1
     
     4.0.0
     war
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java
index 77a25b97..acd961be 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/AliPayController.java
@@ -39,7 +39,7 @@
 /**
  * 发起支付入口
  *
- * @author: egan
+ * @author egan
  * email egzosn@gmail.com
  * date 2016/11/18 0:25
  */
@@ -81,7 +81,8 @@ private static void certKeyPublic(AliPayConfigStorage aliPayConfigStorage) {
     public void init() {
         AliPayConfigStorage aliPayConfigStorage = new AliPayConfigStorage();
         aliPayConfigStorage.setPid("2088102169916436");
-        aliPayConfigStorage.setAppid("2016080400165436");
+        aliPayConfigStorage.setAppId("2016080400165436");
+//        aliPayConfigStorage.setAppAuthToken("ISV代商户代用，指定appAuthToken");
         //普通公钥方式与证书公钥方式为两者取其一的方式
         keyPublic(aliPayConfigStorage);
         aliPayConfigStorage.setKeyPrivate("MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKroe/8h5vC4L6T+B2WdXiVwGsMvUKgb2XsKix6VY3m2wcf6tyzpNRDCNykbIwGtaeo7FshN+qZxdXHLiIam9goYncBit/8ojfLGy2gLxO/PXfzGxYGs0KsDZ+ryVPPmE34ZZ8jiJpR0ygzCFl8pN3QJPJRGTJn5+FTT9EF/9zyZAgMBAAECgYAktngcYC35u7cQXDk+jMVyiVhWYU2ULxdSpPspgLGzrZyG1saOcTIi/XVX8Spd6+B6nmLQeF/FbU3rOeuD8U2clzul2Z2YMbJ0FYay9oVZFfp5gTEFpFRTVfzqUaZQBIjJe/xHL9kQVqc5xHlE/LVA27/Kx3dbC35Y7B4EVBDYAQJBAOhsX8ZreWLKPhXiXHTyLmNKhOHJc+0tFH7Ktise/0rNspojU7o9prOatKpNylp9v6kux7migcMRdVUWWiVe+4ECQQC8PqsuEz7B0yqirQchRg1DbHjh64bw9Kj82EN1/NzOUd53tP9tg+SO97EzsibK1F7tOcuwqsa7n2aY48mQ+y0ZAkBndA2xcRcnvOOjtAz5VO8G7R12rse181HjGfG6AeMadbKg30aeaGCyIxN1loiSfNR5xsPJwibGIBg81mUrqzqBAkB+K6rkaPXJR9XtzvdWb/N3235yPkDlw7Z4MiOVM3RzvR/VMDV7m8lXoeDde2zQyeMOMYy6ztwA6WgE1bhGOnQRAkEAouUBv1sVdSBlsexX15qphOmAevzYrpufKgJIRLFWQxroXMS7FTesj+f+FmGrpPCxIde1dqJ8lqYLTyJmbzMPYw==");
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/FuiouPayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/FuiouPayController.java
index e3e79a08..046001e4 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/FuiouPayController.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/FuiouPayController.java
@@ -20,7 +20,7 @@
 /**
  * 发起支付入口
  *
- * @author: egan
+ * @author egan
  * email egzosn@gmail.com
  * date 2016/11/18 0:25
  */
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java
index 7f1b916f..0789efb7 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayController.java
@@ -46,7 +46,7 @@
 /**
  * 发起支付入口
  *
- * @author: egan
+ * @author egan
  * email egzosn@gmail.com
  * date 2016/11/18 0:25
  */
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayPalPayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayPalPayController.java
index a9b6a082..934b8b1c 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayPalPayController.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayPalPayController.java
@@ -26,7 +26,7 @@
 /**
  * 发起支付入口
  *
- * @author: egan
+ * @author egan
  * email egzosn@gmail.com
  * date 2018/05/06 10:30
  */
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayPalV2PayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayPalV2PayController.java
index 95abfd13..94917e7d 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayPalV2PayController.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/PayPalV2PayController.java
@@ -27,7 +27,7 @@
 /**
  * 发起支付入口
  *
- * @author: egan
+ * @author egan
  * email egzosn@gmail.com
  * date 2018/05/06 10:30
  */
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java
index 15a6b406..0b9493f9 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java
@@ -32,7 +32,7 @@
 /**
  *  银联相关
  *
- * @author: egan
+ * @author egan
  * email egzosn@gmail.com
  * date 2016/11/18 0:25
  */
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxPayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxPayController.java
index 1269ebc0..4b0b2413 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxPayController.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxPayController.java
@@ -24,7 +24,7 @@
 /**
  * 发起支付入口
  *
- * @author: egan
+ * @author egan
  * email egzosn@gmail.com
  * date 2016/11/18 0:25
  */
@@ -42,7 +42,7 @@ public class WxPayController {
     @PostConstruct
     public void init() {
         WxPayConfigStorage wxPayConfigStorage = new WxPayConfigStorage();
-        wxPayConfigStorage.setAppid("公众账号ID");
+        wxPayConfigStorage.setAppId("公众账号ID");
 
         wxPayConfigStorage.setMchId("合作者id（商户号）");
         //以下两个参数在 服务商版模式中必填--------
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/dao/ApyAccountRepository.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/dao/ApyAccountRepository.java
index 58cf5e27..b659dd70 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/dao/ApyAccountRepository.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/dao/ApyAccountRepository.java
@@ -13,7 +13,7 @@
 /**
  * 账户
  *
- * @author: egan
+ * @author egan
  * email egzosn@gmail.com
  * date 2016/11/18 1:21
  */
@@ -29,7 +29,7 @@ public class ApyAccountRepository {
         ApyAccount apyAccount1 = new ApyAccount();
         apyAccount1.setPayId(1);
         apyAccount1.setPartner("2088102169916436");
-        apyAccount1.setAppid("2016080400165436");
+        apyAccount1.setAppId("2016080400165436");
         // TODO 2017/2/9 16:20 author: egan  sign_type只有单一key时public_key与private_key相等，比如sign_type=MD5的情况
         apyAccount1.setPublicKey("MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDIgHnOn7LLILlKETd6BFRJ0GqgS2Y3mn1wMQmyh9zEyWlz5p1zrahRahbXAfCfSqshSNfqOmAQzSHRVjCqjsAw1jyqrXaPdKBmr90DIpIxmIyKXv4GGAkPyJ/6FTFY99uhpiq0qadD/uSzQsefWo0aTvP/65zi3eof7TcZ32oWpwIDAQAB");
         apyAccount1.setPrivateKey("MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKroe/8h5vC4L6T+B2WdXiVwGsMvUKgb2XsKix6VY3m2wcf6tyzpNRDCNykbIwGtaeo7FshN+qZxdXHLiIam9goYncBit/8ojfLGy2gLxO/PXfzGxYGs0KsDZ+ryVPPmE34ZZ8jiJpR0ygzCFl8pN3QJPJRGTJn5+FTT9EF/9zyZAgMBAAECgYAktngcYC35u7cQXDk+jMVyiVhWYU2ULxdSpPspgLGzrZyG1saOcTIi/XVX8Spd6+B6nmLQeF/FbU3rOeuD8U2clzul2Z2YMbJ0FYay9oVZFfp5gTEFpFRTVfzqUaZQBIjJe/xHL9kQVqc5xHlE/LVA27/Kx3dbC35Y7B4EVBDYAQJBAOhsX8ZreWLKPhXiXHTyLmNKhOHJc+0tFH7Ktise/0rNspojU7o9prOatKpNylp9v6kux7migcMRdVUWWiVe+4ECQQC8PqsuEz7B0yqirQchRg1DbHjh64bw9Kj82EN1/NzOUd53tP9tg+SO97EzsibK1F7tOcuwqsa7n2aY48mQ+y0ZAkBndA2xcRcnvOOjtAz5VO8G7R12rse181HjGfG6AeMadbKg30aeaGCyIxN1loiSfNR5xsPJwibGIBg81mUrqzqBAkB+K6rkaPXJR9XtzvdWb/N3235yPkDlw7Z4MiOVM3RzvR/VMDV7m8lXoeDde2zQyeMOMYy6ztwA6WgE1bhGOnQRAkEAouUBv1sVdSBlsexX15qphOmAevzYrpufKgJIRLFWQxroXMS7FTesj+f+FmGrpPCxIde1dqJ8lqYLTyJmbzMPYw==");
@@ -47,7 +47,7 @@ public class ApyAccountRepository {
         ApyAccount apyAccount2 = new ApyAccount();
         apyAccount2.setPayId(2);
         apyAccount2.setPartner("1469188802");
-        apyAccount2.setAppid("wx3344f4aed352deae");
+        apyAccount2.setAppId("wx3344f4aed352deae");
         // TODO 2017/2/9 16:20 author: egan  sign_type只有单一key时public_key与private_key相等，比如sign_type=MD5的情况
         apyAccount2.setPublicKey("991ded080***************f7fc61095");
         apyAccount2.setPrivateKey("991ded080***************f7fc61095");
@@ -65,7 +65,7 @@ public class ApyAccountRepository {
         ApyAccount apyAccount3 = new ApyAccount();
         apyAccount3.setPayId(3);
         apyAccount3.setPartner("12****601");
-        apyAccount3.setAppid("wxa39*****ba9e9");
+        apyAccount3.setAppId("wxa39*****ba9e9");
         apyAccount3.setPublicKey("48gf0i************h9eiut9");
         apyAccount3.setPrivateKey("48gf0i************h9eiut9");
         apyAccount3.setNotifyUrl("http://pay.egan.in/payBack3.json");
@@ -106,7 +106,7 @@ public class ApyAccountRepository {
 
         ApyAccount apyAccount6 = new ApyAccount();
         apyAccount6.setPayId(6);
-        apyAccount6.setAppid("1AZ7HTcvrEAxYbzYx_iDZAi06GdqbjhqqQzFgPBFLxm2VUMzwlmiNUBk_y_5QNP4zWKblTuM6ZBAmxScd");//Program ID
+        apyAccount6.setAppId("1AZ7HTcvrEAxYbzYx_iDZAi06GdqbjhqqQzFgPBFLxm2VUMzwlmiNUBk_y_5QNP4zWKblTuM6ZBAmxScd");//Program ID
         apyAccount6.setPrivateKey("1EBMIjAag6NiRdXZxteTv0amEsmKN345xJv3bN7f_HRXSqcRJlW7PXhYXjI9sk5I4nKYOHgeqzhXCXKFo");//API password
         apyAccount6.setInputCharset("UTF-8");
         apyAccount6.setPayType(PayType.payPal);
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/ApyAccount.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/ApyAccount.java
index ccc202b5..8aec8997 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/ApyAccount.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/ApyAccount.java
@@ -7,7 +7,7 @@
 /**
  * 支付账户
  *
- * @author: egan
+ * @author egan
  * email egzosn@gmail.com
  * date 2016/11/18 0:36
  */
@@ -24,7 +24,7 @@ public class ApyAccount {
     private String partner;
     // 应用id
 //    @Column(name = "appid")
-    private String appid;
+    private String appId;
     //   支付平台公钥(签名校验使用)，sign_type只有单一key时public_key与private_key相等，比如sign_type=MD5的情况
     private String publicKey;
     // 应用私钥(生成签名)
@@ -77,12 +77,12 @@ public void setPartner(String partner) {
         this.partner = partner;
     }
 
-    public String getAppid() {
-        return appid;
+    public String getAppId() {
+        return appId;
     }
 
-    public void setAppid(String appid) {
-        this.appid = appid;
+    public void setAppId(String appId) {
+        this.appId = appId;
     }
 
     public String getPublicKey() {
@@ -178,7 +178,7 @@ public String toString() {
         return "ApyAccount{" +
                 "payId=" + payId +
                 ", partner='" + partner + '\'' +
-                ", appid='" + appid + '\'' +
+                ", appId='" + appId + '\'' +
                 ", publicKey='" + publicKey + '\'' +
                 ", privateKey='" + privateKey + '\'' +
                 ", notifyUrl='" + notifyUrl + '\'' +
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java
index 7437aa48..27fd4897 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/entity/PayType.java
@@ -51,7 +51,7 @@ public PayService getPayService(ApyAccount apyAccount) {
             //配置的附加参数的使用
             configStorage.setAttach(apyAccount.getPayId());
             configStorage.setPid(apyAccount.getPartner());
-            configStorage.setAppid(apyAccount.getAppid());
+            configStorage.setAppId(apyAccount.getAppId());
             configStorage.setKeyPublic(apyAccount.getPublicKey());
             configStorage.setKeyPrivate(apyAccount.getPrivateKey());
             configStorage.setNotifyUrl(apyAccount.getNotifyUrl());
@@ -84,7 +84,7 @@ public TransactionType getTransactionType(String transactionType) {
         public PayService getPayService(ApyAccount apyAccount) {
             WxPayConfigStorage wxPayConfigStorage = new WxPayConfigStorage();
             wxPayConfigStorage.setMchId(apyAccount.getPartner());
-            wxPayConfigStorage.setAppid(apyAccount.getAppid());
+            wxPayConfigStorage.setAppId(apyAccount.getAppId());
             //转账公钥，转账时必填
             wxPayConfigStorage.setKeyPublic(apyAccount.getPublicKey());
             wxPayConfigStorage.setSecretKey(apyAccount.getPrivateKey());
@@ -239,7 +239,7 @@ public PayService getPayService(ApyAccount apyAccount) {
             PayPalConfigStorage storage = new PayPalConfigStorage();
             //配置的附加参数的使用
             storage.setAttach(apyAccount.getPayId());
-            storage.setClientID(apyAccount.getAppid());
+            storage.setClientID(apyAccount.getAppId());
             storage.setClientSecret(apyAccount.getPrivateKey());
             storage.setTest(true);
             //发起付款后的页面转跳地址
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/request/QueryOrder.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/request/QueryOrder.java
index 38d814d1..5e8579dc 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/request/QueryOrder.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/request/QueryOrder.java
@@ -5,7 +5,7 @@
 
 /**
  * 订单辅助接口
- * @author: egan
+ * @author egan
  * email egzosn@gmail.com
  * date 2017/3/12 14:50
  */
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/ApyAccountService.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/ApyAccountService.java
index a55bde13..ea3b4075 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/ApyAccountService.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/ApyAccountService.java
@@ -10,7 +10,7 @@
 import java.util.Map;
 
 /**
- * @author: egan
+ * @author egan
  * email egzosn@gmail.com
  * date 2016/11/18 1:11
  */
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java
index 1be58b9a..c085fe5c 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/PayResponse.java
@@ -23,7 +23,7 @@
 /**
  * 支付响应对象
  *
- * @author: egan
+ * @author egan
  * email egzosn@gmail.com
  * date 2016/11/18 0:34
  */
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java
index 3d35c88a..849dec19 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/AliPayMessageInterceptor.java
@@ -13,7 +13,7 @@
 
 /**
  * 支付宝回调信息拦截器
- * @author: egan
+ * @author egan
  * email egzosn@gmail.com
  * date 2017/1/18 19:28
  */
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/YoudianPayMessageInterceptor.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/YoudianPayMessageInterceptor.java
index efb8a07f..02b4e05f 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/YoudianPayMessageInterceptor.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/interceptor/YoudianPayMessageInterceptor.java
@@ -12,7 +12,7 @@
 
 /**
  * 回调信息拦截器
- * @author: egan
+ * @author egan
  * email egzosn@gmail.com
  * date 2017/1/18 19:28
  */
diff --git a/pay-java-demo/src/main/resources/apy_account.sql b/pay-java-demo/src/main/resources/apy_account.sql
index 2180cf18..c248a8e3 100644
--- a/pay-java-demo/src/main/resources/apy_account.sql
+++ b/pay-java-demo/src/main/resources/apy_account.sql
@@ -6,7 +6,7 @@ DROP TABLE IF EXISTS `pay_account`;
 CREATE TABLE `pay_account` (
   `pay_id` INT(11) NOT NULL AUTO_INCREMENT COMMENT '支付账号id',
   `partner` VARCHAR(32) DEFAULT NULL COMMENT '支付合作id,商户id，差不多是支付平台的账号或id',
-  `appid` VARCHAR(32) DEFAULT NULL COMMENT '应用id',
+  `app_Id` VARCHAR(32) DEFAULT NULL COMMENT '应用id',
   `public_key` VARCHAR(1204) DEFAULT NULL COMMENT '支付平台公钥(签名校验使用)，sign_type只有单一key时public_key与private_key相等，比如sign_type=MD5(友店支付除外)的情况',
   `private_key` VARCHAR(2048) DEFAULT NULL COMMENT '应用私钥(生成签名)',
   `notify_url` VARCHAR(1024) DEFAULT NULL COMMENT '异步回调地址',
diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml
index 6a834c72..183e19a0 100644
--- a/pay-java-fuiou/pom.xml
+++ b/pay-java-fuiou/pom.xml
@@ -5,7 +5,7 @@
     
         pay-java-parent
         com.egzosn
-        2.13.4-SNAPSHOT
+        2.14.1
     
     4.0.0
     pay-java-fuiou
diff --git a/pay-java-payoneer/pom.xml b/pay-java-payoneer/pom.xml
index 9df1dedf..ebff04b9 100644
--- a/pay-java-payoneer/pom.xml
+++ b/pay-java-payoneer/pom.xml
@@ -5,7 +5,7 @@
     
         pay-java-parent
         com.egzosn
-        2.13.4-SNAPSHOT
+        2.14.1
     
     4.0.0
     pay-java-payoneer
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 c93ec958..979eea2e 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
@@ -100,6 +100,7 @@ public void setApiPassword(String apiPassword) {
 
     /**
      * 获取 PayoneerPay API password
+     * @return PayoneerPay API password
      */
     public String getApiPassword() {
         return getKeyPrivate();
diff --git a/pay-java-paypal/pom.xml b/pay-java-paypal/pom.xml
index 0abbb063..887ff3ec 100644
--- a/pay-java-paypal/pom.xml
+++ b/pay-java-paypal/pom.xml
@@ -5,7 +5,7 @@
     
         pay-java-parent
         com.egzosn
-        2.13.4-SNAPSHOT
+        2.14.1
     
     4.0.0
 
diff --git a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java
index 4a8d2127..ae0e2365 100644
--- a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java
+++ b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalPayService.java
@@ -111,7 +111,7 @@ public String getAccessToken(boolean forceRefresh) throws PayErrorException {
 
             if (payConfigStorage.isAccessTokenExpired()) {
                 Map header = new HashMap<>();
-                header.put("Authorization", "Basic " + authorizationString(getPayConfigStorage().getAppid(), getPayConfigStorage().getKeyPrivate()));
+                header.put("Authorization", "Basic " + authorizationString(getPayConfigStorage().getAppId(), getPayConfigStorage().getKeyPrivate()));
                 header.put("Accept", "application/json");
                 header.put("Content-Type", "application/x-www-form-urlencoded");
                 try {
diff --git a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/bean/order/Error.java b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/bean/order/Error.java
index 85430462..1207b884 100644
--- a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/bean/order/Error.java
+++ b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/bean/order/Error.java
@@ -40,9 +40,7 @@ public class Error {
     public Error() {
     }
 
-    /**
-     * Parameterized Constructor
-     */
+
     public Error(String name, String message, String informationLink, String debugId) {
         this.name = name;
         this.message = message;
diff --git a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/bean/order/Links.java b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/bean/order/Links.java
index 55d66654..ebb7376c 100644
--- a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/bean/order/Links.java
+++ b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/bean/order/Links.java
@@ -23,9 +23,7 @@ public class Links {
 	public Links() {
 	}
 
-	/**
-	 * Parameterized Constructor
-	 */
+
 	public Links(String href, String rel) {
 		this.href = href;
 		this.rel = rel;
diff --git a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/v2/api/PayPalPayService.java b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/v2/api/PayPalPayService.java
index acf3d079..10289dd8 100644
--- a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/v2/api/PayPalPayService.java
+++ b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/v2/api/PayPalPayService.java
@@ -122,7 +122,7 @@ public String getAccessToken(boolean forceRefresh) throws PayErrorException {
             }
             if (payConfigStorage.isAccessTokenExpired()) {
                 Map header = new HashMap<>();
-                header.put("Authorization", "Basic " + authorizationString(getPayConfigStorage().getAppid(), getPayConfigStorage().getKeyPrivate()));
+                header.put("Authorization", "Basic " + authorizationString(getPayConfigStorage().getAppId(), getPayConfigStorage().getKeyPrivate()));
                 header.put("Accept", "application/json");
                 header.put("Content-Type", "application/x-www-form-urlencoded");
                 try {
@@ -153,7 +153,7 @@ public String getAccessToken(boolean forceRefresh) throws PayErrorException {
      * 4.Check that the price (carried in mc_gross) and the currency (carried in mc_currency) are correct for the item (carried in item_name or item_number).
      *
      * @param params 回调回来的参数集
-     * @return
+     * @return 是否成功 true成功
      */
     @Override
     public boolean verify(Map params) {
diff --git a/pay-java-union/pom.xml b/pay-java-union/pom.xml
index 6c539c14..d52eb4de 100644
--- a/pay-java-union/pom.xml
+++ b/pay-java-union/pom.xml
@@ -5,7 +5,7 @@
     
         pay-java-parent
         com.egzosn
-        2.13.4-SNAPSHOT
+        2.14.1
     
     4.0.0
 
diff --git a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayConfigStorage.java b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayConfigStorage.java
index 5c2f2e69..010ed7d1 100644
--- a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayConfigStorage.java
+++ b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayConfigStorage.java
@@ -9,7 +9,6 @@
 
 /**
  * @author Actinia
- * 

  * 
  *         email hayesfu@qq.com
  *           create 2017 2017/11/4 0004
diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml
index 20812272..80500aed 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.13.4-SNAPSHOT
+        2.14.1
     
     4.0.0
     pay-java-wx-youdian
diff --git a/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/bean/YdPayError.java b/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/bean/YdPayError.java
index b782a500..9aed2479 100644
--- a/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/bean/YdPayError.java
+++ b/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/bean/YdPayError.java
@@ -20,7 +20,7 @@
 import com.egzosn.pay.common.bean.result.PayError;
 
 /**
- * @author: egan
+ * @author egan
  *
  * email egzosn@gmail.com
  * date 2017/3/6 19:41
diff --git a/pay-java-wx/README.md b/pay-java-wx/README.md
index da29557b..6012fe62 100644
--- a/pay-java-wx/README.md
+++ b/pay-java-wx/README.md
@@ -8,7 +8,7 @@
 
               WxPayConfigStorage wxPayConfigStorage = new WxPayConfigStorage();
               wxPayConfigStorage.setMchId("合作者id（商户号）");
-              wxPayConfigStorage.setAppid("应用id");
+              wxPayConfigStorage.setAppId("应用id");
               wxPayConfigStorage.setKeyPublic("转账公钥，转账时必填");
               wxPayConfigStorage.setSecretKey("密钥");
               wxPayConfigStorage.setNotifyUrl("异步回调地址");
diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml
index dfe0e5d3..f68a0b6b 100644
--- a/pay-java-wx/pom.xml
+++ b/pay-java-wx/pom.xml
@@ -5,7 +5,7 @@
     
         pay-java-parent
         com.egzosn
-        2.13.4-SNAPSHOT
+        2.14.1
     
     4.0.0
     pay-java-wx
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxBillService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxBillService.java
index 06d9f05d..09232dfa 100644
--- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxBillService.java
+++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxBillService.java
@@ -8,7 +8,7 @@
 /**
  * 账单接口
  *
- * @author: faymanwang
+ * @author faymanwang
  * email: 1057438332@qq.com
  * time: 2020/7/31 11:21
  */
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java
index b0016a18..f9556475 100644
--- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java
+++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayService.java
@@ -277,14 +277,14 @@ public Map orderInfo(PayOrder order) {
 
             if (WxTransactionType.JSAPI == order.getTransactionType()) {
                 params.put("signType", payConfigStorage.getSignType());
-                params.put("appId", payConfigStorage.getAppid());
+                params.put("appId", payConfigStorage.getAppId());
                 params.put("timeStamp", System.currentTimeMillis() / 1000 + "");
                 params.put("nonceStr", result.get(NONCE_STR));
                 params.put("package", "prepay_id=" + result.get("prepay_id"));
             }
             else if (WxTransactionType.APP == order.getTransactionType()) {
                 params.put("partnerid", payConfigStorage.getPid());
-                params.put(APPID, payConfigStorage.getAppid());
+                params.put(APPID, payConfigStorage.getAppId());
                 params.put("prepayid", result.get("prepay_id"));
                 params.put("timestamp", System.currentTimeMillis() / 1000);
                 params.put("noncestr", result.get(NONCE_STR));
@@ -824,7 +824,7 @@ public Map transfer(TransferOrder order) {
      */
     public Map transfers(Map parameters, TransferOrder order) {
         //转账到余额, 申请商户号的appid或商户号绑定的appid
-        parameters.put("mch_appid", payConfigStorage.getAppid());
+        parameters.put("mch_appid", payConfigStorage.getAppId());
         parameters.put("openid", order.getPayeeAccount());
         parameters.put("spbill_create_ip", StringUtils.isEmpty(order.getIp()) ? "192.168.1.150" : order.getIp());
         //默认不校验真实姓名
@@ -908,7 +908,7 @@ public PayMessage createMessage(Map message) {
      *
      * @param redpackOrder 红包实体
      * @return 返回发红包实体后的结果
-     * @author: faymanwang 1057438332@qq.com
+     * @author faymanwang 1057438332@qq.com
      */
     @Override
     public Map sendredpack(RedpackOrder redpackOrder) {
@@ -948,7 +948,7 @@ else if (WxSendredpackType.SENDMINIPROGRAMHB == transferType) {
      *
      * @param mchBillno 商户发放红包的商户订单号
      * @return 返回查询结果
-     * @author: faymanwang 1057438332@qq.com
+     * @author faymanwang 1057438332@qq.com
      */
     @Override
     public Map gethbinfo(String mchBillno) {
@@ -968,7 +968,7 @@ public Map gethbinfo(String mchBillno) {
     private void redPackParam(RedpackOrder redpackOrder, Map parameters) {
         parameters.put(NONCE_STR, SignUtils.randomStr());
         parameters.put(MCH_ID, payConfigStorage.getPid());
-        parameters.put("wxappid", payConfigStorage.getAppid());
+        parameters.put("wxappid", payConfigStorage.getAppId());
         parameters.put("send_name", redpackOrder.getSendName());
         parameters.put("re_openid", redpackOrder.getReOpenid());
         parameters.put("mch_billno", redpackOrder.getMchBillno());
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/bean/WxTransactionType.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/bean/WxTransactionType.java
index 740f9b5d..a0497546 100644
--- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/bean/WxTransactionType.java
+++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/bean/WxTransactionType.java
@@ -9,12 +9,13 @@
 
 /**
  * 微信交易类型
- * @author egan
  *
+ * @author egan
+ * 

  * email egzosn@gmail.com
  * date 2016/10/19 22:58
  */
-public enum  WxTransactionType implements TransactionType {
+public enum WxTransactionType implements TransactionType {
     /**
      * 公众号支付
      */
@@ -50,7 +51,7 @@ public boolean isReturn() {
     /**
      * 刷脸支付
      */
-    FACEPAY("pay/facepay"){
+    FACEPAY("pay/facepay") {
         @Override
         public void setAttribute(Map parameters, PayOrder order) {
             parameters.put("openid", order.getOpenid());
@@ -60,11 +61,11 @@ public void setAttribute(Map parameters, PayOrder order) {
     /**
      * H5支付
      */
-    MWEB("pay/unifiedorder"){
+    MWEB("pay/unifiedorder") {
         @Override
         public void setAttribute(Map parameters, PayOrder order) {
             //H5支付专用
-            LinkedHashMap value = new LinkedHashMap();
+            LinkedHashMap value = new LinkedHashMap(6);
             value.put("type", "Wap");
             //WAP网站URL地址
             value.put("wap_url", order.getWapUrl());
@@ -74,6 +75,7 @@ public void setAttribute(Map parameters, PayOrder order) {
             sceneInfo.put("h5_info", value);
             parameters.put("scene_info", sceneInfo.toJSONString());
         }
+
         /**
          * 是否直接返回
          *
@@ -87,13 +89,14 @@ public boolean isReturn() {
     /**
      * 刷卡付
      */
-    MICROPAY("pay/micropay"){
+    MICROPAY("pay/micropay") {
         @Override
         public void setAttribute(Map parameters, PayOrder order) {
             parameters.put("auth_code", order.getAuthCode());
             parameters.remove("notify_url");
             parameters.remove("trade_type");
         }
+
         /**
          * 是否直接返回
          *
@@ -146,6 +149,7 @@ public boolean isReturn() {
     public String getType() {
         return this.name();
     }
+
     @Override
     public String getMethod() {
         return this.method;
@@ -153,13 +157,14 @@ public String getMethod() {
 
     /**
      * 是否直接返回
+     *
      * @return 是否直接返回
      */
-    public boolean isReturn(){
+    public boolean isReturn() {
         return false;
     }
 
-    public  void setAttribute(Map parameters, PayOrder order){
+    public void setAttribute(Map parameters, PayOrder order) {
 
     }
 }
diff --git a/pay-java-wx/src/test/java/PayTest.java b/pay-java-wx/src/test/java/PayTest.java
index 45881574..8137df0e 100644
--- a/pay-java-wx/src/test/java/PayTest.java
+++ b/pay-java-wx/src/test/java/PayTest.java
@@ -26,7 +26,7 @@ public class PayTest {
 
     public static void main(String[] args) {
         WxPayConfigStorage wxPayConfigStorage = new WxPayConfigStorage();
-        wxPayConfigStorage.setAppid("公众账号ID");
+        wxPayConfigStorage.setAppId("公众账号ID");
 
         wxPayConfigStorage.setMchId("合作者id（商户号）");
         //以下两个参数在 服务商版模式中必填--------
diff --git a/pay-java-yiji/pom.xml b/pay-java-yiji/pom.xml
index 0a3ac4e5..0411dfdd 100644
--- a/pay-java-yiji/pom.xml
+++ b/pay-java-yiji/pom.xml
@@ -5,7 +5,7 @@
     
         pay-java-parent
         com.egzosn
-        2.13.4-SNAPSHOT
+        2.14.1
     
     4.0.0
 
diff --git a/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java
index 5d42fbdc..ba197071 100644
--- a/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java
+++ b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java
@@ -53,9 +53,6 @@ public class YiJiPayService extends BasePayService {
 
     public static final String SIGN = "sign";
 
-    public static final String SUCCESS_CODE = "10000";
-
-    public static final String CODE = "code";
 
     /**
      * 获取对应的请求地址
diff --git a/pom.xml b/pom.xml
index fc3322b6..8c7479bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     com.egzosn
     pay-java-parent
     pom
-    2.13.4-SNAPSHOT
+    2.14.1
 
     Pay Java - Parent
     Pay Java Parent
@@ -64,7 +64,7 @@
 
 
     
-        2.13.4-SNAPSHOT
+        2.14.1
         4.5.4
         1.2.17
         1.2.73
@@ -185,6 +185,7 @@
                         
                             
                                 attach-javadocs
+                                install
                                 
                                     jar
                                 
@@ -198,6 +199,7 @@
                         
                             
                                 attach-sources
+                                install
                                 
                                     jar-no-fork