Pre Merge pull request !297 from knifeedge/N/A

This commit is contained in:
knifeedge 2022-05-11 01:58:15 +00:00 committed by Gitee
commit 2815e4ab1d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 7 additions and 16 deletions

View File

@ -16,19 +16,10 @@ import com.ruoyi.common.utils.StringUtils;
* @author ruoyi * @author ruoyi
*/ */
@Component @Component
public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware public final class SpringUtils implements ApplicationContextAware
{ {
/** Spring应用上下文环境 */
private static ConfigurableListableBeanFactory beanFactory;
private static ApplicationContext applicationContext; private static ApplicationContext applicationContext;
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
{
SpringUtils.beanFactory = beanFactory;
}
@Override @Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{ {
@ -46,7 +37,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static <T> T getBean(String name) throws BeansException public static <T> T getBean(String name) throws BeansException
{ {
return (T) beanFactory.getBean(name); return (T) applicationContext.getBean(name);
} }
/** /**
@ -59,7 +50,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
*/ */
public static <T> T getBean(Class<T> clz) throws BeansException public static <T> T getBean(Class<T> clz) throws BeansException
{ {
T result = (T) beanFactory.getBean(clz); T result = (T) applicationContext.getBean(clz);
return result; return result;
} }
@ -71,7 +62,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
*/ */
public static boolean containsBean(String name) public static boolean containsBean(String name)
{ {
return beanFactory.containsBean(name); return applicationContext.containsBean(name);
} }
/** /**
@ -84,7 +75,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
*/ */
public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException
{ {
return beanFactory.isSingleton(name); return applicationContext.isSingleton(name);
} }
/** /**
@ -95,7 +86,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
*/ */
public static Class<?> getType(String name) throws NoSuchBeanDefinitionException public static Class<?> getType(String name) throws NoSuchBeanDefinitionException
{ {
return beanFactory.getType(name); return applicationContext.getType(name);
} }
/** /**
@ -108,7 +99,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
*/ */
public static String[] getAliases(String name) throws NoSuchBeanDefinitionException public static String[] getAliases(String name) throws NoSuchBeanDefinitionException
{ {
return beanFactory.getAliases(name); return applicationContext.getAliases(name);
} }
/** /**