Merge remote-tracking branch 'origin/master' into dev

# Conflicts:
#	dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/Picker.java

dbsyncer-parser/src/main/java/org/dbsyncer/parser/LogType.java

@@ -279,8 +279,8 @@ public interface LogType {
         DELETE("82", "删除"),
         UPLOAD_LICENSE_FILE("83", "上传授权许可文件"),
         UPLOAD_LICENSE_FILE_ERROR("84", "上传授权许可文件失败"),
-        ACTIVATE_FREE_LICENSE_FILE("85", "免费激活授权许可文件"),
-        ACTIVATE_FREE_LICENSE_FILE_ERROR("86", "免费激活授权许可文件失败"),
+        ACTIVATE_FREE_LICENSE_FILE("85", "激活授权许可文件"),
+        ACTIVATE_FREE_LICENSE_FILE_ERROR("86", "激活授权许可文件失败"),
         DELETE_LICENSE_FILE("87", "删除授权许可文件"),
         DELETE_LICENSE_FILE_ERROR("88", "删除授权许可文件失败");
 

dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/Picker.java

@@ -15,12 +15,8 @@ public class Picker {
     public Picker(List<FieldMapping> fieldMapping) {
         if (!CollectionUtils.isEmpty(fieldMapping)) {
             fieldMapping.forEach(m -> {
-                if (m.getSource() != null) {
-                    sourceFields.add(m.getSource());
-                }
-                if (m.getTarget() != null) {
-                    targetFields.add(m.getTarget());
-                }
+                sourceFields.add(m.getSource());
+                targetFields.add(m.getTarget());
             });
         }
     }
@@ -114,11 +110,12 @@ public class Picker {
         List<Field> fields = new ArrayList<>();
         Set<String> keys = new HashSet<>();
         list.forEach(f -> {
-            if (!keys.contains(f.getName())) {
+            if (f != null && !keys.contains(f.getName())) {
                 fields.add(f);
                 keys.add(f.getName());
             }
         });
+        keys.clear();
         return Collections.unmodifiableList(fields);
     }