diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java index a9d901a..f46f905 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java @@ -1,7 +1,8 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.service.IXxlJobService; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -19,13 +21,19 @@ @Controller @RequestMapping("/jobinfo") public class JobInfoController { - + + @Resource + private IXxlJobGroupDao xxlJobGroupDao; @Resource private IXxlJobService xxlJobService; @RequestMapping public String index(Model model) { - model.addAttribute("JobGroupList", JobGroupEnum.values()); // 任务组列表 + + // 任务组 + List jobGroupList = xxlJobGroupDao.findAll(); + + model.addAttribute("JobGroupList", jobGroupList); return "jobinfo/jobinfo.index"; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java index a9d901a..f46f905 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java @@ -1,7 +1,8 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.service.IXxlJobService; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -19,13 +21,19 @@ @Controller @RequestMapping("/jobinfo") public class JobInfoController { - + + @Resource + private IXxlJobGroupDao xxlJobGroupDao; @Resource private IXxlJobService xxlJobService; @RequestMapping public String index(Model model) { - model.addAttribute("JobGroupList", JobGroupEnum.values()); // 任务组列表 + + // 任务组 + List jobGroupList = xxlJobGroupDao.findAll(); + + model.addAttribute("JobGroupList", jobGroupList); return "jobinfo/jobinfo.index"; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java index 20ffa95..f5cac1e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java @@ -1,9 +1,10 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.model.XxlJobLog; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.dao.IXxlJobInfoDao; import com.xxl.job.admin.dao.IXxlJobLogDao; import com.xxl.job.core.router.HandlerRouter.ActionRepository; @@ -34,15 +35,21 @@ public class JobLogController { @Resource - public IXxlJobLogDao xxlJobLogDao; + private IXxlJobGroupDao xxlJobGroupDao; @Resource public IXxlJobInfoDao xxlJobInfoDao; - + @Resource + public IXxlJobLogDao xxlJobLogDao; + @RequestMapping public String index(Model model, String jobGroup, String jobName) { + + // 任务组 + List jobGroupList = xxlJobGroupDao.findAll(); + model.addAttribute("jobGroup", jobGroup); model.addAttribute("jobName", jobName); - model.addAttribute("JobGroupList", JobGroupEnum.values()); + model.addAttribute("JobGroupList", jobGroupList); return "joblog/joblog.index"; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java index a9d901a..f46f905 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java @@ -1,7 +1,8 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.service.IXxlJobService; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -19,13 +21,19 @@ @Controller @RequestMapping("/jobinfo") public class JobInfoController { - + + @Resource + private IXxlJobGroupDao xxlJobGroupDao; @Resource private IXxlJobService xxlJobService; @RequestMapping public String index(Model model) { - model.addAttribute("JobGroupList", JobGroupEnum.values()); // 任务组列表 + + // 任务组 + List jobGroupList = xxlJobGroupDao.findAll(); + + model.addAttribute("JobGroupList", jobGroupList); return "jobinfo/jobinfo.index"; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java index 20ffa95..f5cac1e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java @@ -1,9 +1,10 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.model.XxlJobLog; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.dao.IXxlJobInfoDao; import com.xxl.job.admin.dao.IXxlJobLogDao; import com.xxl.job.core.router.HandlerRouter.ActionRepository; @@ -34,15 +35,21 @@ public class JobLogController { @Resource - public IXxlJobLogDao xxlJobLogDao; + private IXxlJobGroupDao xxlJobGroupDao; @Resource public IXxlJobInfoDao xxlJobInfoDao; - + @Resource + public IXxlJobLogDao xxlJobLogDao; + @RequestMapping public String index(Model model, String jobGroup, String jobName) { + + // 任务组 + List jobGroupList = xxlJobGroupDao.findAll(); + model.addAttribute("jobGroup", jobGroup); model.addAttribute("jobName", jobName); - model.addAttribute("JobGroupList", JobGroupEnum.values()); + model.addAttribute("JobGroupList", jobGroupList); return "joblog/joblog.index"; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java deleted file mode 100644 index 210a518..0000000 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.xxl.job.admin.core.constant; - -/** - * job group - * @author xuxueli 2016-1-15 14:23:05 - */ -public class Constants { - - public enum JobGroupEnum{ - defaults("默认"), - waimai("外卖"), - movie("电影"); - private String desc; - private JobGroupEnum(String desc){ - this.desc = desc; - } - public String getDesc() { - return desc; - } - public static JobGroupEnum match(String name){ - if (name==null || name.trim().length()==0) { - return null; - } - for (JobGroupEnum group : JobGroupEnum.values()) { - if (group.name().equals(name)) { - return group; - } - } - return null; - } - } -} diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java index a9d901a..f46f905 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java @@ -1,7 +1,8 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.service.IXxlJobService; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -19,13 +21,19 @@ @Controller @RequestMapping("/jobinfo") public class JobInfoController { - + + @Resource + private IXxlJobGroupDao xxlJobGroupDao; @Resource private IXxlJobService xxlJobService; @RequestMapping public String index(Model model) { - model.addAttribute("JobGroupList", JobGroupEnum.values()); // 任务组列表 + + // 任务组 + List jobGroupList = xxlJobGroupDao.findAll(); + + model.addAttribute("JobGroupList", jobGroupList); return "jobinfo/jobinfo.index"; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java index 20ffa95..f5cac1e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java @@ -1,9 +1,10 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.model.XxlJobLog; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.dao.IXxlJobInfoDao; import com.xxl.job.admin.dao.IXxlJobLogDao; import com.xxl.job.core.router.HandlerRouter.ActionRepository; @@ -34,15 +35,21 @@ public class JobLogController { @Resource - public IXxlJobLogDao xxlJobLogDao; + private IXxlJobGroupDao xxlJobGroupDao; @Resource public IXxlJobInfoDao xxlJobInfoDao; - + @Resource + public IXxlJobLogDao xxlJobLogDao; + @RequestMapping public String index(Model model, String jobGroup, String jobName) { + + // 任务组 + List jobGroupList = xxlJobGroupDao.findAll(); + model.addAttribute("jobGroup", jobGroup); model.addAttribute("jobName", jobName); - model.addAttribute("JobGroupList", JobGroupEnum.values()); + model.addAttribute("JobGroupList", jobGroupList); return "joblog/joblog.index"; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java deleted file mode 100644 index 210a518..0000000 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.xxl.job.admin.core.constant; - -/** - * job group - * @author xuxueli 2016-1-15 14:23:05 - */ -public class Constants { - - public enum JobGroupEnum{ - defaults("默认"), - waimai("外卖"), - movie("电影"); - private String desc; - private JobGroupEnum(String desc){ - this.desc = desc; - } - public String getDesc() { - return desc; - } - public static JobGroupEnum match(String name){ - if (name==null || name.trim().length()==0) { - return null; - } - for (JobGroupEnum group : JobGroupEnum.values()) { - if (group.name().equals(name)) { - return group; - } - } - return null; - } - } -} diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java index deffff3..52238bf 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java @@ -1,6 +1,6 @@ package com.xxl.job.admin.core.thread; -import com.xxl.job.admin.core.constant.Constants; +import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.model.XxlJobLog; import com.xxl.job.admin.core.util.DynamicSchedulerUtil; @@ -59,8 +59,8 @@ Set emailSet = new HashSet(Arrays.asList(info.getAlarmEmail().split(","))); for (String email: emailSet) { String title = "《调度监控报警-任务调度中心XXL-JOB》"; - String content = MessageFormat.format("任务调度失败, 任务组:{0}, 任务描述:{1}.", - Constants.JobGroupEnum.match(info.getJobGroup()).getDesc(), info.getJobDesc()); + XxlJobGroup group = DynamicSchedulerUtil.xxlJobGroupDao.load(info.getJobGroup()); + String content = MessageFormat.format("任务调度失败, 执行器名称:{0}, 任务描述:{1}.", group!=null?group.getTitle():"null", info.getJobDesc()); MailUtil.sendMail(email, title, content, false, null); } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java index a9d901a..f46f905 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java @@ -1,7 +1,8 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.service.IXxlJobService; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -19,13 +21,19 @@ @Controller @RequestMapping("/jobinfo") public class JobInfoController { - + + @Resource + private IXxlJobGroupDao xxlJobGroupDao; @Resource private IXxlJobService xxlJobService; @RequestMapping public String index(Model model) { - model.addAttribute("JobGroupList", JobGroupEnum.values()); // 任务组列表 + + // 任务组 + List jobGroupList = xxlJobGroupDao.findAll(); + + model.addAttribute("JobGroupList", jobGroupList); return "jobinfo/jobinfo.index"; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java index 20ffa95..f5cac1e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java @@ -1,9 +1,10 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.model.XxlJobLog; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.dao.IXxlJobInfoDao; import com.xxl.job.admin.dao.IXxlJobLogDao; import com.xxl.job.core.router.HandlerRouter.ActionRepository; @@ -34,15 +35,21 @@ public class JobLogController { @Resource - public IXxlJobLogDao xxlJobLogDao; + private IXxlJobGroupDao xxlJobGroupDao; @Resource public IXxlJobInfoDao xxlJobInfoDao; - + @Resource + public IXxlJobLogDao xxlJobLogDao; + @RequestMapping public String index(Model model, String jobGroup, String jobName) { + + // 任务组 + List jobGroupList = xxlJobGroupDao.findAll(); + model.addAttribute("jobGroup", jobGroup); model.addAttribute("jobName", jobName); - model.addAttribute("JobGroupList", JobGroupEnum.values()); + model.addAttribute("JobGroupList", jobGroupList); return "joblog/joblog.index"; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java deleted file mode 100644 index 210a518..0000000 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.xxl.job.admin.core.constant; - -/** - * job group - * @author xuxueli 2016-1-15 14:23:05 - */ -public class Constants { - - public enum JobGroupEnum{ - defaults("默认"), - waimai("外卖"), - movie("电影"); - private String desc; - private JobGroupEnum(String desc){ - this.desc = desc; - } - public String getDesc() { - return desc; - } - public static JobGroupEnum match(String name){ - if (name==null || name.trim().length()==0) { - return null; - } - for (JobGroupEnum group : JobGroupEnum.values()) { - if (group.name().equals(name)) { - return group; - } - } - return null; - } - } -} diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java index deffff3..52238bf 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java @@ -1,6 +1,6 @@ package com.xxl.job.admin.core.thread; -import com.xxl.job.admin.core.constant.Constants; +import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.model.XxlJobLog; import com.xxl.job.admin.core.util.DynamicSchedulerUtil; @@ -59,8 +59,8 @@ Set emailSet = new HashSet(Arrays.asList(info.getAlarmEmail().split(","))); for (String email: emailSet) { String title = "《调度监控报警-任务调度中心XXL-JOB》"; - String content = MessageFormat.format("任务调度失败, 任务组:{0}, 任务描述:{1}.", - Constants.JobGroupEnum.match(info.getJobGroup()).getDesc(), info.getJobDesc()); + XxlJobGroup group = DynamicSchedulerUtil.xxlJobGroupDao.load(info.getJobGroup()); + String content = MessageFormat.format("任务调度失败, 执行器名称:{0}, 任务描述:{1}.", group!=null?group.getTitle():"null", info.getJobDesc()); MailUtil.sendMail(email, title, content, false, null); } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java index 472c166..d04d58d 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java @@ -4,6 +4,7 @@ import com.xxl.job.admin.core.jobbean.RemoteHttpJobBean; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.thread.JobRegistryHelper; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.dao.IXxlJobInfoDao; import com.xxl.job.admin.dao.IXxlJobLogDao; import com.xxl.job.admin.dao.IXxlJobRegistryDao; @@ -66,12 +67,14 @@ public static IXxlJobLogDao xxlJobLogDao; public static IXxlJobInfoDao xxlJobInfoDao; public static IXxlJobRegistryDao xxlJobRegistryDao; + public static IXxlJobGroupDao xxlJobGroupDao; @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { DynamicSchedulerUtil.xxlJobLogDao = applicationContext.getBean(IXxlJobLogDao.class); DynamicSchedulerUtil.xxlJobInfoDao = applicationContext.getBean(IXxlJobInfoDao.class); DynamicSchedulerUtil.xxlJobRegistryDao = applicationContext.getBean(IXxlJobRegistryDao.class); + DynamicSchedulerUtil.xxlJobGroupDao = applicationContext.getBean(IXxlJobGroupDao.class); } @Override diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java index a9d901a..f46f905 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java @@ -1,7 +1,8 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.service.IXxlJobService; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -19,13 +21,19 @@ @Controller @RequestMapping("/jobinfo") public class JobInfoController { - + + @Resource + private IXxlJobGroupDao xxlJobGroupDao; @Resource private IXxlJobService xxlJobService; @RequestMapping public String index(Model model) { - model.addAttribute("JobGroupList", JobGroupEnum.values()); // 任务组列表 + + // 任务组 + List jobGroupList = xxlJobGroupDao.findAll(); + + model.addAttribute("JobGroupList", jobGroupList); return "jobinfo/jobinfo.index"; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java index 20ffa95..f5cac1e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java @@ -1,9 +1,10 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.model.XxlJobLog; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.dao.IXxlJobInfoDao; import com.xxl.job.admin.dao.IXxlJobLogDao; import com.xxl.job.core.router.HandlerRouter.ActionRepository; @@ -34,15 +35,21 @@ public class JobLogController { @Resource - public IXxlJobLogDao xxlJobLogDao; + private IXxlJobGroupDao xxlJobGroupDao; @Resource public IXxlJobInfoDao xxlJobInfoDao; - + @Resource + public IXxlJobLogDao xxlJobLogDao; + @RequestMapping public String index(Model model, String jobGroup, String jobName) { + + // 任务组 + List jobGroupList = xxlJobGroupDao.findAll(); + model.addAttribute("jobGroup", jobGroup); model.addAttribute("jobName", jobName); - model.addAttribute("JobGroupList", JobGroupEnum.values()); + model.addAttribute("JobGroupList", jobGroupList); return "joblog/joblog.index"; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java deleted file mode 100644 index 210a518..0000000 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.xxl.job.admin.core.constant; - -/** - * job group - * @author xuxueli 2016-1-15 14:23:05 - */ -public class Constants { - - public enum JobGroupEnum{ - defaults("默认"), - waimai("外卖"), - movie("电影"); - private String desc; - private JobGroupEnum(String desc){ - this.desc = desc; - } - public String getDesc() { - return desc; - } - public static JobGroupEnum match(String name){ - if (name==null || name.trim().length()==0) { - return null; - } - for (JobGroupEnum group : JobGroupEnum.values()) { - if (group.name().equals(name)) { - return group; - } - } - return null; - } - } -} diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java index deffff3..52238bf 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java @@ -1,6 +1,6 @@ package com.xxl.job.admin.core.thread; -import com.xxl.job.admin.core.constant.Constants; +import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.model.XxlJobLog; import com.xxl.job.admin.core.util.DynamicSchedulerUtil; @@ -59,8 +59,8 @@ Set emailSet = new HashSet(Arrays.asList(info.getAlarmEmail().split(","))); for (String email: emailSet) { String title = "《调度监控报警-任务调度中心XXL-JOB》"; - String content = MessageFormat.format("任务调度失败, 任务组:{0}, 任务描述:{1}.", - Constants.JobGroupEnum.match(info.getJobGroup()).getDesc(), info.getJobDesc()); + XxlJobGroup group = DynamicSchedulerUtil.xxlJobGroupDao.load(info.getJobGroup()); + String content = MessageFormat.format("任务调度失败, 执行器名称:{0}, 任务描述:{1}.", group!=null?group.getTitle():"null", info.getJobDesc()); MailUtil.sendMail(email, title, content, false, null); } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java index 472c166..d04d58d 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java @@ -4,6 +4,7 @@ import com.xxl.job.admin.core.jobbean.RemoteHttpJobBean; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.thread.JobRegistryHelper; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.dao.IXxlJobInfoDao; import com.xxl.job.admin.dao.IXxlJobLogDao; import com.xxl.job.admin.dao.IXxlJobRegistryDao; @@ -66,12 +67,14 @@ public static IXxlJobLogDao xxlJobLogDao; public static IXxlJobInfoDao xxlJobInfoDao; public static IXxlJobRegistryDao xxlJobRegistryDao; + public static IXxlJobGroupDao xxlJobGroupDao; @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { DynamicSchedulerUtil.xxlJobLogDao = applicationContext.getBean(IXxlJobLogDao.class); DynamicSchedulerUtil.xxlJobInfoDao = applicationContext.getBean(IXxlJobInfoDao.class); DynamicSchedulerUtil.xxlJobRegistryDao = applicationContext.getBean(IXxlJobRegistryDao.class); + DynamicSchedulerUtil.xxlJobGroupDao = applicationContext.getBean(IXxlJobGroupDao.class); } @Override 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 5e41ff2..3a9d90c 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 @@ -1,9 +1,10 @@ package com.xxl.job.admin.service.impl; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.util.DynamicSchedulerUtil; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.dao.IXxlJobInfoDao; import com.xxl.job.admin.dao.IXxlJobLogDao; import com.xxl.job.admin.dao.IXxlJobLogGlueDao; @@ -32,6 +33,8 @@ private static Logger logger = LoggerFactory.getLogger(XxlJobServiceImpl.class); @Resource + private IXxlJobGroupDao xxlJobGroupDao; + @Resource private IXxlJobInfoDao xxlJobInfoDao; @Resource public IXxlJobLogDao xxlJobLogDao; @@ -65,8 +68,9 @@ String executorAppname, String executorAddress, String executorHandler, String executorParam, int glueSwitch, String glueSource, String glueRemark, String childJobKey) { // valid - if (JobGroupEnum.match(jobGroup) == null) { - return new ReturnT(500, "请选择“任务组”"); + XxlJobGroup group = xxlJobGroupDao.load(jobGroup); + if (group == null) { + return new ReturnT(500, "请选择“执行器”"); } if (!CronExpression.isValidExpression(jobCron)) { return new ReturnT(500, "请输入格式正确的“Cron”"); @@ -153,8 +157,9 @@ String executorAppname, String executorAddress, String executorHandler, String executorParam, int glueSwitch, String childJobKey) { // valid - if (JobGroupEnum.match(jobGroup) == null) { - return new ReturnT(500, "请选择“任务组”"); + XxlJobGroup group = xxlJobGroupDao.load(jobGroup); + if (group == null) { + return new ReturnT(500, "请选择“执行器”"); } if (StringUtils.isBlank(jobName)) { return new ReturnT(500, "请输入“任务名”"); diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java index a9d901a..f46f905 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java @@ -1,7 +1,8 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.service.IXxlJobService; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -19,13 +21,19 @@ @Controller @RequestMapping("/jobinfo") public class JobInfoController { - + + @Resource + private IXxlJobGroupDao xxlJobGroupDao; @Resource private IXxlJobService xxlJobService; @RequestMapping public String index(Model model) { - model.addAttribute("JobGroupList", JobGroupEnum.values()); // 任务组列表 + + // 任务组 + List jobGroupList = xxlJobGroupDao.findAll(); + + model.addAttribute("JobGroupList", jobGroupList); return "jobinfo/jobinfo.index"; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java index 20ffa95..f5cac1e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java @@ -1,9 +1,10 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.model.XxlJobLog; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.dao.IXxlJobInfoDao; import com.xxl.job.admin.dao.IXxlJobLogDao; import com.xxl.job.core.router.HandlerRouter.ActionRepository; @@ -34,15 +35,21 @@ public class JobLogController { @Resource - public IXxlJobLogDao xxlJobLogDao; + private IXxlJobGroupDao xxlJobGroupDao; @Resource public IXxlJobInfoDao xxlJobInfoDao; - + @Resource + public IXxlJobLogDao xxlJobLogDao; + @RequestMapping public String index(Model model, String jobGroup, String jobName) { + + // 任务组 + List jobGroupList = xxlJobGroupDao.findAll(); + model.addAttribute("jobGroup", jobGroup); model.addAttribute("jobName", jobName); - model.addAttribute("JobGroupList", JobGroupEnum.values()); + model.addAttribute("JobGroupList", jobGroupList); return "joblog/joblog.index"; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java deleted file mode 100644 index 210a518..0000000 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.xxl.job.admin.core.constant; - -/** - * job group - * @author xuxueli 2016-1-15 14:23:05 - */ -public class Constants { - - public enum JobGroupEnum{ - defaults("默认"), - waimai("外卖"), - movie("电影"); - private String desc; - private JobGroupEnum(String desc){ - this.desc = desc; - } - public String getDesc() { - return desc; - } - public static JobGroupEnum match(String name){ - if (name==null || name.trim().length()==0) { - return null; - } - for (JobGroupEnum group : JobGroupEnum.values()) { - if (group.name().equals(name)) { - return group; - } - } - return null; - } - } -} diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java index deffff3..52238bf 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java @@ -1,6 +1,6 @@ package com.xxl.job.admin.core.thread; -import com.xxl.job.admin.core.constant.Constants; +import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.model.XxlJobLog; import com.xxl.job.admin.core.util.DynamicSchedulerUtil; @@ -59,8 +59,8 @@ Set emailSet = new HashSet(Arrays.asList(info.getAlarmEmail().split(","))); for (String email: emailSet) { String title = "《调度监控报警-任务调度中心XXL-JOB》"; - String content = MessageFormat.format("任务调度失败, 任务组:{0}, 任务描述:{1}.", - Constants.JobGroupEnum.match(info.getJobGroup()).getDesc(), info.getJobDesc()); + XxlJobGroup group = DynamicSchedulerUtil.xxlJobGroupDao.load(info.getJobGroup()); + String content = MessageFormat.format("任务调度失败, 执行器名称:{0}, 任务描述:{1}.", group!=null?group.getTitle():"null", info.getJobDesc()); MailUtil.sendMail(email, title, content, false, null); } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java index 472c166..d04d58d 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java @@ -4,6 +4,7 @@ import com.xxl.job.admin.core.jobbean.RemoteHttpJobBean; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.thread.JobRegistryHelper; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.dao.IXxlJobInfoDao; import com.xxl.job.admin.dao.IXxlJobLogDao; import com.xxl.job.admin.dao.IXxlJobRegistryDao; @@ -66,12 +67,14 @@ public static IXxlJobLogDao xxlJobLogDao; public static IXxlJobInfoDao xxlJobInfoDao; public static IXxlJobRegistryDao xxlJobRegistryDao; + public static IXxlJobGroupDao xxlJobGroupDao; @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { DynamicSchedulerUtil.xxlJobLogDao = applicationContext.getBean(IXxlJobLogDao.class); DynamicSchedulerUtil.xxlJobInfoDao = applicationContext.getBean(IXxlJobInfoDao.class); DynamicSchedulerUtil.xxlJobRegistryDao = applicationContext.getBean(IXxlJobRegistryDao.class); + DynamicSchedulerUtil.xxlJobGroupDao = applicationContext.getBean(IXxlJobGroupDao.class); } @Override 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 5e41ff2..3a9d90c 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 @@ -1,9 +1,10 @@ package com.xxl.job.admin.service.impl; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.util.DynamicSchedulerUtil; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.dao.IXxlJobInfoDao; import com.xxl.job.admin.dao.IXxlJobLogDao; import com.xxl.job.admin.dao.IXxlJobLogGlueDao; @@ -32,6 +33,8 @@ private static Logger logger = LoggerFactory.getLogger(XxlJobServiceImpl.class); @Resource + private IXxlJobGroupDao xxlJobGroupDao; + @Resource private IXxlJobInfoDao xxlJobInfoDao; @Resource public IXxlJobLogDao xxlJobLogDao; @@ -65,8 +68,9 @@ String executorAppname, String executorAddress, String executorHandler, String executorParam, int glueSwitch, String glueSource, String glueRemark, String childJobKey) { // valid - if (JobGroupEnum.match(jobGroup) == null) { - return new ReturnT(500, "请选择“任务组”"); + XxlJobGroup group = xxlJobGroupDao.load(jobGroup); + if (group == null) { + return new ReturnT(500, "请选择“执行器”"); } if (!CronExpression.isValidExpression(jobCron)) { return new ReturnT(500, "请输入格式正确的“Cron”"); @@ -153,8 +157,9 @@ String executorAppname, String executorAddress, String executorHandler, String executorParam, int glueSwitch, String childJobKey) { // valid - if (JobGroupEnum.match(jobGroup) == null) { - return new ReturnT(500, "请选择“任务组”"); + XxlJobGroup group = xxlJobGroupDao.load(jobGroup); + if (group == null) { + return new ReturnT(500, "请选择“执行器”"); } if (StringUtils.isBlank(jobName)) { return new ReturnT(500, "请输入“任务名”"); diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl index d136930..7f99793 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl @@ -40,10 +40,10 @@
- 任务组 + 执行器
@@ -115,11 +115,11 @@
- +
@@ -207,7 +207,7 @@
- +
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java index a9d901a..f46f905 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java @@ -1,7 +1,8 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.service.IXxlJobService; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; +import java.util.List; import java.util.Map; /** @@ -19,13 +21,19 @@ @Controller @RequestMapping("/jobinfo") public class JobInfoController { - + + @Resource + private IXxlJobGroupDao xxlJobGroupDao; @Resource private IXxlJobService xxlJobService; @RequestMapping public String index(Model model) { - model.addAttribute("JobGroupList", JobGroupEnum.values()); // 任务组列表 + + // 任务组 + List jobGroupList = xxlJobGroupDao.findAll(); + + model.addAttribute("JobGroupList", jobGroupList); return "jobinfo/jobinfo.index"; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java index 20ffa95..f5cac1e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java @@ -1,9 +1,10 @@ package com.xxl.job.admin.controller; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.model.XxlJobLog; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.dao.IXxlJobInfoDao; import com.xxl.job.admin.dao.IXxlJobLogDao; import com.xxl.job.core.router.HandlerRouter.ActionRepository; @@ -34,15 +35,21 @@ public class JobLogController { @Resource - public IXxlJobLogDao xxlJobLogDao; + private IXxlJobGroupDao xxlJobGroupDao; @Resource public IXxlJobInfoDao xxlJobInfoDao; - + @Resource + public IXxlJobLogDao xxlJobLogDao; + @RequestMapping public String index(Model model, String jobGroup, String jobName) { + + // 任务组 + List jobGroupList = xxlJobGroupDao.findAll(); + model.addAttribute("jobGroup", jobGroup); model.addAttribute("jobName", jobName); - model.addAttribute("JobGroupList", JobGroupEnum.values()); + model.addAttribute("JobGroupList", jobGroupList); return "joblog/joblog.index"; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java deleted file mode 100644 index 210a518..0000000 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/constant/Constants.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.xxl.job.admin.core.constant; - -/** - * job group - * @author xuxueli 2016-1-15 14:23:05 - */ -public class Constants { - - public enum JobGroupEnum{ - defaults("默认"), - waimai("外卖"), - movie("电影"); - private String desc; - private JobGroupEnum(String desc){ - this.desc = desc; - } - public String getDesc() { - return desc; - } - public static JobGroupEnum match(String name){ - if (name==null || name.trim().length()==0) { - return null; - } - for (JobGroupEnum group : JobGroupEnum.values()) { - if (group.name().equals(name)) { - return group; - } - } - return null; - } - } -} diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java index deffff3..52238bf 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java @@ -1,6 +1,6 @@ package com.xxl.job.admin.core.thread; -import com.xxl.job.admin.core.constant.Constants; +import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.model.XxlJobLog; import com.xxl.job.admin.core.util.DynamicSchedulerUtil; @@ -59,8 +59,8 @@ Set emailSet = new HashSet(Arrays.asList(info.getAlarmEmail().split(","))); for (String email: emailSet) { String title = "《调度监控报警-任务调度中心XXL-JOB》"; - String content = MessageFormat.format("任务调度失败, 任务组:{0}, 任务描述:{1}.", - Constants.JobGroupEnum.match(info.getJobGroup()).getDesc(), info.getJobDesc()); + XxlJobGroup group = DynamicSchedulerUtil.xxlJobGroupDao.load(info.getJobGroup()); + String content = MessageFormat.format("任务调度失败, 执行器名称:{0}, 任务描述:{1}.", group!=null?group.getTitle():"null", info.getJobDesc()); MailUtil.sendMail(email, title, content, false, null); } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java index 472c166..d04d58d 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java @@ -4,6 +4,7 @@ import com.xxl.job.admin.core.jobbean.RemoteHttpJobBean; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.thread.JobRegistryHelper; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.dao.IXxlJobInfoDao; import com.xxl.job.admin.dao.IXxlJobLogDao; import com.xxl.job.admin.dao.IXxlJobRegistryDao; @@ -66,12 +67,14 @@ public static IXxlJobLogDao xxlJobLogDao; public static IXxlJobInfoDao xxlJobInfoDao; public static IXxlJobRegistryDao xxlJobRegistryDao; + public static IXxlJobGroupDao xxlJobGroupDao; @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { DynamicSchedulerUtil.xxlJobLogDao = applicationContext.getBean(IXxlJobLogDao.class); DynamicSchedulerUtil.xxlJobInfoDao = applicationContext.getBean(IXxlJobInfoDao.class); DynamicSchedulerUtil.xxlJobRegistryDao = applicationContext.getBean(IXxlJobRegistryDao.class); + DynamicSchedulerUtil.xxlJobGroupDao = applicationContext.getBean(IXxlJobGroupDao.class); } @Override 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 5e41ff2..3a9d90c 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 @@ -1,9 +1,10 @@ package com.xxl.job.admin.service.impl; -import com.xxl.job.admin.core.constant.Constants.JobGroupEnum; import com.xxl.job.admin.core.model.ReturnT; +import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.util.DynamicSchedulerUtil; +import com.xxl.job.admin.dao.IXxlJobGroupDao; import com.xxl.job.admin.dao.IXxlJobInfoDao; import com.xxl.job.admin.dao.IXxlJobLogDao; import com.xxl.job.admin.dao.IXxlJobLogGlueDao; @@ -32,6 +33,8 @@ private static Logger logger = LoggerFactory.getLogger(XxlJobServiceImpl.class); @Resource + private IXxlJobGroupDao xxlJobGroupDao; + @Resource private IXxlJobInfoDao xxlJobInfoDao; @Resource public IXxlJobLogDao xxlJobLogDao; @@ -65,8 +68,9 @@ String executorAppname, String executorAddress, String executorHandler, String executorParam, int glueSwitch, String glueSource, String glueRemark, String childJobKey) { // valid - if (JobGroupEnum.match(jobGroup) == null) { - return new ReturnT(500, "请选择“任务组”"); + XxlJobGroup group = xxlJobGroupDao.load(jobGroup); + if (group == null) { + return new ReturnT(500, "请选择“执行器”"); } if (!CronExpression.isValidExpression(jobCron)) { return new ReturnT(500, "请输入格式正确的“Cron”"); @@ -153,8 +157,9 @@ String executorAppname, String executorAddress, String executorHandler, String executorParam, int glueSwitch, String childJobKey) { // valid - if (JobGroupEnum.match(jobGroup) == null) { - return new ReturnT(500, "请选择“任务组”"); + XxlJobGroup group = xxlJobGroupDao.load(jobGroup); + if (group == null) { + return new ReturnT(500, "请选择“执行器”"); } if (StringUtils.isBlank(jobName)) { return new ReturnT(500, "请输入“任务名”"); diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl index d136930..7f99793 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl @@ -40,10 +40,10 @@
- 任务组 + 执行器
@@ -115,11 +115,11 @@
- +
@@ -207,7 +207,7 @@
- +
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl index 835fca3..b3cb4e5 100644 --- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl +++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.index.ftl @@ -34,11 +34,11 @@
- 任务组 + 执行器