xueli.xue 9 лет назад
Родитель
Сommit
9e4f2c6b1e

+ 1 - 0
README.md Просмотреть файл

716
 - 2、线程模型统一;
716
 - 2、线程模型统一;
717
 - 3、执行器支持手动设置执行地址列表,提供开关切换使用注册地址还是手动设置的地址;
717
 - 3、执行器支持手动设置执行地址列表,提供开关切换使用注册地址还是手动设置的地址;
718
 - 4、执行器路由规则:第一个、循环、随机、顺序故障(默认)转移;
718
 - 4、执行器路由规则:第一个、循环、随机、顺序故障(默认)转移;
719
+- 5、CleanCode,清理无效的历史参数;
719
 
720
 
720
 #### TODO LIST
721
 #### TODO LIST
721
 - 1、支持脚本JOB(源码或指定路径), 即shell/python/php等, 日志实时输出并支持在线监控;定制JobHandler实现;
722
 - 1、支持脚本JOB(源码或指定路径), 即shell/python/php等, 日志实时输出并支持在线监控;定制JobHandler实现;

+ 4 - 6
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java Просмотреть файл

49
 	@RequestMapping("/add")
49
 	@RequestMapping("/add")
50
 	@ResponseBody
50
 	@ResponseBody
51
 	public ReturnT<String> add(int jobGroup, String jobCron, String jobDesc, String author, String alarmEmail,
51
 	public ReturnT<String> add(int jobGroup, String jobCron, String jobDesc, String author, String alarmEmail,
52
-							   String executorAppname, String executorAddress, String executorHandler, String executorParam,
53
-							   int glueSwitch, String glueSource, String glueRemark, String childJobKey) {
52
+							   String executorHandler, String executorParam, int glueSwitch, String glueSource, String glueRemark, String childJobKey) {
54
 		
53
 		
55
 		return xxlJobService.add(jobGroup, jobCron, jobDesc, author, alarmEmail,
54
 		return xxlJobService.add(jobGroup, jobCron, jobDesc, author, alarmEmail,
56
-				executorAddress, executorHandler, executorParam,
55
+				executorHandler, executorParam,
57
 				glueSwitch, glueSource, glueRemark, childJobKey);
56
 				glueSwitch, glueSource, glueRemark, childJobKey);
58
 	}
57
 	}
59
 	
58
 	
60
 	@RequestMapping("/reschedule")
59
 	@RequestMapping("/reschedule")
61
 	@ResponseBody
60
 	@ResponseBody
62
 	public ReturnT<String> reschedule(int jobGroup, String jobName, String jobCron, String jobDesc, String author, String alarmEmail,
61
 	public ReturnT<String> reschedule(int jobGroup, String jobName, String jobCron, String jobDesc, String author, String alarmEmail,
63
-			String executorAppname, String executorAddress, String executorHandler, String executorParam,
64
-			int glueSwitch, String childJobKey) {
62
+			String executorHandler, String executorParam, int glueSwitch, String childJobKey) {
65
 
63
 
66
 		return xxlJobService.reschedule(jobGroup, jobName, jobCron, jobDesc, author, alarmEmail,
64
 		return xxlJobService.reschedule(jobGroup, jobName, jobCron, jobDesc, author, alarmEmail,
67
-				executorAddress, executorHandler, executorParam, glueSwitch, childJobKey);
65
+				executorHandler, executorParam, glueSwitch, childJobKey);
68
 	}
66
 	}
69
 	
67
 	
70
 	@RequestMapping("/remove")
68
 	@RequestMapping("/remove")

+ 2 - 3
xxl-job-admin/src/main/java/com/xxl/job/admin/service/IXxlJobService.java Просмотреть файл

15
 	public Map<String, Object> pageList(int start, int length, int jobGroup, String executorHandler, String filterTime);
15
 	public Map<String, Object> pageList(int start, int length, int jobGroup, String executorHandler, String filterTime);
16
 	
16
 	
17
 	public ReturnT<String> add(int jobGroup, String jobCron, String jobDesc, String author, String alarmEmail,
17
 	public ReturnT<String> add(int jobGroup, String jobCron, String jobDesc, String author, String alarmEmail,
18
-							   String executorAddress, String executorHandler, String executorParam,
19
-							   int glueSwitch, String glueSource, String glueRemark, String childJobKey);
18
+			String executorHandler, String executorParam, int glueSwitch, String glueSource, String glueRemark, String childJobKey);
20
 	
19
 	
21
 	public ReturnT<String> reschedule(int jobGroup, String jobName, String jobCron, String jobDesc, String author, String alarmEmail,
20
 	public ReturnT<String> reschedule(int jobGroup, String jobName, String jobCron, String jobDesc, String author, String alarmEmail,
22
-			String executorAddress, String executorHandler, String executorParam, int glueSwitch, String childJobKey);
21
+			String executorHandler, String executorParam, int glueSwitch, String childJobKey);
23
 	
22
 	
24
 	public ReturnT<String> remove(int jobGroup, String jobName);
23
 	public ReturnT<String> remove(int jobGroup, String jobName);
25
 	
24
 	

+ 2 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java Просмотреть файл

65
 
65
 
66
 	@Override
66
 	@Override
67
 	public ReturnT<String> add(int jobGroup, String jobCron, String jobDesc, String author, String alarmEmail,
67
 	public ReturnT<String> add(int jobGroup, String jobCron, String jobDesc, String author, String alarmEmail,
68
-							   String executorAddress, String executorHandler, String executorParam,
68
+							   String executorHandler, String executorParam,
69
 							   int glueSwitch, String glueSource, String glueRemark, String childJobKey) {
69
 							   int glueSwitch, String glueSource, String glueRemark, String childJobKey) {
70
 		// valid
70
 		// valid
71
 		XxlJobGroup group = xxlJobGroupDao.load(jobGroup);
71
 		XxlJobGroup group = xxlJobGroupDao.load(jobGroup);
146
 
146
 
147
 	@Override
147
 	@Override
148
 	public ReturnT<String> reschedule(int jobGroup, String jobName, String jobCron, String jobDesc, String author, String alarmEmail,
148
 	public ReturnT<String> reschedule(int jobGroup, String jobName, String jobCron, String jobDesc, String author, String alarmEmail,
149
-			String executorAddress, String executorHandler, String executorParam, int glueSwitch, String childJobKey) {
149
+			String executorHandler, String executorParam, int glueSwitch, String childJobKey) {
150
 
150
 
151
 		// valid
151
 		// valid
152
 		XxlJobGroup group = xxlJobGroupDao.load(jobGroup);
152
 		XxlJobGroup group = xxlJobGroupDao.load(jobGroup);