From 8170f7dc65802b15e5fb16fc3fdbb646d286b146 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 28 Jul 2021 14:23:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=BC=BA=E5=88=A4=E6=96=AD=20?=
 =?UTF-8?q?=E4=B8=8D=E6=8A=9B=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/filter/LogMsgSendFilter.java     | 2 +-
 .../com/epmet/commons/tools/utils/SpringContextUtils.java    | 3 +++
 .../java/com/epmet/service/impl/CustomerAppServiceImpl.java  | 5 ++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
index 0651951d56..8216827ee6 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
@@ -123,7 +123,7 @@ public class LogMsgSendFilter extends LevelFilter {
         try {
             if (serverIp == null) {
                 InetUtils inetUtils = SpringContextUtils.getBean(InetUtils.class);
-                if (inetUtils.findFirstNonLoopbackHostInfo() == null){
+                if (inetUtils == null || inetUtils.findFirstNonLoopbackHostInfo() == null){
                     return;
                 }
                 serverIp = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SpringContextUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SpringContextUtils.java
index cb5b455b14..3acb96c868 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SpringContextUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SpringContextUtils.java
@@ -34,6 +34,9 @@ public class SpringContextUtils implements ApplicationContextAware {
 	}
 
 	public static <T> T getBean(Class<T> requiredType) {
+		if (applicationContext == null){
+			return null;
+		}
 		return applicationContext.getBean(requiredType);
 	}
 
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerAppServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerAppServiceImpl.java
index c245f3a06e..00da16612d 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerAppServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerAppServiceImpl.java
@@ -38,7 +38,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import javax.annotation.PostConstruct;
 import java.util.List;
 import java.util.Map;
 
@@ -54,7 +53,7 @@ public class CustomerAppServiceImpl extends BaseServiceImpl<CustomerAppDao, Cust
     @Autowired
     private RedisTemplate redisTemplate;
 
-    @PostConstruct
+    //@PostConstruct
     private void initApp2Redis() {
         SetOperations<String, CustomerAppRedisDTO> appSet = redisTemplate.opsForSet();
         List<CustomerAppDTO> configAllApp = this.getConfigAllApp();
@@ -127,4 +126,4 @@ public class CustomerAppServiceImpl extends BaseServiceImpl<CustomerAppDao, Cust
         return customerAppDTOS;
     }
 
-}
\ No newline at end of file
+}