Browse Source

命名更新

xueli.xue 9 years ago
parent
commit
71a033771f

BIN
doc/XXL-JOB1.3.x用户手册_20160522_1547.docx View File


doc/db/tables_mysql.sql → doc/db/tables_mysql(备份,请忽略).sql View File


BIN
doc/~$L-JOB1.3.x用户手册_20160522_1547.docx View File


+ 4 - 4
xxl-job-admin/src/main/java/com/xxl/job/controller/JobInfoController.java View File

93
 			return new ReturnT<String>(500, "请输入“任务描述”");
93
 			return new ReturnT<String>(500, "请输入“任务描述”");
94
 		}
94
 		}
95
 		if (StringUtils.isBlank(handler_address)) {
95
 		if (StringUtils.isBlank(handler_address)) {
96
-			return new ReturnT<String>(500, "请输入“器地址”");
96
+			return new ReturnT<String>(500, "请输入“执行器地址”");
97
 		}
97
 		}
98
 		if (glueSwitch==0 && StringUtils.isBlank(handler_name)) {
98
 		if (glueSwitch==0 && StringUtils.isBlank(handler_name)) {
99
-			return new ReturnT<String>(500, "请输入“执行器”");
99
+			return new ReturnT<String>(500, "请输入“jobHandler”");
100
 		}
100
 		}
101
 		if (StringUtils.isBlank(author)) {
101
 		if (StringUtils.isBlank(author)) {
102
 			return new ReturnT<String>(500, "请输入“负责人”");
102
 			return new ReturnT<String>(500, "请输入“负责人”");
174
 			return new ReturnT<String>(500, "请输入“任务描述”");
174
 			return new ReturnT<String>(500, "请输入“任务描述”");
175
 		}
175
 		}
176
 		if (StringUtils.isBlank(handler_address)) {
176
 		if (StringUtils.isBlank(handler_address)) {
177
-			return new ReturnT<String>(500, "请输入“器地址”");
177
+			return new ReturnT<String>(500, "请输入“执行器地址”");
178
 		}
178
 		}
179
 		if (glueSwitch==0 && StringUtils.isBlank(handler_name)) {
179
 		if (glueSwitch==0 && StringUtils.isBlank(handler_name)) {
180
-			return new ReturnT<String>(500, "请输入“执行器”");
180
+			return new ReturnT<String>(500, "请输入“jobHandler”");
181
 		}
181
 		}
