2.13.2

egzosn · egzosn · commit bcec18372197 · 2020-06-01T23:04:36.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.13.1</version>
+    <version>2.13.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.13.2-SNAPSHOT</version>
+        <version>2.13.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.13.2-SNAPSHOT</version>
+        <version>2.13.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.13.2-SNAPSHOT</version>
+        <version>2.13.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java b/pay-java-common/src/main/java/com/egzosn/pay/common/bean/PayOrder.java
@@ -1,12 +1,12 @@
 package com.egzosn.pay.common.bean;
 
+import com.egzosn.pay.common.util.str.StringUtils;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.egzosn.pay.common.util.str.StringUtils;
-
 /**
  * 支付订单信息
  *
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/RSA.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/RSA.java
@@ -175,7 +175,8 @@ public static boolean verify(String content, String sign, PublicKey publicKey, S
 	* @param privateKey 商户私钥
 	* @param characterEncoding 编码格式
 	* @return 解密后的字符串
-	 * @throws Exception 解密异常
+	 * @throws GeneralSecurityException 解密异常
+	 * @throws IOException IOException
 	*/
 	public static String decrypt(String content, String privateKey, String characterEncoding) throws GeneralSecurityException, IOException {
         PrivateKey prikey = getPrivateKey(privateKey);
diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/RSA2.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/sign/encrypt/RSA2.java
@@ -63,7 +63,8 @@ public static boolean verify(String content, String sign, PublicKey publicKey, S
 	* @param privateKey 商户私钥
 	* @param characterEncoding 编码格式
 	* @return 解密后的字符串
-	 * @throws Exception 解密异常
+	 * @throws GeneralSecurityException 解密异常
+	 * @throws IOException 解密异常
 	*/
 	public static String decrypt(String content, String privateKey, String characterEncoding) throws GeneralSecurityException, IOException {
         return RSA.decrypt(content, privateKey, characterEncoding);
@@ -73,14 +74,23 @@ public static String decrypt(String content, String privateKey, String character
 	/**
 	* 得到私钥
 	* @param key 密钥字符串（经过base64编码）
-	* @throws Exception 加密异常
+	* @throws GeneralSecurityException 加密异常
 	 * @return 私钥
 	*/
-	public static PrivateKey getPrivateKey(String key) throws Exception {
+	public static PrivateKey getPrivateKey(String key) throws GeneralSecurityException {
 		return RSA.getPrivateKey(key);
 	}
 
-
+	/**
+	 *
+	 * @param content 加密文本
+	 * @param publicKey 公钥
+	 * @param cipherAlgorithm 算法
+	 * @param characterEncoding 编码类型
+	 * @return 加密后文本
+	 * @throws GeneralSecurityException 加密异常
+	 * @throws IOException IOException
+	 */
 	public static String encrypt(String content, String publicKey, String cipherAlgorithm, String characterEncoding ) throws GeneralSecurityException, IOException {
 		return Base64.encode(RSA.encrypt(content.getBytes(characterEncoding), RSA.getPublicKey(publicKey), 2048, 11, cipherAlgorithm));
 	}
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.13.2-SNAPSHOT</version>
+        <version>2.13.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
@@ -86,7 +86,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.10</version>
+            <version>2.9.10.1</version>
         </dependency>
 
     </dependencies>
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
@@ -10,8 +10,6 @@
 import com.egzosn.pay.ali.bean.OrderSettle;
 import com.egzosn.pay.common.bean.PayOrder;
 import com.egzosn.pay.common.bean.RefundOrder;
-import com.egzosn.pay.common.bean.TransactionType;
-import com.egzosn.pay.common.bean.TransferOrder;
 import com.egzosn.pay.common.http.HttpConfigStorage;
 import com.egzosn.pay.common.http.UriVariables;
 import com.egzosn.pay.common.util.sign.SignUtils;
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
@@ -118,7 +118,7 @@ public Map<String, Object> sendHttpRequest( BigDecimal price) {
         //手机控件支付产品
         PayOrder order = new PayOrder("订单title", "摘要", null == price ? new BigDecimal(0.01) : price, UUID.randomUUID().toString().replace("-", "")
                 ,UnionTransactionType.WAP);
-        return service.sendHttpRequest(order);
+        return service.app(order);
     }
 
 
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.13.2-SNAPSHOT</version>
+        <version>2.13.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.13.2-SNAPSHOT</version>
+        <version>2.13.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.13.2-SNAPSHOT</version>
+        <version>2.13.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.13.2-SNAPSHOT</version>
+        <version>2.13.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayService.java
@@ -516,7 +516,9 @@ public String buildRequest(Map<String, Object> orderInfo, MethodType method) {
      */
     @Override
     public Map<String, Object>  app(PayOrder order){
-        order.setTransactionType(UnionTransactionType.APP);
+        if (null == order.getTransactionType()){
+            order.setTransactionType(UnionTransactionType.APP);
+        }
         JSONObject response = postOrder(order);
         if (this.verify(response)) {
             if (SDKConstants.OK_RESP_CODE.equals(response.get(SDKConstants.param_respCode))) {
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.13.2-SNAPSHOT</version>
+        <version>2.13.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.13.2-SNAPSHOT</version>
+        <version>2.13.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/api/WxConst.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxConst.java
@@ -1,18 +1,12 @@
 package com.egzosn.pay.wx.api;
 
-import com.egzosn.pay.common.bean.Order;
-import com.egzosn.pay.common.bean.PayOrder;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
+ * 常量
  * @author egan
- * @date 2020/3/10 21:22
- * <a href="mailto:zheng.zaosheng@iwhalecloud.com">郑灶生</a>
- * <br/>
- * email: zheng.zaosheng@iwhalecloud.com
+ * <pre>
+ * email egzosn@gmail.com
+ * date 2020/3/10 21:22
+ * </pre>
  */
 public interface WxConst {
     /**
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
@@ -677,7 +677,6 @@ public Map<String, Object> payBank(Map<String, Object> parameters, TransferOrder
      * @param outNo          商户转账订单号
      * @param wxTransferType 微信转账类型，.....这里没办法了只能这样写(┬＿┬)，请见谅 {@link com.egzosn.pay.wx.bean.WxTransferType}
      *                       <p>
-     *                       <p>
      *                       <a href="https://pay.weixin.qq.com/wiki/doc/api/tools/mch_pay.php?chapter=14_3">企业付款到零钱</a>
      *                       <a href="https://pay.weixin.qq.com/wiki/doc/api/tools/mch_pay.php?chapter=24_3">商户企业付款到银行卡</a>
      *                       </p>
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/bean/RedpackOrder.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/bean/RedpackOrder.java
@@ -5,9 +5,9 @@
 import java.math.BigDecimal;
 
 /**
- * @description: 发红包订单
- * @author: 保网 faymanwang 1057438332@qq.com
- * @time: 2020/5/15 12:40
+ *  发红包订单
+ * @author 保网 faymanwang 1057438332@qq.com
+ * 2020/5/15 12:40
  */
 public class RedpackOrder extends TransferOrder {
 
@@ -64,6 +64,7 @@ public void setTotalAmount(BigDecimal totalAmount) {
      * 红包发放总人数
      * 普通红包：1
      * 裂变：必须介于(包括)3到20之间
+     * @return 红包发放总人数
      */
     public int getTotalNum() {
         Object totalNum = getAttr("total_num");
@@ -75,6 +76,7 @@ public void setTotalNum(int totalNum) {
     }
     /**
      * 红包祝福语
+     * @return 红包祝福语
      */
     public String getWishing() {
         return (String) getAttr("wishing");
@@ -88,6 +90,7 @@ public void setWishing(String wishing) {
 
     /**
      * 活动名称
+     * @return 活动名称
      */
     public String getActName() {
         return (String) getAttr("act_name");
@@ -110,6 +113,7 @@ public String getSceneId() {
      * PRODUCT_6:保险回馈
      * PRODUCT_7:彩票派奖
      * PRODUCT_8:税务刮奖
+     * @param  sceneId 红包使用场景
      */
     public void setSceneId(String sceneId) {
         addAttr("scene_id", sceneId);
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/bean/WxPayError.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/bean/WxPayError.java
@@ -21,7 +21,7 @@
 
 /**
  * 微信支付异常
- * @author: egan
+ * @author egan
  * <pre>
  *
  * email egzosn@gmail.com
diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/bean/WxSendredpackType.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/bean/WxSendredpackType.java
@@ -6,9 +6,9 @@
 import java.util.Map;
 
 /**
- * @description: 红包交易类型
+ *  红包交易类型
  * @author faymanwang
- * @time: 2020/5/14 20:11
+ *  2020/5/14 20:11
  */
 public enum WxSendredpackType  implements TransferType {
     /**
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.13.2-SNAPSHOT</version>
+        <version>2.13.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.13.2-SNAPSHOT</version>
+    <version>2.13.2</version>
 
     <name>Pay Java - Parent</name>
     <description>Pay Java Parent</description>
@@ -64,7 +64,7 @@
 
 
     <properties>
-        <pay.version>2.13.2-SNAPSHOT</pay.version>
+        <pay.version>2.13.2</pay.version>
         <httpmime.version>4.5.4</httpmime.version>
         <log4j.version>1.2.17</log4j.version>
         <fastjson.version>1.2.58</fastjson.version>

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public Map<String, Object> sendHttpRequest( BigDecimal price) {`
`118`	`118`	`//手机控件支付产品`
`119`	`119`	`PayOrder order = new PayOrder("订单title", "摘要", null == price ? new BigDecimal(0.01) : price, UUID.randomUUID().toString().replace("-", "")`
`120`	`120`	`,UnionTransactionType.WAP);`
`121`		`- return service.sendHttpRequest(order);`
	`121`	`+ return service.app(order);`
`122`	`122`	`}`
`123`	`123`
`124`	`124`