From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java | 85 +++++++++---------------------------------
1 files changed, 18 insertions(+), 67 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
index 19bd77e..ebc6d27 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
@@ -1,56 +1,17 @@
package com.ruoyi.common.utils.spring;
+import cn.hutool.extra.spring.SpringUtil;
import org.springframework.aop.framework.AopContext;
-import org.springframework.beans.BeansException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.stereotype.Component;
/**
- * spring宸ュ叿绫� 鏂逛究鍦ㄩ潪spring绠＄悊鐜涓幏鍙朾ean
- *
- * @author ruoyi
+ * spring宸ュ叿绫�
+ *
+ * @author Lion Li
*/
@Component
-public final class SpringUtils implements BeanFactoryPostProcessor
-{
- /** Spring搴旂敤涓婁笅鏂囩幆澧� */
- private static ConfigurableListableBeanFactory beanFactory;
-
- @Override
- public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
- {
- SpringUtils.beanFactory = beanFactory;
- }
-
- /**
- * 鑾峰彇瀵硅薄
- *
- * @param name
- * @return Object 涓�涓互鎵�缁欏悕瀛楁敞鍐岀殑bean鐨勫疄渚�
- * @throws org.springframework.beans.BeansException
- *
- */
- @SuppressWarnings("unchecked")
- public static <T> T getBean(String name) throws BeansException
- {
- return (T) beanFactory.getBean(name);
- }
-
- /**
- * 鑾峰彇绫诲瀷涓簉equiredType鐨勫璞�
- *
- * @param clz
- * @return
- * @throws org.springframework.beans.BeansException
- *
- */
- public static <T> T getBean(Class<T> clz) throws BeansException
- {
- T result = (T) beanFactory.getBean(clz);
- return result;
- }
+public final class SpringUtils extends SpringUtil {
/**
* 濡傛灉BeanFactory鍖呭惈涓�涓笌鎵�缁欏悕绉板尮閰嶇殑bean瀹氫箟锛屽垯杩斿洖true
@@ -58,57 +19,47 @@
* @param name
* @return boolean
*/
- public static boolean containsBean(String name)
- {
- return beanFactory.containsBean(name);
+ public static boolean containsBean(String name) {
+ return getBeanFactory().containsBean(name);
}
/**
- * 鍒ゆ柇浠ョ粰瀹氬悕瀛楁敞鍐岀殑bean瀹氫箟鏄竴涓猻ingleton杩樻槸涓�涓猵rototype銆� 濡傛灉涓庣粰瀹氬悕瀛楃浉搴旂殑bean瀹氫箟娌℃湁琚壘鍒帮紝灏嗕細鎶涘嚭涓�涓紓甯革紙NoSuchBeanDefinitionException锛�
+ * 鍒ゆ柇浠ョ粰瀹氬悕瀛楁敞鍐岀殑bean瀹氫箟鏄竴涓猻ingleton杩樻槸涓�涓猵rototype銆�
+ * 濡傛灉涓庣粰瀹氬悕瀛楃浉搴旂殑bean瀹氫箟娌℃湁琚壘鍒帮紝灏嗕細鎶涘嚭涓�涓紓甯革紙NoSuchBeanDefinitionException锛�
*
* @param name
* @return boolean
- * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
- *
*/
- public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException
- {
- return beanFactory.isSingleton(name);
+ public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
+ return getBeanFactory().isSingleton(name);
}
/**
* @param name
* @return Class 娉ㄥ唽瀵硅薄鐨勭被鍨�
- * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
- *
*/
- public static Class<?> getType(String name) throws NoSuchBeanDefinitionException
- {
- return beanFactory.getType(name);
+ public static Class<?> getType(String name) throws NoSuchBeanDefinitionException {
+ return getBeanFactory().getType(name);
}
/**
* 濡傛灉缁欏畾鐨刡ean鍚嶅瓧鍦╞ean瀹氫箟涓湁鍒悕锛屽垯杩斿洖杩欎簺鍒悕
*
* @param name
- * @return
- * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
- *
*/
- public static String[] getAliases(String name) throws NoSuchBeanDefinitionException
- {
- return beanFactory.getAliases(name);
+ public static String[] getAliases(String name) throws NoSuchBeanDefinitionException {
+ return getBeanFactory().getAliases(name);
}
/**
* 鑾峰彇aop浠ｇ悊瀵硅薄
- *
+ *
* @param invoker
* @return
*/
@SuppressWarnings("unchecked")
- public static <T> T getAopProxy(T invoker)
- {
+ public static <T> T getAopProxy(T invoker) {
return (T) AopContext.currentProxy();
}
+
}
--
Gitblit v1.9.3