From 63edb6d8489ea95d90de7fc751a0429372d06134 Mon Sep 17 00:00:00 2001 From: "xueli.xue" Date: Wed, 8 Jun 2016 14:28:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9FCron=E6=96=87=E6=A1=88?= =?UTF-8?q?=E8=AE=A2=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/tables_xxl_job.sql | 4 ++-- .../com/xxl/job/admin/service/impl/XxlJobServiceImpl.java | 4 ++-- .../webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl | 8 ++++---- .../src/main/webapp/static/js/jobinfo.index.1.js | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/db/tables_xxl_job.sql b/db/tables_xxl_job.sql index ae91cf18..7766ddd1 100644 --- a/db/tables_xxl_job.sql +++ b/db/tables_xxl_job.sql @@ -147,7 +147,7 @@ CREATE TABLE `xxl_job_qrtz_trigger_info` ( `id` int(11) NOT NULL AUTO_INCREMENT, `job_group` varchar(255) NOT NULL COMMENT '任务组', `job_name` varchar(255) NOT NULL COMMENT '任务名', - `job_cron` varchar(128) NOT NULL COMMENT '任务执行CORN', + `job_cron` varchar(128) NOT NULL COMMENT '任务执行CRON', `job_desc` varchar(255) NOT NULL, `job_class` varchar(255) NOT NULL COMMENT '任务执行JobBean', `add_time` datetime DEFAULT NULL, @@ -168,7 +168,7 @@ CREATE TABLE `xxl_job_qrtz_trigger_log` ( `id` int(11) NOT NULL AUTO_INCREMENT, `job_group` varchar(255) NOT NULL COMMENT '任务组', `job_name` varchar(255) NOT NULL COMMENT '任务名', - `job_cron` varchar(128) NOT NULL COMMENT '任务执行CORN表达式', + `job_cron` varchar(128) NOT NULL COMMENT '任务执行CRON表达式', `job_desc` varchar(255) NOT NULL, `job_class` varchar(255) NOT NULL COMMENT '任务执行JobBean', `executor_address` varchar(255) DEFAULT NULL COMMENT '执行器地址，本次执行的地址', 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 701d66bf..7ea392fc 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 @@ -70,7 +70,7 @@ public class XxlJobServiceImpl implements IXxlJobService { return new ReturnT(500, "请输入“任务名”"); } if (!CronExpression.isValidExpression(jobCron)) { - return new ReturnT(500, "请输入格式正确的“corn”"); + return new ReturnT(500, "请输入格式正确的“Cron”"); } if (StringUtils.isBlank(jobDesc)) { return new ReturnT(500, "请输入“任务描述”"); @@ -146,7 +146,7 @@ public class XxlJobServiceImpl implements IXxlJobService { return new ReturnT(500, "请输入“任务名”"); } if (!CronExpression.isValidExpression(jobCron)) { - return new ReturnT(500, "请输入格式正确的“corn”"); + return new ReturnT(500, "请输入格式正确的“Cron”"); } if (StringUtils.isBlank(jobDesc)) { return new ReturnT(500, "请输入“任务描述”"); diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl index 3d705a9b..5c6a6c11 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl @@ -121,8 +121,8 @@
- -
+ +
@@ -201,8 +201,8 @@ public class DemoJobHandler extends IJobHandler {
- -
+ +
diff --git a/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js index b0e640f8..de2eb1d4 100644 --- a/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js +++ b/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js @@ -253,8 +253,8 @@ $(function() { maxlength:"“任务名”长度不应超过100位" }, jobCron : { - required :"请输入“Corn”." , - maxlength:"“Corn”长度不应超过100位" + required :"请输入“Cron”." , + maxlength:"“Cron”长度不应超过100位" }, jobDesc : { required :"请输入“任务描述”." , @@ -405,8 +405,8 @@ $(function() { }, messages : { jobCron : { - required :"请输入“Corn”." , - maxlength:"“Corn”长度不应超过100位" + required :"请输入“Cron”." , + maxlength:"“Cron”长度不应超过100位" }, jobDesc : { required :"请输入“任务描述”." ,