From bee089b89bfa4292d8c79a3710afd0bf27ac3f10 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Thu, 18 Jul 2019 21:24:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E4=BA=A4?= =?UTF-8?q?=E4=BA=92=E4=BC=98=E5=8C=96=EF=BC=8C=E6=94=AF=E6=8C=81=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E4=BB=BB=E5=8A=A1=E6=89=80=E5=B1=9E=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=99=A8=E7=9A=84=E6=B3=A8=E5=86=8C=E8=8A=82=E7=82=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB官方文档.md | 1 + .../admin/controller/JobGroupController.java | 7 ++++ .../main/resources/i18n/message.properties | 5 ++- .../main/resources/i18n/message_en.properties | 5 ++- .../resources/static/js/jobinfo.index.1.js | 41 ++++++++++++++++++- 5 files changed, 54 insertions(+), 5 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index a0d54277..3774b334 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -1520,6 +1520,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 9、[ING]任务触发组件优化，常规1s预加载一次，轮空时主动休眠4s； - 10、注册监控线程优化，降低死锁几率； - 11、调度组件优化：针对永远不会触发的Cron禁止配置和启动；任务Cron最后一次触发后再也不会触发时，比如一次性任务，主动停止相关任务； +- 12、任务列表交互优化，支持查看任务所属执行器的注册节点； ### TODO LIST diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java index a5a3bbff..bb130f65 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java @@ -158,4 +158,11 @@ public class JobGroupController { return (ret>0)?ReturnT.SUCCESS:ReturnT.FAIL; } + @RequestMapping("/loadById") + @ResponseBody + public ReturnT loadById(int id){ + XxlJobGroup jobGroup = xxlJobGroupDao.load(id); + return jobGroup!=null?new ReturnT(jobGroup):new ReturnT(ReturnT.FAIL_CODE, null); + } + } diff --git a/xxl-job-admin/src/main/resources/i18n/message.properties b/xxl-job-admin/src/main/resources/i18n/message.properties index 2d2456a8..c7ab2fb3 100644 --- a/xxl-job-admin/src/main/resources/i18n/message.properties +++ b/xxl-job-admin/src/main/resources/i18n/message.properties @@ -125,8 +125,9 @@ jobinfo_shard_index=分片序号 jobinfo_shard_total=分片总数 jobinfo_opt_stop=停止 jobinfo_opt_start=启动 -jobinfo_opt_log=日志 -jobinfo_opt_run=执行 +jobinfo_opt_log=查询日志 +jobinfo_opt_run=执行一次 +jobinfo_opt_registryinfo=注册节点 jobinfo_glue_remark=源码备注 jobinfo_glue_remark_limit=源码备注长度限制为4~100 jobinfo_glue_rollback=版本回溯 diff --git a/xxl-job-admin/src/main/resources/i18n/message_en.properties b/xxl-job-admin/src/main/resources/i18n/message_en.properties index e5140e89..6eb16b1a 100644 --- a/xxl-job-admin/src/main/resources/i18n/message_en.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_en.properties @@ -125,8 +125,9 @@ jobinfo_shard_index=Shard index jobinfo_shard_total=Shard total jobinfo_opt_stop=Stop jobinfo_opt_start=Start -jobinfo_opt_log=Log -jobinfo_opt_run=Run +jobinfo_opt_log=Query Log +jobinfo_opt_run=Run Once +jobinfo_opt_registryinfo=Registry Info jobinfo_glue_remark=Resource Remark jobinfo_glue_remark_limit=Resource Remark length is limited to 4~100 jobinfo_glue_rollback=Version Backtrack diff --git a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js index b9268286..78267df6 100644 --- a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js +++ b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js @@ -133,9 +133,10 @@ $(function() { ' \n' + '