diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 899023d9..efc50f5d 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -1919,7 +1919,7 @@ Header： "jobId":1, // 任务ID "executorHandler":"demoJobHandler", // 任务标识 "executorParams":"demoJobHandler", // 任务参数 - "executorBlockStrategy":"COVER_EARLY", // 任务阻塞策略，可选值参考 com.xxl.job.core.enums.ExecutorBlockStrategyEnum + "executorBlockStrategy":"COVER_EARLY", // 任务阻塞策略，可选值参考 com.xxl.job.core.constant.ExecutorBlockStrategyEnum "executorTimeout":0, // 任务超时时间，单位秒，大于零时生效 "logId":1, // 本次调度日志ID "logDateTime":1586629003729, // 本次调度日志时间 diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java index 18095e03..b5ccfa88 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobGroupController.java @@ -7,7 +7,7 @@ import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.mapper.XxlJobGroupMapper; import com.xxl.job.admin.mapper.XxlJobInfoMapper; import com.xxl.job.admin.mapper.XxlJobRegistryMapper; -import com.xxl.job.core.enums.RegistryConfig; +import com.xxl.job.core.constant.Const; import com.xxl.sso.core.annotation.XxlSso; import com.xxl.tool.core.CollectionTool; import com.xxl.tool.core.StringTool; @@ -152,10 +152,10 @@ public class JobGroupController { private List findRegistryByAppName(String appnameParam){ HashMap> appAddressMap = new HashMap<>(); - List list = xxlJobRegistryMapper.findAll(RegistryConfig.DEAD_TIMEOUT, new Date()); + List list = xxlJobRegistryMapper.findAll(Const.DEAD_TIMEOUT, new Date()); if (CollectionTool.isNotEmpty(list)) { for (XxlJobRegistry item: list) { - if (!RegistryConfig.RegistType.EXECUTOR.name().equals(item.getRegistryGroup())) { + if (!Const.RegistType.EXECUTOR.name().equals(item.getRegistryGroup())) { continue; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java index c52366d6..eb192438 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java @@ -10,8 +10,7 @@ import com.xxl.job.admin.scheduler.type.ScheduleTypeEnum; import com.xxl.job.admin.service.XxlJobService; import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.util.JobGroupPermissionUtil; -import com.xxl.job.core.openapi.model.ReturnT; -import com.xxl.job.core.enums.ExecutorBlockStrategyEnum; +import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.sso.core.helper.XxlSsoHelper; import com.xxl.sso.core.model.LoginInfo; @@ -32,7 +31,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; /** * index controller @@ -93,7 +91,7 @@ public class JobInfoController { @RequestMapping("/add") @ResponseBody - public ReturnT add(HttpServletRequest request, XxlJobInfo jobInfo) { + public Response add(HttpServletRequest request, XxlJobInfo jobInfo) { // valid permission LoginInfo loginInfo = JobGroupPermissionUtil.validJobGroupPermission(request, jobInfo.getJobGroup()); @@ -103,7 +101,7 @@ public class JobInfoController { @RequestMapping("/update") @ResponseBody - public ReturnT update(HttpServletRequest request, XxlJobInfo jobInfo) { + public Response update(HttpServletRequest request, XxlJobInfo jobInfo) { // valid permission LoginInfo loginInfo = JobGroupPermissionUtil.validJobGroupPermission(request, jobInfo.getJobGroup()); @@ -113,28 +111,28 @@ public class JobInfoController { @RequestMapping("/remove") @ResponseBody - public ReturnT remove(HttpServletRequest request, @RequestParam("id") int id) { + public Response remove(HttpServletRequest request, @RequestParam("id") int id) { Response loginInfoResponse = XxlSsoHelper.loginCheckWithAttr(request); return xxlJobService.remove(id, loginInfoResponse.getData()); } @RequestMapping("/stop") @ResponseBody - public ReturnT pause(HttpServletRequest request, @RequestParam("id") int id) { + public Response pause(HttpServletRequest request, @RequestParam("id") int id) { Response loginInfoResponse = XxlSsoHelper.loginCheckWithAttr(request); return xxlJobService.stop(id, loginInfoResponse.getData()); } @RequestMapping("/start") @ResponseBody - public ReturnT start(HttpServletRequest request, @RequestParam("id") int id) { + public Response start(HttpServletRequest request, @RequestParam("id") int id) { Response loginInfoResponse = XxlSsoHelper.loginCheckWithAttr(request); return xxlJobService.start(id, loginInfoResponse.getData()); } @RequestMapping("/trigger") @ResponseBody - public ReturnT triggerJob(HttpServletRequest request, + public Response triggerJob(HttpServletRequest request, @RequestParam("id") int id, @RequestParam("executorParam") String executorParam, @RequestParam("addressList") String addressList) { @@ -144,7 +142,7 @@ public class JobInfoController { @RequestMapping("/nextTriggerTime") @ResponseBody - public ReturnT> nextTriggerTime(@RequestParam("scheduleType") String scheduleType, + public Response> nextTriggerTime(@RequestParam("scheduleType") String scheduleType, @RequestParam("scheduleConf") String scheduleConf) { XxlJobInfo paramXxlJobInfo = new XxlJobInfo(); @@ -169,9 +167,9 @@ public class JobInfoController { } } catch (Exception e) { logger.error(">>>>>>>>>>> nextTriggerTime error. scheduleType = {}, scheduleConf= {}", scheduleType, scheduleConf, e); - return ReturnT.ofFail((I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) + e.getMessage()); + return Response.ofFail((I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) + e.getMessage()); } - return ReturnT.ofSuccess(result); + return Response.ofSuccess(result); } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/config/XxlJobAdminBootstrap.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/config/XxlJobAdminBootstrap.java index 4a76f225..40cc6933 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/config/XxlJobAdminBootstrap.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/config/XxlJobAdminBootstrap.java @@ -8,7 +8,7 @@ import com.xxl.job.admin.scheduler.trigger.JobTrigger; import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.core.openapi.ExecutorBiz; import com.xxl.job.core.openapi.client.ExecutorBizClient; -import com.xxl.job.core.enums.ExecutorBlockStrategyEnum; +import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.tool.core.StringTool; import jakarta.annotation.Resource; import org.slf4j.Logger; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java index 2e0bcf9e..8493d893 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobRegistryHelper.java @@ -4,7 +4,7 @@ import com.xxl.job.admin.model.XxlJobGroup; import com.xxl.job.admin.model.XxlJobRegistry; import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.core.openapi.model.RegistryRequest; -import com.xxl.job.core.enums.RegistryConfig; +import com.xxl.job.core.constant.Const; import com.xxl.tool.core.StringTool; import com.xxl.tool.response.Response; import org.slf4j.Logger; @@ -64,17 +64,17 @@ public class JobRegistryHelper { if (groupList!=null && !groupList.isEmpty()) { // remove dead address (admin/executor) - List ids = XxlJobAdminBootstrap.getInstance().getXxlJobRegistryMapper().findDead(RegistryConfig.DEAD_TIMEOUT, new Date()); + List ids = XxlJobAdminBootstrap.getInstance().getXxlJobRegistryMapper().findDead(Const.DEAD_TIMEOUT, new Date()); if (ids!=null && ids.size()>0) { XxlJobAdminBootstrap.getInstance().getXxlJobRegistryMapper().removeDead(ids); } // fresh online address (admin/executor) HashMap> appAddressMap = new HashMap>(); - List list = XxlJobAdminBootstrap.getInstance().getXxlJobRegistryMapper().findAll(RegistryConfig.DEAD_TIMEOUT, new Date()); + List list = XxlJobAdminBootstrap.getInstance().getXxlJobRegistryMapper().findAll(Const.DEAD_TIMEOUT, new Date()); if (list != null) { for (XxlJobRegistry item: list) { - if (RegistryConfig.RegistType.EXECUTOR.name().equals(item.getRegistryGroup())) { + if (Const.RegistType.EXECUTOR.name().equals(item.getRegistryGroup())) { String appname = item.getRegistryKey(); List registryList = appAddressMap.get(appname); if (registryList == null) { @@ -114,7 +114,7 @@ public class JobRegistryHelper { } } try { - TimeUnit.SECONDS.sleep(RegistryConfig.BEAT_TIMEOUT); + TimeUnit.SECONDS.sleep(Const.BEAT_TIMEOUT); } catch (Throwable e) { if (!toStop) { logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:{}", e); diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/JobTrigger.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/JobTrigger.java index 89108571..27cebdb9 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/JobTrigger.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/trigger/JobTrigger.java @@ -12,7 +12,7 @@ import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.core.openapi.ExecutorBiz; import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.job.core.context.XxlJobContext; -import com.xxl.job.core.enums.ExecutorBlockStrategyEnum; +import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.tool.core.StringTool; import com.xxl.tool.exception.ThrowableTool; import com.xxl.tool.http.IPTool; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java index b3a51ab3..9e57302d 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java @@ -1,7 +1,6 @@ package com.xxl.job.admin.service; import com.xxl.job.admin.model.XxlJobInfo; -import com.xxl.job.core.openapi.model.ReturnT; import com.xxl.sso.core.model.LoginInfo; import com.xxl.tool.response.PageModel; import com.xxl.tool.response.Response; @@ -24,32 +23,32 @@ public interface XxlJobService { /** * add job */ - public ReturnT add(XxlJobInfo jobInfo, LoginInfo loginInfo); + public Response add(XxlJobInfo jobInfo, LoginInfo loginInfo); /** * update job */ - public ReturnT update(XxlJobInfo jobInfo, LoginInfo loginInfo); + public Response update(XxlJobInfo jobInfo, LoginInfo loginInfo); /** * remove job */ - public ReturnT remove(int id, LoginInfo loginInfo); + public Response remove(int id, LoginInfo loginInfo); /** * start job */ - public ReturnT start(int id, LoginInfo loginInfo); + public Response start(int id, LoginInfo loginInfo); /** * stop job */ - public ReturnT stop(int id, LoginInfo loginInfo); + public Response stop(int id, LoginInfo loginInfo); /** * trigger */ - public ReturnT trigger(LoginInfo loginInfo, int jobId, String executorParam, String addressList); + public Response trigger(LoginInfo loginInfo, int jobId, String executorParam, String addressList); /** * dashboard info diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java index 86f8e74c..f3b69e99 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java @@ -14,8 +14,7 @@ import com.xxl.job.admin.scheduler.type.ScheduleTypeEnum; import com.xxl.job.admin.service.XxlJobService; import com.xxl.job.admin.util.I18nUtil; import com.xxl.job.admin.util.JobGroupPermissionUtil; -import com.xxl.job.core.openapi.model.ReturnT; -import com.xxl.job.core.enums.ExecutorBlockStrategyEnum; +import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.sso.core.model.LoginInfo; import com.xxl.tool.core.DateTool; @@ -64,49 +63,49 @@ public class XxlJobServiceImpl implements XxlJobService { } @Override - public ReturnT add(XxlJobInfo jobInfo, LoginInfo loginInfo) { + public Response add(XxlJobInfo jobInfo, LoginInfo loginInfo) { // valid base XxlJobGroup group = xxlJobGroupMapper.load(jobInfo.getJobGroup()); if (group == null) { - return ReturnT.ofFail (I18nUtil.getString("system_please_choose")+I18nUtil.getString("jobinfo_field_jobgroup")); + return Response.ofFail (I18nUtil.getString("system_please_choose")+I18nUtil.getString("jobinfo_field_jobgroup")); } if (jobInfo.getJobDesc()==null || jobInfo.getJobDesc().trim().length()==0) { - return ReturnT.ofFail ( (I18nUtil.getString("system_please_input")+I18nUtil.getString("jobinfo_field_jobdesc")) ); + return Response.ofFail ( (I18nUtil.getString("system_please_input")+I18nUtil.getString("jobinfo_field_jobdesc")) ); } if (jobInfo.getAuthor()==null || jobInfo.getAuthor().trim().length()==0) { - return ReturnT.ofFail ( (I18nUtil.getString("system_please_input")+I18nUtil.getString("jobinfo_field_author")) ); + return Response.ofFail ( (I18nUtil.getString("system_please_input")+I18nUtil.getString("jobinfo_field_author")) ); } // valid trigger ScheduleTypeEnum scheduleTypeEnum = ScheduleTypeEnum.match(jobInfo.getScheduleType(), null); if (scheduleTypeEnum == null) { - return ReturnT.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); } if (scheduleTypeEnum == ScheduleTypeEnum.CRON) { if (jobInfo.getScheduleConf()==null || !CronExpression.isValidExpression(jobInfo.getScheduleConf())) { - return ReturnT.ofFail ( "Cron"+I18nUtil.getString("system_unvalid")); + return Response.ofFail ( "Cron"+I18nUtil.getString("system_unvalid")); } } else if (scheduleTypeEnum == ScheduleTypeEnum.FIX_RATE/* || scheduleTypeEnum == ScheduleTypeEnum.FIX_DELAY*/) { if (jobInfo.getScheduleConf() == null) { - return ReturnT.ofFail ( (I18nUtil.getString("schedule_type")) ); + return Response.ofFail ( (I18nUtil.getString("schedule_type")) ); } try { int fixSecond = Integer.valueOf(jobInfo.getScheduleConf()); if (fixSecond < 1) { - return ReturnT.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); } } catch (Exception e) { - return ReturnT.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); } } // valid job if (GlueTypeEnum.match(jobInfo.getGlueType()) == null) { - return ReturnT.ofFail ( (I18nUtil.getString("jobinfo_field_gluetype")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("jobinfo_field_gluetype")+I18nUtil.getString("system_unvalid")) ); } if (GlueTypeEnum.BEAN==GlueTypeEnum.match(jobInfo.getGlueType()) && (jobInfo.getExecutorHandler()==null || jobInfo.getExecutorHandler().trim().length()==0) ) { - return ReturnT.ofFail ( (I18nUtil.getString("system_please_input")+"JobHandler") ); + return Response.ofFail ( (I18nUtil.getString("system_please_input")+"JobHandler") ); } // 》fix "\r" in shell if (GlueTypeEnum.GLUE_SHELL==GlueTypeEnum.match(jobInfo.getGlueType()) && jobInfo.getGlueSource()!=null) { @@ -115,13 +114,13 @@ public class XxlJobServiceImpl implements XxlJobService { // valid advanced if (ExecutorRouteStrategyEnum.match(jobInfo.getExecutorRouteStrategy(), null) == null) { - return ReturnT.ofFail ( (I18nUtil.getString("jobinfo_field_executorRouteStrategy")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("jobinfo_field_executorRouteStrategy")+I18nUtil.getString("system_unvalid")) ); } if (MisfireStrategyEnum.match(jobInfo.getMisfireStrategy(), null) == null) { - return ReturnT.ofFail ( (I18nUtil.getString("misfire_strategy")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("misfire_strategy")+I18nUtil.getString("system_unvalid")) ); } if (ExecutorBlockStrategyEnum.match(jobInfo.getExecutorBlockStrategy(), null) == null) { - return ReturnT.ofFail ( (I18nUtil.getString("jobinfo_field_executorBlockStrategy")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("jobinfo_field_executorBlockStrategy")+I18nUtil.getString("system_unvalid")) ); } // 》ChildJobId valid @@ -131,16 +130,16 @@ public class XxlJobServiceImpl implements XxlJobService { if (childJobIdItem!=null && childJobIdItem.trim().length()>0 && isNumeric(childJobIdItem)) { XxlJobInfo childJobInfo = xxlJobInfoMapper.loadById(Integer.parseInt(childJobIdItem)); if (childJobInfo==null) { - return ReturnT.ofFail ( + return Response.ofFail ( MessageFormat.format((I18nUtil.getString("jobinfo_field_childJobId")+"({0})"+I18nUtil.getString("system_not_found")), childJobIdItem)); } // valid jobGroup permission if (!JobGroupPermissionUtil.hasJobGroupPermission(loginInfo, childJobInfo.getJobGroup())) { - return ReturnT.ofFail ( + return Response.ofFail ( MessageFormat.format((I18nUtil.getString("jobinfo_field_childJobId")+"({0})"+I18nUtil.getString("system_permission_limit")), childJobIdItem)); } } else { - return ReturnT.ofFail ( + return Response.ofFail ( MessageFormat.format((I18nUtil.getString("jobinfo_field_childJobId")+"({0})"+I18nUtil.getString("system_unvalid")), childJobIdItem)); } } @@ -163,10 +162,10 @@ public class XxlJobServiceImpl implements XxlJobService { jobInfo.setExecutorHandler(jobInfo.getExecutorHandler().trim()); xxlJobInfoMapper.save(jobInfo); if (jobInfo.getId() < 1) { - return ReturnT.ofFail ( (I18nUtil.getString("jobinfo_field_add")+I18nUtil.getString("system_fail")) ); + return Response.ofFail ( (I18nUtil.getString("jobinfo_field_add")+I18nUtil.getString("system_fail")) ); } - return ReturnT.ofSuccess(String.valueOf(jobInfo.getId())); + return Response.ofSuccess(String.valueOf(jobInfo.getId())); } private boolean isNumeric(String str){ @@ -179,48 +178,48 @@ public class XxlJobServiceImpl implements XxlJobService { } @Override - public ReturnT update(XxlJobInfo jobInfo, LoginInfo loginInfo) { + public Response update(XxlJobInfo jobInfo, LoginInfo loginInfo) { // valid base if (jobInfo.getJobDesc()==null || jobInfo.getJobDesc().trim().length()==0) { - return ReturnT.ofFail ( (I18nUtil.getString("system_please_input")+I18nUtil.getString("jobinfo_field_jobdesc")) ); + return Response.ofFail ( (I18nUtil.getString("system_please_input")+I18nUtil.getString("jobinfo_field_jobdesc")) ); } if (jobInfo.getAuthor()==null || jobInfo.getAuthor().trim().length()==0) { - return ReturnT.ofFail ( (I18nUtil.getString("system_please_input")+I18nUtil.getString("jobinfo_field_author")) ); + return Response.ofFail ( (I18nUtil.getString("system_please_input")+I18nUtil.getString("jobinfo_field_author")) ); } // valid trigger ScheduleTypeEnum scheduleTypeEnum = ScheduleTypeEnum.match(jobInfo.getScheduleType(), null); if (scheduleTypeEnum == null) { - return ReturnT.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); } if (scheduleTypeEnum == ScheduleTypeEnum.CRON) { if (jobInfo.getScheduleConf()==null || !CronExpression.isValidExpression(jobInfo.getScheduleConf())) { - return ReturnT.ofFail ( "Cron"+I18nUtil.getString("system_unvalid") ); + return Response.ofFail ( "Cron"+I18nUtil.getString("system_unvalid") ); } } else if (scheduleTypeEnum == ScheduleTypeEnum.FIX_RATE /*|| scheduleTypeEnum == ScheduleTypeEnum.FIX_DELAY*/) { if (jobInfo.getScheduleConf() == null) { - return ReturnT.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); } try { int fixSecond = Integer.valueOf(jobInfo.getScheduleConf()); if (fixSecond < 1) { - return ReturnT.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); } } catch (Exception e) { - return ReturnT.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); } } // valid advanced if (ExecutorRouteStrategyEnum.match(jobInfo.getExecutorRouteStrategy(), null) == null) { - return ReturnT.ofFail ( (I18nUtil.getString("jobinfo_field_executorRouteStrategy")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("jobinfo_field_executorRouteStrategy")+I18nUtil.getString("system_unvalid")) ); } if (MisfireStrategyEnum.match(jobInfo.getMisfireStrategy(), null) == null) { - return ReturnT.ofFail ( (I18nUtil.getString("misfire_strategy")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("misfire_strategy")+I18nUtil.getString("system_unvalid")) ); } if (ExecutorBlockStrategyEnum.match(jobInfo.getExecutorBlockStrategy(), null) == null) { - return ReturnT.ofFail ( (I18nUtil.getString("jobinfo_field_executorBlockStrategy")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("jobinfo_field_executorBlockStrategy")+I18nUtil.getString("system_unvalid")) ); } // 》ChildJobId valid @@ -231,22 +230,22 @@ public class XxlJobServiceImpl implements XxlJobService { // parse child int childJobId = Integer.parseInt(childJobIdItem); if (childJobId == jobInfo.getId()) { - return ReturnT.ofFail ( (I18nUtil.getString("jobinfo_field_childJobId")+"("+childJobId+")"+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("jobinfo_field_childJobId")+"("+childJobId+")"+I18nUtil.getString("system_unvalid")) ); } // valid child XxlJobInfo childJobInfo = xxlJobInfoMapper.loadById(childJobId); if (childJobInfo==null) { - return ReturnT.ofFail ( + return Response.ofFail ( MessageFormat.format((I18nUtil.getString("jobinfo_field_childJobId")+"({0})"+I18nUtil.getString("system_not_found")), childJobIdItem)); } // valid jobGroup permission if (!JobGroupPermissionUtil.hasJobGroupPermission(loginInfo, childJobInfo.getJobGroup())) { - return ReturnT.ofFail ( + return Response.ofFail ( MessageFormat.format((I18nUtil.getString("jobinfo_field_childJobId")+"({0})"+I18nUtil.getString("system_permission_limit")), childJobIdItem)); } } else { - return ReturnT.ofFail ( + return Response.ofFail ( MessageFormat.format((I18nUtil.getString("jobinfo_field_childJobId")+"({0})"+I18nUtil.getString("system_unvalid")), childJobIdItem)); } } @@ -264,13 +263,13 @@ public class XxlJobServiceImpl implements XxlJobService { // group valid XxlJobGroup jobGroup = xxlJobGroupMapper.load(jobInfo.getJobGroup()); if (jobGroup == null) { - return ReturnT.ofFail ( (I18nUtil.getString("jobinfo_field_jobgroup")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("jobinfo_field_jobgroup")+I18nUtil.getString("system_unvalid")) ); } // stage job info XxlJobInfo exists_jobInfo = xxlJobInfoMapper.loadById(jobInfo.getId()); if (exists_jobInfo == null) { - return ReturnT.ofFail ( (I18nUtil.getString("jobinfo_field_id")+I18nUtil.getString("system_not_found")) ); + return Response.ofFail ( (I18nUtil.getString("jobinfo_field_id")+I18nUtil.getString("system_not_found")) ); } // next trigger time (5s后生效，避开预读周期) @@ -282,12 +281,12 @@ public class XxlJobServiceImpl implements XxlJobService { // generate next trigger time Date nextValidTime = scheduleTypeEnum.getScheduleType().generateNextTriggerTime(jobInfo, new Date(System.currentTimeMillis() + JobScheduleHelper.PRE_READ_MS)); if (nextValidTime == null) { - return ReturnT.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); } nextTriggerTime = nextValidTime.getTime(); } catch (Exception e) { logger.error(e.getMessage(), e); - return ReturnT.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); } } @@ -311,46 +310,45 @@ public class XxlJobServiceImpl implements XxlJobService { exists_jobInfo.setUpdateTime(new Date()); xxlJobInfoMapper.update(exists_jobInfo); - - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } @Override - public ReturnT remove(int id, LoginInfo loginInfo) { + public Response remove(int id, LoginInfo loginInfo) { // valid job XxlJobInfo xxlJobInfo = xxlJobInfoMapper.loadById(id); if (xxlJobInfo == null) { - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } // valid jobGroup permission if (!JobGroupPermissionUtil.hasJobGroupPermission(loginInfo, xxlJobInfo.getJobGroup())) { - return ReturnT.ofFail(I18nUtil.getString("system_permission_limit")); + return Response.ofFail(I18nUtil.getString("system_permission_limit")); } xxlJobInfoMapper.delete(id); xxlJobLogMapper.delete(id); xxlJobLogGlueMapper.deleteByJobId(id); - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } @Override - public ReturnT start(int id, LoginInfo loginInfo) { + public Response start(int id, LoginInfo loginInfo) { // load and valid XxlJobInfo xxlJobInfo = xxlJobInfoMapper.loadById(id); if (xxlJobInfo == null) { - return ReturnT.ofFail(I18nUtil.getString("jobinfo_glue_jobid_unvalid")); + return Response.ofFail(I18nUtil.getString("jobinfo_glue_jobid_unvalid")); } // valid jobGroup permission if (!JobGroupPermissionUtil.hasJobGroupPermission(loginInfo, xxlJobInfo.getJobGroup())) { - return ReturnT.ofFail(I18nUtil.getString("system_permission_limit")); + return Response.ofFail(I18nUtil.getString("system_permission_limit")); } // valid ScheduleType: can not be none ScheduleTypeEnum scheduleTypeEnum = ScheduleTypeEnum.match(xxlJobInfo.getScheduleType(), ScheduleTypeEnum.NONE); if (ScheduleTypeEnum.NONE == scheduleTypeEnum) { - return ReturnT.ofFail(I18nUtil.getString("schedule_type_none_limit_start")); + return Response.ofFail(I18nUtil.getString("schedule_type_none_limit_start")); } // next trigger time (5s后生效，避开预读周期) @@ -360,12 +358,12 @@ public class XxlJobServiceImpl implements XxlJobService { Date nextValidTime = scheduleTypeEnum.getScheduleType().generateNextTriggerTime(xxlJobInfo, new Date(System.currentTimeMillis() + JobScheduleHelper.PRE_READ_MS)); if (nextValidTime == null) { - return ReturnT.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); } nextTriggerTime = nextValidTime.getTime(); } catch (Exception e) { logger.error(e.getMessage(), e); - return ReturnT.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); + return Response.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) ); } xxlJobInfo.setTriggerStatus(1); @@ -374,20 +372,20 @@ public class XxlJobServiceImpl implements XxlJobService { xxlJobInfo.setUpdateTime(new Date()); xxlJobInfoMapper.update(xxlJobInfo); - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } @Override - public ReturnT stop(int id, LoginInfo loginInfo) { + public Response stop(int id, LoginInfo loginInfo) { // load and valid XxlJobInfo xxlJobInfo = xxlJobInfoMapper.loadById(id); if (xxlJobInfo == null) { - return ReturnT.ofFail(I18nUtil.getString("jobinfo_glue_jobid_unvalid")); + return Response.ofFail(I18nUtil.getString("jobinfo_glue_jobid_unvalid")); } // valid jobGroup permission if (!JobGroupPermissionUtil.hasJobGroupPermission(loginInfo, xxlJobInfo.getJobGroup())) { - return ReturnT.ofFail(I18nUtil.getString("system_permission_limit")); + return Response.ofFail(I18nUtil.getString("system_permission_limit")); } // stop @@ -397,22 +395,20 @@ public class XxlJobServiceImpl implements XxlJobService { xxlJobInfo.setUpdateTime(new Date()); xxlJobInfoMapper.update(xxlJobInfo); - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } - - @Override - public ReturnT trigger(LoginInfo loginInfo, int jobId, String executorParam, String addressList) { + public Response trigger(LoginInfo loginInfo, int jobId, String executorParam, String addressList) { // valid job XxlJobInfo xxlJobInfo = xxlJobInfoMapper.loadById(jobId); if (xxlJobInfo == null) { - return ReturnT.ofFail(I18nUtil.getString("jobinfo_glue_jobid_unvalid")); + return Response.ofFail(I18nUtil.getString("jobinfo_glue_jobid_unvalid")); } // valid jobGroup permission if (!JobGroupPermissionUtil.hasJobGroupPermission(loginInfo, xxlJobInfo.getJobGroup())) { - return ReturnT.ofFail(I18nUtil.getString("system_permission_limit")); + return Response.ofFail(I18nUtil.getString("system_permission_limit")); } // force cover job param @@ -421,7 +417,7 @@ public class XxlJobServiceImpl implements XxlJobService { } XxlJobAdminBootstrap.getInstance().getJobTriggerPoolHelper().trigger(jobId, TriggerTypeEnum.MANUAL, -1, null, executorParam, addressList); - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } @Override diff --git a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js index fdcc24c4..047a50dd 100644 --- a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js +++ b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js @@ -361,9 +361,9 @@ $(function() { }); } else { var html = '
'; - if (data.code == 200 && data.content) { - for (var index in data.content) { - html += '' + data.content[index] + '
'; + if (data.code == 200 && data.data) { + for (var index in data.data) { + html += '' + data.data[index] + '
'; } } html += '
'; diff --git a/xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js b/xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js index 0638eee2..82be6793 100644 --- a/xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js +++ b/xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js @@ -32,19 +32,19 @@ $(function() { success : function(data){ if (data.code == 200) { - if (!data.content) { + if (!data.data) { console.log('pullLog fail'); return; } - if (fromLineNum != data.content.fromLineNum) { + if (fromLineNum != data.data.fromLineNum) { console.log('pullLog fromLineNum not match'); return; } - if (fromLineNum > data.content.toLineNum ) { + if (fromLineNum > data.data.toLineNum ) { console.log('pullLog already line-end'); // valid end - if (data.content.end) { + if (data.data.end) { logRunStop('
[Rolling Log Finish]'); return; } @@ -53,8 +53,8 @@ $(function() { } // append content - fromLineNum = data.content.toLineNum + 1; - $('#logConsole').append(data.content.logContent); + fromLineNum = data.data.toLineNum + 1; + $('#logConsole').append(data.data.logContent); pullFailCount = 0; // scroll to bottom diff --git a/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js b/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js index 3922d7cd..2a7de4fd 100755 --- a/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js +++ b/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js @@ -650,7 +650,7 @@ dataType : "json", success : function(data){ if (data.code === 200) { - $('#runTime').val(data.content.join("\n")); + $('#runTime').val(data.data.join("\n")); } else { $('#runTime').val(data.msg); } diff --git a/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js b/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js index 0e2335d5..8b54bc9d 100755 --- a/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js +++ b/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js @@ -647,7 +647,7 @@ dataType : "json", success : function(data){ if (data.code === 200) { - $('#runTime').val(data.content.join("\n")); + $('#runTime').val(data.data.join("\n")); } else { $('#runTime').val(data.msg); } diff --git a/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java index 3b122928..bd3f66e9 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java @@ -1,13 +1,15 @@ package com.xxl.job.adminbiz; import com.xxl.job.core.openapi.AdminBiz; -import com.xxl.job.core.openapi.client.AdminBizClient; import com.xxl.job.core.openapi.model.HandleCallbackRequest; import com.xxl.job.core.openapi.model.RegistryRequest; import com.xxl.job.core.context.XxlJobContext; -import com.xxl.job.core.enums.RegistryConfig; +import com.xxl.job.core.constant.Const; +import com.xxl.tool.http.HttpTool; import com.xxl.tool.response.Response; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Arrays; import java.util.List; @@ -20,16 +22,26 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * @author xuxueli 2017-07-28 22:14:52 */ public class AdminBizTest { + private static final Logger logger = LoggerFactory.getLogger(AdminBizTest.class); // admin-client - private static String addressUrl = "http://127.0.0.1:8080/xxl-job-admin/"; - private static String accessToken = null; - private static int timeoutSecond = 3; + private static String addressUrl = "http://127.0.0.1:8080/xxl-job-admin"; + private static String accessToken = "default_token"; + + private AdminBiz buildClient(){ + String finalUrl = addressUrl + "/api"; + + return HttpTool.createClient() + .url(finalUrl) + .timeout(3 * 1000) + .header(Const.XXL_JOB_ACCESS_TOKEN, accessToken) + .proxy(AdminBiz.class); + } @Test public void callback() throws Exception { - AdminBiz adminBiz = new AdminBizClient(addressUrl, accessToken, timeoutSecond); + AdminBiz adminBiz = buildClient(); HandleCallbackRequest param = new HandleCallbackRequest(); param.setLogId(1); @@ -38,7 +50,6 @@ public class AdminBizTest { List callbackParamList = Arrays.asList(param); Response returnT = adminBiz.callback(callbackParamList); - assertTrue(returnT.isSuccess()); } @@ -49,11 +60,11 @@ public class AdminBizTest { */ @Test public void registry() throws Exception { - AdminBiz adminBiz = new AdminBizClient(addressUrl, accessToken, timeoutSecond); + AdminBiz adminBiz = buildClient(); - RegistryRequest registryParam = new RegistryRequest(RegistryConfig.RegistType.EXECUTOR.name(), "xxl-job-executor-example", "127.0.0.1:9999"); - Response returnT = adminBiz.registry(registryParam); + RegistryRequest registryParam = new RegistryRequest(Const.RegistType.EXECUTOR.name(), "xxl-job-executor-example", "127.0.0.1:9999"); + Response returnT = adminBiz.registry(registryParam); assertTrue(returnT.isSuccess()); } @@ -64,11 +75,11 @@ public class AdminBizTest { */ @Test public void registryRemove() throws Exception { - AdminBiz adminBiz = new AdminBizClient(addressUrl, accessToken, timeoutSecond); + AdminBiz adminBiz = buildClient(); - RegistryRequest registryParam = new RegistryRequest(RegistryConfig.RegistType.EXECUTOR.name(), "xxl-job-executor-example", "127.0.0.1:9999"); - Response returnT = adminBiz.registryRemove(registryParam); + RegistryRequest registryParam = new RegistryRequest(Const.RegistType.EXECUTOR.name(), "xxl-job-executor-example", "127.0.0.1:9999"); + Response returnT = adminBiz.registryRemove(registryParam); assertTrue(returnT.isSuccess()); } diff --git a/xxl-job-admin/src/test/java/com/xxl/job/executorbiz/ExecutorBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/executorbiz/ExecutorBizTest.java index ab7564bb..687e183d 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/executorbiz/ExecutorBizTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/executorbiz/ExecutorBizTest.java @@ -3,7 +3,7 @@ package com.xxl.job.executorbiz; import com.xxl.job.core.openapi.ExecutorBiz; import com.xxl.job.core.openapi.client.ExecutorBizClient; import com.xxl.job.core.openapi.model.*; -import com.xxl.job.core.enums.ExecutorBlockStrategyEnum; +import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.tool.response.Response; import org.junit.jupiter.api.Assertions; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/enums/RegistryConfig.java b/xxl-job-core/src/main/java/com/xxl/job/core/constant/Const.java similarity index 53% rename from xxl-job-core/src/main/java/com/xxl/job/core/enums/RegistryConfig.java rename to xxl-job-core/src/main/java/com/xxl/job/core/constant/Const.java index ddf024cd..031d66c3 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/enums/RegistryConfig.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/constant/Const.java @@ -1,9 +1,19 @@ -package com.xxl.job.core.enums; +package com.xxl.job.core.constant; /** * Created by xuxueli on 17/5/10. */ -public class RegistryConfig { +public class Const { + + // ---------------------- for openapi ---------------------- + + /** + * access token + */ + public static final String XXL_JOB_ACCESS_TOKEN = "XXL-JOB-ACCESS-TOKEN"; + + + // ---------------------- for registry ---------------------- /** * registry beat interval, default 30s diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java b/xxl-job-core/src/main/java/com/xxl/job/core/constant/ExecutorBlockStrategyEnum.java similarity index 96% rename from xxl-job-core/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java rename to xxl-job-core/src/main/java/com/xxl/job/core/constant/ExecutorBlockStrategyEnum.java index a9dc1bea..c1975eda 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/constant/ExecutorBlockStrategyEnum.java @@ -1,4 +1,4 @@ -package com.xxl.job.core.enums; +package com.xxl.job.core.constant; /** * Created by xuxueli on 17/5/9. diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/client/AdminBizClient.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/client/AdminBizClient.java deleted file mode 100644 index 08a7aa9f..00000000 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/client/AdminBizClient.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.xxl.job.core.openapi.client; - -import com.xxl.job.core.openapi.AdminBiz; -import com.xxl.job.core.openapi.model.HandleCallbackRequest; -import com.xxl.job.core.openapi.model.RegistryRequest; -import com.xxl.job.core.util.XxlJobRemotingUtil; -import com.xxl.tool.response.Response; - -import java.util.List; - -/** - * admin api test - * - * @author xuxueli 2017-07-28 22:14:52 - */ -public class AdminBizClient implements AdminBiz { - - public AdminBizClient() { - } - public AdminBizClient(String addressUrl, String accessToken, int timeout) { - this.addressUrl = addressUrl; - this.accessToken = accessToken; - this.timeout = timeout; - - // valid - if (!this.addressUrl.endsWith("/")) { - this.addressUrl = this.addressUrl + "/"; - } - if (!(this.timeout >=1 && this.timeout <= 10)) { - this.timeout = 3; - } - } - - private String addressUrl ; - private String accessToken; - private int timeout; - - - @Override - public Response callback(List handleCallbackRequestList) { - return XxlJobRemotingUtil.postBody(addressUrl+"api/callback", accessToken, timeout, handleCallbackRequestList, String.class); - } - - @Override - public Response registry(RegistryRequest registryRequest) { - return XxlJobRemotingUtil.postBody(addressUrl + "api/registry", accessToken, timeout, registryRequest, String.class); - } - - @Override - public Response registryRemove(RegistryRequest registryRequest) { - return XxlJobRemotingUtil.postBody(addressUrl + "api/registryRemove", accessToken, timeout, registryRequest, String.class); - } - -} diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/impl/ExecutorBizImpl.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/impl/ExecutorBizImpl.java index 38c289b4..c5afe7db 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/impl/ExecutorBizImpl.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/impl/ExecutorBizImpl.java @@ -3,7 +3,7 @@ package com.xxl.job.core.openapi.impl; import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.openapi.ExecutorBiz; import com.xxl.job.core.openapi.model.*; -import com.xxl.job.core.enums.ExecutorBlockStrategyEnum; +import com.xxl.job.core.constant.ExecutorBlockStrategyEnum; import com.xxl.job.core.executor.XxlJobExecutor; import com.xxl.job.core.glue.GlueFactory; import com.xxl.job.core.glue.GlueTypeEnum; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/ReturnT.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/ReturnT.java deleted file mode 100644 index f86e1825..00000000 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/ReturnT.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.xxl.job.core.openapi.model; - -import java.io.Serializable; - -/** - * common return - * - * @author xuxueli 2015-12-4 16:32:31 - * @param - */ -public class ReturnT implements Serializable { - public static final long serialVersionUID = 42L; - - private int code; - - private String msg; - - private T content; - - public ReturnT(){} - - public ReturnT(int code, String msg) { - this.code = code; - this.msg = msg; - } - - public ReturnT(int code, String msg, T content) { - this.code = code; - this.msg = msg; - this.content = content; - } - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - - public T getContent() { - return content; - } - - public void setContent(T content) { - this.content = content; - } - - @Override - public String toString() { - return "ReturnT{" + - "code=" + code + - ", msg='" + msg + '\'' + - ", content=" + content + - '}'; - } - - - // --------------------------- tool --------------------------- - - public static final int SUCCESS_CODE = 200; - public static final int FAIL_CODE = 500; - - /** - * is success - * - * @return - */ - public boolean isSuccess() { - return code == SUCCESS_CODE; - } - - public static ReturnT of(int code, String msg, T data) { - return new ReturnT(code, msg, data); - } - public static ReturnT of(int code, String msg) { - return new ReturnT(code, msg, null); - } - - public static ReturnT ofSuccess(T data) { - return new ReturnT(SUCCESS_CODE, "Success", data); - } - - public static ReturnT ofSuccess() { - return new ReturnT(SUCCESS_CODE, "Success", null); - } - - public static ReturnT ofFail(String msg) { - return new ReturnT(FAIL_CODE, msg, null); - } - public static ReturnT ofFail() { - return new ReturnT(FAIL_CODE, "Fail", null); - } - -} diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java b/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java index 5b828ff3..11e54d0c 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java @@ -7,6 +7,7 @@ import com.xxl.job.core.thread.ExecutorRegistryThread; import com.xxl.job.core.util.XxlJobRemotingUtil; import com.xxl.tool.exception.ThrowableTool; import com.xxl.tool.gson.GsonTool; +import com.xxl.tool.response.Response; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.Unpooled; import io.netty.channel.*; @@ -169,15 +170,15 @@ public class EmbedServer { private Object dispatchRequest(HttpMethod httpMethod, String uri, String requestData, String accessTokenReq) { // valid if (HttpMethod.POST != httpMethod) { - return ReturnT.ofFail("invalid request, HttpMethod not support."); + return Response.ofFail("invalid request, HttpMethod not support."); } if (uri == null || uri.trim().isEmpty()) { - return ReturnT.ofFail( "invalid request, uri-mapping empty."); + return Response.ofFail( "invalid request, uri-mapping empty."); } if (accessToken != null && !accessToken.trim().isEmpty() && !accessToken.equals(accessTokenReq)) { - return ReturnT.ofFail("The access token is wrong."); + return Response.ofFail("The access token is wrong."); } // services mapping @@ -198,11 +199,11 @@ public class EmbedServer { LogRequest logParam = GsonTool.fromJson(requestData, LogRequest.class); return executorBiz.log(logParam); default: - return ReturnT.ofFail( "invalid request, uri-mapping(" + uri + ") not found."); + return Response.ofFail( "invalid request, uri-mapping(" + uri + ") not found."); } } catch (Throwable e) { logger.error(e.getMessage(), e); - return ReturnT.ofFail("request error:" + ThrowableTool.toString(e)); + return Response.ofFail("request error:" + ThrowableTool.toString(e)); } } diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java index 9f3035ab..b998528b 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java @@ -2,7 +2,7 @@ package com.xxl.job.core.thread; import com.xxl.job.core.openapi.AdminBiz; import com.xxl.job.core.openapi.model.RegistryRequest; -import com.xxl.job.core.enums.RegistryConfig; +import com.xxl.job.core.constant.Const; import com.xxl.job.core.executor.XxlJobExecutor; import com.xxl.tool.response.Response; import org.slf4j.Logger; @@ -42,7 +42,7 @@ public class ExecutorRegistryThread { // registry while (!toStop) { try { - RegistryRequest registryParam = new RegistryRequest(RegistryConfig.RegistType.EXECUTOR.name(), appname, address); + RegistryRequest registryParam = new RegistryRequest(Const.RegistType.EXECUTOR.name(), appname, address); for (AdminBiz adminBiz: XxlJobExecutor.getAdminBizList()) { try { Response registryResult = adminBiz.registry(registryParam); @@ -67,7 +67,7 @@ public class ExecutorRegistryThread { try { if (!toStop) { - TimeUnit.SECONDS.sleep(RegistryConfig.BEAT_TIMEOUT); + TimeUnit.SECONDS.sleep(Const.BEAT_TIMEOUT); } } catch (Throwable e) { if (!toStop) { @@ -78,7 +78,7 @@ public class ExecutorRegistryThread { // registry remove try { - RegistryRequest registryParam = new RegistryRequest(RegistryConfig.RegistType.EXECUTOR.name(), appname, address); + RegistryRequest registryParam = new RegistryRequest(Const.RegistType.EXECUTOR.name(), appname, address); for (AdminBiz adminBiz: XxlJobExecutor.getAdminBizList()) { try { Response registryResult = adminBiz.registryRemove(registryParam); diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java index 85ccd8aa..434917ac 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java @@ -4,7 +4,7 @@ import com.xxl.job.core.openapi.AdminBiz; import com.xxl.job.core.openapi.model.HandleCallbackRequest; import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.context.XxlJobHelper; -import com.xxl.job.core.enums.RegistryConfig; +import com.xxl.job.core.constant.Const; import com.xxl.job.core.executor.XxlJobExecutor; import com.xxl.job.core.log.XxlJobFileAppender; import com.xxl.tool.core.ArrayTool; @@ -132,7 +132,7 @@ public class TriggerCallbackThread { } try { - TimeUnit.SECONDS.sleep(RegistryConfig.BEAT_TIMEOUT); + TimeUnit.SECONDS.sleep(Const.BEAT_TIMEOUT); } catch (Throwable e) { if (!toStop) { logger.error(e.getMessage(), e); diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/deprecated/AdminBizClient.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/deprecated/AdminBizClient.java new file mode 100644 index 00000000..99e4718e --- /dev/null +++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/deprecated/AdminBizClient.java @@ -0,0 +1,54 @@ +//package com.xxl.job.core.openapi.client; +// +//import com.xxl.job.core.openapi.AdminBiz; +//import com.xxl.job.core.openapi.model.HandleCallbackRequest; +//import com.xxl.job.core.openapi.model.RegistryRequest; +//import com.xxl.job.core.util.XxlJobRemotingUtil; +//import com.xxl.tool.response.Response; +// +//import java.util.List; +// +///** +// * admin api test +// * +// * @author xuxueli 2017-07-28 22:14:52 +// */ +//public class AdminBizClient implements AdminBiz { +// +// public AdminBizClient() { +// } +// public AdminBizClient(String addressUrl, String accessToken, int timeout) { +// this.addressUrl = addressUrl; +// this.accessToken = accessToken; +// this.timeout = timeout; +// +// // valid +// if (!this.addressUrl.endsWith("/")) { +// this.addressUrl = this.addressUrl + "/"; +// } +// if (!(this.timeout >=1 && this.timeout <= 10)) { +// this.timeout = 3; +// } +// } +// +// private String addressUrl ; +// private String accessToken; +// private int timeout; +// +// +// @Override +// public Response callback(List handleCallbackRequestList) { +// return XxlJobRemotingUtil.postBody(addressUrl+"api/callback", accessToken, timeout, handleCallbackRequestList, String.class); +// } +// +// @Override +// public Response registry(RegistryRequest registryRequest) { +// return XxlJobRemotingUtil.postBody(addressUrl + "api/registry", accessToken, timeout, registryRequest, String.class); +// } +// +// @Override +// public Response registryRemove(RegistryRequest registryRequest) { +// return XxlJobRemotingUtil.postBody(addressUrl + "api/registryRemove", accessToken, timeout, registryRequest, String.class); +// } +// +//} diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/deprecated/ReturnT.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/deprecated/ReturnT.java new file mode 100644 index 00000000..e7a07cd0 --- /dev/null +++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/deprecated/ReturnT.java @@ -0,0 +1,103 @@ +//package com.xxl.job.core.openapi.model; +// +//import java.io.Serializable; +// +///** +// * common return +// * +// * @author xuxueli 2015-12-4 16:32:31 +// * @param +// */ +//public class ReturnT implements Serializable { +// public static final long serialVersionUID = 42L; +// +// private int code; +// +// private String msg; +// +// private T content; +// +// public ReturnT(){} +// +// public ReturnT(int code, String msg) { +// this.code = code; +// this.msg = msg; +// } +// +// public ReturnT(int code, String msg, T content) { +// this.code = code; +// this.msg = msg; +// this.content = content; +// } +// +// public int getCode() { +// return code; +// } +// +// public void setCode(int code) { +// this.code = code; +// } +// +// public String getMsg() { +// return msg; +// } +// +// public void setMsg(String msg) { +// this.msg = msg; +// } +// +// public T getContent() { +// return content; +// } +// +// public void setContent(T content) { +// this.content = content; +// } +// +// @Override +// public String toString() { +// return "ReturnT{" + +// "code=" + code + +// ", msg='" + msg + '\'' + +// ", content=" + content + +// '}'; +// } +// +// +// // --------------------------- tool --------------------------- +// +// public static final int SUCCESS_CODE = 200; +// public static final int FAIL_CODE = 500; +// +// /** +// * is success +// * +// * @return +// */ +// public boolean isSuccess() { +// return code == SUCCESS_CODE; +// } +// +// public static ReturnT of(int code, String msg, T data) { +// return new ReturnT(code, msg, data); +// } +// public static ReturnT of(int code, String msg) { +// return new ReturnT(code, msg, null); +// } +// +// public static ReturnT ofSuccess(T data) { +// return new ReturnT(SUCCESS_CODE, "Success", data); +// } +// +// public static ReturnT ofSuccess() { +// return new ReturnT(SUCCESS_CODE, "Success", null); +// } +// +// public static ReturnT ofFail(String msg) { +// return new ReturnT(FAIL_CODE, msg, null); +// } +// public static ReturnT ofFail() { +// return new ReturnT(FAIL_CODE, "Fail", null); +// } +// +//}