From ce035dbcdb38fc1f73ec82f54336f490a632b53b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 05 一月 2023 09:38:11 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/utils/SpringBeanFactory.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/SpringBeanFactory.java b/src/main/java/com/genersoft/iot/vmp/utils/SpringBeanFactory.java
index 273f5fb..5323875 100644
--- a/src/main/java/com/genersoft/iot/vmp/utils/SpringBeanFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/SpringBeanFactory.java
@@ -6,8 +6,8 @@
import org.springframework.stereotype.Component;
/**
- * @Description:spring bean鑾峰彇宸ュ巶锛岃幏鍙杝pring涓殑宸插垵濮嬪寲鐨刡ean
- * @author: songww
+ * @description:spring bean鑾峰彇宸ュ巶锛岃幏鍙杝pring涓殑宸插垵濮嬪寲鐨刡ean
+ * @author: swwheihei
* @date: 2019骞�6鏈�25鏃� 涓嬪崍4:51:52
*
*/
@@ -33,8 +33,11 @@
/**
* 鑾峰彇瀵硅薄 杩欓噷閲嶅啓浜哹ean鏂规硶锛岃捣涓昏浣滅敤
*/
- public static Object getBean(String beanId) throws BeansException {
- return applicationContext.getBean(beanId);
+ public static <T> T getBean(String beanId) throws BeansException {
+ if (applicationContext == null) {
+ return null;
+ }
+ return (T) applicationContext.getBean(beanId);
}
/**
--
Gitblit v1.8.0