fix: issue#1940 对list和array属性字段加密

binarywang · binarywang · Mar 15, 2021 · Oct 12, 2020 · Oct 12, 2020 · Oct 17, 2020
commit 4d0a8bb022469d333ace5b788cf424c60fac4f40
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/util/RsaCryptoUtil.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/util/RsaCryptoUtil.java
@@ -15,6 +15,8 @@
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 import java.util.Base64;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 微信支付敏感信息加密
@@ -29,12 +31,26 @@ public class RsaCryptoUtil {
 
   public static void encryptFields(Object encryptObject, X509Certificate certificate) throws WxPayException {
     try {
-      encryptField(encryptObject, certificate);
+      encryptObject(encryptObject, certificate);
     } catch (Exception e) {
       throw new WxPayException("敏感信息加密失败", e);
     }
   }
 
+  private static void encryptObject(Object encryptObject, X509Certificate certificate) throws IllegalAccessException, IllegalBlockSizeException {
+    if(encryptObject instanceof Collection) {
+      for (Object object : (Collection) encryptObject) {
+        encryptField(object, certificate);
+      }
+    } else if (encryptObject.getClass().isArray()) {
+      for (Object object : (Object[]) encryptObject) {
+        encryptField(object, certificate);
+      }
+    } else {
+      encryptField(encryptObject, certificate);
+    }
+  }
+
   private static void encryptField(Object encryptObject, X509Certificate certificate) throws IllegalAccessException, IllegalBlockSizeException {
     Class<?> infoClass = encryptObject.getClass();
     Field[] infoFieldArray = infoClass.getDeclaredFields();
@@ -54,7 +70,7 @@ private static void encryptField(Object encryptObject, X509Certificate certifica
           field.setAccessible(true);
           Object obj = field.get(encryptObject);
           if (obj != null) {
-            encryptField(field.get(encryptObject), certificate);
+            encryptObject(field.get(encryptObject), certificate);
           }
         }
       }