review code with spring code style and update spring version and springboot version

pom.xml

 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-		<maven.compiler.source>1.7</maven.compiler.source>
-		<maven.compiler.target>1.7</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.test.skip>true</maven.test.skip>
 
 		<xxl-rpc.version>1.5.0</xxl-rpc.version>
 
-		<spring.version>4.3.25.RELEASE</spring.version>
-		<spring-boot.version>1.5.22.RELEASE</spring-boot.version>
-		<mybatis-spring-boot-starter.version>1.3.5</mybatis-spring-boot-starter.version>
-		<mysql-connector-java.version>5.1.48</mysql-connector-java.version>
+		<spring.version>5.2.2.RELEASE</spring.version>
+		<spring-boot.version>2.2.2.RELEASE</spring-boot.version>
+		<mybatis-spring-boot-starter.version>2.1.1</mybatis-spring-boot-starter.version>
+		<mysql-connector-java.version>8.0.18</mysql-connector-java.version>
 
-		<slf4j-api.version>1.7.29</slf4j-api.version>
+		<slf4j-api.version>1.7.30</slf4j-api.version>
 		<junit.version>4.12</junit.version>
 
 		<groovy.version>2.5.8</groovy.version>

xxl-job-admin/config/application.properties

-spring.profiles.active=production
+#spring.profiles.active=production

xxl-job-admin/pom.xml

             <version>${project.parent.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

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

+package com.xxl.job.admin.config;
+
+import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.core.util.I18nUtil;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author VcKerry on 2020/1/6
+ */
+
+@Component
+public class StaticAware implements ApplicationContextAware {
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        final XxlJobAdminConfig bean = applicationContext.getBean(XxlJobAdminConfig.class);
+        I18nUtil.setI18n(bean.getI18n());
+    }
+}

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

+package com.xxl.job.admin.config;
+
+/**
+ * @author VcKerry on 2020/1/6
+ */
+
+//@Configuration
+public class XxlJobConfiguration {
+
+ /*   @Bean
+    public JobTriggerPoolHelper jobTriggerPoolHelper() {
+        return new JobTriggerPoolHelper();
+    }
+
+
+    @Bean
+    public JobFailMonitorHelper jobFailMonitorHelper(JobTriggerPoolHelper jobTriggerPoolHelper) {
+        return new JobFailMonitorHelper(jobTriggerPoolHelper);
+    }
+
+
+    @Bean
+    public JobLogReportHelper jobLogReportHelper() {
+        return new JobLogReportHelper();
+    }
+
+    @Bean
+    public JobScheduleHelper jobScheduleHelper(JobTriggerPoolHelper jobTriggerPoolHelper) {
+        return new JobScheduleHelper(jobTriggerPoolHelper);
+    }
+*/
+
+   /* @Bean(destroyMethod = "destroy")
+    public XxlJobScheduler xxlJobScheduler(JobRegistryMonitorHelper jobRegistryMonitorHelper,
+                                           JobFailMonitorHelper jobFailMonitorHelper,
+                                           JobTriggerPoolHelper jobTriggerPoolHelper,
+                                           JobLogReportHelper jobLogReportHelper,
+                                           JobScheduleHelper jobScheduleHelper) throws Exception {
+        XxlJobScheduler xxlJobScheduler = new XxlJobScheduler(jobRegistryMonitorHelper, jobFailMonitorHelper, jobTriggerPoolHelper, jobLogReportHelper, jobScheduleHelper);
+        xxlJobScheduler.init();
+        return xxlJobScheduler;
+    }*/
+
+}

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java

 package com.xxl.job.admin.controller;
 
 import com.xxl.job.admin.controller.annotation.PermissionLimit;
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
 import com.xxl.job.admin.core.exception.XxlJobException;
 import com.xxl.job.admin.core.util.JacksonUtil;
 import com.xxl.job.core.biz.AdminBiz;
 import com.xxl.job.core.biz.model.RegistryParam;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.util.XxlJobRemotingUtil;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
     @Resource
     private AdminBiz adminBiz;
 
+    @Value("${xxl.job.accessToken}")
+    private String accessToken;
+
 
     // ---------------------- base ----------------------
 
      * valid access token
      */
     private void validAccessToken(HttpServletRequest request) {
-        if (XxlJobAdminConfig.getAdminConfig().getAccessToken() != null
-                && XxlJobAdminConfig.getAdminConfig().getAccessToken().trim().length() > 0
-                && !XxlJobAdminConfig.getAdminConfig().getAccessToken().equals(request.getHeader(XxlJobRemotingUtil.XXL_RPC_ACCESS_TOKEN))) {
+        if (accessToken != null
+                && accessToken.trim().length() > 0
+                && !accessToken.equals(request.getHeader(XxlJobRemotingUtil.XXL_RPC_ACCESS_TOKEN))) {
             throw new XxlJobException("The access token is wrong.");
         }
     }

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java

     private XxlJobGroupDao xxlJobGroupDao;
     @Resource
     private XxlJobService xxlJobService;
+    @Resource
+    private JobTriggerPoolHelper jobTriggerPoolHelper;
 
     @RequestMapping
     public String index(HttpServletRequest request, Model model, @RequestParam(required = false, defaultValue = "-1") int jobGroup) {
             executorParam = "";
         }
 
-        JobTriggerPoolHelper.trigger(id, TriggerTypeEnum.MANUAL, -1, null, executorParam);
+        jobTriggerPoolHelper.trigger(id, TriggerTypeEnum.MANUAL, -1, null, executorParam);
         return ReturnT.SUCCESS;
     }
 

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java

     public XxlJobInfoDao xxlJobInfoDao;
     @Resource
     public XxlJobLogDao xxlJobLogDao;
