diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl index 8e288d8..3235de3 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl @@ -33,7 +33,7 @@

任务列表

- +
@@ -82,11 +82,6 @@ - - + diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl index 8e288d8..3235de3 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl @@ -33,7 +33,7 @@

任务列表

-
任务ID
+
@@ -82,11 +82,6 @@ - - + diff --git a/xxl-job-admin/src/main/webapp/static/js/job.index.1.js b/xxl-job-admin/src/main/webapp/static/js/job.index.1.js new file mode 100644 index 0000000..025128a --- /dev/null +++ b/xxl-job-admin/src/main/webapp/static/js/job.index.1.js @@ -0,0 +1,5 @@ +$(function(){ + $(function () { + $("#job_list").DataTable(); + }); +}); \ No newline at end of file diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl index 8e288d8..3235de3 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl @@ -33,7 +33,7 @@

任务列表

-
任务ID
+
@@ -82,11 +82,6 @@ - - + diff --git a/xxl-job-admin/src/main/webapp/static/js/job.index.1.js b/xxl-job-admin/src/main/webapp/static/js/job.index.1.js new file mode 100644 index 0000000..025128a --- /dev/null +++ b/xxl-job-admin/src/main/webapp/static/js/job.index.1.js @@ -0,0 +1,5 @@ +$(function(){ + $(function () { + $("#job_list").DataTable(); + }); +}); \ No newline at end of file diff --git a/xxl-job-admin/src/test/java/quartz/JunitTest.java b/xxl-job-admin/src/test/java/quartz/JunitTest.java index 86164ee..1066973 100644 --- a/xxl-job-admin/src/test/java/quartz/JunitTest.java +++ b/xxl-job-admin/src/test/java/quartz/JunitTest.java @@ -2,12 +2,12 @@ import java.lang.reflect.InvocationTargetException; -import java.util.Set; +import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; import org.junit.Test; import org.junit.runner.RunWith; -import org.quartz.JobKey; import org.quartz.SchedulerException; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -21,7 +21,7 @@ @Test public void getJobKeys() throws SchedulerException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, InterruptedException { - Set list = DynamicSchedulerUtil.getJobKeys(); + List> list = DynamicSchedulerUtil.getJobList(); System.out.println(list); TimeUnit.SECONDS.sleep(30); }
任务ID