2.14.1

Author: egzosn

README.md

@@ -21,7 +21,7 @@
 <dependency>
     <groupId>com.egzosn</groupId>
     <artifactId>{module-name}</artifactId>
-    <version>2.13.3-b1</version>
+    <version>2.14.1</version>
 </dependency>
 
 ```

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);

pay-java-ali/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.13.4-SNAPSHOT</version>
+        <version>2.14.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pay-java-ali</artifactId>

pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java

@@ -301,7 +301,7 @@ private Map<String, Object> setExpirationTime(Map<String, Object> bizContent, Pa
      */
     private Map<String, Object> getPublicParameters(TransactionType transactionType) {
         Map<String, Object> 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()));

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;

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);

pay-java-baidu/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.13.4-SNAPSHOT</version>
+        <version>2.14.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pay-java-baidu</artifactId>

pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayService.java

@@ -112,7 +112,7 @@ public Map<String, Object> getUseQueryPay() {
         String appKey = payConfigStorage.getAppKey();
         Map<String, Object> result = new HashMap<>();
         result.put(APP_KEY, appKey);
-        result.put(APP_ID, payConfigStorage.getAppid());
+        result.put(APP_ID, payConfigStorage.getAppId());
         return result;
     }
 

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);

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");