182
 		if (StringUtils.isBlank(author)) {
182
 		if (StringUtils.isBlank(author)) {
183
 			return new ReturnT<String>(500, "请输入“负责人”");
183
 			return new ReturnT<String>(500, "请输入“负责人”");

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

125
 						<div class="col-sm-4"><input type="text" class="form-control" name="jobDesc" placeholder="请输入“描述”" maxlength="200" ></div>
125
 						<div class="col-sm-4"><input type="text" class="form-control" name="jobDesc" placeholder="请输入“描述”" maxlength="200" ></div>
126
 					</div>
126
 					</div>
127
 					<div class="form-group">
127
 					<div class="form-group">
128
-						<label for="lastname" class="col-sm-2 control-label">器地址<font color="red">*</font></label>
129
-						<div class="col-sm-4"><input type="text" class="form-control" name="handler_address" placeholder="请输入“远程-机器地址”" maxlength="200" ></div>
130
-						<label for="lastname" class="col-sm-2 control-label">执行器<font color="red">*</font></label>
131
-						<div class="col-sm-4"><input type="text" class="form-control" name="handler_name" placeholder="请输入“远程-执行器”" maxlength="200" ></div>
128
+						<label for="lastname" class="col-sm-2 control-label">执行器地址<font color="red">*</font></label>
129
+						<div class="col-sm-4"><input type="text" class="form-control" name="handler_address" placeholder="请输入“执行器地址”" maxlength="200" ></div>
130
+						<label for="lastname" class="col-sm-2 control-label">jobHandler<font color="red">*</font></label>
131
+						<div class="col-sm-4"><input type="text" class="form-control" name="handler_name" placeholder="请输入“jobHandler”" maxlength="200" ></div>
132
 					</div>
132
 					</div>
133
 					<div class="form-group">
133
 					<div class="form-group">
134
 						<label for="firstname" class="col-sm-2 control-label">执行参数<font color="black">*</font></label>
134
 						<label for="firstname" class="col-sm-2 control-label">执行参数<font color="black">*</font></label>
206
 					</div>
206
 					</div>
207
 					
207
 					
208
 					<div class="form-group">
208
 					<div class="form-group">
209
-						<label for="lastname" class="col-sm-2 control-label">器地址<font color="red">*</font></label>
210
-						<div class="col-sm-4"><input type="text" class="form-control" name="handler_address" placeholder="请输入“远程-机器地址”" maxlength="200" ></div>
211
-						<label for="lastname" class="col-sm-2 control-label">执行器<font color="red">*</font></label>
212
-						<div class="col-sm-4"><input type="text" class="form-control" name="handler_name" placeholder="请输入“远程-执行器”" maxlength="200" ></div>
209
+						<label for="lastname" class="col-sm-2 control-label">执行器地址<font color="red">*</font></label>
210
+						<div class="col-sm-4"><input type="text" class="form-control" name="handler_address" placeholder="请输入“执行器地址”" maxlength="200" ></div>
211
+						<label for="lastname" class="col-sm-2 control-label">jobHandler<font color="red">*</font></label>
212
+						<div class="col-sm-4"><input type="text" class="form-control" name="handler_name" placeholder="请输入“jobHandler”" maxlength="200" ></div>
213
 					</div>
213
 					</div>
214
 					<div class="form-group">
214
 					<div class="form-group">
215
 						<label for="firstname" class="col-sm-2 control-label">执行参数<font color="black">*</font></label>
215
 						<label for="firstname" class="col-sm-2 control-label">执行参数<font color="black">*</font></label>

+ 9 - 9
xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js View File

40
 	                		var _jobData = eval('(' + data + ')');	// row.jobData
40
 	                		var _jobData = eval('(' + data + ')');	// row.jobData
41
 	                		var html = "<p title='" + data + "'>执行器:" + _jobData.handler_name +
41
 	                		var html = "<p title='" + data + "'>执行器:" + _jobData.handler_name +
42
 	                			"<br>执行参数:" + _jobData.handler_params + 
42
 	                			"<br>执行参数:" + _jobData.handler_params + 
43
-	                			"<br>执行器:" + _jobData.handler_address + "</p>";
43
+	                			"<br>执行器地址:" + _jobData.handler_address + "</p>";
44
 	                		return html;
44
 	                		return html;
45
 	                	}
45
 	                	}
46
 	                },
46
 	                },
272
                 maxlength:"“任务描述”长度不应超过200位"
272
                 maxlength:"“任务描述”长度不应超过200位"
273
             },  
273
             },  
274
             handler_address : {
274
             handler_address : {
275
-            	required :"请输入“器地址”."  ,
276
-                maxlength:"“器地址”长度不应超过200位"
275
+            	required :"请输入“执行器地址”."  ,
276
+                maxlength:"“执行器地址”长度不应超过200位"
277
             },
277
             },
278
             handler_name : {
278
             handler_name : {
279
-            	required : "请输入“执行器”."  ,
280
-                maxlength: "“执行器”长度不应超过200位"
279
+            	required : "请输入“jobHandler”."  ,
280
+                maxlength: "“jobHandler”长度不应超过200位"
281
             },
281
             },
282
             author : {
282
             author : {
283
             	required : "请输入“负责人”."  ,
283
             	required : "请输入“负责人”."  ,
424
                 maxlength:"“任务描述”长度不应超过200位"
424
                 maxlength:"“任务描述”长度不应超过200位"
425
             },  
425
             },  
426
             handler_address : {
426
             handler_address : {
427
-            	required :"请输入“器地址”."  ,
428
-                maxlength:"“器地址”长度不应超过200位"
427
+            	required :"请输入“执行器地址”."  ,
428
+                maxlength:"“执行器地址”长度不应超过200位"
429
             },
429
             },
430
             handler_name : {
430
             handler_name : {
431
-            	required : "请输入“执行器”."  ,
432
-                maxlength: "“执行器”长度不应超过200位"
431
+            	required : "请输入“jobHandler”."  ,
432
+                maxlength: "“jobHandler”长度不应超过200位"
433
             },
433
             },
