remove

xxl-job-admin/src/main/java/com/xxl/job/admin/config/RestConfiguration.java

@@ -0,0 +1,23 @@
+package com.xxl.job.admin.config;
+
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.DefaultResponseErrorHandler;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @author VcKerry on 2020/1/6
+ */
+
+@Configuration
+public class RestConfiguration {
+
+    @Bean
+    public RestTemplate restTemplate(RestTemplateBuilder builder) {
+        final RestTemplate restTemplate = builder.build();
+        restTemplate.setErrorHandler(new DefaultResponseErrorHandler());
+        return restTemplate;
+    }
+
+}

xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import javax.sql.DataSource;
@@ -82,6 +83,8 @@ public class XxlJobAdminConfig implements InitializingBean, DisposableBean {
     private JavaMailSender mailSender;
     @Resource
     private DataSource dataSource;
+    @Resource
+    private RestTemplate restTemplate;
 
 
     public String getI18n() {
@@ -145,4 +148,7 @@ public class XxlJobAdminConfig implements InitializingBean, DisposableBean {
         return dataSource;
     }
 
+    public RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
 }

xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java

@@ -10,13 +10,12 @@ import com.xxl.job.core.biz.model.ReturnT;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.web.client.RestTemplate;
 
 import javax.mail.internet.MimeMessage;
 import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -124,7 +123,49 @@ public class JobFailMonitorHelper {
     }
 
 
-    // ---------------------- alarm ----------------------
+    /**
+     * fail alarm
+     *
+     * @param jobLog
+     */
+    private boolean failAlarm(XxlJobInfo info, XxlJobLog jobLog) {
+
+        if (info == null || info.getAlarmEmail() == null || info.getAlarmEmail().trim().length() == 0) {
+            return false;
+        }
+        boolean alarmResult = true;
+
+        // email info
+        XxlJobGroup group = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().load(info.getJobGroup());
+        String personal = I18nUtil.getString("admin_name_full");
+        String title = I18nUtil.getString("jobconf_monitor");
+
+        Set<String> alarmAddressSet = new HashSet<String>(Arrays.asList(info.getAlarmEmail().split(",")));
+
+        for (String email : alarmAddressSet) {
+            try {
+                email = email.trim();
+                if (email.startsWith("http://") || email.startsWith("https://")) {
+                    final String content = textContent(group, info, jobLog, personal);
+                    alarmResult = failAlarmHttp(email, title, content, jobLog.getId());
+                } else if (email.startsWith("sms://")) {
+                    // sms 短信
+                } else {
+                    String content = emailContent(group, info, jobLog);
+                    alarmResult = failAlarmEmail(email, title, content, jobLog.getId(), personal);
+                }
+            } catch (Exception e) {
+                alarmResult = false;
+            }
+        }
+
+
+        // do something, custom alarm strategy, such as sms
+
+        return alarmResult;
+    }
+
+    // ---------------------- email alarm ----------------------
 
     // email alarm template
     private static final String mailBodyTemplate = "<h5>" + I18nUtil.getString("jobconf_monitor_detail") + "：</span>" +
@@ -149,63 +190,99 @@ public class JobFailMonitorHelper {
             "   </tbody>\n" +
             "</table>";
 
+    private String emailContent(XxlJobGroup group, XxlJobInfo info, XxlJobLog jobLog) {
+        // alarmContent
+        String alarmContent = "Alarm Job LogId=" + jobLog.getId();
+        if (jobLog.getTriggerCode() != ReturnT.SUCCESS_CODE) {
+            alarmContent += "<br>TriggerMsg=<br>" + jobLog.getTriggerMsg();
+        }
+        if (jobLog.getHandleCode() > 0 && jobLog.getHandleCode() != ReturnT.SUCCESS_CODE) {
+            alarmContent += "<br>HandleCode=" + jobLog.getHandleMsg();
+        }
+        return MessageFormat.format(mailBodyTemplate,
+                group != null ? group.getTitle() : "null",
+                info.getId(),
+                info.getJobDesc(),
+                alarmContent);
+    }
+
     /**
-     * fail alarm
+     * Email
      *
-     * @param jobLog
+     * @param email
+     * @param title
+     * @param content
+     * @param jobLogId for error
+     * @return
      */
-    private boolean failAlarm(XxlJobInfo info, XxlJobLog jobLog) {
-        boolean alarmResult = true;
-
-        // send monitor email
-        if (info != null && info.getAlarmEmail() != null && info.getAlarmEmail().trim().length() > 0) {
+    private boolean failAlarmEmail(String email, String title, String content, Long jobLogId, String personal) throws Exception {
+        // make mail
+        try {
+            MimeMessage mimeMessage = XxlJobAdminConfig.getAdminConfig().getMailSender().createMimeMessage();
+            MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
+            helper.setFrom(XxlJobAdminConfig.getAdminConfig().getEmailUserName(), personal);
+            helper.setTo(email);
+            helper.setSubject(title);
+            helper.setText(content, true);
+            XxlJobAdminConfig.getAdminConfig().getMailSender().send(mimeMessage);
+            return true;
+        } catch (Exception e) {
+            logger.error(">>>>>>>>>>> xxl-job, job fail alarm email send error, JobLogId:{}", jobLogId, e);
+            throw e;
+        }
+    }
 
-            // alarmContent
-            String alarmContent = "Alarm Job LogId=" + jobLog.getId();
-            if (jobLog.getTriggerCode() != ReturnT.SUCCESS_CODE) {
-                alarmContent += "<br>TriggerMsg=<br>" + jobLog.getTriggerMsg();
-            }
-            if (jobLog.getHandleCode() > 0 && jobLog.getHandleCode() != ReturnT.SUCCESS_CODE) {
-                alarmContent += "<br>HandleCode=" + jobLog.getHandleMsg();
-            }
+    private static final String TEXT_TEMPLATE = "{0} \n\n" +
+            I18nUtil.getString("jobconf_monitor_detail") + ": \n\n" +
+            I18nUtil.getString("jobinfo_field_jobgroup") + " : {1}" + " \n\n" +
+            I18nUtil.getString("jobinfo_field_id") + " : {2}" + " \n\n" +
+            I18nUtil.getString("jobinfo_field_jobdesc") + " : {3}" + " \n\n" +
+            I18nUtil.getString("jobconf_monitor_alarm_title") + " : " + I18nUtil.getString("jobconf_monitor_alarm_type") + " \n\n" +
+            I18nUtil.getString("jobconf_monitor_alarm_content") + " : {4}" + " \n\n";
 
-            // email info
-            XxlJobGroup group = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().load(Integer.valueOf(info.getJobGroup()));
-            String personal = I18nUtil.getString("admin_name_full");
-            String title = I18nUtil.getString("jobconf_monitor");
-            String content = MessageFormat.format(mailBodyTemplate,
-                    group != null ? group.getTitle() : "null",
-                    info.getId(),
-                    info.getJobDesc(),
-                    alarmContent);
-
-            Set<String> emailSet = new HashSet<String>(Arrays.asList(info.getAlarmEmail().split(",")));
-            for (String email : emailSet) {
-
-                // make mail
-                try {
-                    MimeMessage mimeMessage = XxlJobAdminConfig.getAdminConfig().getMailSender().createMimeMessage();
-
-                    MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
-                    helper.setFrom(XxlJobAdminConfig.getAdminConfig().getEmailUserName(), personal);
-                    helper.setTo(email);
-                    helper.setSubject(title);
-                    helper.setText(content, true);
-
-                    XxlJobAdminConfig.getAdminConfig().getMailSender().send(mimeMessage);
-                } catch (Exception e) {
-                    logger.error(">>>>>>>>>>> xxl-job, job fail alarm email send error, JobLogId:{}", jobLog.getId(), e);
-
-                    alarmResult = false;
-                }
 
-            }
+    private String textContent(XxlJobGroup group, XxlJobInfo info, XxlJobLog jobLog, String personal) {
+        // alarmContent
+        String alarmContent = "Alarm Job LogId=" + jobLog.getId() + ".";
+        if (jobLog.getTriggerCode() != ReturnT.SUCCESS_CODE) {
+            alarmContent += "TriggerMsg=" + jobLog.getTriggerMsg() + ".";
         }
+        if (jobLog.getHandleCode() > 0 && jobLog.getHandleCode() != ReturnT.SUCCESS_CODE) {
+            alarmContent += "HandleCode=" + jobLog.getHandleMsg() + ".";
+        }
+        return MessageFormat.format(TEXT_TEMPLATE,
+                personal,
+                group != null ? group.getTitle() : "null",
+                info.getId(),
+                info.getJobDesc(),
+                alarmContent);
+    }
 
-        // do something, custom alarm strategy, such as sms
-
+    /**
+     * todo only support ftqq
+     *
+     * @param url
+     * @param title
+     * @param content
+     * @param jobLogId
+     * @return
+     * @throws Exception
+     */
+    private boolean failAlarmHttp(String url, String title, String content, Long jobLogId) throws Exception {
 
-        return alarmResult;
+        try {
+            final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            final String format = simpleDateFormat.format(new Date());
+            title = title + "[" + format + "]";
+            final RestTemplate restTemplate = XxlJobAdminConfig.getAdminConfig().getRestTemplate();
+            final String forObject = restTemplate.getForObject(url, String.class, title, content);
+            logger.debug(">>>>>>>>>>> xxl-job, job result:{}, JobLogId:{}", forObject, jobLogId);
+            return true;
+        } catch (Exception e) {
+            logger.error(">>>>>>>>>>> xxl-job, job fail alarm http send error, JobLogId:{}", jobLogId, e);
+            throw e;
+        }
     }
 
+
 }

xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java

@@ -108,13 +108,13 @@ public class XxlJobServiceImpl implements XxlJobService {
             }
 
             // join , avoid "xxx,,"
-            String temp = "";
+            StringBuilder temp = new StringBuilder();
             for (String item : childJobIds) {
-                temp += item + ",";
+                temp.append(item).append(",");
             }
-            temp = temp.substring(0, temp.length() - 1);
+            temp = new StringBuilder(temp.substring(0, temp.length() - 1));
 
-            jobInfo.setChildJobId(temp);
+            jobInfo.setChildJobId(temp.toString());
         }
 
         // add in db

xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl

@@ -172,7 +172,7 @@
                         <label for="lastname" class="col-sm-2 control-label">${I18n.jobinfo_field_author}<font color="red">*</font></label>
                         <div class="col-sm-4"><input type="text" class="form-control" name="author" placeholder="${I18n.system_please_input}${I18n.jobinfo_field_author}" maxlength="50" ></div>
                         <label for="lastname" class="col-sm-2 control-label">${I18n.jobinfo_field_alarmemail}<font color="black">*</font></label>
-                        <div class="col-sm-4"><input type="text" class="form-control" name="alarmEmail" placeholder="${I18n.jobinfo_field_alarmemail_placeholder}" maxlength="100" ></div>
+                        <div class="col-sm-4"><input type="text" class="form-control" name="alarmEmail" placeholder="${I18n.jobinfo_field_alarmemail_placeholder}" maxlength="255" ></div>
 					</div>
                     <div class="form-group">
                         <label for="firstname" class="col-sm-2 control-label">${I18n.jobinfo_field_executorparam}<font color="black">*</font></label>
@@ -368,7 +368,7 @@ exit 0
                         <label for="lastname" class="col-sm-2 control-label">${I18n.jobinfo_field_author}<font color="red">*</font></label>
                         <div class="col-sm-4"><input type="text" class="form-control" name="author" placeholder="${I18n.system_please_input}${I18n.jobinfo_field_author}" maxlength="50" ></div>
                         <label for="lastname" class="col-sm-2 control-label">${I18n.jobinfo_field_alarmemail}<font color="black">*</font></label>
-                        <div class="col-sm-4"><input type="text" class="form-control" name="alarmEmail" placeholder="${I18n.jobinfo_field_alarmemail_placeholder}" maxlength="100" ></div>
+                        <div class="col-sm-4"><input type="text" class="form-control" name="alarmEmail" placeholder="${I18n.jobinfo_field_alarmemail_placeholder}" maxlength="255" ></div>
                     </div>
                     <div class="form-group">
                         <label for="firstname" class="col-sm-2 control-label">${I18n.jobinfo_field_executorparam}<font color="black">*</font></label>