+    @Resource
+    private XxlJobScheduler xxlJobScheduler;
 
     @RequestMapping
     public String index(HttpServletRequest request, Model model, @RequestParam(required = false, defaultValue = "0") Integer jobId) {
     @ResponseBody
     public ReturnT<LogResult> logDetailCat(String executorAddress, long triggerTime, long logId, int fromLineNum) {
         try {
-            ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(executorAddress);
+            ExecutorBiz executorBiz = xxlJobScheduler.getExecutorBiz(executorAddress);
             ReturnT<LogResult> logResult = executorBiz.log(triggerTime, logId, fromLineNum);
 
             // is end
         // request of kill
         ReturnT<String> runResult = null;
         try {
-            ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(log.getExecutorAddress());
+            ExecutorBiz executorBiz = xxlJobScheduler.getExecutorBiz(log.getExecutorAddress());
             runResult = executorBiz.kill(jobInfo.getId());
         } catch (Exception e) {
             logger.error(e.getMessage(), e);

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

 package com.xxl.job.admin.core.conf;
 
-import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
-import com.xxl.job.admin.dao.*;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
+import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
-import javax.sql.DataSource;
 
 /**
- * xxl-job config
- *
- * @author xuxueli 2017-04-28
+ * @author VcKerry on 2020/1/6
  */
 
-@Component
-public class XxlJobAdminConfig implements InitializingBean, DisposableBean {
-
-    private static XxlJobAdminConfig adminConfig = null;
-
-    public static XxlJobAdminConfig getAdminConfig() {
-        return adminConfig;
-    }
-
-
-    // ---------------------- XxlJobScheduler ----------------------
-
-    private XxlJobScheduler xxlJobScheduler;
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        adminConfig = this;
-
-        xxlJobScheduler = new XxlJobScheduler();
-        xxlJobScheduler.init();
-    }
 
-    @Override
-    public void destroy() throws Exception {
-        xxlJobScheduler.destroy();
-    }
-
-
-    // ---------------------- XxlJobScheduler ----------------------
+@Data
+@Configuration
+@Component
+public class XxlJobAdminConfig {
 
-    // conf
     @Value("${xxl.job.i18n}")
     private String i18n;
 
-    @Value("${xxl.job.accessToken}")
-    private String accessToken;
-
-    @Value("${spring.mail.username}")
-    private String emailUserName;
-
     @Value("${xxl.job.triggerpool.fast.max}")
     private int triggerPoolFastMax;
 
     private int triggerPoolSlowMax;
 
     @Value("${xxl.job.logretentiondays}")
-    private int logretentiondays;
-
-    // dao, service
-
-    @Resource
-    private XxlJobLogDao xxlJobLogDao;
-    @Resource
-    private XxlJobInfoDao xxlJobInfoDao;
-    @Resource
-    private XxlJobRegistryDao xxlJobRegistryDao;
-    @Resource
-    private XxlJobGroupDao xxlJobGroupDao;
-    @Resource
-    private XxlJobLogReportDao xxlJobLogReportDao;
-    @Resource
-    private JavaMailSender mailSender;
-    @Resource
-    private DataSource dataSource;
-    @Resource
-    private RestTemplate restTemplate;
-
-
-    public String getI18n() {
-        return i18n;
-    }
-
-    public String getAccessToken() {
-        return accessToken;
-    }
-
-    public String getEmailUserName() {
-        return emailUserName;
-    }
+    private int logRetentionDays;
 
     public int getTriggerPoolFastMax() {
         if (triggerPoolFastMax < 200) {
         return triggerPoolSlowMax;
     }
 
-    public int getLogretentiondays() {
-        if (logretentiondays < 7) {
-            return -1;  // Limit greater than or equal to 7, otherwise close
+    public int getLogRetentionDays() {
+        if (logRetentionDays < 7) {
+            // Limit greater than or equal to 7, otherwise close
+            return -1;
         }
-        return logretentiondays;
-    }
-
-    public XxlJobLogDao getXxlJobLogDao() {
-        return xxlJobLogDao;
-    }
-
-    public XxlJobInfoDao getXxlJobInfoDao() {
-        return xxlJobInfoDao;
-    }
-
-    public XxlJobRegistryDao getXxlJobRegistryDao() {
-        return xxlJobRegistryDao;
-    }
-
-    public XxlJobGroupDao getXxlJobGroupDao() {
-        return xxlJobGroupDao;
-    }
-
-    public XxlJobLogReportDao getXxlJobLogReportDao() {
-        return xxlJobLogReportDao;
-    }
-
-    public JavaMailSender getMailSender() {
-        return mailSender;
-    }
-
-    public DataSource getDataSource() {
-        return dataSource;
-    }
-
-    public RestTemplate getRestTemplate() {
-        return restTemplate;
+        return logRetentionDays;
     }
 }

xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.java

 package com.xxl.job.admin.core.route;
 
+import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.biz.model.TriggerParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 
 import java.util.List;
 
 /**
  * Created by xuxueli on 17/3/10.
  */
-public abstract class ExecutorRouter {
+public abstract class ExecutorRouter implements ApplicationContextAware {
     protected static Logger logger = LoggerFactory.getLogger(ExecutorRouter.class);
 
+
+    protected XxlJobScheduler xxlJobScheduler;
+
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        xxlJobScheduler = applicationContext.getBean(XxlJobScheduler.class);
+    }
+
     /**
      * route address
      *

xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java

 package com.xxl.job.admin.core.route.strategy;
 
 import com.xxl.job.admin.core.route.ExecutorRouter;
-import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
 import com.xxl.job.admin.core.util.I18nUtil;
 import com.xxl.job.core.biz.ExecutorBiz;
 import com.xxl.job.core.biz.model.ReturnT;
             // beat
             ReturnT<String> idleBeatResult = null;
             try {
-                ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(address);
+                ExecutorBiz executorBiz = xxlJobScheduler.getExecutorBiz(address);
                 idleBeatResult = executorBiz.idleBeat(triggerParam.getJobId());
             } catch (Exception e) {
                 logger.error(e.getMessage(), e);
                 idleBeatResult = new ReturnT<String>(ReturnT.FAIL_CODE, "" + e);
             }
             idleBeatResultSB.append((idleBeatResultSB.length() > 0) ? "<br><br>" : "")
-                    .append(I18nUtil.getString("jobconf_idleBeat") + "：")
+                    .append(I18nUtil.getString("jobconf_idleBeat")).append("：")
                     .append("<br>address：").append(address)
                     .append("<br>code：").append(idleBeatResult.getCode())
                     .append("<br>msg：").append(idleBeatResult.getMsg());

xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java

 package com.xxl.job.admin.core.route.strategy;
 
 import com.xxl.job.admin.core.route.ExecutorRouter;
-import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
 import com.xxl.job.admin.core.util.I18nUtil;
 import com.xxl.job.core.biz.ExecutorBiz;
 import com.xxl.job.core.biz.model.ReturnT;
             // beat
             ReturnT<String> beatResult = null;
             try {
-                ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(address);
+                ExecutorBiz executorBiz = xxlJobScheduler.getExecutorBiz(address);
                 beatResult = executorBiz.beat();
             } catch (Exception e) {
                 logger.error(e.getMessage(), e);

xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java

 package com.xxl.job.admin.core.scheduler;
 
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
-import com.xxl.job.admin.core.thread.*;
 import com.xxl.job.admin.core.util.I18nUtil;
 import com.xxl.job.core.biz.ExecutorBiz;
 import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
 import com.xxl.rpc.serialize.impl.HessianSerializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
  * @author xuxueli 2018-10-28 00:18:17
  */
 
-public class XxlJobScheduler {
+@Component
+public class XxlJobScheduler implements InitializingBean {
     private static final Logger logger = LoggerFactory.getLogger(XxlJobScheduler.class);
 
+    @Value("${xxl.job.accessToken}")
+    private String accessToken;
 
-    public void init() throws Exception {
-        // init i18n
-        initI18n();
-
-        // admin registry monitor run
-        JobRegistryMonitorHelper.getInstance().start();
-
-        // admin monitor run
-        JobFailMonitorHelper.getInstance().start();
-
-        // admin trigger pool start
-        JobTriggerPoolHelper.toStart();
-
-        // admin log report start
-        JobLogReportHelper.getInstance().start();
-
-        // start-schedule
-        JobScheduleHelper.getInstance().start();
-
-        logger.info(">>>>>>>>> init xxl-job admin success.");
-    }
-
-
-    public void destroy() throws Exception {
-
-        // stop-schedule
-        JobScheduleHelper.getInstance().toStop();
-
-        // admin log report stop
-        JobLogReportHelper.getInstance().toStop();
-
-        // admin trigger pool stop
-        JobTriggerPoolHelper.toStop();
-
-        // admin monitor stop
-        JobFailMonitorHelper.getInstance().toStop();
-
-        // admin registry stop
-        JobRegistryMonitorHelper.getInstance().toStop();
-
-    }
-
-    // ---------------------- I18n ----------------------
-
+    /**
+     * I18n
+     */
+    @PostConstruct
     private void initI18n() {
         for (ExecutorBlockStrategyEnum item : ExecutorBlockStrategyEnum.values()) {
             item.setTitle(I18nUtil.getString("jobconf_block_".concat(item.name())));
     // ---------------------- executor-client ----------------------
     private static ConcurrentMap<String, ExecutorBiz> executorBizRepository = new ConcurrentHashMap<String, ExecutorBiz>();
 
-    public static ExecutorBiz getExecutorBiz(String address) throws Exception {
+    public ExecutorBiz getExecutorBiz(String address) throws Exception {
         // valid
         if (address == null || address.trim().length() == 0) {
             return null;
         referenceBean.setVersion(null);
         referenceBean.setTimeout(3000);
         referenceBean.setAddress(address);
-        referenceBean.setAccessToken(XxlJobAdminConfig.getAdminConfig().getAccessToken());
+        referenceBean.setAccessToken(accessToken);
         referenceBean.setInvokeCallback(null);
         referenceBean.setInvokerFactory(null);
 
         return executorBiz;
     }
 
+    @Override
+    public void afterPropertiesSet() throws Exception {
+
+    }
 }

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

 package com.xxl.job.admin.core.thread;
 
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
-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.trigger.TriggerTypeEnum;
 import com.xxl.job.admin.core.util.I18nUtil;
-import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.admin.dao.XxlJobInfoDao;
+import com.xxl.job.admin.dao.XxlJobLogDao;
+import com.xxl.job.admin.service.AlarmService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.mail.javamail.MimeMessageHelper;
-import org.springframework.web.client.RestTemplate;
+import org.springframework.stereotype.Component;
 
-import javax.mail.internet.MimeMessage;
-import java.text.MessageFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 /**
  *
  * @author xuxueli 2015-9-1 18:05:56
  */
+@Component
 public class JobFailMonitorHelper {
     private static Logger logger = LoggerFactory.getLogger(JobFailMonitorHelper.class);
 
-    private static JobFailMonitorHelper instance = new JobFailMonitorHelper();
-
-    public static JobFailMonitorHelper getInstance() {
-        return instance;
-    }
-
     // ---------------------- monitor ----------------------
 
     private Thread monitorThread;
     private volatile boolean toStop = false;
 
+
+    private final JobTriggerPoolHelper jobTriggerPoolHelper;
+    private final AlarmService alarmService;
+    private final XxlJobInfoDao xxlJobInfoDao;
+    private final XxlJobLogDao xxlJobLogDao;
+
+    public JobFailMonitorHelper(JobTriggerPoolHelper jobTriggerPoolHelper, XxlJobLogDao xxlJobLogDao, AlarmService alarmService, XxlJobInfoDao xxlJobInfoDao) {
+        this.jobTriggerPoolHelper = jobTriggerPoolHelper;
+        this.xxlJobLogDao = xxlJobLogDao;
+        this.alarmService = alarmService;
+        this.xxlJobInfoDao = xxlJobInfoDao;
+    }
+
+
+    /**
+     * admin monitor run
+     */
+    @PostConstruct
     public void start() {
         monitorThread = new Thread(new Runnable() {
 
                 while (!toStop) {
                     try {
 
-                        List<Long> failLogIds = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().findFailJobLogIds(1000);
+                        List<Long> failLogIds = xxlJobLogDao.findFailJobLogIds(1000);
                         if (failLogIds != null && !failLogIds.isEmpty()) {
                             for (long failLogId : failLogIds) {
 
                                 // lock log
-                                int lockRet = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateAlarmStatus(failLogId, 0, -1);
+                                int lockRet = xxlJobLogDao.updateAlarmStatus(failLogId, 0, -1);
                                 if (lockRet < 1) {
                                     continue;
                                 }
-                                XxlJobLog log = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().load(failLogId);
-                                XxlJobInfo info = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoDao().loadById(log.getJobId());
+                                XxlJobLog log = xxlJobLogDao.load(failLogId);
+                                XxlJobInfo info = xxlJobInfoDao.loadById(log.getJobId());
 
                                 // 1、fail retry monitor
                                 if (log.getExecutorFailRetryCount() > 0) {
-                                    JobTriggerPoolHelper.trigger(log.getJobId(), TriggerTypeEnum.RETRY, (log.getExecutorFailRetryCount() - 1), log.getExecutorShardingParam(), log.getExecutorParam());
+                                    jobTriggerPoolHelper.trigger(log.getJobId(), TriggerTypeEnum.RETRY, (log.getExecutorFailRetryCount() - 1), log.getExecutorShardingParam(), log.getExecutorParam());
                                     String retryMsg = "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>" + I18nUtil.getString("jobconf_trigger_type_retry") + "<<<<<<<<<<< </span><br>";
                                     log.setTriggerMsg(log.getTriggerMsg() + retryMsg);
-                                    XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateTriggerInfo(log);
+                                    xxlJobLogDao.updateTriggerInfo(log);
                                 }
 
                                 // 2、fail alarm monitor
                                     newAlarmStatus = 1;
                                 }
 
-                                XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateAlarmStatus(failLogId, -1, newAlarmStatus);
+                                xxlJobLogDao.updateAlarmStatus(failLogId, -1, newAlarmStatus);
                             }
                         }
 
         monitorThread.start();
     }
 
+    @PreDestroy
     public void toStop() {
         toStop = true;
         // interrupt and wait
         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;
+        return alarmService.alarmNotify(info, jobLog);
     }
 
-    // ---------------------- email alarm ----------------------
-
-    // email alarm template
-    private static final String mailBodyTemplate = "<h5>" + I18nUtil.getString("jobconf_monitor_detail") + "：</span>" +
-            "<table border=\"1\" cellpadding=\"3\" style=\"border-collapse:collapse; width:80%;\" >\n" +
-            "   <thead style=\"font-weight: bold;color: #ffffff;background-color: #ff8c00;\" >" +
-            "      <tr>\n" +
-            "         <td width=\"20%\" >" + I18nUtil.getString("jobinfo_field_jobgroup") + "</td>\n" +
-            "         <td width=\"10%\" >" + I18nUtil.getString("jobinfo_field_id") + "</td>\n" +
-            "         <td width=\"20%\" >" + I18nUtil.getString("jobinfo_field_jobdesc") + "</td>\n" +
-            "         <td width=\"10%\" >" + I18nUtil.getString("jobconf_monitor_alarm_title") + "</td>\n" +
-            "         <td width=\"40%\" >" + I18nUtil.getString("jobconf_monitor_alarm_content") + "</td>\n" +
-            "      </tr>\n" +
-            "   </thead>\n" +
-            "   <tbody>\n" +
-            "      <tr>\n" +
-            "         <td>{0}</td>\n" +
-            "         <td>{1}</td>\n" +
-            "         <td>{2}</td>\n" +
-            "         <td>" + I18nUtil.getString("jobconf_monitor_alarm_type") + "</td>\n" +
-            "         <td>{3}</td>\n" +
-            "      </tr>\n" +
-            "   </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);
-    }
-
-    /**
-     * Email
-     *
-     * @param email
-     * @param title
-     * @param content
-     * @param jobLogId for error
-     * @return
-     */
-    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;
-        }
-    }
-
-    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";
-
-
-    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);
-    }
-
-    /**
-     * 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 {
-
-        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/core/thread/JobLogReportHelper.java

 
 import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
 import com.xxl.job.admin.core.model.XxlJobLogReport;
+import com.xxl.job.admin.dao.XxlJobLogDao;
+import com.xxl.job.admin.dao.XxlJobLogReportDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
  *
  * @author xuxueli 2019-11-22
  */
+@Component
 public class JobLogReportHelper {
     private static Logger logger = LoggerFactory.getLogger(JobLogReportHelper.class);
 
-    private static JobLogReportHelper instance = new JobLogReportHelper();
-
-    public static JobLogReportHelper getInstance() {
-        return instance;
-    }
-
 
     private Thread logrThread;
     private volatile boolean toStop = false;
 
+    private final XxlJobLogDao xxlJobLogDao;
+    private final XxlJobLogReportDao xxlJobLogReportDao;
+    private final XxlJobAdminConfig xxlJobAdminConfig;
+
+
+    public JobLogReportHelper(XxlJobLogDao xxlJobLogDao, XxlJobLogReportDao xxlJobLogReportDao, XxlJobAdminConfig xxlJobAdminConfig) {
+        this.xxlJobLogDao = xxlJobLogDao;
+        this.xxlJobLogReportDao = xxlJobLogReportDao;
+        this.xxlJobAdminConfig = xxlJobAdminConfig;
+    }
+
+    /**
+     * admin log report start
+     */
+    @PostConstruct
     public void start() {
         logrThread = new Thread(new Runnable() {
 
                             xxlJobLogReport.setSucCount(0);
                             xxlJobLogReport.setFailCount(0);
 
-                            Map<String, Object> triggerCountMap = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().findLogReport(todayFrom, todayTo);
+                            Map<String, Object> triggerCountMap = xxlJobLogDao.findLogReport(todayFrom, todayTo);
                             if (triggerCountMap != null && triggerCountMap.size() > 0) {
                                 int triggerDayCount = triggerCountMap.containsKey("triggerDayCount") ? Integer.valueOf(String.valueOf(triggerCountMap.get("triggerDayCount"))) : 0;
                                 int triggerDayCountRunning = triggerCountMap.containsKey("triggerDayCountRunning") ? Integer.valueOf(String.valueOf(triggerCountMap.get("triggerDayCountRunning"))) : 0;
                             }
 
                             // do refresh
-                            int ret = XxlJobAdminConfig.getAdminConfig().getXxlJobLogReportDao().update(xxlJobLogReport);
+                            int ret = xxlJobLogReportDao.update(xxlJobLogReport);
                             if (ret < 1) {
-                                XxlJobAdminConfig.getAdminConfig().getXxlJobLogReportDao().save(xxlJobLogReport);
+                                xxlJobLogReportDao.save(xxlJobLogReport);
                             }
                         }
 
                     }
 
                     // 2、log-clean: switch open & once each day
-                    if (XxlJobAdminConfig.getAdminConfig().getLogretentiondays() > 0
-                            && System.currentTimeMillis() - lastCleanLogTime > 24 * 60 * 60 * 1000) {
+                    if (xxlJobAdminConfig.getLogRetentionDays() > 0 && System.currentTimeMillis() - lastCleanLogTime > 24 * 60 * 60 * 1000) {
 
                         // expire-time
                         Calendar expiredDay = Calendar.getInstance();
-                        expiredDay.add(Calendar.DAY_OF_MONTH, -1 * XxlJobAdminConfig.getAdminConfig().getLogretentiondays());
+                        expiredDay.add(Calendar.DAY_OF_MONTH, -1 * xxlJobAdminConfig.getLogRetentionDays());
                         expiredDay.set(Calendar.HOUR_OF_DAY, 0);
                         expiredDay.set(Calendar.MINUTE, 0);
                         expiredDay.set(Calendar.SECOND, 0);
                         // clean expired log
                         List<Long> logIds = null;
                         do {
-                            logIds = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().findClearLogIds(0, 0, clearBeforeTime, 0, 1000);
+                            logIds = xxlJobLogDao.findClearLogIds(0, 0, clearBeforeTime, 0, 1000);
                             if (logIds != null && logIds.size() > 0) {
-                                XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().clearLog(logIds);
+                                xxlJobLogDao.clearLog(logIds);
                             }
                         } while (logIds != null && logIds.size() > 0);
 
         logrThread.start();
     }
 
+    @PreDestroy
     public void toStop() {
         toStop = true;
         // interrupt and wait

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

 package com.xxl.job.admin.core.thread;
 
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
 import com.xxl.job.admin.core.model.XxlJobGroup;
 import com.xxl.job.admin.core.model.XxlJobRegistry;
+import com.xxl.job.admin.dao.XxlJobGroupDao;
+import com.xxl.job.admin.dao.XxlJobRegistryDao;
 import com.xxl.job.core.enums.RegistryConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
  *
  * @author xuxueli 2016-10-02 19:10:24
  */
+
+@Component
 public class JobRegistryMonitorHelper {
     private static Logger logger = LoggerFactory.getLogger(JobRegistryMonitorHelper.class);
 
-    private static JobRegistryMonitorHelper instance = new JobRegistryMonitorHelper();
-
-    public static JobRegistryMonitorHelper getInstance() {
-        return instance;
-    }
 
     private Thread registryThread;
     private volatile boolean toStop = false;
 
+
+    private final XxlJobGroupDao xxlJobGroupDao;
+    private final XxlJobRegistryDao xxlJobRegistryDao;
+
+    public JobRegistryMonitorHelper(XxlJobGroupDao xxlJobGroupDao, XxlJobRegistryDao xxlJobRegistryDao) {
+        this.xxlJobGroupDao = xxlJobGroupDao;
+        this.xxlJobRegistryDao = xxlJobRegistryDao;
+    }
+
+    /**
+     * admin registry monitor run
+     */
+    @PostConstruct
     public void start() {
         registryThread = new Thread(new Runnable() {
             @Override
                 while (!toStop) {
                     try {
                         // auto registry group
-                        List<XxlJobGroup> groupList = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().findByAddressType(0);
+                        List<XxlJobGroup> groupList = xxlJobGroupDao.findByAddressType(0);
                         if (groupList != null && !groupList.isEmpty()) {
 
                             // remove dead address (admin/executor)
-                            List<Integer> ids = XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryDao().findDead(RegistryConfig.DEAD_TIMEOUT, new Date());
+                            List<Integer> ids = xxlJobRegistryDao.findDead(RegistryConfig.DEAD_TIMEOUT, new Date());
                             if (ids != null && ids.size() > 0) {
-                                XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryDao().removeDead(ids);
+                                xxlJobRegistryDao.removeDead(ids);
                             }
 
                             // fresh online address (admin/executor)
                             HashMap<String, List<String>> appAddressMap = new HashMap<String, List<String>>();
-                            List<XxlJobRegistry> list = XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryDao().findAll(RegistryConfig.DEAD_TIMEOUT, new Date());
+                            List<XxlJobRegistry> list = xxlJobRegistryDao.findAll(RegistryConfig.DEAD_TIMEOUT, new Date());
                             if (list != null) {
                                 for (XxlJobRegistry item : list) {
                                     if (RegistryConfig.RegistType.EXECUTOR.name().equals(item.getRegistryGroup())) {
                                     addressListStr = addressListStr.substring(0, addressListStr.length() - 1);
                                 }
                                 group.setAddressList(addressListStr);
-                                XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().update(group);
+                                xxlJobGroupDao.update(group);
                             }
                         }
                     } catch (Exception e) {
         registryThread.start();
     }
 
+
+    @PreDestroy
     public void toStop() {
         toStop = true;
         // interrupt and wait

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

 import com.xxl.job.admin.core.cron.CronExpression;
 import com.xxl.job.admin.core.model.XxlJobInfo;
 import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
+import com.xxl.job.admin.dao.XxlJobInfoDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 /**
  * @author xuxueli 2019-05-21
  */
+
+@Component
 public class JobScheduleHelper {
     private static Logger logger = LoggerFactory.getLogger(JobScheduleHelper.class);
 
-    private static JobScheduleHelper instance = new JobScheduleHelper();
-
-    public static JobScheduleHelper getInstance() {
-        return instance;
-    }
-
     public static final long PRE_READ_MS = 5000;    // pre read
 
     private Thread scheduleThread;
     private volatile boolean ringThreadToStop = false;
     private volatile static Map<Integer, List<Integer>> ringData = new ConcurrentHashMap<>();
 
+    private final JobTriggerPoolHelper jobTriggerPoolHelper;
+    private final XxlJobInfoDao xxlJobInfoDao;
+    private final DataSource dataSource;
+    private final XxlJobAdminConfig xxlJobAdminConfig;
+
+    public JobScheduleHelper(JobTriggerPoolHelper jobTriggerPoolHelper, XxlJobInfoDao xxlJobInfoDao, DataSource dataSource, XxlJobAdminConfig xxlJobAdminConfig) {
+        this.jobTriggerPoolHelper = jobTriggerPoolHelper;
+        this.xxlJobInfoDao = xxlJobInfoDao;
+        this.dataSource = dataSource;
+        this.xxlJobAdminConfig = xxlJobAdminConfig;
+    }
+
+
+    /**
+     * start-schedule
+     */
+    @PostConstruct
     public void start() {
 
         // schedule thread
                 logger.info(">>>>>>>>> init xxl-job admin scheduler success.");
 
                 // pre-read count: treadpool-size * trigger-qps (each trigger cost 50ms, qps = 1000/50 = 20)
-                int preReadCount = (XxlJobAdminConfig.getAdminConfig().getTriggerPoolFastMax() + XxlJobAdminConfig.getAdminConfig().getTriggerPoolSlowMax()) * 20;
+                int preReadCount = (xxlJobAdminConfig.getTriggerPoolFastMax() + xxlJobAdminConfig.getTriggerPoolSlowMax()) * 20;
 
                 while (!scheduleThreadToStop) {
 
                     boolean preReadSuc = true;
                     try {
 
-                        conn = XxlJobAdminConfig.getAdminConfig().getDataSource().getConnection();
+                        conn = dataSource.getConnection();
                         connAutoCommit = conn.getAutoCommit();
                         conn.setAutoCommit(false);
 
 
                         // 1、pre read
                         long nowTime = System.currentTimeMillis();
-                        List<XxlJobInfo> scheduleList = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoDao().scheduleJobQuery(nowTime + PRE_READ_MS, preReadCount);
+                        List<XxlJobInfo> scheduleList = xxlJobInfoDao.scheduleJobQuery(nowTime + PRE_READ_MS, preReadCount);
                         if (scheduleList != null && scheduleList.size() > 0) {
                             // 2、push time-ring
                             for (XxlJobInfo jobInfo : scheduleList) {
                                     // 2.2、trigger-expire < 5s：direct-trigger && make next-trigger-time
 
                                     // 1、trigger
-                                    JobTriggerPoolHelper.trigger(jobInfo.getId(), TriggerTypeEnum.CRON, -1, null, null);
+                                    jobTriggerPoolHelper.trigger(jobInfo.getId(), TriggerTypeEnum.CRON, -1, null, null);
                                     logger.debug(">>>>>>>>>>> xxl-job, schedule push trigger : jobId = " + jobInfo.getId());
 
                                     // 2、fresh next
 
                             // 3、update trigger info
                             for (XxlJobInfo jobInfo : scheduleList) {
-                                XxlJobAdminConfig.getAdminConfig().getXxlJobInfoDao().scheduleUpdate(jobInfo);
+                                xxlJobInfoDao.scheduleUpdate(jobInfo);
                             }
 
                         } else {
                             // do trigger
                             for (int jobId : ringItemData) {
                                 // do trigger
-                                JobTriggerPoolHelper.trigger(jobId, TriggerTypeEnum.CRON, -1, null, null);
+                                jobTriggerPoolHelper.trigger(jobId, TriggerTypeEnum.CRON, -1, null, null);
                             }
                             // clear
                             ringItemData.clear();
         logger.debug(">>>>>>>>>>> xxl-job, schedule push time-ring : " + ringSecond + " = " + Arrays.asList(ringItemData));
     }
 
+    @PreDestroy
     public void toStop() {
 
         // 1、stop schedule

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

 import com.xxl.job.admin.core.trigger.XxlJobTrigger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
  *
  * @author xuxueli 2018-07-03 21:08:07
  */
+
+@Component
 public class JobTriggerPoolHelper {
     private static Logger logger = LoggerFactory.getLogger(JobTriggerPoolHelper.class);
 
     private ThreadPoolExecutor fastTriggerPool = null;
     private ThreadPoolExecutor slowTriggerPool = null;
 
+
+    private final XxlJobTrigger xxlJobTrigger;
+    private final XxlJobAdminConfig xxlJobAdminConfig;
+
+    public JobTriggerPoolHelper(XxlJobTrigger xxlJobTrigger, XxlJobAdminConfig xxlJobAdminConfig) {
+
+        this.xxlJobTrigger = xxlJobTrigger;
+        this.xxlJobAdminConfig = xxlJobAdminConfig;
+    }
+
+    /**
+     * admin trigger pool start
+     */
+    @PostConstruct
     public void start() {
         fastTriggerPool = new ThreadPoolExecutor(
                 10,
-                XxlJobAdminConfig.getAdminConfig().getTriggerPoolFastMax(),
+                xxlJobAdminConfig.getTriggerPoolFastMax(),
                 60L,
                 TimeUnit.SECONDS,
                 new LinkedBlockingQueue<Runnable>(1000),
 
         slowTriggerPool = new ThreadPoolExecutor(
                 10,
-                XxlJobAdminConfig.getAdminConfig().getTriggerPoolSlowMax(),
+                xxlJobAdminConfig.getTriggerPoolSlowMax(),
                 60L,
                 TimeUnit.SECONDS,
                 new LinkedBlockingQueue<Runnable>(2000),
     }
 
 
+    @PreDestroy
     public void stop() {
         //triggerPool.shutdown();
         fastTriggerPool.shutdownNow();
 
                 try {
                     // do trigger
-                    XxlJobTrigger.trigger(jobId, triggerType, failRetryCount, executorShardingParam, executorParam);
+                    xxlJobTrigger.trigger(jobId, triggerType, failRetryCount, executorShardingParam, executorParam);
                 } catch (Exception e) {
                     logger.error(e.getMessage(), e);
                 } finally {
     }
 
 
-    // ---------------------- helper ----------------------
-
-    private static JobTriggerPoolHelper helper = new JobTriggerPoolHelper();
-
-    public static void toStart() {
-        helper.start();
-    }
-
-    public static void toStop() {
-        helper.stop();
-    }
-
     /**
      * @param jobId
      * @param triggerType
      * @param executorParam         null: use job param
      *                              not null: cover job param
      */
-    public static void trigger(int jobId, TriggerTypeEnum triggerType, int failRetryCount, String executorShardingParam, String executorParam) {
-        helper.addTrigger(jobId, triggerType, failRetryCount, executorShardingParam, executorParam);
+    public void trigger(int jobId, TriggerTypeEnum triggerType, int failRetryCount, String executorShardingParam, String executorParam) {
+        this.addTrigger(jobId, triggerType, failRetryCount, executorShardingParam, executorParam);
     }
 
 }

xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java

 package com.xxl.job.admin.core.trigger;
 
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
 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.route.ExecutorRouteStrategyEnum;
 import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
 import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.dao.XxlJobGroupDao;
+import com.xxl.job.admin.dao.XxlJobInfoDao;
+import com.xxl.job.admin.dao.XxlJobLogDao;
 import com.xxl.job.core.biz.ExecutorBiz;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.biz.model.TriggerParam;
 import com.xxl.rpc.util.ThrowableUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
 
 import java.util.Date;
 
  * xxl-job trigger
  * Created by xuxueli on 17/7/13.
  */
+
+@Component
 public class XxlJobTrigger {
     private static Logger logger = LoggerFactory.getLogger(XxlJobTrigger.class);
 
+
+    private final XxlJobScheduler xxlJobScheduler;
+    private final XxlJobGroupDao xxlJobGroupDao;
+    private final XxlJobInfoDao xxlJobInfoDao;
+    private final XxlJobLogDao xxlJobLogDao;
+
+    public XxlJobTrigger(XxlJobScheduler xxlJobScheduler, XxlJobGroupDao xxlJobGroupDao, XxlJobInfoDao xxlJobInfoDao, XxlJobLogDao xxlJobLogDao) {
+
+        this.xxlJobScheduler = xxlJobScheduler;
+        this.xxlJobGroupDao = xxlJobGroupDao;
+        this.xxlJobInfoDao = xxlJobInfoDao;
+        this.xxlJobLogDao = xxlJobLogDao;
+    }
+
     /**
      * trigger job
      *
      * @param executorParam         null: use job param
      *                              not null: cover job param
      */
-    public static void trigger(int jobId, TriggerTypeEnum triggerType, int failRetryCount, String executorShardingParam, String executorParam) {
+    public void trigger(int jobId, TriggerTypeEnum triggerType, int failRetryCount, String executorShardingParam, String executorParam) {
         // load data
-        XxlJobInfo jobInfo = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoDao().loadById(jobId);
+        XxlJobInfo jobInfo = xxlJobInfoDao.loadById(jobId);
         if (jobInfo == null) {
             logger.warn(">>>>>>>>>>>> trigger fail, jobId invalid，jobId={}", jobId);
             return;
             jobInfo.setExecutorParam(executorParam);
         }
         int finalFailRetryCount = failRetryCount >= 0 ? failRetryCount : jobInfo.getExecutorFailRetryCount();
-        XxlJobGroup group = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().load(jobInfo.getJobGroup());
+        XxlJobGroup group = xxlJobGroupDao.load(jobInfo.getJobGroup());
 
         // sharding param
         int[] shardingParam = null;
             String[] shardingArr = executorShardingParam.split("/");
             if (shardingArr.length == 2 && isNumeric(shardingArr[0]) && isNumeric(shardingArr[1])) {
                 shardingParam = new int[2];
-                shardingParam[0] = Integer.valueOf(shardingArr[0]);
-                shardingParam[1] = Integer.valueOf(shardingArr[1]);
+                shardingParam[0] = Integer.parseInt(shardingArr[0]);
+                shardingParam[1] = Integer.parseInt(shardingArr[1]);
             }
         }
         if (ExecutorRouteStrategyEnum.SHARDING_BROADCAST == ExecutorRouteStrategyEnum.match(jobInfo.getExecutorRouteStrategy(), null)
      * @param index               sharding index
      * @param total               sharding index
      */
-    private static void processTrigger(XxlJobGroup group, XxlJobInfo jobInfo, int finalFailRetryCount, TriggerTypeEnum triggerType, int index, int total) {
+    private void processTrigger(XxlJobGroup group, XxlJobInfo jobInfo, int finalFailRetryCount, TriggerTypeEnum triggerType, int index, int total) {
 
         // param
         ExecutorBlockStrategyEnum blockStrategy = ExecutorBlockStrategyEnum.match(jobInfo.getExecutorBlockStrategy(), ExecutorBlockStrategyEnum.SERIAL_EXECUTION);  // block strategy
         jobLog.setJobGroup(jobInfo.getJobGroup());
         jobLog.setJobId(jobInfo.getId());
         jobLog.setTriggerTime(new Date());
-        XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().save(jobLog);
+        xxlJobLogDao.save(jobLog);
         logger.debug(">>>>>>>>>>> xxl-job trigger start, jobId:{}", jobLog.getId());
 
         // 2、init trigger-param
         //jobLog.setTriggerTime();
         jobLog.setTriggerCode(triggerResult.getCode());
         jobLog.setTriggerMsg(triggerMsgSb.toString());
-        XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateTriggerInfo(jobLog);
+        xxlJobLogDao.updateTriggerInfo(jobLog);
 
         logger.debug(">>>>>>>>>>> xxl-job trigger end, jobId:{}", jobLog.getId());
     }
      * @param address
      * @return
      */
-    public static ReturnT<String> runExecutor(TriggerParam triggerParam, String address) {
+    public ReturnT<String> runExecutor(TriggerParam triggerParam, String address) {
         ReturnT<String> runResult = null;
         try {
-            ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(address);
+            ExecutorBiz executorBiz = xxlJobScheduler.getExecutorBiz(address);
             runResult = executorBiz.run(triggerParam);
         } catch (Exception e) {
             logger.error(">>>>>>>>>>> xxl-job trigger error, please check if the executor[{}] is running.", address, e);

xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java

 package com.xxl.job.admin.core.util;
 
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ClassPathResource;
  *
  * @author xuxueli 2018-01-17 20:39:06
  */
+
+
 public class I18nUtil {
     private static Logger logger = LoggerFactory.getLogger(I18nUtil.class);
 
     private static Properties prop = null;
 
+    private static String i18n = null;
+
+    public static void setI18n(String i18n) {
+        I18nUtil.i18n = i18n;
+    }
+
     public static Properties loadI18nProp() {
-        if (prop != null) {
-            return prop;
-        }
-        try {
-            // build i18n prop
-            String i18n = XxlJobAdminConfig.getAdminConfig().getI18n();
-            i18n = (i18n != null && i18n.trim().length() > 0) ? ("_" + i18n) : i18n;
-            String i18nFile = MessageFormat.format("i18n/message{0}.properties", i18n);
-
-            // load prop
-            Resource resource = new ClassPathResource(i18nFile);
-            EncodedResource encodedResource = new EncodedResource(resource, "UTF-8");
-            prop = PropertiesLoaderUtils.loadProperties(encodedResource);
-        } catch (IOException e) {
-            logger.error(e.getMessage(), e);
+        if (prop == null) {
+            synchronized (I18nUtil.class) {
+                if (prop == null) {
+                    try {
+                        // build i18n prop
+                        if (i18n == null) {
+                            i18n = "";
+                        } else {
+                            i18n = i18n.trim().length() > 0 ? "_" + i18n : i18n;
+                        }
+                        String i18nFile = MessageFormat.format("i18n/message{0}.properties", i18n);
+
+                        // load prop
+                        Resource resource = new ClassPathResource(i18nFile);
+                        EncodedResource encodedResource = new EncodedResource(resource, "UTF-8");
+                        prop = PropertiesLoaderUtils.loadProperties(encodedResource);
+                    } catch (IOException e) {
+                        logger.error(e.getMessage(), e);
+                    }
+                }
+            }
         }
         return prop;
     }
         return loadI18nProp().getProperty(key);
     }
 
+
+    private static Map<String, String> PROPERTIES_CACHE = new HashMap<String, String>();
+
     /**
-     * get mult val of i18n mult key, as json
+     * get multi val of i18n mult key, as json
      *
      * @param keys
      * @return
      */
-    public static String getMultString(String... keys) {
-        Map<String, String> map = new HashMap<String, String>();
+    public static String getMultiString(String... keys) {
+        Map<String, String> map;
 
         Properties prop = loadI18nProp();
         if (keys != null && keys.length > 0) {
+            map = new HashMap<String, String>(keys.length);
             for (String key : keys) {
                 map.put(key, prop.getProperty(key));
             }
         } else {
-            for (String key : prop.stringPropertyNames()) {
-                map.put(key, prop.getProperty(key));
+            if (PROPERTIES_CACHE.isEmpty()) {
+                for (String key : prop.stringPropertyNames()) {
+                    PROPERTIES_CACHE.put(key, prop.getProperty(key));
+                }
             }
+            map = PROPERTIES_CACHE;
         }
-
-        String json = JacksonUtil.writeValueAsString(map);
-        return json;
+        return JacksonUtil.writeValueAsString(map);
     }
 
+
 }

xxl-job-admin/src/main/java/com/xxl/job/admin/service/AlarmService.java

+package com.xxl.job.admin.service;
+
+import com.xxl.job.admin.core.model.XxlJobInfo;
+import com.xxl.job.admin.core.model.XxlJobLog;
+
+/**
+ * @author VcKerry on 2020/1/6
+ */
+
+public interface AlarmService {
+
+    /**
+     * 告警通知
+     *
+     * @param info
+     * @param jobLog
+     * @return
+     */
+    boolean alarmNotify(XxlJobInfo info, XxlJobLog jobLog);
+
+}

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

 import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
 import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
 import com.xxl.job.admin.core.util.I18nUtil;
-import com.xxl.job.admin.dao.XxlJobGroupDao;
 import com.xxl.job.admin.dao.XxlJobInfoDao;
 import com.xxl.job.admin.dao.XxlJobLogDao;
 import com.xxl.job.admin.dao.XxlJobRegistryDao;
     @Resource
     private XxlJobRegistryDao xxlJobRegistryDao;
     @Resource
-    private XxlJobGroupDao xxlJobGroupDao;
+    private JobTriggerPoolHelper jobTriggerPoolHelper;
 
 
     @Override
                     int childJobId = (childJobIds[i] != null && childJobIds[i].trim().length() > 0 && isNumeric(childJobIds[i])) ? Integer.valueOf(childJobIds[i]) : -1;
                     if (childJobId > 0) {
 
-                        JobTriggerPoolHelper.trigger(childJobId, TriggerTypeEnum.PARENT, -1, null, null);
+                        jobTriggerPoolHelper.trigger(childJobId, TriggerTypeEnum.PARENT, -1, null, null);
                         ReturnT<String> triggerChildResult = ReturnT.SUCCESS;
 
                         // add msg

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

+package com.xxl.job.admin.service.impl;
+
+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.I18nUtil;
+import com.xxl.job.admin.dao.XxlJobGroupDao;
+import com.xxl.job.admin.service.AlarmService;
+import com.xxl.job.core.biz.model.ReturnT;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import javax.mail.internet.MimeMessage;
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author VcKerry on 2020/1/6
+ */
+
+@Service
+public class AlarmServiceImpl implements AlarmService {
+
+    private static Logger logger = LoggerFactory.getLogger(AlarmServiceImpl.class);
+
+
+    @Value("${spring.mail.username}")
+    private String emailUserName;
+
+
+    private final XxlJobGroupDao xxlJobGroupDao;
+    private final JavaMailSender mailSender;
+    private final RestTemplate restTemplate;
+
+    public AlarmServiceImpl(XxlJobGroupDao xxlJobGroupDao, JavaMailSender mailSender, RestTemplate restTemplate) {
+        this.xxlJobGroupDao = xxlJobGroupDao;
+        this.mailSender = mailSender;
+        this.restTemplate = restTemplate;
+    }
+
+    @Override
+    public boolean alarmNotify(XxlJobInfo info, XxlJobLog jobLog) {
+
+        boolean alarmResult = true;
+
+        // email info
+        XxlJobGroup group = xxlJobGroupDao.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>" +
+            "<table border=\"1\" cellpadding=\"3\" style=\"border-collapse:collapse; width:80%;\" >\n" +
+            "   <thead style=\"font-weight: bold;color: #ffffff;background-color: #ff8c00;\" >" +
+            "      <tr>\n" +
+            "         <td width=\"20%\" >" + I18nUtil.getString("jobinfo_field_jobgroup") + "</td>\n" +
+            "         <td width=\"10%\" >" + I18nUtil.getString("jobinfo_field_id") + "</td>\n" +
+            "         <td width=\"20%\" >" + I18nUtil.getString("jobinfo_field_jobdesc") + "</td>\n" +
+            "         <td width=\"10%\" >" + I18nUtil.getString("jobconf_monitor_alarm_title") + "</td>\n" +
+            "         <td width=\"40%\" >" + I18nUtil.getString("jobconf_monitor_alarm_content") + "</td>\n" +
+            "      </tr>\n" +
+            "   </thead>\n" +
+            "   <tbody>\n" +
+            "      <tr>\n" +
+            "         <td>{0}</td>\n" +
+            "         <td>{1}</td>\n" +
+            "         <td>{2}</td>\n" +
+            "         <td>" + I18nUtil.getString("jobconf_monitor_alarm_type") + "</td>\n" +
+            "         <td>{3}</td>\n" +
+            "      </tr>\n" +
+            "   </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);
+    }
+
+    /**
+     * Email
+     *
+     * @param email
+     * @param title
+     * @param content
+     * @param jobLogId for error
+     * @return
+     */
+    private boolean failAlarmEmail(String email, String title, String content, Long jobLogId, String personal) throws Exception {
+        // make mail
+        try {
+            MimeMessage mimeMessage = mailSender.createMimeMessage();
+            MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
+            helper.setFrom(emailUserName, personal);
+            helper.setTo(email);
+            helper.setSubject(title);
+            helper.setText(content, true);
+            mailSender.send(mimeMessage);
+            return true;
+        } catch (Exception e) {
+            logger.error(">>>>>>>>>>> xxl-job, job fail alarm email send error, JobLogId:{}", jobLogId, e);
+            throw e;
+        }
+    }
+
+    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";
+
+
+    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);
+    }
+
+    /**
+     * 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 {
+
+        try {
+            final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            final String format = simpleDateFormat.format(new Date());
+            title = title + "[" + format + "]";
+            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/resources/application-dev1.properties

 ### web
 server.port=8081
-server.context-path=/xxl-job-admin
-
+server.servlet.context-path=/xxl-job-admin
+### xxl-job, datasource
+spring.datasource.url=jdbc:mysql://192.168.10.210:6446/xxl_job?Unicode=true&useSSL=false&characterEncoding=UTF-8
+spring.datasource.username=xxl_job
+spring.datasource.password=E_wsq@163.com
+spring.datasource.hikari.connection-test-query=SELECT 1
+spring.datasource.hikari.maximum-pool-size=20
+spring.datasource.hikari.minimum-idle=10
 ### actuator
-management.context-path=/actuator
+management.server.servlet.context-path=/actuator
 management.health.mail.enabled=false
-
 ### resources
 spring.mvc.servlet.load-on-startup=0
 spring.mvc.static-path-pattern=/static/**
 spring.resources.static-locations=classpath:/static/
-
 ### freemarker
 spring.freemarker.templateLoaderPath=classpath:/templates/
 spring.freemarker.suffix=.ftl
 spring.freemarker.charset=UTF-8
 spring.freemarker.request-context-attribute=request
 spring.freemarker.settings.number_format=0.##########
-
 ### mybatis
 mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
-
-### xxl-job, datasource
-spring.datasource.url=jdbc:mysql://192.168.10.210:6446/xxl_job?Unicode=true&characterEncoding=UTF-8
-spring.datasource.username=xxl_job
-spring.datasource.password=E_wsq@163.com
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource
-spring.datasource.tomcat.max-wait=10000
-spring.datasource.tomcat.max-active=30
-spring.datasource.tomcat.test-on-borrow=true
-spring.datasource.tomcat.validation-query=SELECT 1
-spring.datasource.tomcat.validation-interval=30000
-
 ### xxl-job email
-spring.mail.host=smtp.qq.com
-spring.mail.port=25
-spring.mail.username=xxx@qq.com
-spring.mail.password=xxx
+spring.mail.host=smtp.exmail.qq.com
+spring.mail.port=465
+spring.mail.username=system@vcarecity.com
+spring.mail.password=123Abc
 spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 spring.mail.properties.mail.smtp.starttls.required=true
 spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
-
 ### xxl-job, access token
 xxl.job.accessToken=
-
 ### xxl-job, i18n (default empty as chinese, "en" as english)
 xxl.job.i18n=
-
 ## xxl-job, triggerpool max size
 xxl.job.triggerpool.fast.max=200
 xxl.job.triggerpool.slow.max=100
-
 ### xxl-job, log retention days
 xxl.job.logretentiondays=30

xxl-job-admin/src/main/resources/application-dev2.properties

 ### web
-server.port=8081
-server.context-path=/xxl-job-admin
-
+server.port=8082
+server.servlet.context-path=/xxl-job-admin
+### xxl-job, datasource
+spring.datasource.url=jdbc:mysql://192.168.10.210:6446/xxl_job?Unicode=true&useSSL=false&characterEncoding=UTF-8
+spring.datasource.username=xxl_job
+spring.datasource.password=E_wsq@163.com
+spring.datasource.hikari.connection-test-query=SELECT 1
+spring.datasource.hikari.maximum-pool-size=20
+spring.datasource.hikari.minimum-idle=10
 ### actuator
-management.context-path=/actuator
+management.server.servlet.context-path=/actuator
 management.health.mail.enabled=false
-
 ### resources
 spring.mvc.servlet.load-on-startup=0
 spring.mvc.static-path-pattern=/static/**
 spring.resources.static-locations=classpath:/static/
-
 ### freemarker
 spring.freemarker.templateLoaderPath=classpath:/templates/
 spring.freemarker.suffix=.ftl
 spring.freemarker.charset=UTF-8
 spring.freemarker.request-context-attribute=request
 spring.freemarker.settings.number_format=0.##########
-
 ### mybatis
 mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
-
-### xxl-job, datasource
-spring.datasource.url=jdbc:mysql://192.168.10.210:6446/xxl_job?Unicode=true&characterEncoding=UTF-8
-spring.datasource.username=xxl_job
-spring.datasource.password=E_wsq@163.com
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource
-spring.datasource.tomcat.max-wait=10000
-spring.datasource.tomcat.max-active=30
-spring.datasource.tomcat.test-on-borrow=true
-spring.datasource.tomcat.validation-query=SELECT 1
-spring.datasource.tomcat.validation-interval=30000
-
 ### xxl-job email
-spring.mail.host=smtp.qq.com
-spring.mail.port=25
-spring.mail.username=xxx@qq.com
-spring.mail.password=xxx
+spring.mail.host=smtp.exmail.qq.com
+spring.mail.port=465
+spring.mail.username=system@vcarecity.com
+spring.mail.password=123Abc
 spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 spring.mail.properties.mail.smtp.starttls.required=true
 spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
-
 ### xxl-job, access token
 xxl.job.accessToken=
-
 ### xxl-job, i18n (default empty as chinese, "en" as english)
 xxl.job.i18n=
-
 ## xxl-job, triggerpool max size
 xxl.job.triggerpool.fast.max=200
 xxl.job.triggerpool.slow.max=100
-
 ### xxl-job, log retention days
 xxl.job.logretentiondays=30

xxl-job-admin/src/main/resources/application.properties

 ### web
 server.port=8080
-server.context-path=/xxl-job-admin
-
+server.servlet.context-path=/xxl-job-admin
+### xxl-job, datasource
+spring.datasource.url=jdbc:mysql://192.168.10.210:6446/xxl_job?Unicode=true&useSSL=false&characterEncoding=UTF-8
+spring.datasource.username=xxl_job
+spring.datasource.password=E_wsq@163.com
+spring.datasource.hikari.connection-test-query=SELECT 1
+spring.datasource.hikari.maximum-pool-size=20
+spring.datasource.hikari.minimum-idle=10
 ### actuator
-management.context-path=/actuator
+management.server.servlet.context-path=/actuator
 management.health.mail.enabled=false
-
 ### resources
 spring.mvc.servlet.load-on-startup=0
 spring.mvc.static-path-pattern=/static/**
 spring.resources.static-locations=classpath:/static/
-
 ### freemarker
 spring.freemarker.templateLoaderPath=classpath:/templates/
 spring.freemarker.suffix=.ftl
 spring.freemarker.charset=UTF-8
 spring.freemarker.request-context-attribute=request
 spring.freemarker.settings.number_format=0.##########
-
 ### mybatis
 mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
-
-### xxl-job, datasource
-spring.datasource.url=jdbc:mysql://192.168.10.210:6446/xxl_job?Unicode=true&useSSL=false&characterEncoding=UTF-8
-spring.datasource.username=xxl_job
-spring.datasource.password=E_wsq@163.com
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource
-spring.datasource.tomcat.max-wait=10000
-spring.datasource.tomcat.max-active=30
-spring.datasource.tomcat.test-on-borrow=true
-spring.datasource.tomcat.validation-query=SELECT 1
-spring.datasource.tomcat.validation-interval=30000
-
 ### xxl-job email
 spring.mail.host=smtp.exmail.qq.com
 spring.mail.port=465
-spring.mail.username=xxx.11.com
-spring.mail.password=pass
+spring.mail.username=system@vcarecity.com
+spring.mail.password=123Abc
 spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 spring.mail.properties.mail.smtp.starttls.required=true
 spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
-
 ### xxl-job, access token
 xxl.job.accessToken=
-
 ### xxl-job, i18n (default empty as chinese, "en" as english)
 xxl.job.i18n=
-
 ## xxl-job, triggerpool max size
 xxl.job.triggerpool.fast.max=200
 xxl.job.triggerpool.slow.max=100
-
 ### xxl-job, log retention days
 xxl.job.logretentiondays=30
+

xxl-job-admin/src/main/resources/templates/common/common.macro.ftl

 	<link rel="stylesheet" href="${request.contextPath}/static/adminlte/bower_components/PACE/themes/blue/pace-theme-flash.css">
 
 	<#-- i18n -->
-	<#global I18n = I18nUtil.getMultString()?eval />
+	<#global I18n = I18nUtil.getMultiString()?eval />
 
 </#macro>
 
     <script src="${request.contextPath}/static/js/common.1.js"></script>
     <script>
 		var base_url = '${request.contextPath}';
-        var I18n = ${I18nUtil.getMultString()};
+        var I18n = ${I18nUtil.getMultiString()};
 	</script>
 
 </#macro>

xxl-job-admin/src/test/java/com/xxl/job/admin/util/I18nUtilTest.java

     @Test
     public void test() {
         System.out.println(I18nUtil.getString("admin_name"));
-        System.out.println(I18nUtil.getMultString("admin_name", "admin_name_full"));
-        System.out.println(I18nUtil.getMultString());
+        System.out.println(I18nUtil.getMultiString("admin_name", "admin_name_full"));
+        System.out.println(I18nUtil.getMultiString());
     }
 
 }

xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java

             logger.error(e.getMessage(), e);
         }
         connection.setHostnameVerifier(new HostnameVerifier() {
+            @Override
             public boolean verify(String hostname, SSLSession session) {
                 return true;
             }
     }
 
     private static final TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
+        @Override
         public java.security.cert.X509Certificate[] getAcceptedIssuers() {
             return new java.security.cert.X509Certificate[]{};
         }
 
+        @Override
         public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
         }
 
+        @Override
         public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
         }
     }};