xueli.xue преди 8 години
родител
ревизия
9e4f2c6b1e

+ 1 - 0
README.md Целия файл

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

+ 4 - 6
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java Целия файл

@@ -49,22 +49,20 @@ public class JobInfoController {
49 49
 	@RequestMapping("/add")
50 50
 	@ResponseBody
51 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 54
 		return xxlJobService.add(jobGroup, jobCron, jobDesc, author, alarmEmail,
56
-				executorAddress, executorHandler, executorParam,
55
+				executorHandler, executorParam,
57 56
 				glueSwitch, glueSource, glueRemark, childJobKey);
58 57
 	}
59 58
 	
60 59
 	@RequestMapping("/reschedule")
61 60
 	@ResponseBody
62 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 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 68
 	@RequestMapping("/remove")

+ 2 - 3
xxl-job-admin/src/main/java/com/xxl/job/admin/service/IXxlJobService.java Целия файл

@@ -15,11 +15,10 @@ public interface IXxlJobService {
15 15
 	public Map<String, Object> pageList(int start, int length, int jobGroup, String executorHandler, String filterTime);
16 16
 	
17 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 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 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,7 +65,7 @@ public class XxlJobServiceImpl implements IXxlJobService {
65 65
 
66 66
 	@Override
67 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 69
 							   int glueSwitch, String glueSource, String glueRemark, String childJobKey) {
70 70
 		// valid
71 71
 		XxlJobGroup group = xxlJobGroupDao.load(jobGroup);
@@ -146,7 +146,7 @@ public class XxlJobServiceImpl implements IXxlJobService {
146 146
 
147 147
 	@Override
148 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 151
 		// valid
152 152
 		XxlJobGroup group = xxlJobGroupDao.load(jobGroup);