Merge branch 'feature' into 'release'

2023年05/22 标注逻辑单线程

See merge request !48

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

@@ -27,6 +27,6 @@ public class TaskInit implements ApplicationRunner {
 
     @Override
     public void run(ApplicationArguments args) {
-        TaskManager.initManager(ManagerType.SON, redissonUtil, TaskServiceHandler.getInstance()::taskExecute, 5, TimeUnit.SECONDS);
+        TaskManager.initManager(ManagerType.SON, redissonUtil, TaskServiceHandler.getInstance()::taskExecute, 1, TimeUnit.SECONDS);
     }
 }

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

@@ -181,13 +181,13 @@ public class TaskServiceCommon extends BaseTaskTypePair<TaskServiceCommon.TaskCo
      * @throws Exception 异步异常
      */
     private void asyncTitleMark(String group, List<MarkInfo> markInfos, Map<String, TemplateTitleVo> titleVoMap) throws Exception {
-        List<List<MarkInfo>> splitList = Tools.spilt(markInfos, 1000);
-        List<CompletableFuture<Void>> futures = splitList.stream()
-                .map(e -> CompletableFuture.runAsync(() -> oneTitleMark(group, e, titleVoMap), autoMarkExecutor)).collect(Collectors.toList());
-        CompletableFuture<Void> allOf = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
-        // 获取返回值
-        allOf.thenApply(e -> futures.stream().map(CompletableFuture::join)).get();
-
+//        List<List<MarkInfo>> splitList = Tools.spilt(markInfos, 1000);
+//        List<CompletableFuture<Void>> futures = splitList.stream()
+//                .map(e -> CompletableFuture.runAsync(() -> oneTitleMark(group, e, titleVoMap), autoMarkExecutor)).collect(Collectors.toList());
+//        CompletableFuture<Void> allOf = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
+//        // 获取返回值
+//        allOf.thenApply(e -> futures.stream().map(CompletableFuture::join)).get();
+        oneTitleMark(group, markInfos, titleVoMap);
     }
 
     /**