Merge remote-tracking branch 'wechat/develop' into develop

# Conflicts: # weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/util/RsaCryptoUtil.java
binarywang · binarywang · Mar 15, 2021 · Oct 12, 2020 · Oct 12, 2020 · Oct 17, 2020
commit daf5c8869d9fdb18dbb43787f278e008d29630d4
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
@@ -30,26 +30,12 @@ public class RsaCryptoUtil {
 
   public static void encryptFields(Object encryptObject, X509Certificate certificate) throws WxPayException {
     try {
-      encryptObject(encryptObject, certificate);
+      encryptField(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();
@@ -68,8 +54,18 @@ private static void encryptField(Object encryptObject, X509Certificate certifica
         } else {
           field.setAccessible(true);
           Object obj = field.get(encryptObject);
-          if (obj != null) {
-            encryptObject(field.get(encryptObject), certificate);
+          if (obj == null) {
+            continue;
+          }
+          if (obj instanceof Collection) {
+            Collection collection = (Collection) obj;
+            for (Object o : collection) {
+              if (o != null) {
+                encryptField(o, certificate);
+              }
+            }
+          } else {
+            encryptField(obj, certificate);
           }
         }
       }