From 88350873ee7632924cb135a450fef9f4d05c5306 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 11 九月 2023 11:21:50 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev

---
 src/main/java/com/genersoft/iot/vmp/utils/SpringBeanFactory.java |  100 +++++++++++++++++++++++++-------------------------
 1 files changed, 50 insertions(+), 50 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
old mode 100644
new mode 100755
index 5323875..1806524
--- a/src/main/java/com/genersoft/iot/vmp/utils/SpringBeanFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/SpringBeanFactory.java
@@ -1,50 +1,50 @@
-package com.genersoft.iot.vmp.utils;
-
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-/**    
- * @description:spring bean鑾峰彇宸ュ巶锛岃幏鍙杝pring涓殑宸插垵濮嬪寲鐨刡ean
- * @author: swwheihei
- * @date:   2019骞�6鏈�25鏃� 涓嬪崍4:51:52   
- * 
- */
-@Component
-public class SpringBeanFactory implements ApplicationContextAware {
-
-	// Spring搴旂敤涓婁笅鏂囩幆澧�
-    private static ApplicationContext applicationContext;
-    
-    /**
-     * 瀹炵幇ApplicationContextAware鎺ュ彛鐨勫洖璋冩柟娉曪紝璁剧疆涓婁笅鏂囩幆澧�
-     */
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext)
-            throws BeansException {
-    	SpringBeanFactory.applicationContext = applicationContext;
-    }
-
-    public static ApplicationContext getApplicationContext() {
-        return applicationContext;
-    }
-
-    /**
-     * 鑾峰彇瀵硅薄 杩欓噷閲嶅啓浜哹ean鏂规硶锛岃捣涓昏浣滅敤
-     */
-    public static  <T> T getBean(String beanId) throws BeansException {
-        if (applicationContext == null) {
-            return null;
-        }
-        return (T) applicationContext.getBean(beanId);
-    }
-
-    /**
-     * 鑾峰彇褰撳墠鐜
-     */
-    public static String getActiveProfile() {
-        return applicationContext.getEnvironment().getActiveProfiles()[0];
-    }
-
-}
+package com.genersoft.iot.vmp.utils;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**    
+ * @description:spring bean鑾峰彇宸ュ巶锛岃幏鍙杝pring涓殑宸插垵濮嬪寲鐨刡ean
+ * @author: swwheihei
+ * @date:   2019骞�6鏈�25鏃� 涓嬪崍4:51:52   
+ * 
+ */
+@Component
+public class SpringBeanFactory implements ApplicationContextAware {
+
+	// Spring搴旂敤涓婁笅鏂囩幆澧�
+    private static ApplicationContext applicationContext;
+    
+    /**
+     * 瀹炵幇ApplicationContextAware鎺ュ彛鐨勫洖璋冩柟娉曪紝璁剧疆涓婁笅鏂囩幆澧�
+     */
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext)
+            throws BeansException {
+    	SpringBeanFactory.applicationContext = applicationContext;
+    }
+
+    public static ApplicationContext getApplicationContext() {
+        return applicationContext;
+    }
+
+    /**
+     * 鑾峰彇瀵硅薄 杩欓噷閲嶅啓浜哹ean鏂规硶锛岃捣涓昏浣滅敤
+     */
+    public static  <T> T getBean(String beanId) throws BeansException {
+        if (applicationContext == null) {
+            return null;
+        }
+        return (T) applicationContext.getBean(beanId);
+    }
+
+    /**
+     * 鑾峰彇褰撳墠鐜
+     */
+    public static String getActiveProfile() {
+        return applicationContext.getEnvironment().getActiveProfiles()[0];
+    }
+
+}

--
Gitblit v1.8.0