From c2f3a827b06cbf631f9cbc698539371debc0201d Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Fri, 19 Jan 2018 21:10:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=93=8D=E4=BD=9C=E5=9B=BD=E9=99=85=E5=8C=96=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/JobLogController.java | 2 + .../main/resources/i18n/message.properties | 43 ++++- .../WEB-INF/template/joblog/joblog.index.ftl | 82 ++++----- .../src/main/webapp/static/js/index.js | 11 +- .../main/webapp/static/js/joblog.index.1.js | 156 +++++++++--------- 5 files changed, 162 insertions(+), 132 deletions(-) diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java index a31536cf..a9de45d9 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java @@ -10,6 +10,7 @@ import com.xxl.job.admin.dao.XxlJobLogDao; import com.xxl.job.core.biz.ExecutorBiz; import com.xxl.job.core.biz.model.LogResult; import com.xxl.job.core.biz.model.ReturnT; +import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.job.core.rpc.netcom.NetComClientProxy; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; @@ -50,6 +51,7 @@ public class JobLogController { // 执行器列表 List jobGroupList = xxlJobGroupDao.findAll(); model.addAttribute("JobGroupList", jobGroupList); + model.addAttribute("GlueTypeEnum", GlueTypeEnum.values()); // 任务 if (jobId > 0) { diff --git a/xxl-job-admin/src/main/resources/i18n/message.properties b/xxl-job-admin/src/main/resources/i18n/message.properties index 3dd53221..67d95e8a 100644 --- a/xxl-job-admin/src/main/resources/i18n/message.properties +++ b/xxl-job-admin/src/main/resources/i18n/message.properties @@ -18,14 +18,21 @@ system_add_suc=新增成功 system_add_fail=新增失败 system_update_suc=更新成功 system_update_fail=更新失败 +system_all=全部 +system_api_error=接口异常 +system_show=查看 +system_empty=无 +system_opt_suc=操作成功 +system_opt_fail=操作失败 ## daterangepicker +daterangepicker_ranges_recent_hour=最近一小时 daterangepicker_ranges_today=今日 daterangepicker_ranges_yesterday=昨日 daterangepicker_ranges_this_month=本月 daterangepicker_ranges_last_month=上个月 -daterangepicker_ranges_recent_week=最近1周 -daterangepicker_ranges_recent_month=最近1月 +daterangepicker_ranges_recent_week=最近一周 +daterangepicker_ranges_recent_month=最近一月 daterangepicker_custom_name=自定义 daterangepicker_custom_starttime=起始时间 daterangepicker_custom_endtime=结束时间 @@ -87,13 +94,14 @@ job_dashboard_rate_report_fail_count=失败调度次数 ## job info jobinfo_name=任务管理 +jobinfo_job=任务 jobinfo_field_add=新增任务 jobinfo_field_update=更新任务 jobinfo_field_id=任务ID jobinfo_field_jobgroup=执行器 jobinfo_field_jobdesc=任务描述 jobinfo_field_gluetype=运行模式 -jobinfo_field_executorparam=执行参数 +jobinfo_field_executorparam=任务参数 jobinfo_field_author=负责人 jobinfo_field_alarmemail=报警邮件 jobinfo_field_alarmemail_placeholder=请输入报警邮件,多个邮件地址则逗号分隔 @@ -114,6 +122,35 @@ jobinfo_opt_del=删除 ## job log joblog_name=调度日志 +joblog_status=状态 +joblog_status_all=全部 +joblog_status_suc=成功 +joblog_status_fail=失败 +joblog_status_running=进行中 +joblog_field_triggerTime=调度时间 +joblog_field_triggerCode=调度结果 +joblog_field_triggerMsg=调度备注 +joblog_field_handleTime=执行时间 +joblog_field_handleCode=执行结果 +joblog_field_handleMsg=执行备注 +joblog_field_executorAddress=执行器地址 +joblog_clean=清理 +joblog_clean_log=日志清理 +joblog_clean_type=清理方式 +joblog_clean_type_1=清理一个月之前日志数据 +joblog_clean_type_2=清理三个月之前日志数据 +joblog_clean_type_3=清理六个月之前日志数据 +joblog_clean_type_4=清理一年之前日志数据 +joblog_clean_type_5=清理一千条以前日志数据 +joblog_clean_type_6=清理一万条以前日志数据 +joblog_clean_type_7=清理三万条以前日志数据 +joblog_clean_type_8=清理十万条以前日志数据 +joblog_clean_type_9=清理所有日志数据 +joblog_handleCode_200=成功 +joblog_handleCode_500=失败 +joblog_handleCode_501=失败重试 +joblog_rolling_log=执行日志 +joblog_kill_log=终止任务 ## job group jobgroup_name=执行器管理 diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl index 3c4a7f09..bc85fc74 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl @@ -21,12 +21,6 @@

${I18n.joblog_name}

-
@@ -34,9 +28,9 @@
- 执行器 + ${I18n.jobinfo_field_jobgroup} - +
- 状态 + ${I18n.joblog_status}
@@ -74,11 +68,11 @@
- +
- +
@@ -90,18 +84,18 @@ - - + + <#----> - - - - - - - + + + + + + + @@ -122,12 +116,12 @@
任务ID执行器ID${I18n.jobinfo_field_id}jobGroup执行器地址 运行模式 任务参数调度时间调度结果调度备注执行时间执行结果执行备注操作${I18n.joblog_field_triggerTime}${I18n.joblog_field_triggerCode}${I18n.joblog_field_triggerMsg}${I18n.joblog_field_handleTime}${I18n.joblog_field_handleCode}${I18n.joblog_field_handleMsg}${I18n.system_opt}