From b0e83247dc1b6408a0e582ef4d30f8da3d2d5646 Mon Sep 17 00:00:00 2001 From: egzosn Date: Mon, 1 Jun 2020 23:12:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A72.13.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/common/util/sign/encrypt/RSA.java | 3 ++- .../pay/common/util/sign/encrypt/RSA2.java | 18 ++++++++++++++---- .../java/com/egzosn/pay/wx/api/WxConst.java | 16 +++++----------- .../com/egzosn/pay/wx/api/WxPayService.java | 1 - .../com/egzosn/pay/wx/bean/RedpackOrder.java | 10 +++++++--- .../com/egzosn/pay/wx/bean/WxPayError.java | 2 +- .../egzosn/pay/wx/bean/WxSendredpackType.java | 4 ++-- pom.xml | 2 +- 8 files changed, 32 insertions(+), 24 deletions(-) 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 index 3bcf772..d75d1c8 100644 --- 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 class RSA{ * @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 index 5aa464d..46cae1c 100644 --- 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 class RSA2 { * @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 class RSA2 { /** * 得到私钥 * @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-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 index 08994f3..b2cac70 100644 --- 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 - * 郑灶生 - *
- * email: zheng.zaosheng@iwhalecloud.com + * 
+ * email egzosn@gmail.com
+ * date 2020/3/10 21:22
+ *
*/ 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 index feaff86..f6bb106 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 @@ -677,7 +677,6 @@ public class WxPayService extends BasePayService implements * @param outNo 商户转账订单号 * @param wxTransferType 微信转账类型，.....这里没办法了只能这样写(┬＿┬)，请见谅 {@link com.egzosn.pay.wx.bean.WxTransferType} *

- *

* 企业付款到零钱 * 商户企业付款到银行卡 *

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 index 300c85e..8354f3c 100644 --- 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 com.egzosn.pay.common.bean.TransferOrder; 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 class RedpackOrder extends TransferOrder { * 红包发放总人数 * 普通红包：1 * 裂变：必须介于(包括)3到20之间 + * @return 红包发放总人数 */ public int getTotalNum() { Object totalNum = getAttr("total_num"); @@ -75,6 +76,7 @@ public class RedpackOrder extends TransferOrder { } /** * 红包祝福语 + * @return 红包祝福语 */ public String getWishing() { return (String) getAttr("wishing"); @@ -88,6 +90,7 @@ public class RedpackOrder extends TransferOrder { /** * 活动名称 + * @return 活动名称 */ public String getActName() { return (String) getAttr("act_name"); @@ -110,6 +113,7 @@ public class RedpackOrder extends TransferOrder { * 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 index ab86676..f079de1 100644 --- 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 @@ import com.egzosn.pay.common.bean.result.PayError; /** * 微信支付异常 - * @author: egan + * @author egan * 
  *
  * 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
index 248e6f4..27b1bae 100644
--- 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 com.egzosn.pay.common.bean.TransferType;
 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/pom.xml b/pom.xml
index b6e033c..9b7e104 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
         pay-java-paypal
         pay-java-yiji
         pay-java-baidu
-        pay-java-demo
+