xueli.xue преди 10 години
родител
ревизия
740b2d0268

+ 2 - 7
xxl-job-admin/src/main/webapp/WEB-INF/template/job/index.ftl Целия файл

@@ -33,7 +33,7 @@
33 33
 					<div class="box">
34 34
 			            <div class="box-header"><h3 class="box-title">任务列表</h3></div>
35 35
 			            <div class="box-body">
36
-			              	<table id="example1" class="table table-bordered table-striped">
36
+			              	<table id="job_list" class="table table-bordered table-striped">
37 37
 				                <thead>
38 38
 					            	<tr>
39 39
 					                	<th>任务ID</th>
@@ -82,11 +82,6 @@
82 82
 <!-- DataTables -->
83 83
 <script src="${request.contextPath}/static/adminlte/plugins/datatables/jquery.dataTables.min.js"></script>
84 84
 <script src="${request.contextPath}/static/adminlte/plugins/datatables/dataTables.bootstrap.min.js"></script>
85
-<!-- page script -->
86
-<script>
87
-  $(function () {
88
-		$("#example1").DataTable();
89
-  });
90
-</script>
85
+<script src="${request.contextPath}/static/js/job.index.1.js"></script>
91 86
 </body>
92 87
 </html>

+ 5 - 0
xxl-job-admin/src/main/webapp/static/js/job.index.1.js Целия файл

@@ -0,0 +1,5 @@
1
+$(function(){
2
+	$(function () {
3
+		$("#job_list").DataTable();
4
+	});
5
+});

+ 3 - 3
xxl-job-admin/src/test/java/quartz/JunitTest.java Целия файл

@@ -2,12 +2,12 @@ package quartz;
2 2
 
3 3
 
4 4
 import java.lang.reflect.InvocationTargetException;
5
-import java.util.Set;
5
+import java.util.List;
6
+import java.util.Map;
6 7
 import java.util.concurrent.TimeUnit;
7 8
 
8 9
 import org.junit.Test;
9 10
 import org.junit.runner.RunWith;
10
-import org.quartz.JobKey;
11 11
 import org.quartz.SchedulerException;
12 12
 import org.springframework.test.context.ContextConfiguration;
13 13
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -21,7 +21,7 @@ public class JunitTest {
21 21
 	
22 22
 	@Test
23 23
     public void getJobKeys() throws SchedulerException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, InterruptedException {
24
-		Set<JobKey> list = DynamicSchedulerUtil.getJobKeys();
24
+		List<Map<String, Object>> list = DynamicSchedulerUtil.getJobList();
25 25
     	System.out.println(list);
26 26
     	TimeUnit.SECONDS.sleep(30);
27 27
     }