diff --git "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" "b/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" index f22143d..90e19a8 100644 --- "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" +++ "b/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" Binary files differ diff --git "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" "b/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" index f22143d..90e19a8 100644 --- "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" +++ "b/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" Binary files differ diff --git "a/doc/~$L-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" "b/doc/~$L-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" deleted file mode 100644 index fcd42e3..0000000 --- "a/doc/~$L-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" +++ /dev/null Binary files differ diff --git "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" "b/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" index f22143d..90e19a8 100644 --- "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" +++ "b/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" Binary files differ diff --git "a/doc/~$L-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" "b/doc/~$L-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" deleted file mode 100644 index fcd42e3..0000000 --- "a/doc/~$L-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" +++ /dev/null Binary files 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 ebb0d9a..10d7998 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.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 @@ * “@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/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" "b/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" index f22143d..90e19a8 100644 --- "a/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" +++ "b/doc/XXL-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" Binary files differ diff --git "a/doc/~$L-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" "b/doc/~$L-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" deleted file mode 100644 index fcd42e3..0000000 --- "a/doc/~$L-JOB1.3.x\347\224\250\346\210\267\346\211\213\345\206\214_20160522_1547.docx" +++ /dev/null Binary files 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 ebb0d9a..10d7998 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.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 @@ * “@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 69f7910..30b1603 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 @@