From 7d0e212723c86744cf0f3ce1405131dbca74151f Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 7 Jul 2020 19:05:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=94=99=E8=AF=AF=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E9=92=89=E9=92=89=E6=B6=88=E6=81=AF=20=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=9C=8D=E5=8A=A1Ip=E5=9C=B0=E5=9D=80=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/filter/LogMsgSendFilter.java        | 31 +++++++++++++++++--
 .../src/main/resources/logback-spring.xml     |  2 --
 .../src/main/resources/logback-spring.xml     |  2 --
 3 files changed, 28 insertions(+), 7 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 45302413dd..4745de9afa 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
@@ -9,10 +9,12 @@ import ch.qos.logback.core.spi.FilterReply;
 import com.epmet.commons.tools.dto.form.DingTalkTextMsg;
 import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.utils.DingdingMsgSender;
-import com.epmet.commons.tools.utils.IpUtils;
+import com.epmet.commons.tools.utils.SpringContextUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.cloud.commons.util.InetUtils;
+import org.springframework.core.env.Environment;
 
 import java.text.SimpleDateFormat;
 
@@ -27,9 +29,11 @@ public class LogMsgSendFilter extends LevelFilter {
 	private DingdingMsgSender msgSender = new DingdingMsgSender();
 	private String webHook;
 	private String secret;
-	private String activeEnv;
 	private String appName;
 
+	private String activeEnv;
+	private String serverIp;
+
 	@Override
 	public FilterReply decide(ILoggingEvent event) {
 		//如果日志级别等于设置的日志级别 则发送消息
@@ -46,11 +50,12 @@ public class LogMsgSendFilter extends LevelFilter {
 					stringBuilder.append("服务名称：" + appName);
 					stringBuilder.append("\n");
 				}
+				getServerInfo();
 				if (StringUtils.isNotBlank(activeEnv)) {
 					stringBuilder.append("告警环境：" + EnvEnum.getEnum(activeEnv).getName());
 					stringBuilder.append("\n");
 				}
-				String serverIp = IpUtils.getServerIp();
+
 				if (StringUtils.isNotBlank(serverIp)) {
 					stringBuilder.append("IP地址：" + serverIp);
 					stringBuilder.append("\n");
@@ -83,6 +88,26 @@ public class LogMsgSendFilter extends LevelFilter {
 		}
 		//交给其他filter继续向下处理
 		return super.decide(event);
+
+	}
+
+	/**
+	 * desc:获取服务 ip及profile信息
+	 *
+	 */
+	private void getServerInfo() {
+		if (serverIp == null) {
+			InetUtils inetUtils = SpringContextUtils.getBean(InetUtils.class);
+			serverIp = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+		}
+		if (activeEnv == null) {
+			Environment environment = SpringContextUtils.getBean(Environment.class);
+			String[] activeProfiles = environment.getActiveProfiles();
+			if (activeProfiles != null && activeProfiles.length > 0) {
+				logger.info("activeProfiles:{}", activeProfiles);
+				activeEnv = activeProfiles[0];
+			}
+		}
 	}
 
 	private void apendStackInfo(StringBuilder stringBuilder, IThrowableProxy throwableProxy) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
index 9a76a9c74f..8ad6400d13 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml
@@ -5,7 +5,6 @@
     <property name="log.path" value="logs/data-statistical"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
-    <springProperty scope="context" name="activeEnv" source="spring.profiles.active"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
     <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
@@ -133,7 +132,6 @@
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
-            <activeEnv>${activeEnv}</activeEnv>
             <webHook>${webHook}</webHook>
             <secret>${secret}</secret>
             <appName>${appname}</appName>
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
index fcfb1de19e..a4e9cf63d2 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml
@@ -5,7 +5,6 @@
     <property name="log.path" value="logs/job"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
-    <springProperty scope="context" name="activeEnv" source="spring.profiles.active"/>
     <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
     <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
@@ -132,7 +131,6 @@
             <level>ERROR</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
-            <activeEnv>${activeEnv}</activeEnv>
             <webHook>${webHook}</webHook>
             <secret>${secret}</secret>
             <appName>${appname}</appName>