执行器任务Bean扫描逻辑优化，完善懒加载Bean检测及过滤机制；

Author: xuxueli

doc/XXL-JOB官方文档.md

@@ -2580,10 +2580,11 @@ public void execute() {
 - 8、【修复】调度预读任务数量调整，改为调度线程池大小x10，降低事务颗粒度，提升性能及稳定性；
 - 9、【优化】调度不重不漏逻辑优化：调度时间轮单刻度数据去重，避免极端情况下任务重复执行；时间轮转动时校验临近刻度，避免极端情况下遗漏刻度；
 - 10、【重构】调度过期策略、调度类型策略逻辑重构，代码组件化拆分并完善日志，提升健壮性及可维护性；
-- 11、【ING】UI框架重构升级，提升交互体验；
-- 12、【ING】调整资源加载逻辑，移除不必要的拦截器逻辑，提升页面加载效率；
-- 13、【ING】规范API交互协议，通用响应结构体调整为Response；
-- 14、【ING】Http通讯组件升级，基于接口代理方式重构；
+- 11、【优化】执行器任务Bean扫描逻辑优化，完善懒加载Bean检测及过滤机制；
+- 12、【ING】UI框架重构升级，提升交互体验；
+- 13、【ING】调整资源加载逻辑，移除不必要的拦截器逻辑，提升页面加载效率；
+- 14、【ING】规范API交互协议，通用响应结构体调整为Response；
+- 15、【ING】Http通讯组件升级，基于接口代理方式重构；
 
 
 ### TODO LIST

xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java

@@ -8,9 +8,10 @@
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.SmartInitializingSingleton;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.annotation.Lazy;
+import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.MethodIntrospector;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 
@@ -33,9 +34,6 @@ public class XxlJobSpringExecutor extends XxlJobExecutor implements ApplicationC
     @Override
     public void afterSingletonsInstantiated() {
 
-        // init JobHandler Repository
-        /*initJobHandlerRepository(applicationContext);*/
-
         // init JobHandler Repository (for method)
         initJobHandlerMethodRepository(applicationContext);
 
@@ -56,29 +54,11 @@ public void destroy() {
         super.destroy();
     }
 
-
-    /*private void initJobHandlerRepository(ApplicationContext applicationContext) {
-        if (applicationContext == null) {
-            return;
-        }
-
-        // init job handler action
-        Map<String, Object> serviceBeanMap = applicationContext.getBeansWithAnnotation(JobHandler.class);
-
-        if (serviceBeanMap != null && serviceBeanMap.size() > 0) {
-            for (Object serviceBean : serviceBeanMap.values()) {
-                if (serviceBean instanceof IJobHandler) {
-                    String name = serviceBean.getClass().getAnnotation(JobHandler.class).value();
-                    IJobHandler handler = (IJobHandler) serviceBean;
-                    if (loadJobHandler(name) != null) {
-                        throw new RuntimeException("xxl-job jobhandler[" + name + "] naming conflicts.");
-                    }
-                    registJobHandler(name, handler);
-                }
-            }
-        }
-    }*/
-
+    /**
+     * init job handler from method
+     *
+     * @param applicationContext applicationContext
+     */
     private void initJobHandlerMethodRepository(ApplicationContext applicationContext) {
         if (applicationContext == null) {
             return;
@@ -87,12 +67,28 @@ private void initJobHandlerMethodRepository(ApplicationContext applicationContex
         String[] beanDefinitionNames = applicationContext.getBeanNamesForType(Object.class, false, false);  // allowEagerInit=false, avoid early initialization
         for (String beanDefinitionName : beanDefinitionNames) {
 
-            // filter system bean
+            // skip system bean
             if (isSystemBean(beanDefinitionName)) {
                 continue;
             }
 
-            // get bean
+            // skip lazy bean
+            if (applicationContext instanceof GenericApplicationContext genericApplicationContext) {
+                if (!genericApplicationContext.containsBeanDefinition(beanDefinitionName)) {
+                    continue;
+                }
+                // valid lazy bean
+                BeanDefinition beanDefinition = genericApplicationContext.getBeanDefinition(beanDefinitionName);
+                if (beanDefinition.isLazyInit()) {
+                    logger.debug("xxl-job bean-definition scan, skip lazy-init bean:{}", beanDefinitionName);
+                    continue;
+                }
+            }
+
+            // load bean
+            Object bean = applicationContext.getBean(beanDefinitionName);
+            /*
+            skip lazy bean2
             Object bean = null;
             Lazy onBean = applicationContext.findAnnotationOnBean(beanDefinitionName, Lazy.class);
             if (onBean!=null){
@@ -101,6 +97,7 @@ private void initJobHandlerMethodRepository(ApplicationContext applicationContex
             }else {
                 bean = applicationContext.getBean(beanDefinitionName);
             }
+            */
 
             // filter method
             Map<Method, XxlJob> annotatedMethods = null;   // referred to ：org.springframework.context.event.EventListenerMethodProcessor.processBean
@@ -149,13 +146,4 @@ public static ApplicationContext getApplicationContext() {
         return applicationContext;
     }
 
-    /*
-    BeanDefinitionRegistryPostProcessor
-    registry.getBeanDefine()
-    @Override
-    public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
-        this.registry = registry;
-    }
-    * */
-
 }