2.14.2

egzosn · egzosn · commit 9c02712ae9ea · 2021-10-06T17:14:59.000+08:00
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@
 <dependency>
     <groupId>com.egzosn</groupId>
     <artifactId>{module-name}</artifactId>
-    <version>2.14.1-b</version>
+    <version>2.14.2</version>
 </dependency>
 
 ```
diff --git a/pay-java-ali/pom.xml b/pay-java-ali/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.14.2-SNAPSHOT</version>
+        <version>2.14.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pay-java-ali</artifactId>
diff --git a/pay-java-baidu/pom.xml b/pay-java-baidu/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.14.2-SNAPSHOT</version>
+        <version>2.14.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pay-java-baidu</artifactId>
diff --git a/pay-java-common/pom.xml b/pay-java-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.14.2-SNAPSHOT</version>
+        <version>2.14.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
@@ -30,7 +30,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.30</version>
         </dependency>
 
         <!-- / log4j -->
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CloseOrder.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/CloseOrder.java
@@ -5,8 +5,10 @@
 /**
  * 关闭订单
  * @author Egan
- * @email egan@egzosn.com
- * @date 2021/10/6
+ * <pre>
+ * email egan@egzosn.com
+ * date 2021/10/6
+ * </pre>
  */
 public class CloseOrder implements Order {
 
diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.14.2-SNAPSHOT</version>
+        <version>2.14.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.14.2-SNAPSHOT</version>
+        <version>2.14.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pay-java-fuiou</artifactId>
diff --git a/pay-java-payoneer/pom.xml b/pay-java-payoneer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.14.2-SNAPSHOT</version>
+        <version>2.14.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pay-java-payoneer</artifactId>
diff --git a/pay-java-paypal/pom.xml b/pay-java-paypal/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.14.2-SNAPSHOT</version>
+        <version>2.14.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pay-java-union/pom.xml b/pay-java-union/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.14.2-SNAPSHOT</version>
+        <version>2.14.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pay-java-web-support/pom.xml b/pay-java-web-support/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.14.2-SNAPSHOT</version>
+        <version>2.14.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.14.2-SNAPSHOT</version>
+        <version>2.14.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pay-java-wx-youdian</artifactId>
diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.14.2-SNAPSHOT</version>
+        <version>2.14.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pay-java-wx</artifactId>
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/DefaultWxPayAssistService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/DefaultWxPayAssistService.java
@@ -47,7 +47,6 @@
  * date 2021/8/7
  */
 public class DefaultWxPayAssistService implements WxPayAssistService {
-    protected final Logger LOG = LoggerFactory.getLogger(getClass());
     private WxPayConfigStorage payConfigStorage;
 
     private HttpRequestTemplate requestTemplate;
@@ -118,6 +117,7 @@ public JSONObject doExecute(Map<String, Object> parameters, PayOrder order) {
      * 构建请求实体
      * 这里也做签名处理
      *
+     * @param url   url
      * @param body   请求内容体
      * @param method 请求方法
      * @return 请求实体
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java
@@ -69,7 +69,6 @@ public Map<String, Object> getPublicParameters() {
      *
      * @param parameters 订单参数
      * @param order      订单信息
-     * @return 订单参数
      */
     public void initNotifyUrl(Map<String, Object> parameters, Order order) {
         OrderParaStructure.loadParameters(parameters, WxConst.NOTIFY_URL, payConfigStorage.getNotifyUrl());
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java
@@ -52,7 +52,6 @@ public Map<String, Object> getPublicParameters() {
      *
      * @param parameters 订单参数
      * @param order      支付订单
-     * @return 订单参数
      */
     public void loadSettleInfo(Map<String, Object> parameters, PayOrder order) {
         Object profitSharing = order.getAttr("profit_sharing");
@@ -74,7 +73,6 @@ public void loadSettleInfo(Map<String, Object> parameters, PayOrder order) {
      *
      * @param parameters 订单参数
      * @param order      订单信息
-     * @return 订单参数
      */
     public void initNotifyUrl(Map<String, Object> parameters, Order order) {
         OrderParaStructure.loadParameters(parameters, WxConst.NOTIFY_URL, payConfigStorage.getNotifyUrl());
@@ -95,7 +93,6 @@ public String getSpParameters() {
      * 初始化商户相关信息
      *
      * @param parameters 参数信息
-     * @return 参数信息
      */
     public void initPartner(Map<String, Object> parameters) {
         if (null == parameters) {
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayAssistService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayAssistService.java
@@ -53,6 +53,7 @@ public interface WxPayAssistService {
      * 构建请求实体
      * 这里也做签名处理
      *
+     * @param url   url
      * @param body   请求内容体
      * @param method 请求方法
      * @return 请求实体
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/combine/CombineCloseOrder.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/combine/CombineCloseOrder.java
@@ -8,8 +8,10 @@
 /**
  * 微信合单关闭订单
  * @author Egan
- * @email egan@egzosn.com
- * @date 2021/10/6
+ * <pre>
+ * email egan@egzosn.com
+ * date 2021/10/6
+ * </pre>
  */
 public class CombineCloseOrder extends CloseOrder {
 
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/response/WxPayMessage.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/response/WxPayMessage.java
@@ -113,7 +113,7 @@ public class WxPayMessage extends PayMessage {
      * 退款状态，枚举值：
      * SUCCESS：退款成功
      * CLOSE：退款关闭
-     * ABNORMAL：退款异常，退款到银行发现用户的卡作废或者冻结了，导致原路退款银行卡失败，可前往【商户平台—>交易中心】，手动处理此笔退款
+     * ABNORMAL: 退款异常，退款到银行发现用户的卡作废或者冻结了，导致原路退款银行卡失败，可前往【商户平台—交易中心】，手动处理此笔退款
      * 示例值：SUCCESS
      */
     @JSONField(name = "refund_status")
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/response/order/PromotionDetail.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/bean/response/order/PromotionDetail.java
@@ -7,8 +7,10 @@
 /**
  * 优惠功能
  *
- * @author felord.cn
- * @since 1.0.0.RELEASE
+ * <pre>
+ * email egan@egzosn.com
+ * date 2021/10/6
+ * </pre>
  */
 
 public class PromotionDetail {
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/utils/AntCertificationUtil.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/utils/AntCertificationUtil.java
@@ -67,9 +67,10 @@ private AntCertificationUtil() {
 
     /**
      * 装载平台证书
-     *  @param serialNo          证书序列
+     *
+     * @param serialNo          证书序列
      * @param certificateStream 证书流
-     * @return
+     * @return 平台证书
      */
     public static Certificate loadCertificate(String serialNo, InputStream certificateStream) {
         try {
@@ -127,10 +128,12 @@ public static CertEnvironment initCertification(InputStream keyCertStream, Strin
     /**
      * 解密响应体.
      *
-     * @param associatedData 相关数据
-     * @param nonce          随机串
-     * @param cipherText     需要解密的文本
-     * @return the string
+     * @param associatedData    相关数据
+     * @param nonce             随机串
+     * @param cipherText        需要解密的文本
+     * @param secretKey         密钥
+     * @param characterEncoding 编码类型
+     * @return  解密后的信息
      */
     public static String decryptToString(String associatedData, String nonce, String cipherText, String secretKey, String characterEncoding) {
 
@@ -153,8 +156,7 @@ public static String decryptToString(String associatedData, String nonce, String
      *
      * @param message     the message
      * @param certificate the certificate
-     * @return encrypt message
-     * @since 1.0.6.RELEASE
+     * @return  加密后的内容
      */
     public static String encryptToString(String message, Certificate certificate) {
         try {
diff --git a/pay-java-yiji/pom.xml b/pay-java-yiji/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.14.2-SNAPSHOT</version>
+        <version>2.14.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.egzosn</groupId>
     <artifactId>pay-java-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.14.2-SNAPSHOT</version>
+    <version>2.14.2</version>
 
     <name>Pay Java - Parent</name>
     <description>Pay Java Parent</description>
@@ -70,7 +70,7 @@
 
 
     <properties>
-        <pay.version>2.14.2-SNAPSHOT</pay.version>
+        <pay.version>2.14.2</pay.version>
         <httpmime.version>4.5.4</httpmime.version>
         <log4j.version>1.2.17</log4j.version>
         <fastjson.version>1.2.73</fastjson.version>
@@ -110,9 +110,9 @@
 
             <!-- log4j  -->
             <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>${log4j.version}</version>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.7.30</version>
             </dependency>
             <!-- / log4j -->
 
