fix-test(array): 解决部分bug

解决部分bug

Author: mini1798

json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/array/ComplexArrayJsonNeat.java

@@ -64,6 +64,7 @@ public JsonCompareResult ignoreOrder(JSONArray expect, JSONArray actual) {
                 if (compareResult != null && compareResult.isMatch()) {
                     expectFlag[expectIndex] = true;
                     actualFlag[actualIndex] = true;
+                    break;
                 }
             }
         }
@@ -97,7 +98,6 @@ public JsonCompareResult ignoreOrder(JSONArray expect, JSONArray actual) {
                         .setTravelPath(nextTravelPath)
                         .setIllustrateTemplate(DATA_TYPE_INCONSISTENT,  ClassUtil.getClassName(expectItem), ClassUtil.getClassName(actualItem));
                 result.addDefects(defects);
-
             }
         }
         return result;

json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/object/ComplexObjectJsonNeat.java

@@ -96,9 +96,11 @@ private void keySetConversion(Set<String> expectKeys, Set<String> actualKeys) {
         // 字段映射
         Map<String, String> mapping = RunTimeDataFactory.getOptionInstance().getMapping();
         for (Map.Entry<String, String> entry: mapping.entrySet()) {
-            neatActualKeys.add(entry.getKey());
-            neatExpectKeys.add(entry.getValue());
-            keyMap.add(new MappingKey(entry.getValue(), entry.getKey()));
+            if (actualKeys.contains(entry.getKey()) && expectKeys.contains(entry.getValue())) {
+                neatActualKeys.add(entry.getKey());
+                neatExpectKeys.add(entry.getValue());
+                keyMap.add(new MappingKey(entry.getValue(), entry.getKey()));
+            }
         }
         // 忽略的key
         HashSet<String> ignoreKey = RunTimeDataFactory.getOptionInstance().getIgnoreKey();