|
@@ -5,6 +5,7 @@ import com.xxl.job.admin.core.model.XxlJobGroup;
|
|
import com.xxl.job.admin.core.model.XxlJobInfo;
|
|
import com.xxl.job.admin.core.model.XxlJobInfo;
|
|
import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
|
|
import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
|
|
import com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler;
|
|
import com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler;
|
|
|
|
+import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
|
|
import com.xxl.job.admin.core.util.I18nUtil;
|
|
import com.xxl.job.admin.core.util.I18nUtil;
|
|
import com.xxl.job.admin.dao.XxlJobGroupDao;
|
|
import com.xxl.job.admin.dao.XxlJobGroupDao;
|
|
import com.xxl.job.admin.dao.XxlJobInfoDao;
|
|
import com.xxl.job.admin.dao.XxlJobInfoDao;
|
|
@@ -275,7 +276,11 @@ public class XxlJobServiceImpl implements XxlJobService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public ReturnT<String> triggerJob(int id) {
|
|
public ReturnT<String> triggerJob(int id) {
|
|
- XxlJobInfo xxlJobInfo = xxlJobInfoDao.loadById(id);
|
|
|
|
|
|
+
|
|
|
|
+ JobTriggerPoolHelper.trigger(id);
|
|
|
|
+ return ReturnT.SUCCESS;
|
|
|
|
+
|
|
|
|
+ /*XxlJobInfo xxlJobInfo = xxlJobInfoDao.loadById(id);
|
|
if (xxlJobInfo == null) {
|
|
if (xxlJobInfo == null) {
|
|
return new ReturnT<String>(ReturnT.FAIL_CODE, (I18nUtil.getString("jobinfo_field_id")+I18nUtil.getString("system_unvalid")) );
|
|
return new ReturnT<String>(ReturnT.FAIL_CODE, (I18nUtil.getString("jobinfo_field_id")+I18nUtil.getString("system_unvalid")) );
|
|
}
|
|
}
|
|
@@ -289,7 +294,8 @@ public class XxlJobServiceImpl implements XxlJobService {
|
|
} catch (SchedulerException e) {
|
|
} catch (SchedulerException e) {
|
|
logger.error(e.getMessage(), e);
|
|
logger.error(e.getMessage(), e);
|
|
return new ReturnT<String>(ReturnT.FAIL_CODE, e.getMessage());
|
|
return new ReturnT<String>(ReturnT.FAIL_CODE, e.getMessage());
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|