Merge branch 'release' into 'master'

Release

See merge request !27

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/config/TaskPoolConfig.java

@@ -32,6 +32,6 @@ public class TaskPoolConfig {
     @Bean("templateExecutor")
     public ThreadPoolExecutorTimeout templateExecutor() {
         return new ThreadPoolExecutorTimeout(1000L * 60 * 30, 10, 20,10000L,
-                TimeUnit.MILLISECONDS, 10, "模板任务线程池");
+                TimeUnit.MILLISECONDS, 100, "模板任务线程池");
     }
 }

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

@@ -36,7 +36,6 @@ public class TaskServiceHandler {
                 if (taskService.thresholdWarn()) {
                     log.error("任务类型：{}，当前运行任务已到达最大核心数", autoTask.getType());
                 }
-                log.info("任务类型：{}，开始执行，信息：{}", autoTask.getType(), JSONObject.toJSONString(autoTask));
                 taskService.runTask(autoTask);
                 return taskType.getCacheId();
             }

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

@@ -73,8 +73,9 @@ public class TaskServiceCommon extends BaseTaskTypePair<TaskServiceCommon.TaskCo
             log.error("本地任务可用数据为空,taskType:{}", autoTask.getType());
         }
         autoMarkExecutor.execute(() -> {
-            log.info("自动标注任务");
+            long now = System.currentTimeMillis();
             projectAutoMark(dataSourceInfo);
+            log.info("任务类型：{}，开始执行，信息：{}, 耗时:{}", autoTask.getType(), JSONObject.toJSONString(autoTask), System.currentTimeMillis() - now);
         });
     }