434
             author : {
434
             author : {
435
             	required : "请输入“负责人”."  ,
435
             	required : "请输入“负责人”."  ,

+ 2 - 2
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js View File

69
 	                	"visible" : true,
69
 	                	"visible" : true,
70
 	                	"render": function ( data, type, row ) {
70
 	                	"render": function ( data, type, row ) {
71
 	                		var _jobData = eval('(' + data + ')');	// row.jobData
71
 	                		var _jobData = eval('(' + data + ')');	// row.jobData
72
-	                		var html = "<p title='" + data + "'>执行器:" + _jobData.handler_name +
72
+	                		var html = "<p title='" + data + "'>JobHandler:" + _jobData.handler_name +
73
 	                			"<br>执行参数:" + _jobData.handler_params + 
73
 	                			"<br>执行参数:" + _jobData.handler_params + 
74
-	                			"<br>执行器:" + _jobData.handler_address + "</p>";
74
+	                			"<br>执行器地址:" + _jobData.handler_address + "</p>";
75
 	                		
75
 	                		
76
 	                		return data?'<a class="logMsg" href="javascript:;" >查看<span style="display:none;">'+ html +'</span></a>':"无";
76
 	                		return data?'<a class="logMsg" href="javascript:;" >查看<span style="display:none;">'+ html +'</span></a>':"无";
77
 	                	}
77
 	                	}

+ 1 - 1
xxl-job-client-demo/src/main/java/com/xxl/job/service/handler/DemoJobHandler.java View File

11
  * demo job handler
11
  * demo job handler
12
  * @author xuxueli 2015-12-19 19:43:36
12
  * @author xuxueli 2015-12-19 19:43:36
13
  */
13
  */
14
-@JobHander(jobName="demoJobHandler")
14
+@JobHander(name="demoJobHandler")
15
 @Service
15
 @Service
16
 public class DemoJobHandler extends IJobHandler {
16
 public class DemoJobHandler extends IJobHandler {
17
 	private static transient Logger logger = LoggerFactory.getLogger(DemoJobHandler.class);
17
 	private static transient Logger logger = LoggerFactory.getLogger(DemoJobHandler.class);

+ 1 - 1
xxl-job-client-demo/src/main/resources/applicationcontext-xxl-job.xml View File

11
 
11
 
12
 	<context:component-scan base-package="com.xxl.job.service" />
12
 	<context:component-scan base-package="com.xxl.job.service" />
13
 
13
 
14
-	<!-- Jetty任务执行器 -->
14
+	<!-- 执行器 -->
15
 	<bean id="xxlJobJettyServer" class="com.xxl.job.client.netcom.jetty.XxlJobJettyServer" init-method="start">
15
 	<bean id="xxlJobJettyServer" class="com.xxl.job.client.netcom.jetty.XxlJobJettyServer" init-method="start">
16
 		<property name="port" value="9999" />
16
 		<property name="port" value="9999" />
17
 	</bean>
17
 	</bean>

+ 1 - 1
xxl-job-client/src/main/java/com/xxl/job/client/handler/annotation/JobHander.java View File

13
 @Retention(RetentionPolicy.RUNTIME)
13
 @Retention(RetentionPolicy.RUNTIME)
14
 public @interface JobHander {
14
 public @interface JobHander {
15
 
15
 
16
-    String jobName();
16
+    String name();
17
     
17
     
18
 }
18
 }

+ 1 - 1
xxl-job-client/src/main/java/com/xxl/job/client/netcom/jetty/XxlJobJettyServer.java View File

75
 		Map<String, Object> serviceBeanMap = XxlJobJettyServer.applicationContext.getBeansWithAnnotation(JobHander.class);
75
 		Map<String, Object> serviceBeanMap = XxlJobJettyServer.applicationContext.getBeansWithAnnotation(JobHander.class);
76
         if (serviceBeanMap!=null && serviceBeanMap.size()>0) {
76
         if (serviceBeanMap!=null && serviceBeanMap.size()>0) {
77
             for (Object serviceBean : serviceBeanMap.values()) {
77
             for (Object serviceBean : serviceBeanMap.values()) {
78
-                String jobName = serviceBean.getClass().getAnnotation(JobHander.class).jobName();
78
+                String jobName = serviceBean.getClass().getAnnotation(JobHander.class).name();
79
                 if (jobName!=null && jobName.trim().length()>0 && serviceBean instanceof IJobHandler) {
79
                 if (jobName!=null && jobName.trim().length()>0 && serviceBean instanceof IJobHandler) {
80
                 	IJobHandler handler = (IJobHandler) serviceBean;
80
                 	IJobHandler handler = (IJobHandler) serviceBean;
81
                 	HandlerRepository.regist(jobName, handler);
81
                 	HandlerRepository.regist(jobName, handler);