diff --git a/doc/XXL-JOB1.3.x用户手册_20160522_1547.docx b/doc/XXL-JOB1.3.x用户手册_20160522_1547.docx index f22143d1..90e19a86 100644 Binary files a/doc/XXL-JOB1.3.x用户手册_20160522_1547.docx and b/doc/XXL-JOB1.3.x用户手册_20160522_1547.docx differ diff --git a/doc/~$L-JOB1.3.x用户手册_20160522_1547.docx b/doc/~$L-JOB1.3.x用户手册_20160522_1547.docx deleted file mode 100644 index fcd42e3f..00000000 Binary files a/doc/~$L-JOB1.3.x用户手册_20160522_1547.docx and /dev/null differ diff --git a/xxl-job-admin/src/main/java/com/xxl/job/service/job/RemoteHttpJobBean.java b/xxl-job-admin/src/main/java/com/xxl/job/service/job/RemoteHttpJobBean.java index ebb0d9a6..10d7998e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/service/job/RemoteHttpJobBean.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/service/job/RemoteHttpJobBean.java @@ -4,7 +4,6 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.quartz.JobKey; @@ -27,7 +26,7 @@ import com.xxl.job.core.util.DynamicSchedulerUtil; * “@DisallowConcurrentExecution” diable concurrent, thread size can not be only one, better given more * @author xuxueli 2015-12-17 18:20:34 */ -@DisallowConcurrentExecution +//@DisallowConcurrentExecution public class RemoteHttpJobBean extends QuartzJobBean { private static Logger logger = LoggerFactory.getLogger(RemoteHttpJobBean.class); diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl index 69f7910f..30b16037 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/index.ftl @@ -188,7 +188,7 @@ public class DemoJobHandler extends IJobHandler {