diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/SpringContextHolder.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/SpringContextHolder.java index 89374271b..558d63a64 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/SpringContextHolder.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/SpringContextHolder.java @@ -20,7 +20,11 @@ package com.pig4cloud.pigx.common.core.util; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeansException; import org.springframework.beans.factory.DisposableBean; +import org.springframework.beans.factory.ListableBeanFactory; +import org.springframework.beans.factory.config.BeanFactoryPostProcessor; +import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationEvent; @@ -36,7 +40,9 @@ import java.util.Map; @Slf4j @Service @Lazy(false) -public class SpringContextHolder implements ApplicationContextAware, DisposableBean { +public class SpringContextHolder implements BeanFactoryPostProcessor, ApplicationContextAware, DisposableBean { + + private static ConfigurableListableBeanFactory beanFactory; private static ApplicationContext applicationContext = null; @@ -47,6 +53,14 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB return applicationContext; } + /** + * BeanFactoryPostProcessor, 注入Context到静态变量中. + */ + @Override + public void postProcessBeanFactory(ConfigurableListableBeanFactory factory) throws BeansException { + SpringContextHolder.beanFactory = factory; + } + /** * 实现ApplicationContextAware接口, 注入Context到静态变量中. */ @@ -55,26 +69,30 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB SpringContextHolder.applicationContext = applicationContext; } + public static ListableBeanFactory getBeanFactory() { + return null == beanFactory ? applicationContext : beanFactory; + } + /** * 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型. */ @SuppressWarnings("unchecked") public static T getBean(String name) { - return (T) applicationContext.getBean(name); + return (T) getBeanFactory().getBean(name); } /** * 从静态变量applicationContext中取得Bean, Map */ public static Map getBeansOfType(Class type) { - return applicationContext.getBeansOfType(type); + return getBeanFactory().getBeansOfType(type); } /** * 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型. */ public static T getBean(Class requiredType) { - return applicationContext.getBean(requiredType); + return getBeanFactory().getBean(requiredType); } /**