diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java index fe16fbdf..2f2bebe9 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java @@ -48,7 +48,7 @@ public class EmailJobAlarm implements JobAlarm { } // email info - XxlJobGroup group = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().load(Integer.valueOf(info.getJobGroup())); + XxlJobGroup group = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().load(info.getJobGroup()); String personal = I18nUtil.getString("admin_name_full"); String title = I18nUtil.getString("jobconf_monitor"); String content = MessageFormat.format(loadEmailJobAlarmTemplate(), @@ -57,7 +57,7 @@ public class EmailJobAlarm implements JobAlarm { info.getJobDesc(), alarmContent); - Set emailSet = new HashSet(Arrays.asList(info.getAlarmEmail().split(","))); + Set emailSet = new HashSet<>(Arrays.asList(info.getAlarmEmail().split(","))); for (String email: emailSet) { // make mail @@ -89,7 +89,8 @@ public class EmailJobAlarm implements JobAlarm { * @return */ private static final String loadEmailJobAlarmTemplate(){ - String mailBodyTemplate = "
" + I18nUtil.getString("jobconf_monitor_detail") + ":" + + + return "
" + I18nUtil.getString("jobconf_monitor_detail") + ":" + "\n" + " " + " \n" + @@ -110,8 +111,6 @@ public class EmailJobAlarm implements JobAlarm { " \n" + " \n" + "
"; - - return mailBodyTemplate; } }