|  | @@ -61,9 +61,9 @@ public class XxlJobServiceImpl implements IXxlJobService {
 | 
	
		
			
				|  |  |  	}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	@Override
 | 
	
		
			
				|  |  | -	public ReturnT<String> add(String jobGroup, String jobCron, String jobDesc, String author, String alarmEmail,
 | 
	
		
			
				|  |  | -			String executorAddress,	String executorHandler, String executorParam, int glueSwitch, String glueSource, String glueRemark,
 | 
	
		
			
				|  |  | -			String childJobKey) {
 | 
	
		
			
				|  |  | +	public ReturnT<String> add(String jobGroup, String jobCron, String jobDesc,String author, String alarmEmail,
 | 
	
		
			
				|  |  | +			String executorAppname, String executorAddress,	String executorHandler, String executorParam,
 | 
	
		
			
				|  |  | +			int glueSwitch, String glueSource, String glueRemark, String childJobKey) {
 | 
	
		
			
				|  |  |  		// valid
 | 
	
		
			
				|  |  |  		if (JobGroupEnum.match(jobGroup) == null) {
 | 
	
		
			
				|  |  |  			return new ReturnT<String>(500, "请选择“任务组”");
 | 
	
	
		
			
				|  | @@ -80,8 +80,11 @@ public class XxlJobServiceImpl implements IXxlJobService {
 | 
	
		
			
				|  |  |  		if (StringUtils.isBlank(alarmEmail)) {
 | 
	
		
			
				|  |  |  			return new ReturnT<String>(500, "请输入“报警邮件”");
 | 
	
		
			
				|  |  |  		}
 | 
	
		
			
				|  |  | -		if (StringUtils.isBlank(executorAddress)) {
 | 
	
		
			
				|  |  | -			return new ReturnT<String>(500, "请输入“执行器地址”");
 | 
	
		
			
				|  |  | +		if (StringUtils.isBlank(executorAppname) && StringUtils.isBlank(executorAddress)) {
 | 
	
		
			
				|  |  | +			return new ReturnT<String>(500, "“执行器AppName”和“执行器地址”不可同时为空");
 | 
	
		
			
				|  |  | +		}
 | 
	
		
			
				|  |  | +		if (StringUtils.isNotBlank(executorAppname) && StringUtils.isNotBlank(executorAddress)) {
 | 
	
		
			
				|  |  | +			return new ReturnT<String>(500, "“执行器AppName”和“执行器地址” 不可同时使用");
 | 
	
		
			
				|  |  |  		}
 | 
	
		
			
				|  |  |  		if (glueSwitch==0 && StringUtils.isBlank(executorHandler)) {
 | 
	
		
			
				|  |  |  			return new ReturnT<String>(500, "请输入“JobHandler”");
 | 
	
	
		
			
				|  | @@ -121,6 +124,7 @@ public class XxlJobServiceImpl implements IXxlJobService {
 | 
	
		
			
				|  |  |  		jobInfo.setJobDesc(jobDesc);
 | 
	
		
			
				|  |  |  		jobInfo.setAuthor(author);
 | 
	
		
			
				|  |  |  		jobInfo.setAlarmEmail(alarmEmail);
 | 
	
		
			
				|  |  | +		jobInfo.setExecutorAppname(executorAppname);
 | 
	
		
			
				|  |  |  		jobInfo.setExecutorAddress(executorAddress);
 | 
	
		
			
				|  |  |  		jobInfo.setExecutorHandler(executorHandler);
 | 
	
		
			
				|  |  |  		jobInfo.setExecutorParam(executorParam);
 | 
	
	
		
			
				|  | @@ -146,7 +150,7 @@ public class XxlJobServiceImpl implements IXxlJobService {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	@Override
 | 
	
		
			
				|  |  |  	public ReturnT<String> reschedule(String jobGroup, String jobName, String jobCron, String jobDesc, String author, String alarmEmail,
 | 
	
		
			
				|  |  | -			String executorAddress, String executorHandler, String executorParam, int glueSwitch, String childJobKey) {
 | 
	
		
			
				|  |  | +			String executorAppname, String executorAddress, String executorHandler, String executorParam, int glueSwitch, String childJobKey) {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  		// valid
 | 
	
		
			
				|  |  |  		if (JobGroupEnum.match(jobGroup) == null) {
 | 
	
	
		
			
				|  | @@ -167,8 +171,11 @@ public class XxlJobServiceImpl implements IXxlJobService {
 | 
	
		
			
				|  |  |  		if (StringUtils.isBlank(alarmEmail)) {
 | 
	
		
			
				|  |  |  			return new ReturnT<String>(500, "请输入“报警邮件”");
 | 
	
		
			
				|  |  |  		}
 | 
	
		
			
				|  |  | -		if (StringUtils.isBlank(executorAddress)) {
 | 
	
		
			
				|  |  | -			return new ReturnT<String>(500, "请输入“执行器地址”");
 | 
	
		
			
				|  |  | +		if (StringUtils.isBlank(executorAppname) && StringUtils.isBlank(executorAddress)) {
 | 
	
		
			
				|  |  | +			return new ReturnT<String>(500, "“执行器AppName”和“执行器地址”不可同时为空");
 | 
	
		
			
				|  |  | +		}
 | 
	
		
			
				|  |  | +		if (StringUtils.isNotBlank(executorAppname) && StringUtils.isNotBlank(executorAddress)) {
 | 
	
		
			
				|  |  | +			return new ReturnT<String>(500, "“执行器AppName”和“执行器地址” 不可同时使用");
 | 
	
		
			
				|  |  |  		}
 | 
	
		
			
				|  |  |  		if (glueSwitch==0 && StringUtils.isBlank(executorHandler)) {
 | 
	
		
			
				|  |  |  			return new ReturnT<String>(500, "请输入“JobHandler”");
 | 
	
	
		
			
				|  | @@ -195,6 +202,7 @@ public class XxlJobServiceImpl implements IXxlJobService {
 | 
	
		
			
				|  |  |  		jobInfo.setJobDesc(jobDesc);
 | 
	
		
			
				|  |  |  		jobInfo.setAuthor(author);
 | 
	
		
			
				|  |  |  		jobInfo.setAlarmEmail(alarmEmail);
 | 
	
		
			
				|  |  | +		jobInfo.setExecutorAppname(executorAppname);
 | 
	
		
			
				|  |  |  		jobInfo.setExecutorAddress(executorAddress);
 | 
	
		
			
				|  |  |  		jobInfo.setExecutorHandler(executorHandler);
 | 
	
		
			
				|  |  |  		jobInfo.setExecutorParam(executorParam);
 |