CodeCow/datax-web
1
0
Fork 0
mirror of https://github.com/WeiYe-Jing/datax-web.git synced 2026-06-30 21:17:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

api更新

Browse Source
This commit is contained in:
weiye 2019-11-28 15:13:56 +08:00
parent 71368ab294
commit 6bfb6f41b1
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
datax-admin/src/main/java/com/wugui/datax/admin/controller/JobCodeController.java
View File

@ -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")

3
datax-admin/src/main/java/com/wugui/datax/admin/controller/JobGroupController.java
View File

@ -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")

8
datax-admin/src/main/java/com/wugui/datax/admin/controller/JobInfoController.java
View File

@ -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")

3
datax-admin/src/main/java/com/wugui/datax/admin/controller/JobLogController.java
View File

@ -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")

2
datax-core/src/main/java/com/wugui/datatx/core/executor/XxlJobExecutor.java
View File

@ -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) {