From 0142b353b5e59541255bdc4a4185af6c8f9b8502 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sat, 27 Oct 2018 21:39:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=96=B0=E5=A2=9E=E7=9A=84AP?= =?UTF-8?q?I=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1ID=EF=BC=8C=E6=96=B9=E4=BE=BF=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=96=B9=E5=AE=9E=E7=94=A8=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB官方文档.md | 1 + .../com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java | 2 +- .../src/main/java/com/xxl/job/admin/core/util/I18nUtil.java | 2 +- .../java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 9ca60d94..2e343b13 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -1334,6 +1334,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 8、[迭代中]cron在线生成工具，如 "cronboot/cron.qqe2"； - 9、[迭代中]原生提供通用命令行任务Handler（Bean任务，"CommandJobHandler"）；业务方只需要提供命令行即可，可执行任意命令； - 10、IP获取逻辑优化，优先遍历网卡来获取可用IP； +- 11、任务新增的API服务接口返回任务ID，方便调用方实用； ### TODO LIST - 1、任务分片路由：分片采用一致性Hash算法计算出尽量稳定的分片顺序，即使注册机器存在波动也不会引起分批分片顺序大的波动；目前采用IP自然排序，可以满足需求，待定； diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java index ed623b3e..1e01325e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java @@ -36,7 +36,7 @@ public class ExecutorRouteLRU extends ExecutorRouter { * a、accessOrder：ture=访问顺序排序（get/put时排序）；false=插入顺序排期； * b、removeEldestEntry：新增元素时将会调用，返回true时会删除最老元素；可封装LinkedHashMap并重写该方法，比如定义最大容量，超出是返回true即可实现固定长度的LRU算法； */ - lruItem = new LinkedHashMap<>(16, 0.75f, true); + lruItem = new LinkedHashMap(16, 0.75f, true); jobLRUMap.putIfAbsent(jobId, lruItem); } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java index 7936d14a..408b97db 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java @@ -62,7 +62,7 @@ public class I18nUtil { * @return */ public static String getMultString(String... keys) { - Map map = new HashMap<>(); + Map map = new HashMap(); Properties prop = loadI18nProp(); if (keys!=null && keys.length>0) { diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java index 1d8c2937..53f3bc1e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java @@ -130,7 +130,7 @@ public class XxlJobServiceImpl implements XxlJobService { try { XxlJobDynamicScheduler.addJob(qz_name, qz_group, jobInfo.getJobCron()); //XxlJobDynamicScheduler.pauseJob(qz_name, qz_group); - return new ReturnT<>(qz_name); + return new ReturnT(qz_name); } catch (SchedulerException e) { logger.error(e.getMessage(), e); try {