diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index b9bde9cb..657ab8cd 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2810,7 +2810,7 @@ public void execute() { - 8、【优化】调度组件触发判断优化,合并PR-2502; - 9、【优化】调度日志调整,完善日志参数信息,合并PR-2761; - 10、【优化】I18N国际化完善,合并PR-2888; - +- 11、【优化】告警组件初始化重构,提升代码可维护性,合并PR-2903; ### 7.45 版本 v3.4.1 Release Notes[ING] - 1、【TODO】调度中心OpenAPI完善,提供任务管理能力;封装Agent Skill并推送ClawHub; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarmer.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarmer.java index 7a042aee..3a37ba26 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarmer.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/alarm/JobAlarmer.java @@ -3,18 +3,12 @@ package com.xxl.job.admin.scheduler.alarm; import com.xxl.job.admin.model.XxlJobInfo; import com.xxl.job.admin.model.XxlJobLog; import com.xxl.tool.core.CollectionTool; -import com.xxl.tool.core.MapTool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * xxl-job alarmer @@ -22,25 +16,12 @@ import java.util.Map; * @author xuxueli 17/7/13. */ @Component -public class JobAlarmer implements ApplicationContextAware, InitializingBean { +public class JobAlarmer { private static final Logger logger = LoggerFactory.getLogger(JobAlarmer.class); - private ApplicationContext applicationContext; + @Autowired private List jobAlarmList; - @Override - public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { - this.applicationContext = applicationContext; - } - - @Override - public void afterPropertiesSet() throws Exception { - Map serviceBeanMap = applicationContext.getBeansOfType(JobAlarm.class); - if (MapTool.isNotEmpty(serviceBeanMap)) { - jobAlarmList = new ArrayList<>(serviceBeanMap.values()); - } - } - /** * job alarm */ @@ -65,4 +46,22 @@ public class JobAlarmer implements ApplicationContextAware, InitializingBean { return result; } + /* + // implements SmartInitializingSingleton + // implements ApplicationContextAware, InitializingBean + private ApplicationContext applicationContext; + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + this.applicationContext = applicationContext; + } + + @Override + public void afterPropertiesSet() throws Exception { + Map serviceBeanMap = applicationContext.getBeansOfType(JobAlarm.class); + if (MapTool.isNotEmpty(serviceBeanMap)) { + jobAlarmList = new ArrayList<>(serviceBeanMap.values()); + } + }*/ + }