@ -79,18 +79,22 @@ public class SysJobController extends BaseController
@@ -79,18 +79,22 @@ public class SysJobController extends BaseController
@PreAuthorize ( "@ss.hasPermi('monitor:job:add')" )
@Log ( title = "定时任务" , businessType = BusinessType . INSERT )
@PostMapping
public AjaxResult add ( @RequestBody SysJob sysJ ob) throws SchedulerException , TaskException
public AjaxResult add ( @RequestBody SysJob j ob) throws SchedulerException , TaskException
{
if ( ! CronUtils . isValid ( sysJ ob. getCronExpression ( ) ) )
if ( ! CronUtils . isValid ( j ob. getCronExpression ( ) ) )
{
return AjaxResult . error ( "新增任务'" + sysJ ob. getJobName ( ) + "'失败,Cron表达式不正确" ) ;
return error ( "新增任务'" + j ob. getJobName ( ) + "'失败,Cron表达式不正确" ) ;
}
else if ( StringUtils . containsIgnoreCase ( sysJ ob. getInvokeTarget ( ) , Constants . LOOKUP_RMI ) )
else if ( StringUtils . containsIgnoreCase ( j ob. getInvokeTarget ( ) , Constants . LOOKUP_RMI ) )
{
return AjaxResult . error ( "新增任务'" + sysJ ob. getJobName ( ) + "'失败,目标字符串不允许'rmi://'调用" ) ;
return error ( "新增任务'" + j ob. getJobName ( ) + "'失败,目标字符串不允许'rmi://'调用" ) ;
}
sysJob . setCreateBy ( SecurityUtils . getUsername ( ) ) ;
return toAjax ( jobService . insertJob ( sysJob ) ) ;
else if ( StringUtils . containsAnyIgnoreCase ( job . getInvokeTarget ( ) , new String [ ] { Constants . HTTP , Constants . HTTPS } ) )
{
return error ( "新增任务'" + job . getJobName ( ) + "'失败,目标字符串不允许'http(s)//'调用" ) ;
}
job . setCreateBy ( SecurityUtils . getUsername ( ) ) ;
return toAjax ( jobService . insertJob ( job ) ) ;
}
/ * *
@ -99,18 +103,22 @@ public class SysJobController extends BaseController
@@ -99,18 +103,22 @@ public class SysJobController extends BaseController
@PreAuthorize ( "@ss.hasPermi('monitor:job:edit')" )
@Log ( title = "定时任务" , businessType = BusinessType . UPDATE )
@PutMapping
public AjaxResult edit ( @RequestBody SysJob sysJ ob) throws SchedulerException , TaskException
public AjaxResult edit ( @RequestBody SysJob j ob) throws SchedulerException , TaskException
{
if ( ! CronUtils . isValid ( sysJob . getCronExpression ( ) ) )
if ( ! CronUtils . isValid ( job . getCronExpression ( ) ) )
{
return error ( "修改任务'" + job . getJobName ( ) + "'失败,Cron表达式不正确" ) ;
}
else if ( StringUtils . containsIgnoreCase ( job . getInvokeTarget ( ) , Constants . LOOKUP_RMI ) )
{
return AjaxResult . error ( "修改任务'" + sysJob . getJobName ( ) + "'失败,Cron表达式不正确" ) ;
return error ( "修改任务'" + j ob. getJobName ( ) + "'失败,目标字符串不允许'rmi://'调用 " ) ;
}
else if ( StringUtils . containsIgnoreCase ( sysJob . getInvokeTarget ( ) , Constants . LOOKUP_RMI ) )
else if ( StringUtils . containsAny IgnoreCase ( j ob. getInvokeTarget ( ) , new String [ ] { Constants . HTTP , Constants . HTTPS } ) )
{
return AjaxResult . error ( "修改任务'" + sysJ ob. getJobName ( ) + "'失败,目标字符串不允许'rmi: //'调用" ) ;
return error ( "修改任务'" + j ob. getJobName ( ) + "'失败,目标字符串不允许'http(s) //'调用" ) ;
}
sysJ ob. setUpdateBy ( SecurityUtils . getUsername ( ) ) ;
return toAjax ( jobService . updateJob ( sysJ ob) ) ;
j ob. setUpdateBy ( SecurityUtils . getUsername ( ) ) ;
return toAjax ( jobService . updateJob ( j ob) ) ;
}
/ * *