Browse Source

系统Cron文案订正

xueli.xue 8 years ago
parent
commit
63edb6d848

+ 2 - 2
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 '执行器地址,本次执行的地址',

+ 2 - 2
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<String>(500, "请输入“任务名”");
 		}
 		if (!CronExpression.isValidExpression(jobCron)) {
-			return new ReturnT<String>(500, "请输入格式正确的“corn”");
+			return new ReturnT<String>(500, "请输入格式正确的“Cron”");
 		}
 		if (StringUtils.isBlank(jobDesc)) {
 			return new ReturnT<String>(500, "请输入“任务描述”");
@@ -146,7 +146,7 @@ public class XxlJobServiceImpl implements IXxlJobService {
 			return new ReturnT<String>(500, "请输入“任务名”");
 		}
 		if (!CronExpression.isValidExpression(jobCron)) {
-			return new ReturnT<String>(500, "请输入格式正确的“corn”");
+			return new ReturnT<String>(500, "请输入格式正确的“Cron”");
 		}
 		if (StringUtils.isBlank(jobDesc)) {
 			return new ReturnT<String>(500, "请输入“任务描述”");

+ 4 - 4
xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl

@@ -121,8 +121,8 @@
 						<div class="col-sm-4"><input type="text" class="form-control" name="jobName" placeholder="请输入“任务名”" minlength="4" maxlength="100" ></div>
 					</div>
 					<div class="form-group">
-						<label for="lastname" class="col-sm-2 control-label">Corn<font color="red">*</font></label>
-						<div class="col-sm-4"><input type="text" class="form-control" name="jobCron" placeholder="请输入“Corn”" maxlength="100" ></div>
+						<label for="lastname" class="col-sm-2 control-label">Cron<font color="red">*</font></label>
+						<div class="col-sm-4"><input type="text" class="form-control" name="jobCron" placeholder="请输入“Cron”" maxlength="100" ></div>
 						<label for="lastname" class="col-sm-2 control-label">描述<font color="red">*</font></label>
 						<div class="col-sm-4"><input type="text" class="form-control" name="jobDesc" placeholder="请输入“描述”" maxlength="200" ></div>
 					</div>
@@ -201,8 +201,8 @@ public class DemoJobHandler extends IJobHandler {
 						<div class="col-sm-4"><input type="text" class="form-control" name="jobName" placeholder="请输入“任务名”" minlength="4" maxlength="100" readonly ></div>
 					</div>
 					<div class="form-group">
-						<label for="lastname" class="col-sm-2 control-label">Corn<font color="red">*</font></label>
-						<div class="col-sm-4"><input type="text" class="form-control" name="jobCron" placeholder="请输入“Corn”" maxlength="100" ></div>
+						<label for="lastname" class="col-sm-2 control-label">Cron<font color="red">*</font></label>
+						<div class="col-sm-4"><input type="text" class="form-control" name="jobCron" placeholder="请输入“Cron”" maxlength="100" ></div>
 						<label for="lastname" class="col-sm-2 control-label">描述<font color="red">*</font></label>
 						<div class="col-sm-4"><input type="text" class="form-control" name="jobDesc" placeholder="请输入“描述”" maxlength="200" ></div>
 					</div>

+ 4 - 4
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 :"请输入“任务描述”."  ,