Merge branch 'release' into 'master'

Release

See merge request !10

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/service/TaskServiceCommon.java

@@ -16,13 +16,12 @@ import com.zhiwei.middleware.automatic.son.util.CosineSimilarity;
 import com.zhiwei.middleware.automatic.son.util.MarkInfoUtil;
 import com.zhiwei.middleware.automatic.son.util.RedissonUtil;
 import com.zhiwei.middleware.automatic.son.util.Tools;
-import javafx.util.Pair;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
-
+import org.apache.commons.lang3.tuple.Pair;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -51,8 +50,8 @@ public class TaskServiceCommon implements TaskService {
         this.templateTitleService = templateTitleService;
         this.dubboHandler = dubboHandler;
         this.autoMarkExecutor = autoMarkExecutor;
-        TYPE_MAP.put(TaskType.COMMON_TWO.getType(), new Pair<>(TaskType.COMMON_TWO, this::getMultiAutoInfo));
-        TYPE_MAP.put(TaskType.COMMON_ONE.getType(), new Pair<>(TaskType.COMMON_ONE, this::getOneAutoInfo));
+        TYPE_MAP.put(TaskType.COMMON_TWO.getType(), Pair.of(TaskType.COMMON_TWO, this::getMultiAutoInfo));
+        TYPE_MAP.put(TaskType.COMMON_ONE.getType(), Pair.of(TaskType.COMMON_ONE, this::getOneAutoInfo));
     }
 
     @Override

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/service/TaskServiceTemplate.java

@@ -15,7 +15,7 @@ import com.zhiwei.middleware.automatic.son.util.CosineSimilarity;
 import com.zhiwei.middleware.automatic.son.util.Tools;
 import com.zhiwei.nlp.AggreeBootStarter;
 import com.zhiwei.nlp.vo.KResult;
-import javafx.util.Pair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -57,9 +57,9 @@ public class TaskServiceTemplate implements TaskService {
         this.esDao = esDao;
         this.esIndexes = esIndexes;
         this.executor = executor;
-        TYPE_MAP.put(TaskType.TEMPLATE.getType(), new Pair<>(TaskType.TEMPLATE, this::runTask));
-        TYPE_MAP.put(TaskType.TEMPLATE_MODIFY.getType(), new Pair<>(TaskType.TEMPLATE_MODIFY, this::templateModify));
-        TYPE_MAP.put(TaskType.TEMPLATE_RESET.getType(), new Pair<>(TaskType.TEMPLATE_RESET, this::templateReset));
+        TYPE_MAP.put(TaskType.TEMPLATE.getType(), Pair.of(TaskType.TEMPLATE, this::runTask));
+        TYPE_MAP.put(TaskType.TEMPLATE_MODIFY.getType(), Pair.of(TaskType.TEMPLATE_MODIFY, this::templateModify));
+        TYPE_MAP.put(TaskType.TEMPLATE_RESET.getType(), Pair.of(TaskType.TEMPLATE_RESET, this::templateReset));
     }
 
     @Override