From 6bfb6f41b17a94c56230d7bde3a655efccd009ab Mon Sep 17 00:00:00 2001
From: weiye <jingwk@greatld.com>
Date: Thu, 28 Nov 2019 15:13:56 +0800
Subject: [PATCH] =?UTF-8?q?api=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wugui/datax/admin/controller/JobCodeController.java   | 3 +--
 .../wugui/datax/admin/controller/JobGroupController.java  | 3 +--
 .../wugui/datax/admin/controller/JobInfoController.java   | 8 +++-----
 .../wugui/datax/admin/controller/JobLogController.java    | 3 +--
 .../com/wugui/datatx/core/executor/XxlJobExecutor.java    | 2 +-
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobCodeController.java b/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobCodeController.java
index 9bd7044d..b12e2948 100644
--- a/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobCodeController.java
+++ b/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobCodeController.java
@@ -21,8 +21,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * job code controller
- * @author xuxueli 2015-12-19 16:13:16
+ * Created by jingwk on 2019/11/17
  */
 @RestController
 @RequestMapping("/jobcode")
diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobGroupController.java b/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobGroupController.java
index 08285280..5f51c315 100644
--- a/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobGroupController.java
+++ b/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobGroupController.java
@@ -17,8 +17,7 @@ import javax.annotation.Resource;
 import java.util.*;
 
 /**
- * job group controller
- * @author xuxueli 2016-10-02 20:52:56
+ * Created by jingwk on 2019/11/17
  */
 @RestController
 @RequestMapping("/jobgroup")
diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobInfoController.java b/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobInfoController.java
index 6e621912..7d6921b5 100644
--- a/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobInfoController.java
+++ b/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobInfoController.java
@@ -34,7 +34,7 @@ import java.util.*;
  */
 @Api(tags = "任务配置接口")
 @RestController
-@RequestMapping("/jobinfo")
+@RequestMapping("/api")
 public class JobInfoController {
 
     @Resource
@@ -95,11 +95,9 @@ public class JobInfoController {
 
     @GetMapping("/pageList")
     @ApiOperation("任务列表")
-    public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int start,
-                                        @RequestParam(required = false, defaultValue = "10") int length,
-                                        int jobGroup, int triggerStatus, String jobDesc, String executorHandler, String author) {
+    public Map<String, Object> pageList() {
 
-        return xxlJobService.pageList(start, length, jobGroup, triggerStatus, jobDesc, executorHandler, author);
+        return xxlJobService.pageList(0, 10, 1, -1, null, null, null);
     }
 
     @PostMapping("/add")
diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobLogController.java b/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobLogController.java
index a6d04737..b0b0e440 100644
--- a/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobLogController.java
+++ b/datax-admin/src/main/java/com/wugui/datax/admin/controller/JobLogController.java
@@ -28,8 +28,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * index controller
- * @author xuxueli 2015-12-19 16:13:16
+ * Created by jingwk on 2019/11/17
  */
 @RestController
 @RequestMapping("/joblog")
diff --git a/datax-core/src/main/java/com/wugui/datatx/core/executor/XxlJobExecutor.java b/datax-core/src/main/java/com/wugui/datatx/core/executor/XxlJobExecutor.java
index b18ad93a..a18de055 100644
--- a/datax-core/src/main/java/com/wugui/datatx/core/executor/XxlJobExecutor.java
+++ b/datax-core/src/main/java/com/wugui/datatx/core/executor/XxlJobExecutor.java
@@ -113,7 +113,7 @@ public class XxlJobExecutor  {
         if (adminAddresses!=null && adminAddresses.trim().length()>0) {
             for (String address: adminAddresses.trim().split(",")) {
                 if (address!=null && address.trim().length()>0) {
-
+                    //实例化AdminBizClient
                     AdminBiz adminBiz = new AdminBizClient(address.trim(), accessToken);
 
                     if (adminBizList == null) {